jekyll 1.1.2 → 1.2.0

data/lib/jekyll/commands/new.rb

@@ -19,7 +19,7 @@ module Jekyll
           create_sample_files new_blog_path
 
           File.open(File.expand_path(self.initialized_post_name, new_blog_path), "w") do |f|
-            f.write(self.scaffold_post_content(site_template))
+            f.write(self.scaffold_post_content)
           end
         end
 
@@ -33,7 +33,7 @@ module Jekyll
         end
       end
 
-      def self.scaffold_post_content(template_site)
+      def self.scaffold_post_content
         ERB.new(File.read(File.expand_path(scaffold_path, site_template))).result
       end
 

data/lib/jekyll/commands/serve.rb

@@ -24,9 +24,16 @@ module Jekyll
         )
 
         s.mount(options['baseurl'], HTTPServlet::FileHandler, destination, fh_option)
-        t = Thread.new { s.start }
-        trap("INT") { s.shutdown }
-        t.join()
+
+        if options['detach'] # detach the server
+          pid = Process.fork {s.start}
+          Process.detach(pid)
+          pid
+        else # create a new server thread, then join it with current terminal
+          t = Thread.new { s.start }
+          trap("INT") { s.shutdown }
+          t.join()
+        end
       end
     end
   end

data/lib/jekyll/configuration.rb

@@ -15,6 +15,7 @@ module Jekyll
       'timezone'      => nil,           # use the local timezone
 
       'safe'          => false,
+      'detach'        => false,          # default to not detaching the server
       'show_drafts'   => nil,
       'limit_posts'   => 0,
       'lsi'           => false,
@@ -150,7 +151,7 @@ module Jekyll
         $stderr.puts "#{err}"
       end
 
-      configuration.backwards_compatibilize
+      configuration.fix_common_issues.backwards_compatibilize
     end
 
     # Public: Split a CSV string into an array containing its values
@@ -205,5 +206,17 @@ module Jekyll
       config
     end
 
+    def fix_common_issues
+      config = clone
+
+      if config.has_key?('paginate') && (!config['paginate'].is_a?(Integer) || config['paginate'] < 1)
+        Jekyll.logger.warn "Config Warning:", "The `paginate` key must be a" +
+          " positive integer or nil. It's currently set to '#{config['paginate'].inspect}'."
+        config['paginate'] = nil
+      end
+
+      config
+    end
+
   end
 end

data/lib/jekyll/converters/markdown.rb

@@ -26,7 +26,7 @@ module Jekyll
       end
 
       def matches(ext)
-        rgx = '(' + @config['markdown_ext'].gsub(',','|') +')'
+        rgx = '^\.(' + @config['markdown_ext'].gsub(',','|') +')$'
         ext =~ Regexp.new(rgx, Regexp::IGNORECASE)
       end
 

data/lib/jekyll/converters/markdown/kramdown_parser.rb

@@ -14,14 +14,10 @@ module Jekyll
         def convert(content)
           # Check for use of coderay
           if @config['kramdown']['use_coderay']
-            @config['kramdown'].merge!({
-              :coderay_wrap               => @config['kramdown']['coderay']['coderay_wrap'],
-              :coderay_line_numbers       => @config['kramdown']['coderay']['coderay_line_numbers'],
-              :coderay_line_number_start  => @config['kramdown']['coderay']['coderay_line_number_start'],
-              :coderay_tab_width          => @config['kramdown']['coderay']['coderay_tab_width'],
-              :coderay_bold_every         => @config['kramdown']['coderay']['coderay_bold_every'],
-              :coderay_css                => @config['kramdown']['coderay']['coderay_css']
-            })
+            %w[wrap line_numbers line_numbers_start tab_width bold_every css default_lang].each do |opt|
+              key = "coderay_#{opt}"
+              @config['kramdown'][key.to_sym] = @config['kramdown']['coderay'][key] unless @config['kramdown'].has_key?(key)
+            end
           end
 
           Kramdown::Document.new(content, @config["kramdown"].symbolize_keys).to_html

data/lib/jekyll/converters/markdown/rdiscount_parser.rb

@@ -24,7 +24,9 @@ module Jekyll
         private
         def replace_generated_toc(rd, html, toc_token)
           if rd.generate_toc && html.include?(toc_token)
