jekyll 1.0.0.beta4 → 1.0.0.rc1

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

@@ -0,0 +1,26 @@
+module Jekyll
+  module Converters
+    class Markdown
+      class RDiscountParser
+        def initialize(config)
+          require 'rdiscount'
+          @config = config
+          @rdiscount_extensions = @config['rdiscount']['extensions'].map { |e| e.to_sym }
+        rescue LoadError
+          STDERR.puts 'You are missing a library required for Markdown. Please run:'
+          STDERR.puts '  $ [sudo] gem install rdiscount'
+          raise FatalException.new("Missing dependency: rdiscount")
+        end
+
+        def convert(content)
+          rd = RDiscount.new(content, *@rdiscount_extensions)
+          html = rd.to_html
+          if rd.generate_toc and html.include?(@config['rdiscount']['toc_token'])
+            html.gsub!(@config['rdiscount']['toc_token'], rd.toc_content.force_encoding('utf-8'))
+          end
+          html
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module Jekyll
+  module Converters
+    class Markdown
+      class RedcarpetParser
+        def initialize(config)
+          require 'redcarpet'
+          @config = config
+          @redcarpet_extensions = {}
+          @config['redcarpet']['extensions'].each { |e| @redcarpet_extensions[e.to_sym] = true }
+
+          @renderer ||= Class.new(Redcarpet::Render::HTML) do
+            def block_code(code, lang)
+              lang = lang && lang.split.first || "text"
+              output = add_code_tags(
+                Pygments.highlight(code, :lexer => lang, :options => { :encoding => 'utf-8' }),
+                lang
+              )
+            end
+
+            def add_code_tags(code, lang)
+              code = code.sub(/<pre>/,'<pre><code class="' + lang + '">')
+              code = code.sub(/<\/pre>/,"</code></pre>")
+            end
+          end
+        rescue LoadError
+          STDERR.puts 'You are missing a library required for Markdown. Please run:'
+          STDERR.puts '  $ [sudo] gem install redcarpet'
+          raise FatalException.new("Missing dependency: redcarpet")
+        end
+
+        def convert(content)
+          @redcarpet_extensions[:fenced_code_blocks] = !@redcarpet_extensions[:no_fenced_code_blocks]
+          @renderer.send :include, Redcarpet::Render::SmartyPants if @redcarpet_extensions[:smart]
+          markdown = Redcarpet::Markdown.new(@renderer.new(@redcarpet_extensions), @redcarpet_extensions)
+          markdown.render(content)
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/convertible.rb

@@ -71,7 +71,7 @@ module Jekyll
     #
     # Returns nothing.
     def do_layout(payload, layouts)
-      info = { :filters => [Jekyll::Filters], :registers => { :site => self.site } }
+      info = { :filters => [Jekyll::Filters], :registers => { :site => self.site, :page => payload['page'] } }
 
       # render and transform content (this becomes the final content of the object)
       payload["pygments_prefix"] = converter.pygments_prefix

data/lib/jekyll/deprecator.rb

@@ -0,0 +1,25 @@
+module Jekyll
+  class Deprecator
+    def self.process(args)
+      deprecation_message args, "--server", "The --server command has been replaced by the \
+                          'serve' subcommand."
+      deprecation_message 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 \
+                          the '--watch' switch."
+      deprecation_message 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 \
+                          config files."
+      deprecation_message args, "--url", "The 'url' setting can only be set in your config files."
+    end
+
+    def self.deprecation_message(args, deprecated_argument, message)
+      if args.include?(deprecated_argument)
+        Jekyll::Logger.error "Deprecation:", message
+        exit(1)
+      end
+    end
+  end
+end

data/lib/jekyll/logger.rb

