jekyll 1.0.4 → 1.1.1

data/lib/jekyll/page.rb

@@ -134,9 +134,7 @@ module Jekyll
     #
     # Returns the destination file path String.
     def destination(dest)
-      # The url needs to be unescaped in order to preserve the correct
-      # filename.
-      path = File.join(dest, CGI.unescape(self.url))
+      path = File.join(dest, self.url)
       path = File.join(path, "index.html") if self.url =~ /\/$/
       path
     end

data/lib/jekyll/post.rb

@@ -10,8 +10,7 @@ module Jekyll
     # Valid post name regex.
     MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$/
 
-    # Attributes for Liquid templates
-    ATTRIBUTES_FOR_LIQUID = %w[
+    EXCERPT_ATTRIBUTES_FOR_LIQUID = %w[
       title
       url
       date
@@ -20,11 +19,15 @@ module Jekyll
       next
       previous
       tags
-      content
-      excerpt
       path
     ]
 
+    # Attributes for Liquid templates
+    ATTRIBUTES_FOR_LIQUID = EXCERPT_ATTRIBUTES_FOR_LIQUID.concat(%w[
+      content
+      excerpt
+    ])
+
     # Post name validator. Post filenames must be like:
     # 2008-11-05-my-awesome-post.textile
     #
@@ -109,7 +112,7 @@ module Jekyll
       if self.data.has_key? 'excerpt'
         self.data['excerpt']
       else
-        self.extracted_excerpt
+        self.extracted_excerpt.to_s
       end
     end
 
@@ -158,14 +161,6 @@ module Jekyll
       raise FatalException.new("Post #{name} does not have a valid date.")
     end
 
-    # Transform the contents and excerpt based on the content type.
-    #
-    # Returns nothing.
-    def transform
-      super
-      self.extracted_excerpt = converter.convert(self.extracted_excerpt)
-    end
-
     # The generated directory into which the post will be placed
     # upon generation. This is derived from the permalink or, if
     # permalink is absent, set to the default date
@@ -257,10 +252,12 @@ module Jekyll
       # construct payload
       payload = {
         "site" => { "related_posts" => related_posts(site_payload["site"]["posts"]) },
-        "page" => self.to_liquid
+        "page" => self.to_liquid(EXCERPT_ATTRIBUTES_FOR_LIQUID)
       }.deep_merge(site_payload)
 
-      do_layout(payload, layouts)
+      self.extracted_excerpt.do_layout(payload, {})
+
+      do_layout(payload.merge({"page" => self.to_liquid}), layouts)
     end
 
     # Obtain destination path.
@@ -278,8 +275,8 @@ module Jekyll
     # Convert this post into a Hash for use in Liquid templates.
     #
     # Returns the representative Hash.
-    def to_liquid
-      further_data = Hash[ATTRIBUTES_FOR_LIQUID.map { |attribute|
+    def to_liquid(attrs = ATTRIBUTES_FOR_LIQUID)
+      further_data = Hash[attrs.map { |attribute|
         [attribute, send(attribute)]
       }]
       data.deep_merge(further_data)
@@ -311,45 +308,8 @@ module Jekyll
 
     protected
 
-    # Internal: Extract excerpt from the content
-    #
-    # By default excerpt is your first paragraph of a post: everything before
-    # the first two new lines:
-    #
-    #     ---
-    #     title: Example
-    #     ---
-    #
-    #     First paragraph with [link][1].
-    #
-    #     Second paragraph.
-    #
-    #     [1]: http://example.com/
-    #
-    # This is fairly good option for Markdown and Textile files. But might cause
-    # problems for HTML posts (which is quite unusual for Jekyll). If default
-    # excerpt delimiter is not good for you, you might want to set your own via
-    # configuration option `excerpt_separator`. For example, following is a good
-    # alternative for HTML posts:
-    #
-    #     # file: _config.yml
-    #     excerpt_separator: "<!-- more -->"
-    #
-    # Notice that all markdown-style link references will be appended to the
-    # excerpt. So the example post above will have this excerpt source:
-    #
-    #     First paragraph with [link][1].
-    #
-    #     [1]: http://example.com/
-    #
-    # Excerpts are rendered same time as content is rendered.
-    #
-    # Returns excerpt String
     def extract_excerpt
-      separator     = self.site.config['excerpt_separator']
-      head, _, tail = self.content.partition(separator)
-
-      "" << head << "\n\n" << tail.scan(/^\[[^\]]+\]:.+$/).join("\n")
+      Jekyll::Excerpt.new(self)
     end
   end
 end

data/lib/jekyll/related_posts.rb

@@ -46,7 +46,8 @@ module Jekyll
     end
 
     def most_recent_posts
-      (self.site.posts - [self.post])[0..9]
+      recent_posts = self.site.posts.reverse - [self.post]
+      recent_posts.first(10)
     end
 
     def display(output)

data/lib/jekyll/site.rb

@@ -138,34 +138,19 @@ module Jekyll
       entries = Dir.chdir(base) { filter_entries(Dir.entries('.')) }
 
       self.read_posts(dir)
-
-      if self.show_drafts
-        self.read_drafts(dir)
-      end
-
+      self.read_drafts(dir) if self.show_drafts
       self.posts.sort!
-
-      # limit the posts if :limit_posts option is set
-      if limit_posts > 0
-        limit = self.posts.length < limit_posts ? self.posts.length : limit_posts
-        self.posts = self.posts[-limit, limit]
-      end
+      limit_posts! if limit_posts > 0 # limit the posts if :limit_posts option is set
 
       entries.each do |f|
         f_abs = File.join(base, f)
-        f_rel = File.join(dir, f)
         if File.directory?(f_abs)
-          next if self.dest.sub(/\/$/, '') == f_abs
-          read_directories(f_rel)
+          f_rel = File.join(dir, f)
+          read_directories(f_rel) unless self.dest.sub(/\/$/, '') == f_abs
+        elsif has_yaml_header?(f_abs)
+          pages << Page.new(self, self.source, dir, f)
         else
-          first3 = File.open(f_abs) { |fd| fd.read(3) }
-          if first3 == "---"
-            # file appears to have a YAML header so process it as a page
-            pages << Page.new(self, self.source, dir, f)
-          else
-            # otherwise treat it as a static file
-            static_files << StaticFile.new(self, self.source, dir, f)
-          end
+          static_files << StaticFile.new(self, self.source, dir, f)
         end
       end
     end
@@ -255,22 +240,18 @@ module Jekyll
 
       # files to be written
       files = Set.new
-      self.posts.each do |post|
-        files << post.destination(self.dest)
-      end
-      self.pages.each do |page|
-        files << page.destination(self.dest)
-      end
-      self.static_files.each do |sf|
-        files << sf.destination(self.dest)
-      end
+      each_site_file { |item| files << item.destination(self.dest) }
 
       # adding files' parent directories
       dirs = Set.new
       files.each { |file| dirs << File.dirname(file) }
       files.merge(dirs)
 
-      obsolete_files = dest_files - files
+      # files that are replaced by dirs should be deleted
+      files_to_delete = Set.new
+      dirs.each { |dir| files_to_delete << dir if File.file?(dir) }
+
+      obsolete_files = dest_files - files + files_to_delete
       FileUtils.rm_rf(obsolete_files.to_a)
     end
 
@@ -290,15 +271,7 @@ module Jekyll
     #
     # Returns nothing.
     def write
-      self.posts.each do |post|
-        post.write(self.dest)
-      end
-      self.pages.each do |page|
-        page.write(self.dest)
-      end
-      self.static_files.each do |sf|
-        sf.write(self.dest)
-      end
+      each_site_file { |item| item.write(self.dest) }
     end
 
     # Construct a Hash of Posts indexed by the specified Post attribute.
@@ -430,5 +403,24 @@ module Jekyll
         @deprecated_relative_permalinks = true
       end
     end
+
+    def each_site_file
+      %w(posts pages static_files).each do |type|
+        self.send(type).each do |item|
+          yield item
+        end
+      end
+    end
+
+    private
+
+    def has_yaml_header?(file)
+      "---" == File.open(file) { |fd| fd.read(3) }
+    end
+
+    def limit_posts!
+      limit = self.posts.length < limit_posts ? self.posts.length : limit_posts
+      self.posts = self.posts[-limit, limit]
+    end
   end
 end

data/lib/jekyll/stevenson.rb

@@ -5,7 +5,7 @@ module Jekyll
     DEBUG  = 0
     INFO   = 1
     WARN   = 2
-    ERROR = 3
+    ERROR  = 3
 
     # Public: Create a new instance of Stevenson, Jekyll's logger
     #
@@ -15,6 +15,16 @@ module Jekyll
     def initialize(level = INFO)
       @log_level = level
     end
+    
+    # Public: Print a jekyll debug message to stdout
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns nothing
+    def debug(topic, message = nil)
+      $stdout.puts(message(topic, message)) if log_level <= DEBUG
+    end
 
     # Public: Print a jekyll message to stdout
     #
@@ -22,7 +32,7 @@ module Jekyll
     # message - the message detail
     #
     # Returns nothing
-    def info(topic, message)
+    def info(topic, message = nil)
       $stdout.puts(message(topic, message)) if log_level <= INFO
     end
 
@@ -32,7 +42,7 @@ module Jekyll
     # message - the message detail
     #
     # Returns nothing
-    def warn(topic, message)
+    def warn(topic, message = nil)
       $stderr.puts(message(topic, message).yellow) if log_level <= WARN
     end
 
@@ -42,10 +52,21 @@ module Jekyll
     # message - the message detail
     #
     # Returns nothing
-    def error(topic, message)
+    def error(topic, message = nil)
       $stderr.puts(message(topic, message).red) if log_level <= ERROR
     end
 
+    # Public: Print a Jekyll error message to stderr and immediately abort the process
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail (can be omitted)
+    #
+    # Returns nothing
+    def abort_with(topic, message = nil)
+      error(topic, message)
+      abort
+    end
+
     # Public: Build a Jekyll topic method
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.

data/lib/jekyll/tags/include.rb

@@ -1,9 +1,51 @@
 module Jekyll
   module Tags
     class IncludeTag < Liquid::Tag
-      def initialize(tag_name, file, tokens)
+
+      MATCHER = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/
+
+      def initialize(tag_name, markup, tokens)
         super
-        @file = file.strip
+        @file, @params = markup.strip.split(' ', 2);
+      end
+
+      def parse_params(context)
+        validate_syntax
+
+        params = {}
+        markup = @params
+
+        while match = MATCHER.match(markup) do
+          markup = markup[match.end(0)..-1]
+
+          value = if match[2]
+            match[2].gsub(/\\"/, '"')
+          elsif match[3]
+            match[3].gsub(/\\'/, "'")
+          elsif match[4]
+            context[match[4]]
+          end
+
+          params[match[1]] = value
+        end
+        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
+Invalid syntax for include tag:
+
+	#{@params}
+
+Valid syntax:
+
+	{% include file.ext param='value' param2="value" %}
+
+eos
+        end
       end
 
       def render(context)
@@ -22,7 +64,9 @@ module Jekyll
           if choices.include?(@file)
             source = File.read(@file)
             partial = Liquid::Template.parse(source)
+
             context.stack do
+              context['include'] = parse_params(context) if @params
               partial.render(context)
             end
           else

data/lib/site_template/_config.yml

@@ -1,2 +1,3 @@
 name: Your New Jekyll Site
+markdown: redcarpet
 pygments: true

data/lib/site_template/css/main.css

@@ -29,11 +29,6 @@ a         { color: #00a; }
 a:hover   { color: #000; }
 a:visited { color: #a0a; }
 
-table {
-  font-size: inherit;
-  font: 100%;
-}
-
 /*****************************************************************************/
 /*
 /* Home

data/site/_config.yml

@@ -1,3 +1,4 @@
 pygments: true
 relative_permalinks: false
 gauges_id: 503c5af6613f5d0f19000027
+permalink: /news/:year/:month/:day/:title

data/site/_includes/docs_contents.html

@@ -5,6 +5,9 @@
       <li class="{% if page.title == "Welcome" %}current{% endif %}">
         <a href="{{ site.url }}/docs/home">Welcome</a>
       </li>
+      <li class="{% if page.title == "Quick-start guide" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/quickstart">Quick-start guide</a>
+      </li>
       <li class="{% if page.title == "Installation" %}current{% endif %}">
         <a href="{{ site.url }}/docs/installation">Installation</a>
       </li>
@@ -26,6 +29,9 @@
       <li class="{% if page.title == "Writing posts" %}current{% endif %}">
         <a href="{{ site.url }}/docs/posts">Writing posts</a>
       </li>
+      <li class="{% if page.title == "Working with drafts" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/drafts">Working with drafts</a>
+      </li>
       <li class="{% if page.title == "Creating pages" %}current{% endif %}">
         <a href="{{ site.url }}/docs/pages">Creating pages</a>
       </li>
@@ -65,9 +71,6 @@
     </ul>
     <h4>Miscellaneous</h4>
     <ul>
-      <li class="{% if page.title == "Contributing" %}current{% endif %}">
-        <a href="{{ site.url }}/docs/contributing">Contributing</a>
-      </li>
       <li class="{% if page.title == "Troubleshooting" %}current{% endif %}">
         <a href="{{ site.url }}/docs/troubleshooting">Troubleshooting</a>
       </li>
@@ -80,6 +83,12 @@
       <li class="{% if page.title == "Upgrading" %}current{% endif %}">
         <a href="{{ site.url }}/docs/upgrading">Upgrading</a>
       </li>
+    </ul>
+    <h4>Meta</h4>
+    <ul>
+      <li class="{% if page.title == "Contributing" %}current{% endif %}">
+        <a href="{{ site.url }}/docs/contributing">Contributing</a>
+      </li>
       <li class="{% if page.title == "History" %}current{% endif %}">
         <a href="{{ site.url }}/docs/history">History</a>
       </li>