jekyll 2.0.0.alpha.3 → 2.0.0.rc1

data/features/site_data.feature

@@ -5,14 +5,14 @@ Feature: Site data
 
   Scenario: Use page variable in a page
     Given I have an "contact.html" page with title "Contact" that contains "{{ page.title }}: email@example.com"
-    When I run jekyll
+    When I run jekyll build
     Then the _site directory should exist
     And I should see "Contact: email@example.com" in "_site/contact.html"
 
   Scenario Outline: Use page.path variable in a page
     Given I have a <dir> directory
     And I have a "<path>" page that contains "Source path: {{ page.path }}"
-    When I run jekyll
+    When I run jekyll build
     Then the _site directory should exist
     And I should see "Source path: <path>" in "_site/<path>"
 
@@ -24,13 +24,13 @@ Feature: Site data
 
   Scenario: Override page.path
     Given I have an "override.html" page with path "custom-override.html" that contains "Custom path: {{ page.path }}"
-    When I run jekyll
+    When I run jekyll build
     Then the _site directory should exist
     And I should see "Custom path: custom-override.html" in "_site/override.html"
 
   Scenario: Use site.time variable
     Given I have an "index.html" page that contains "{{ site.time }}"
-    When I run jekyll
+    When I run jekyll build
     Then the _site directory should exist
     And I should see today's time in "_site/index.html"
 
@@ -42,7 +42,7 @@ Feature: Site data
       | First Post  | 2009-03-25 | My First Post  |
       | Second Post | 2009-03-26 | My Second Post |
       | Third Post  | 2009-03-27 | My Third Post  |
-    When I run jekyll
+    When I run jekyll build
     Then the _site directory should exist
     And I should see "Third Post: /2009/03/27/third-post.html" in "_site/index.html"
 
@@ -54,7 +54,7 @@ Feature: Site data
       | First Post  | 2009-03-25 | My First Post  |
       | Second Post | 2009-03-26 | My Second Post |
       | Third Post  | 2009-03-27 | My Third Post  |
-    When I run jekyll
+    When I run jekyll build
     Then the _site directory should exist
     And I should see "Third Post  Second Post  First Post" in "_site/index.html"
 
@@ -65,7 +65,7 @@ Feature: Site data
       | title          | date       | category | content            |
       | Awesome Hack   | 2009-03-26 | code     | puts 'Hello World' |
       | Delicious Beer | 2009-03-26 | food     | 1) Yuengling       |
-    When I run jekyll
+    When I run jekyll build
     Then the _site directory should exist
     And I should see "Awesome Hack" in "_site/index.html"
 
@@ -75,7 +75,7 @@ Feature: Site data
     And I have the following posts:
       | title          | date       | tag  | content      |
       | Delicious Beer | 2009-03-26 | beer | 1) Yuengling |
-    When I run jekyll
+    When I run jekyll build
     Then the _site directory should exist
     And I should see "Yuengling" in "_site/index.html"
 
@@ -89,19 +89,19 @@ Feature: Site data
     | B     | 2009-03-26 | B       |
     | C     | 2009-03-26 | C       |
     | last  | 2009-04-26 | last    |
-  When I run jekyll
+  When I run jekyll build
   Then the _site directory should exist
   And I should see "last:C, C:B,last B:A,C A:first,B first:,A" in "_site/index.html"
 
   Scenario: Use configuration date in site payload
     Given I have an "index.html" page that contains "{{ site.url }}"
     And I have a configuration file with "url" set to "http://example.com"
-    When I run jekyll
+    When I run jekyll build
     Then the _site directory should exist
     And I should see "http://example.com" in "_site/index.html"
 
   Scenario: Access Jekyll version via jekyll.version
     Given I have an "index.html" page that contains "{{ jekyll.version }}"
-    When I run jekyll
+    When I run jekyll build
     Then the _site directory should exist
     And I should see "\d+\.\d+\.\d+" in "_site/index.html"

data/features/step_definitions/jekyll_steps.rb

@@ -139,24 +139,11 @@ end
 #
 ##################
 
-When /^I run jekyll(?: with "(.+)")?$/ do |opt|
-  run_jekyll_build(opt)
-end
-
-When /^I run jekyll in safe mode$/ do
-  run_jekyll_build("--safe")
-end
-
-When /^I run jekyll with drafts$/ do
-  run_jekyll_build("--drafts")
-end
-
-When /^I call jekyll new with test_blank --blank$/ do
-  run_jekyll_new("test_blank --blank")
-end
-
-When /^I debug jekyll$/ do
-  run_jekyll_build("--verbose")
+When /^I run jekyll(.*)$/ do |args|
+  status = run_jekyll(args)
+  if !status || args.include?("--verbose")
+    puts jekyll_run_output
+  end
 end
 
 When /^I change "(.*)" to contain "(.*)"$/ do |file, text|

data/features/support/env.rb

@@ -23,21 +23,8 @@ def jekyll_run_output
   File.read(jekyll_output_file)
 end
 