@@ -0,0 +1,52 @@
+module Jekyll
+  module Logger
+    # Public: Print a jekyll message to stdout
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns nothing
+    def self.info(topic, message)
+      $stdout.puts message(topic, message)
+    end
+
+    # Public: Print a jekyll message to stderr
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns nothing
+    def self.warn(topic, message)
+      $stderr.puts message(topic, message).yellow
+    end
+
+    # Public: Print a jekyll error message to stderr
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns nothing
+    def self.error(topic, message)
+      $stderr.puts message(topic, message).red
+    end
+
+    # Public: Build a Jekyll topic method
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns the formatted message
+    def self.message(topic, message)
+       formatted_topic(topic) + message.gsub(/\s+/, ' ')
+    end
+
+    # Public: Format the topic
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    #
+    # Returns the formatted topic statement
+    def self.formatted_topic(topic)
+      "#{topic} ".rjust(20)
+    end
+  end
+end

data/lib/jekyll/mime.types

@@ -35,6 +35,7 @@ application/postscript                ps eps ai
 application/rdf+xml                   rdf
 application/rtf                       rtf
 text/vcard                            vcf vcard
+application/vnd.apple.pkpass          pkpass
 application/vnd.ms-excel              xls
 application/vnd.ms-powerpoint         ppt
 application/vnd.wap.wmlc              wmlc

data/lib/jekyll/page.rb

@@ -23,18 +23,6 @@ module Jekyll
       self.read_yaml(File.join(base, dir), name)
     end
 
-    # Read the YAML frontmatter.
-    #
-    # base - The String path to the dir containing the file.
-    # name - The String filename of the file.
-    #
-    # Returns nothing.
-    def read_yaml(base, name)
-      super(base, name)
-      self.data['layout'] = 'page' unless self.data.has_key?('layout')
-      self.data
-    end
-
     # The generated directory into which the page will be placed
     # upon generation. This is derived from the permalink or, if
     # permalink is absent, we be '/'