-            html.gsub(toc_token, rd.toc_content.force_encoding('utf-8'))
+            utf8_toc = rd.toc_content
+            utf8_toc.force_encoding('utf-8') if utf8_toc.respond_to?(:force_encoding)
+            html.gsub(toc_token, utf8_toc)
           else
             html
           end

data/lib/jekyll/convertible.rb

@@ -80,10 +80,20 @@ module Jekyll
     def render_liquid(content, payload, info)
       Liquid::Template.parse(content).render!(payload, info)
     rescue Exception => e
-      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{payload[:file]}"
+      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{self.path}"
       raise e
     end
 
+    # Convert this Convertible's data to a Hash suitable for use by Liquid.
+    #
+    # Returns the Hash representation of this Convertible.
+    def to_liquid(attrs = nil)
+      further_data = Hash[(attrs || self.class::ATTRIBUTES_FOR_LIQUID).map { |attribute|
+        [attribute, send(attribute)]
+      }]
+      data.deep_merge(further_data)
+    end
+
     # Recursively render layouts
     #
     # layouts - a list of the layouts
@@ -100,7 +110,7 @@ module Jekyll
         payload = payload.deep_merge({"content" => self.output, "page" => layout.data})
 
         self.output = self.render_liquid(layout.content,
-                                         payload.merge({:file => layout.name}),
+                                         payload,
                                          info)
 
         if layout = layouts[layout.data["layout"]]
@@ -127,7 +137,7 @@ module Jekyll
       payload["pygments_suffix"] = converter.pygments_suffix
 
       self.content = self.render_liquid(self.content,
-                                        payload.merge({:file => self.name}),
+                                        payload,
                                         info)
       self.transform
 
@@ -145,7 +155,7 @@ module Jekyll
     def write(dest)
       path = destination(dest)
       FileUtils.mkdir_p(File.dirname(path))
-      File.open(path, 'w') do |f|
+      File.open(path, 'wb') do |f|
         f.write(self.output)
       end
     end

data/lib/jekyll/core_ext.rb

@@ -69,11 +69,3 @@ module Enumerable
     any? { |exp| File.fnmatch?(exp, e) }
   end
 end
-
-if RUBY_VERSION < "1.9"
-  class String
-    def force_encoding(enc)
-      self
-    end
-  end
-end

data/lib/jekyll/deprecator.rb

@@ -2,18 +2,18 @@ module Jekyll
   class Deprecator
     def self.process(args)
       no_subcommand(args)
-      deprecation_message args, "--server", "The --server command has been replaced by the \
+      arg_is_present? args, "--server", "The --server command has been replaced by the \
                           'serve' subcommand."
-      deprecation_message args, "--no-server", "To build Jekyll without launching a server, \
+      arg_is_present? args, "--no-server", "To build Jekyll without launching a server, \
                           use the 'build' subcommand."
-      deprecation_message args, "--auto", "The switch '--auto' has been replaced with '--watch'."
-      deprecation_message args, "--no-auto", "To disable auto-replication, simply leave off \
+      arg_is_present? args, "--auto", "The switch '--auto' has been replaced with '--watch'."
+      arg_is_present? args, "--no-auto", "To disable auto-replication, simply leave off \
                           the '--watch' switch."
-      deprecation_message args, "--pygments", "The 'pygments' setting can only be set in \
+      arg_is_present? args, "--pygments", "The 'pygments' setting can only be set in \
                           your config files."
-      deprecation_message args, "--paginate", "The 'paginate' setting can only be set in your \
+      arg_is_present? args, "--paginate", "The 'paginate' setting can only be set in your \
                           config files."
-      deprecation_message args, "--url", "The 'url' setting can only be set in your config files."
+      arg_is_present? args, "--url", "The 'url' setting can only be set in your config files."
     end
 
     def self.no_subcommand(args)
@@ -23,10 +23,14 @@ module Jekyll
       end
     end
 
-    def self.deprecation_message(args, deprecated_argument, message)
+    def self.arg_is_present?(args, deprecated_argument, message)
       if args.include?(deprecated_argument)
-        Jekyll.logger.error "Deprecation:", message
+        deprecation_message(message)
       end
     end