-def run_jekyll(args, output_file)
-  command = "#{JEKYLL_PATH} #{args} --trace > #{jekyll_output_file} 2>&1"
-  system command
-end
-
-def run_jekyll_build(build_args = "")
-  if !run_jekyll("build #{build_args}", jekyll_output_file) || build_args.eql?("--verbose")
-    puts jekyll_run_output
-  end
-end
-
-def run_jekyll_new(new_args = "")
-  unless run_jekyll("new #{new_args}", jekyll_output_file)
-    puts jekyll_run_output
-  end
+def run_jekyll(args)
+  system "#{JEKYLL_PATH} #{args} --trace > #{jekyll_output_file} 2>&1"
 end
 
 def slug(title)

data/lib/jekyll.rb

@@ -37,6 +37,7 @@ require 'jekyll/configuration'
 require 'jekyll/document'
 require 'jekyll/collection'
 require 'jekyll/plugin_manager'
+require 'jekyll/frontmatter_defaults'
 require 'jekyll/site'
 require 'jekyll/convertible'
 require 'jekyll/url'
@@ -60,6 +61,7 @@ require 'jekyll/plugin'
 require 'jekyll/converter'
 require 'jekyll/generator'
 require 'jekyll/command'
+require 'jekyll/liquid_extensions'
 
 require_all 'jekyll/commands'
 require_all 'jekyll/converters'

data/lib/jekyll/collection.rb

@@ -1,6 +1,6 @@
 module Jekyll
   class Collection
-    attr_reader :site, :label
+    attr_reader :site, :label, :metadata
 
     # Create a new Collection.
     #
@@ -9,8 +9,9 @@ module Jekyll
     #
     # Returns nothing.
     def initialize(site, label)
-      @site  = site
-      @label = sanitize_label(label)
+      @site     = site
+      @label    = sanitize_label(label)
+      @metadata = extract_metadata
     end
 
     # Fetch the Documents in this collection.
@@ -114,7 +115,32 @@ module Jekyll
     #
     # Returns a representation of this collection for use in Liquid.
     def to_liquid
-      docs
+      metadata.merge({
+        "label"     => label,
+        "docs"      => docs,
+        "directory" => directory,
+        "output"    => write?,
+        "relative_directory" => relative_directory
+      })
+    end
+
+    # Whether the collection's documents ought to be written as individual
+    #   files in the output.
+    #
+    # Returns true if the 'write' metadata is true, false otherwise.
+    def write?
+      !!metadata['output']
+    end
+
+    # Extract options for this collection from the site configuration.
+    #
+    # Returns the metadata for this collection
+    def extract_metadata
+      if site.config['collections'].is_a?(Hash)
+        site.config['collections'][label] || Hash.new
+      else
+        {}
+      end
     end
 
   end

data/lib/jekyll/configuration.rb

@@ -46,6 +46,8 @@ module Jekyll
 
       'excerpt_separator' => "\n\n",
 
