jekyll 1.2.1 → 1.3.0.rc

data/lib/jekyll/tags/gist.rb

@@ -12,7 +12,15 @@ module Jekyll
         gist_id, filename = tag_contents[0], tag_contents[1]
         gist_script_tag(gist_id, filename)
       else
-        "Error parsing gist id"
+        raise ArgumentError.new <<-eos
+Syntax error in tag 'gist' while parsing the following markup:
+
+  #{@markup}
+
+Valid syntax:
+  for public gists:  {% gist 1234567 %}
+  for private gists: {% gist user/1234567 %}
+eos
       end
     end
 

data/lib/jekyll/tags/highlight.rb

@@ -14,7 +14,7 @@ module Jekyll
       def initialize(tag_name, markup, tokens)
         super
         if markup.strip =~ SYNTAX
-          @lang = $1
+          @lang = $1.downcase
           @options = {}
           if defined?($2) && $2 != ''
             $2.split.each do |opt|

data/lib/jekyll/tags/include.rb

@@ -1,21 +1,33 @@
 module Jekyll
   module Tags
+    class IncludeTagError < StandardError
+      attr_accessor :path
+
+      def initialize(msg, path)
+        super(msg)
+        @path = path
+      end
+    end
+
     class IncludeTag < Liquid::Tag
 
-      MATCHER = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/
+      SYNTAX_EXAMPLE = "{% include file.ext param='value' param2='value' %}"
+
+      VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/      
+
+      INCLUDES_DIR = '_includes'
 
       def initialize(tag_name, markup, tokens)
         super
         @file, @params = markup.strip.split(' ', 2);
+        validate_params if @params
       end
 
       def parse_params(context)
-        validate_syntax
-
         params = {}
         markup = @params
 
-        while match = MATCHER.match(markup) do
+        while match = VALID_SYNTAX.match(markup) do
           markup = markup[match.end(0)..-1]
 
           value = if match[2]
@@ -31,59 +43,91 @@ module Jekyll
         params
       end
 
-      # ensure the entire markup string from start to end is valid syntax, and params are separated by spaces
-      def validate_syntax
-        full_matcher = Regexp.compile('\A\s*(?:' + MATCHER.to_s + '(?=\s|\z)\s*)*\z')
-        unless @params =~ full_matcher
-          raise SyntaxError.new <<-eos
+      def validate_file_name
+        if @file !~ /^[a-zA-Z0-9_\/\.-]+$/ || @file =~ /\.\// || @file =~ /\/\./
+            raise ArgumentError.new <<-eos
+Invalid syntax for include tag. File contains invalid characters or sequences:
+
+	#{@file}
+
+Valid syntax:
+
+	#{SYNTAX_EXAMPLE}
+
+eos
+        end
+      end
+
+      def validate_params
+        full_valid_syntax = Regexp.compile('\A\s*(?:' + VALID_SYNTAX.to_s + '(?=\s|\z)\s*)*\z')
+        unless @params =~ full_valid_syntax
+          raise ArgumentError.new <<-eos
 Invalid syntax for include tag:
 
 	#{@params}
 
 Valid syntax:
 
-	{% include file.ext param='value' param2="value" %}
+	#{SYNTAX_EXAMPLE}
 
 eos
         end
       end
 
-      def render(context)
-        includes_dir = File.join(context.registers[:site].source, '_includes')
+      # Grab file read opts in the context
+      def file_read_opts(context)
+        context.registers[:site].file_read_opts
+      end
 
-        if error = validate_file(includes_dir)
-          return error
+      def retrieve_variable(context)
+        if /\{\{([\w\-\.]+)\}\}/ =~ @file
+          raise ArgumentError.new("No variable #{$1} was found in include tag") if context[$1].nil?
+          @file = context[$1]
         end
+      end
+
+      def render(context)
+        dir = File.join(context.registers[:site].source, INCLUDES_DIR)
+        validate_dir(dir, context.registers[:site].safe)
+
+        retrieve_variable(context)
+        validate_file_name
 
-        source = File.read(File.join(includes_dir, @file))
-        partial = Liquid::Template.parse(source)
+        file = File.join(dir, @file)
+        validate_file(file, context.registers[:site].safe)
+
+        partial = Liquid::Template.parse(source(file, context))
 
         context.stack do
           context['include'] = parse_params(context) if @params
-          partial.render(context)
+          partial.render!(context)
         end
+      rescue => e
+        raise IncludeTagError.new e.message, File.join(INCLUDES_DIR, @file)
       end
 
-      def validate_file(includes_dir)
-        if File.symlink?(includes_dir)
-          return "Includes directory '#{includes_dir}' cannot be a symlink"
-        end
-
-        if @file !~ /^[a-zA-Z0-9_\/\.-]+$/ || @file =~ /\.\// || @file =~ /\/\./
-          return "Include file '#{@file}' contains invalid characters or sequences"
+      def validate_dir(dir, safe)
+        if File.symlink?(dir) && safe
+          raise IOError.new "Includes directory '#{dir}' cannot be a symlink"
         end
+      end
 
-        file = File.join(includes_dir, @file)
+      def validate_file(file, safe)
         if !File.exists?(file)