+
+    def self.deprecation_message(message)
+      Jekyll.logger.error "Deprecation:", message
+    end
   end
 end

data/lib/jekyll/generators/pagination.rb

@@ -169,7 +169,7 @@ module Jekyll
 
     # Initialize a new Pager.
     #
-    # config    - The Hash configuration of the site.
+    # site     - the Jekyll::Site object
     # page      - The Integer page number.
     # all_posts - The Array of all the site's Posts.
     # num_pages - The Integer number of pages or nil if you'd like the number

data/lib/jekyll/page.rb

@@ -7,6 +7,13 @@ module Jekyll
     attr_accessor :name, :ext, :basename
     attr_accessor :data, :content, :output
 
+    # Attributes for Liquid templates
+    ATTRIBUTES_FOR_LIQUID = %w[
+      url
+      content
+      path
+    ]
+
     # Initialize a new Page.
     #
     # site - The Site object.
@@ -37,7 +44,12 @@ module Jekyll
     #
     # Returns the String permalink or nil if none has been set.
     def permalink
-      self.data && self.data['permalink']
+      return nil if self.data.nil? || self.data['permalink'].nil?
+      if site.config['relative_permalinks']
+        File.join(@dir, self.data['permalink'])
+      else
+        self.data['permalink']
+      end
     end
 
     # The template of the permalink.
@@ -61,29 +73,21 @@ module Jekyll
     #
     # Returns the String url.
     def url