+      'defaults'     => [],
+
       'maruku' => {
         'use_tex'    => false,
         'use_divs'   => false,
@@ -251,6 +253,5 @@ module Jekyll
 
       config
     end
-
   end
 end

data/lib/jekyll/convertible.rb

@@ -14,6 +14,8 @@ require 'set'
 #   self.output=
 #   self.name
 #   self.path
+#   self.type -> :page, :post or :draft
+
 module Jekyll
   module Convertible
     # Returns the contents as a String.
@@ -107,7 +109,19 @@ module Jekyll
       further_data = Hash[(attrs || self.class::ATTRIBUTES_FOR_LIQUID).map { |attribute|
         [attribute, send(attribute)]
       }]
-      Utils.deep_merge_hashes(data, further_data)
+
+      defaults = site.frontmatter_defaults.all(relative_path, type)
+      Utils.deep_merge_hashes defaults, Utils.deep_merge_hashes(data, further_data)
+    end
+
+    def type
+      if is_a?(Post)
+        :post
+      elsif is_a?(Page)
+        :page
+      elsif is_a?(Draft)
+        :draft
+      end
     end
 
     # Recursively render layouts

data/lib/jekyll/document.rb

@@ -112,7 +112,7 @@ module Jekyll
     #
     # Returns the permalink or nil if no permalink was set in the data.
     def permalink
-      data && data['permalink']
+      data && data.is_a?(Hash) && data['permalink']
     end
 
     # The computed URL for the document. See `Jekyll::URL#to_s` for more details.
@@ -192,12 +192,16 @@ module Jekyll
     #
     # Returns a Hash representing this Document's data.
     def to_liquid
-      Utils.deep_merge_hashes data, {
-        "content"       => content,
-        "path"          => path,
-        "relative_path" => relative_path,
-        "url"           => url
-      }
+      if data.is_a?(Hash)
+        Utils.deep_merge_hashes data, {
+          "content"       => content,
+          "path"          => path,
+          "relative_path" => relative_path,
+          "url"           => url
+        }
+      else
+        data
+      end
     end
 
     # The inspect string for this document.

data/lib/jekyll/filters.rb

@@ -83,7 +83,7 @@ module Jekyll
     #
     # Returns the escaped String.
     def xml_escape(input)
-      CGI.escapeHTML(input)
+      CGI.escapeHTML(input.to_s)
     end
 
     # CGI escape a string for use in a URL. Replaces any special characters

data/lib/jekyll/frontmatter_defaults.rb

@@ -0,0 +1,148 @@
+module Jekyll
+  class Configuration
+    # This class handles custom defaults for YAML frontmatter settings.
+    # These are set in _config.yml and apply both to internal use (e.g. layout)
+    # and the data available to liquid.
+    #
+    # It is exposed via the frontmatter_defaults method on the site class.
+    class FrontmatterDefaults
+      # Initializes a new instance.
+      def initialize(site)
+        @site = site
+      end
+
+      # Finds a default value for a given setting, filtered by path and type
+      #
+      # path - the path (relative to the source) of the page, post or :draft the default is used in
+      # type - a symbol indicating whether a :page, a :post or a :draft calls this method
+      #
+      # Returns the default value or nil if none was found
+      def find(path, type, setting)
+        value = nil
+        old_scope = nil
+
+        matching_sets(path, type).each do |set|
+          if set['values'].has_key?(setting) && has_precedence?(old_scope, set['scope'])
+            value = set['values'][setting]
+            old_scope = set['scope']
+          end
+        end
+        value
+      end
+
+      # Collects a hash with all default values for a page or post
+      #
+      # path - the relative path of the page or post
+      # type - a symbol indicating the type (:post, :page or :draft)
+      #
+      # Returns a hash with all default values (an empty hash if there are none)
+      def all(path, type)
+        defaults = {}
+        old_scope = nil
+        matching_sets(path, type).each do |set|
+          if has_precedence?(old_scope, set['scope'])
+            defaults.merge! set['values']
+            old_scope = set['scope']
+          else
+            defaults = set['values'].merge(defaults)
+          end
+        end
+        defaults
+      end
+
+      private
+
+      # Checks if a given default setting scope matches the given path and type
+      #
+      # scope - the hash indicating the scope, as defined in _config.yml
+      # path - the path to check for
+      # type - the type (:post, :page or :draft) to check for
+      #
+      # Returns true if the scope applies to the given path and type
+      def applies?(scope, path, type)
+        applies_path?(scope, path) && applies_type?(scope, type)
+      end
+
+      def applies_path?(scope, path)
+        return true if scope['path'].empty?
+
+        scope_path = Pathname.new(scope['path'])
+        Pathname.new(sanitize_path(path)).ascend do |path|
+          if path == scope_path
+            return true
+          end
+        end
+      end
+
+      def applies_type?(scope, type)
+        !scope.has_key?('type') || scope['type'] == type.to_s
+      end
+
+      # Checks if a given set of default values is valid
+      #
+      # set - the default value hash, as defined in _config.yml
+      #
+      # Returns true if the set is valid and can be used in this class
+      def valid?(set)
+        set.is_a?(Hash) && set['scope'].is_a?(Hash) && set['scope']['path'].is_a?(String) && set['values'].is_a?(Hash)
+      end
+
+      # Determines if a new scope has precedence over an old one
+      #
+      # old_scope - the old scope hash, or nil if there's none
+      # new_scope - the new scope hash
+      #
+      # Returns true if the new scope has precedence over the older
+      def has_precedence?(old_scope, new_scope)
+        return true if old_scope.nil?
+
+        new_path = sanitize_path(new_scope['path'])
+        old_path = sanitize_path(old_scope['path'])
+
+        if new_path.length != old_path.length
+          new_path.length >= old_path.length
+        elsif new_scope.has_key? 'type'
+          true
+        else
+          !old_scope.has_key? 'type'
+        end
+      end
+
+      # Collects a list of sets that match the given path and type
+      #
+      # Returns an array of hashes
+      def matching_sets(path, type)
+        valid_sets.select do |set|
+          applies?(set['scope'], path, type)
+        end
+      end
+
+      # Returns a list of valid sets
+      #
+      # This is not cached to allow plugins to modify the configuration
+      # and have their changes take effect
+      #
+      # Returns an array of hashes
+      def valid_sets
+        sets = @site.config['defaults']
+        return [] unless sets.is_a?(Array)
+
+        sets.select do |set|
+          unless valid?(set)
+            Jekyll.logger.warn "Default:", "An invalid default set was found"
+          end
+          valid?(set)
+        end
+      end
+
+      # Sanitizes the given path by removing a leading and addding a trailing slash
+      def sanitize_path(path)
+        if path.nil? || path.empty?
+          ""
+        else
+          path.gsub(/\A\//, '').gsub(/([^\/])\z/, '\1/')
+        end
+      end
+    end
+  end
+end