-          return "Included file #{@file} not found in _includes directory"
-        elsif File.symlink?(file)
-          return "The included file '_includes/#{@file}' should not be a symlink"
+          raise IOError.new "Included file '#{@file}' not found in '#{INCLUDES_DIR}' directory"
+        elsif File.symlink?(file) && safe
+          raise IOError.new "The included file '#{INCLUDES_DIR}/#{@file}' should not be a symlink"
         end
       end
 
       def blank?
         false
       end
+
+      # This method allows to modify the file content by inheriting from the class.
+      def source(file, context)
+        File.read_with_options(file, file_read_opts(context))
+      end
     end
   end
 end

data/lib/jekyll/tags/post_url.rb

@@ -50,9 +50,11 @@ module Jekyll
           end
         end
 
-        puts "ERROR: post_url: \"#{@orig_post}\" could not be found"
+        raise ArgumentError.new <<-eos
+Could not find post "#{@orig_post}" in tag 'post_url'.
 
-        return "#"
+Make sure the post exists and the name is correct.
+eos
       end
     end
   end

data/lib/site_template/css/main.css

@@ -34,16 +34,16 @@ a:visited { color: #a0a; }
 /* Home
 /*
 /*****************************************************************************/
-ul.posts {
+.posts {
   list-style-type: none;
   margin-bottom: 2em;
 }
 
-ul.posts li {
+.posts li {
   line-height: 1.75em;
 }
 
-ul.posts span {
+.posts span {
   color: #aaa;
   font-family: Monaco, "Courier New", monospace;
   font-size: 80%;
@@ -63,38 +63,38 @@ ul.posts span {
   line-height: 1.5em;
 }
 
-.site .header a {
+.header a {
   font-weight: bold;
   text-decoration: none;
 }
 
-.site .header h1.title {
+.title {
   display: inline-block;
   margin-bottom: 2em;
 }
 
-.site .header h1.title a {
+.title a {
   color: #a00;
 }
 
-.site .header h1.title a:hover {
+.title a:hover {
   color: #000;
 }
 
-.site .header a.extra {
+.header a.extra {
   color: #aaa;
   margin-left: 1em;
 }
 
-.site .header a.extra:hover {
+.header a.extra:hover {
   color: #000;
 }
 
-.site .meta {
+.meta {
   color: #aaa;
 }
 
-.site .footer {
+.footer {
   font-size: 80%;
   color: #666;
   border-top: 4px solid #eee;
@@ -102,22 +102,22 @@ ul.posts span {
   overflow: hidden;
 }
 
-.site .footer .contact {
+.footer .contact {
   float: left;
   margin-right: 3em;
 }
 
-.site .footer .contact a {
+.footer .contact a {
   color: #8085C1;
 }
 
-.site .footer .rss {
+.footer .rss {
   margin-top: 1.1em;
   margin-right: -.2em;
   float: right;
 }
 
-.site .footer .rss img {
+.footer .rss img {
   border: 0;
 }
 

data/site/_includes/docs_contents.html

@@ -3,7 +3,7 @@
     <h4>Getting Started</h4>
     {% include docs_ul.html items='home quickstart installation usage structure configuration' %}
     <h4>Your Content</h4>
-    {% include docs_ul.html items='frontmatter posts drafts pages variables migrations' %}
+    {% include docs_ul.html items='frontmatter posts drafts pages variables datafiles migrations' %}
     <h4>Customization</h4>
     {% include docs_ul.html items='templates permalinks pagination plugins extras' %}
     <h4>Deployment</h4>

data/site/_includes/docs_contents_mobile.html

@@ -5,7 +5,7 @@
       {% include docs_option.html items='home quickstart installation usage structure configuration' %}
     </optgroup>
     <optgroup label="Your Content">
-      {% include docs_option.html items='frontmatter posts drafts pages variables migrations' %}
+      {% include docs_option.html items='frontmatter posts drafts pages variables datafiles migrations' %}
     </optgroup>
     <optgroup label="Customization">
       {% include docs_option.html items='templates permalinks pagination plugins extras' %}

data/site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown

@@ -0,0 +1,19 @@
+---
+layout: news_item
+title: 'Jekyll 1.3.0.rc1 Released'
+date: 2013-10-28 20:14:39 -0500
+author: mattr-
+version: 1.3.0.rc1
+categories: [release]
+---
+
+Jekyll 1.3.0 is going to be a big release! In order to make sure we
+didn't screw anything up too badly, we're making a release candidate
+available for any early adopters who want to give the latest and
+greatest code a spin without having to clone a repository from git.
+
+Please take this prerelease for a spin and [let us
+know](https://github.com/mojombo/jekyll/issues/new) if you run into any
+issues!
+
+

data/site/docs/configuration.md

@@ -99,6 +99,22 @@ class="flag">flags</code> (specified on the command-line) that control them.
         <p><code class="option">timezone: TIMEZONE</code></p>
       </td>
     </tr>
+    <tr class='setting'>
+      <td>
+        <p class='name'><strong>Encoding</strong></p>
+        <p class="description">
+            Set the encoding of files by name. Only available for Ruby
+            1.9 or later).
+            The default value is nil, which use Ruby default,
+            <code>ASCII-8BIT</code>.
+            Available encoding for the ruby in use, can be shown by
+            command <code>ruby -e 'puts Encoding::list.join("\n")'</code>
+        </p>
+      </td>
+      <td class='align-center'>
+        <p><code class="option">encoding: ENCODING</code></p>
+      </td>
+    </tr>
   </tbody>
 </table>
 </div>
@@ -265,7 +281,9 @@ layouts:     ./_layouts
 include:     ['.htaccess']
 exclude:     []
 keep_files:  ['.git','.svn']
+gems:        []
 timezone:    nil
+encoding:    nil
 
 future:      true
 show_drafts: nil

data/site/docs/datafiles.md

@@ -0,0 +1,63 @@
+---
+layout: docs
+title: Data Files
+prev_section: variables
+next_section: migrations
+permalink: /docs/datafiles/
+---
+
+In addition to the [built-in variables](../variables/) available from Jekyll,
+you can specify your own custom data that can be accessed via the [Liquid 
+templating system](http://wiki.github.com/shopify/liquid/liquid-for-designers).
+
+Jekyll supports loading data from [YAML](http://yaml.org/) files located in the 
+`_data` directory.
+
+This powerful features allows you to avoid repetition in your templates and to
+set site specific options without changing `_config.yml`. 
+
+Plugins/themes can also leverage Data Files to set configuration variables.
+
+## The Data Folder
+
+As explained on the [directory structure](../structure/) page, the `_data` 
+folder is where you can store additional data for Jekyll to use when generating
+your site. These files must be YAML files (using either the `.yml` or `.yaml`
+extension) and they will be accessible via `site.data`.
+
+## Example: List of members
+
+Here is a basic example of using Data Files to avoid copy-pasting large chunks of
+code in your Jekyll templates:
+
+In `_data/members.yml`:
+
+{% highlight yaml %}
+- name: Tom Preston-Werner
+  github: mojombo
+
+- name: Parker Moore
+  github: parkr
+
+- name: Liu Fengyun
+  github: liufengyun
+{% endhighlight %}
+
+This data can be accessed via `site.data.members` (notice that the filename
+determines the variable name).
+
+You can now render the list of members in a template:
+
+{% highlight html %}
+{% raw %}
+<ul>
+{% for member in site.data.members %}
+  <li>
+    <a href="https://github.com/{{ member.github }}">
+      {{ member.name }}
+    </a>
+  </li>
+{% end %}
+</ul>
+{% endraw %}
+{% endhighlight %}

data/site/docs/installation.md

@@ -46,6 +46,16 @@ installing Jekyll, check out the [troubleshooting](../troubleshooting/) page or
 [report an issue]({{ site.repository }}/issues/new) so the Jekyll
 community can improve the experience for everyone.
 
+<div class="note info">
+  <h5>Installing Xcode Command-Line Tools</h5>
+  <p>
+    If you run into issues installing Jekyll's dependencies which make use of
+    native extensions and are using Mac OS X, you will need to install Xcode
+    and the Command-Line Tools it ships with. Download in
+    <code>Preferences &#8594; Downloads &#8594; Components</code>.
+  </p>
+</div>
+
 ## Optional Extras
 
 There are a number of (optional) extra features that Jekyll supports that you

data/site/docs/migrations.md

@@ -1,7 +1,7 @@
 ---
 layout: docs
 title: Blog migrations
-prev_section: variables
+prev_section: datafiles
 next_section: templates
 permalink: /docs/migrations/
 ---
@@ -24,6 +24,15 @@ Jekyll's standard command line interface.
 $ gem install jekyll-import --pre
 {% endhighlight %}
 
+<div class="note warning">
+  <h5>Jekyll-import requires you to manually install some dependencies.</h5>
+  <p markdown="1">If you are importing your blog from Drupal 6,7, Joomla,
+  Mephisto, Movable Type, Textpattern, or Typo (with mysql db), you need to install
+  `mysql` and `sequel` gems. If you are importing from a WordPress database, you
+  need to install `mysql2` and `sequel` gems, and if you are importing from Enki
+  or Typo (with postgresql db) you need to install `pg` and `sequel` gems.</p>
+</div>
+
 You should now be all set to run the importers below. If you ever get stuck, you
 can see help for each importer:
 
@@ -74,7 +83,7 @@ here's how:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpress";
-    JekyllImport::WordPress.process({:database => "database", :user => "user", :pass => "pass"})'
+    JekyllImport::WordPress.process({:dbname => "database", :user => "user", :pass => "pass"})'
 {% endhighlight %}
 
 If you are using Webfaction and have to set up an [SSH
@@ -85,7 +94,7 @@ authentication system:
 
 {% highlight bash %}
 $ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpress";
-    JekyllImport::WordPress.process("database", "user", "pass", "127.0.0.1")'
+    JekyllImport::WordPress.process({:host => "127.0.0.1", :dbname => "database", :user => "user", :pass => "pass"})'
 {% endhighlight %}
 
 ### Further WordPress migration alternatives