-      return @url if @url
-
-      url = if permalink
-        if site.config['relative_permalinks']
-          File.join(@dir, permalink)
-        else
-          permalink
-        end
-      else
-        {
-          "path"       => @dir,
-          "basename"   => self.basename,
-          "output_ext" => self.output_ext,
-        }.inject(template) { |result, token|
-          result.gsub(/:#{token.first}/, token.last)
-        }.gsub(/\/\//, "/")
-      end
+      @url ||= URL.new({
+        :template => template,
+        :placeholders => url_placeholders,
+        :permalink => permalink
+      }).to_s
+    end
 
-      # sanitize url
-      @url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/')
-      @url += "/" if url =~ /\/$/
-      @url.gsub!(/\A([^\/])/, '/\1')
-      @url
+    # Returns a hash of URL placeholder names (as symbols) mapping to the
+    # desired placeholder replacements. For details see "url.rb"
+    def url_placeholders
+      {
+        :path       => @dir,
+        :basename   => self.basename,
+        :output_ext => self.output_ext
+      }
     end
 
     # Extract information from the page filename.
@@ -111,21 +115,16 @@ module Jekyll
       do_layout(payload, layouts)
     end
 
-    # Convert this Page's data to a Hash suitable for use by Liquid.
-    #
-    # Returns the Hash representation of this Page.
-    def to_liquid
-      self.data.deep_merge({
-        "url"        => self.url,
-        "content"    => self.content,
-        "path"       => self.data['path'] || path })
-    end
-
     # The path to the source file
     #
     # Returns the path to the source file
     def path
-      File.join(@dir, @name).sub(/\A\//, '')
+      self.data.fetch('path', self.relative_path.sub(/\A\//, ''))
+    end
+
+    # The path to the page source file, relative to the site source
+    def relative_path
+      File.join(@dir, @name)
     end
 
     # Obtain destination path.

data/lib/jekyll/post.rb

@@ -3,10 +3,6 @@ module Jekyll
     include Comparable
     include Convertible
 
-    class << self
-      attr_accessor :lsi
-    end
-
     # Valid post name regex.
     MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$/
 
@@ -109,18 +105,19 @@ module Jekyll
     #
     # Returns excerpt string.
     def excerpt
-      if self.data.has_key? 'excerpt'
-        self.data['excerpt']
-      else
-        self.extracted_excerpt.to_s
-      end
+      self.data.fetch('excerpt', self.extracted_excerpt.to_s)
     end
 
     # Public: the Post title, from the YAML Front-Matter or from the slug
     #
     # Returns the post title
     def title
-      self.data["title"] || self.slug.split('-').select {|w| w.capitalize! || w }.join(' ')
+      self.data.fetch("title", self.titleized_slug)
+    end
+
+    # Turns the post slug into a suitable title
+    def titleized_slug
+      self.slug.split('-').select {|w| w.capitalize! || w }.join(' ')
     end
 
     # Public: the path to the post relative to the site source,
@@ -130,7 +127,12 @@ module Jekyll
     #
     # Returns the path to the file relative to the site source
     def path
-      self.data['path'] || File.join(@dir, '_posts', @name).sub(/\A\//, '')
+      self.data.fetch('path', self.relative_path.sub(/\A\//, ''))
+    end
+
+    # The path to the post source file, relative to the site source
+    def relative_path
+      File.join(@dir, '_posts', @name)
     end
 
     # Compares Post objects. First compares the Post date. If the dates are
@@ -195,36 +197,31 @@ module Jekyll
     end
 
     # The generated relative url of this post.
-    # e.g. /2008/11/05/my-awesome-post.html
     #
-    # Returns the String URL.
+    # Returns the String url.
     def url
-      return @url if @url
-
-      url = if permalink
-        permalink
-      else
-        {
-          "year"       => date.strftime("%Y"),
-          "month"      => date.strftime("%m"),
-          "day"        => date.strftime("%d"),
-          "title"      => CGI.escape(slug),
-          "i_day"      => date.strftime("%d").to_i.to_s,
-          "i_month"    => date.strftime("%m").to_i.to_s,
-          "categories" => categories.map { |c| URI.escape(c.to_s) }.join('/'),
-          "short_month" => date.strftime("%b"),
-          "y_day"      => date.strftime("%j"),
-          "output_ext" => self.output_ext
-        }.inject(template) { |result, token|
-          result.gsub(/:#{Regexp.escape token.first}/, token.last)
-        }.gsub(/\/\//, "/")
-      end
+      @url ||= URL.new({
+        :template => template,
+        :placeholders => url_placeholders,
+        :permalink => permalink
+      }).to_s
+    end
 
-      # sanitize url
-      @url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/')
-      @url += "/" if url =~ /\/$/
-      @url.gsub!(/\A([^\/])/, '/\1')
-      @url
+    # Returns a hash of URL placeholder names (as symbols) mapping to the
+    # desired placeholder replacements. For details see "url.rb"
+    def url_placeholders
+      {
+        :year        => date.strftime("%Y"),
+        :month       => date.strftime("%m"),
+        :day         => date.strftime("%d"),
+        :title       => CGI.escape(slug),
+        :i_day       => date.strftime("%d").to_i.to_s,
+        :i_month     => date.strftime("%m").to_i.to_s,
+        :categories  => (categories || []).map { |c| URI.escape(c.to_s) }.join('/'),
+        :short_month => date.strftime("%b"),
+        :y_day       => date.strftime("%j"),
+        :output_ext  => self.output_ext
+      }
     end
 
     # The UID for this post (useful in feeds).
@@ -255,7 +252,9 @@ module Jekyll
         "page" => self.to_liquid(EXCERPT_ATTRIBUTES_FOR_LIQUID)
       }.deep_merge(site_payload)
 
-      self.extracted_excerpt.do_layout(payload, {})
+      if generate_excerpt?
+        self.extracted_excerpt.do_layout(payload, {})
+      end
 
       do_layout(payload.merge({"page" => self.to_liquid}), layouts)
     end
@@ -268,20 +267,10 @@ module Jekyll
     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(path, "index.html") if template[/\.html$/].nil?
+      path = File.join(path, "index.html") if path[/\.html$/].nil?
       path
     end
 
-    # Convert this post into a Hash for use in Liquid templates.
-    #
-    # Returns the representative Hash.
-    def to_liquid(attrs = ATTRIBUTES_FOR_LIQUID)
-      further_data = Hash[attrs.map { |attribute|
-        [attribute, send(attribute)]
-      }]
-      data.deep_merge(further_data)
-    end
-
     # Returns the shorthand String identifier of this Post.
     def inspect
       "<Post: #{self.id}>"
@@ -309,7 +298,15 @@ module Jekyll
     protected
 
     def extract_excerpt
-      Jekyll::Excerpt.new(self)
+      if generate_excerpt?
+        Jekyll::Excerpt.new(self)
+      else
+        ""
+      end
+    end
+
+    def generate_excerpt?
+      !(site.config['excerpt_separator'].to_s.empty?)
     end
   end
 end