@@ -124,7 +112,8 @@ module Jekyll
     def to_liquid
       self.data.deep_merge({
         "url"        => self.url,
-        "content"    => self.content })
+        "content"    => self.content,
+        "path"       => self.data['path'] || File.join(@dir, @name).sub(/\A\//, '') })
     end
 
     # Obtain destination path.

data/lib/jekyll/post.rb

@@ -19,7 +19,7 @@ module Jekyll
     end
 
     attr_accessor :site
-    attr_accessor :data, :excerpt, :content, :output, :ext
+    attr_accessor :data, :extracted_excerpt, :content, :output, :ext
     attr_accessor :date, :slug, :published, :tags, :categories
 
     attr_reader :name
@@ -33,12 +33,13 @@ module Jekyll
     # Returns the new Post.
     def initialize(site, source, dir, name)
       @site = site
+      @dir = dir
       @base = self.containing_dir(source, dir)
       @name = name
 
       self.categories = dir.downcase.split('/').reject { |x| x.empty? }
       self.process(name)
-      begin 
+      begin
         self.read_yaml(@base, name)
       rescue Exception => msg
         raise FatalException.new("#{msg} in #{@base}/#{name}")
@@ -80,8 +81,19 @@ module Jekyll
     # Returns nothing.
     def read_yaml(base, name)
       super(base, name)
-      self.excerpt = self.extract_excerpt
-      self.data['layout'] = 'post' unless self.data.has_key?('layout')
+      self.extracted_excerpt = self.extract_excerpt
+    end
+
+    # The post excerpt. This is either a custom excerpt
+    # set in YAML front matter or the result of extract_excerpt.
+    #
+    # Returns excerpt string.
+    def excerpt
+      if self.data.has_key? 'excerpt'
+        self.data['excerpt']
+      else
+        self.extracted_excerpt
+      end
     end
 
     # Compares Post objects. First compares the Post date. If the dates are
@@ -117,7 +129,7 @@ module Jekyll
     # Returns nothing.
     def transform
       super
-      self.excerpt = converter.convert(self.excerpt)
+      self.extracted_excerpt = converter.convert(self.extracted_excerpt)
     end
 
     # The generated directory into which the post will be placed
@@ -233,7 +245,7 @@ module Jekyll
 
       do_layout(payload, layouts)
     end
-    
+
     # Obtain destination path.
     #
     # dest - The String path to the destination dir.
@@ -273,7 +285,8 @@ module Jekyll
         "previous"   => self.previous,
         "tags"       => self.tags,
         "content"    => self.content,
-        "excerpt"    => self.excerpt })
+        "excerpt"    => self.excerpt,
+        "path"       => self.data['path'] || File.join(@dir, '_posts', @name).sub(/\A\//, '') })
     end
 
     # Returns the shorthand String identifier of this Post.

data/lib/jekyll/site.rb

@@ -23,12 +23,12 @@ module Jekyll
       self.pygments        = config['pygments']
       self.baseurl         = config['baseurl']
       self.permalink_style = config['permalink'].to_sym
-      self.exclude         = config['exclude'] || []
-      self.include         = config['include'] || []
+      self.exclude         = config['exclude']
+      self.include         = config['include']
       self.future          = config['future']
-      self.show_drafts     = config['show_drafts'] || nil
-      self.limit_posts     = config['limit_posts'] || nil
-      self.keep_files      = config['keep_files'] || []
+      self.show_drafts     = config['show_drafts']
+      self.limit_posts     = config['limit_posts']
+      self.keep_files      = config['keep_files']
 
       self.reset
       self.setup
@@ -97,7 +97,7 @@ module Jekyll
     #
     # Returns an Array of plugin search paths
     def plugins_path
-      if (config['plugins'] == Jekyll::DEFAULTS['plugins'])
+      if (config['plugins'] == Jekyll::Configuration::DEFAULTS['plugins'])
         [File.join(self.source, config['plugins'])]
       else
         Array(config['plugins']).map { |d| File.expand_path(d) }

data/lib/site_template/_config.yml

@@ -1,2 +1 @@
-markdown: rdiscount
 pygments: true

data/site/_config.yml

@@ -1,5 +1,3 @@
-auto: false
-server: true
 permalink: /docs/:categories/:title
 pygments: true
 gauges_id: 503c5af6613f5d0f19000027

data/site/_posts/2012-07-01-configuration.md

@@ -81,6 +81,22 @@ class="flag">flags</code> (specified on the command-line) that control them.
         <p><code class="option">include: [DIR, FILE, ...]</code></p>
       </td>
     </tr>
+    <tr class='setting'>
+      <td>
+        <p class='name'><strong>Time Zone</strong></p>
+        <p class="description">
+            Set the time zone for site generation. This sets the <code>TZ</code>
+            environment variable, which Ruby uses to handle time and date
+            creation and manipulation. Any entry from the
+            <a href="http://en.wikipedia.org/wiki/Tz_database">IANA Time Zone
+            Database</a> is valid, e.g. <code>America/New_York</code>. The default
+            is the local time zone, as set by your operating system.
+        </p>
+      </td>
+      <td class='align-center'>
+        <p><code class="option">timezone: TIMEZONE</code></p>
+      </td>
+    </tr>
   </tbody>
 </table>
 

data/site/_posts/2012-07-01-variables.md

@@ -159,6 +159,14 @@ following is a reference of the available data.
 
       </p></td>
     </tr>
+    <tr>
+      <td><p><code>page.excerpt</code></p></td>
+      <td><p>
+
+        The un-rendered excerpt of the Page.
+
+      </p></td>
+    </tr>
     <tr>
       <td><p><code>page.url</code></p></td>
       <td><p>
@@ -205,7 +213,17 @@ following is a reference of the available data.
       <td><p>
 
         The list of tags to which this post belongs. These can be specified in
-        the <a href="../frontmatter">YAML Front Matter</a>
+        the <a href="../frontmatter">YAML Front Matter</a>.
+
+      </p></td>
+    </tr>
+    <tr>
+      <td><p><code>page.path</code></p></td>
+      <td><p>
+
+        The path to the raw post or page. Example usage: Linking back to the
+        page or post's source on GitHub. This can be overridden in the
+        <a href="../frontmatter">YAML Front Matter</a>.
 
       </p></td>
     </tr>
@@ -258,10 +276,18 @@ following is a reference of the available data.
       <td><p><code>paginator.previous_page</code></p></td>
       <td><p>The number of the previous page.</p></td>
     </tr>
+    <tr>
+      <td><p><code>paginator.previous_page_path</code></p></td>
+      <td><p>The path to the previous page.</p></td>
+    </tr>
     <tr>
       <td><p><code>paginator.next_page</code></p></td>
       <td><p>The number of the next page.</p></td>
     </tr>
+    <tr>
+      <td><p><code>paginator.next_page_path</code></p></td>
+      <td><p>The path to the next page.</p></td>
+    </tr>
   </tbody>
 </table>
 

data/site/index.html

@@ -49,10 +49,15 @@ overview: true
           <p class="line">
             <span class="path">~</span>
             <span class="prompt">$</span>
-            <span class="command">cd my/awesome/site</span>
+            <span class="command">jekyll new my-awesome-site</span>
           </p>
           <p class="line">
-            <span class="path">~/my/awesome/site</span>
+            <span class="path">~</span>
+            <span class="prompt">$</span>
+            <span class="command">cd my-awesome-site</span>
+          </p>
+          <p class="line">
+            <span class="path">~/my-awesome-site</span>
             <span class="prompt">$</span>
             <span class="command">jekyll serve</span>
           </p>

data/test/source/_posts/2013-04-11-custom-excerpt.markdown

@@ -0,0 +1,10 @@
+---
+layout: ~
+excerpt: 'I can set a custom excerpt'
+---
+
+This is not my excerpt.
+
+Neither is this.
+
+I can use the excerpt: <quote>{{page.excerpt}}</quote>

data/test/test_configuration.rb

@@ -1,6 +1,72 @@
 require 'helper'
 
 class TestConfiguration < Test::Unit::TestCase
+  context "#stringify_keys" do
+    setup do
+      @mixed_keys = Configuration[{
+        'markdown' => 'maruku',
+        :permalink => 'date',
+        'baseurl'  => '/',
+        :include   => ['.htaccess'],
+        :source    => './'
+      }]
+      @string_keys = Configuration[{
+        'markdown'  => 'maruku',
+        'permalink' => 'date',
+        'baseurl'   => '/',
+        'include'   => ['.htaccess'],
+        'source'    => './'
+      }]
+    end
+    should "stringify symbol keys" do
+      assert_equal @string_keys, @mixed_keys.stringify_keys
+    end
+    should "not mess with keys already strings" do
+      assert_equal @string_keys, @string_keys.stringify_keys
+    end
+  end
+  context "#config_files" do
+    setup do
+      @config = Configuration[{"source" => source_dir}]
+      @no_override     = {}
+      @one_config_file = {"config" => "config.yml"}
+      @multiple_files  = {"config" => %w[config/site.yml config/deploy.yml configuration.yml]}
+    end
+
+    should "always return an array" do
+      assert @config.config_files(@no_override).is_a?(Array)
+      assert @config.config_files(@one_config_file).is_a?(Array)
+      assert @config.config_files(@multiple_files).is_a?(Array)
+    end
+    should "return the default config path if no config files are specified" do
+      assert_equal [File.join(source_dir, "_config.yml")], @config.config_files(@no_override)
+    end
+    should "return the config if given one config file" do
+      assert_equal %w[config.yml], @config.config_files(@one_config_file)
+    end
+    should "return an array of the config files if given many config files" do
+      assert_equal %w[config/site.yml config/deploy.yml configuration.yml], @config.config_files(@multiple_files)
+    end
+  end
+  context "#backwards_compatibilize" do
+    setup do
+      @config = Configuration[{
+        "auto" => true,
+        "watch" => true,
+        "server" => true
+      }]
+    end
+    should "unset 'auto' and 'watch'" do
+      assert @config.has_key?("auto")
+      assert @config.has_key?("watch")
+      assert !@config.backwards_compatibilize.has_key?("auto")
+      assert !@config.backwards_compatibilize.has_key?("watch")
+    end
+    should "unset 'server'" do
+      assert @config.has_key?("server")
+      assert !@config.backwards_compatibilize.has_key?("server")
+    end
+  end
   context "loading configuration" do
     setup do
       @path = File.join(Dir.pwd, '_config.yml')
@@ -8,21 +74,21 @@ class TestConfiguration < Test::Unit::TestCase
 
     should "fire warning with no _config.yml" do
       mock(YAML).safe_load_file(@path) { raise SystemCallError, "No such file or directory - #{@path}" }
-      mock($stderr).puts("Configuration file: none")
-      assert_equal Jekyll::DEFAULTS, Jekyll.configuration({})
+      mock($stderr).puts("Configuration file: none".yellow)
+      assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
     end
 
     should "load configuration as hash" do
       mock(YAML).safe_load_file(@path) { Hash.new }
       mock($stdout).puts("Configuration file: #{@path}")
-      assert_equal Jekyll::DEFAULTS, Jekyll.configuration({})
+      assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
     end
 
     should "fire warning with bad config" do
       mock(YAML).safe_load_file(@path) { Array.new }
-      mock($stderr).puts("           WARNING: Error reading configuration. Using defaults (and options).")
-      mock($stderr).puts("Configuration file: (INVALID) #{@path}")
-      assert_equal Jekyll::DEFAULTS, Jekyll.configuration({})
+      mock($stderr).puts(("WARNING: ".rjust(20) + "Error reading configuration. Using defaults (and options).").yellow)
+      mock($stderr).puts("Configuration file: (INVALID) #{@path}".yellow)
+      assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
     end
   end
   context "loading config from external file" do
@@ -37,19 +103,35 @@ class TestConfiguration < Test::Unit::TestCase
     should "load default config if no config_file is set" do
       mock(YAML).safe_load_file(@paths[:default]) { Hash.new }
       mock($stdout).puts("Configuration file: #{@paths[:default]}")
-      assert_equal Jekyll::DEFAULTS, Jekyll.configuration({})
+      assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({})
     end
 
     should "load different config if specified" do
       mock(YAML).safe_load_file(@paths[:other]) { {"baseurl" => "http://wahoo.dev"} }
       mock($stdout).puts("Configuration file: #{@paths[:other]}")
-      assert_equal Jekyll::DEFAULTS.deep_merge({ "baseurl" => "http://wahoo.dev" }), Jekyll.configuration({ "config" => @paths[:other] })
+      assert_equal Jekyll::Configuration::DEFAULTS.deep_merge({ "baseurl" => "http://wahoo.dev" }), Jekyll.configuration({ "config" => @paths[:other] })
     end
 
     should "load default config if path passed is empty" do
       mock(YAML).safe_load_file(@paths[:default]) { Hash.new }
       mock($stdout).puts("Configuration file: #{@paths[:default]}")
-      assert_equal Jekyll::DEFAULTS, Jekyll.configuration({ "config" => @paths[:empty] })
+      assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({ "config" => @paths[:empty] })
+    end
+
+    should "load multiple config files" do
+      mock(YAML).safe_load_file(@paths[:default]) { Hash.new }
+      mock(YAML).safe_load_file(@paths[:other]) { Hash.new }
+      mock($stdout).puts("Configuration file: #{@paths[:default]}")
+      mock($stdout).puts("Configuration file: #{@paths[:other]}")
+      assert_equal Jekyll::Configuration::DEFAULTS, Jekyll.configuration({ "config" => [@paths[:default], @paths[:other]] })
+    end
+
+    should "load multiple config files and last config should win" do
+      mock(YAML).safe_load_file(@paths[:default]) { {"baseurl" => "http://example.dev"} }
+      mock(YAML).safe_load_file(@paths[:other]) { {"baseurl" => "http://wahoo.dev"} }
+      mock($stdout).puts("Configuration file: #{@paths[:default]}")
+      mock($stdout).puts("Configuration file: #{@paths[:other]}")
+      assert_equal Jekyll::Configuration::DEFAULTS.deep_merge({ "baseurl" => "http://wahoo.dev" }), Jekyll.configuration({ "config" => [@paths[:default], @paths[:other]] })
     end
   end
 end