jekyll 2.0.3 → 2.1.0

data/lib/jekyll/deprecator.rb

@@ -19,7 +19,7 @@ module Jekyll
     def self.no_subcommand(args)
       if args.size > 0 && args.first =~ /^--/ && !%w[--help --version].include?(args.first)
         Jekyll.logger.error "Deprecation:", "Jekyll now uses subcommands instead of just \
-                            switches. Run `jekyll help' to find out more."
+                            switches. Run `jekyll --help' to find out more."
       end
     end
 

data/lib/jekyll/document.rb

@@ -88,11 +88,19 @@ module Jekyll
       !(asset_file? || yaml_file?)
     end
 
+    # Determine whether the file should be placed into layouts.
+    #
+    # Returns false if the document is either an asset file or a yaml file,
+    #   true otherwise.
+    def place_in_layout?
+      !(asset_file? || yaml_file?)
+    end
+
     # The URL template where the document would be accessible.
     #
     # Returns the URL template for the document.
     def url_template
-      "/:collection/:path:output_ext"
+      collection.url_template
     end
 
     # Construct a Hash of key-value pairs which contain a mapping between
@@ -168,6 +176,8 @@ module Jekyll
     end
 
     # Read in the file and assign the content and data based on the file contents.
+    # Merge the frontmatter of the file with the frontmatter default
+    # values
     #
     # Returns nothing.
     def read(opts = {})
@@ -175,10 +185,17 @@ module Jekyll
         @data = SafeYAML.load_file(path)
       else
         begin
+          defaults = @site.frontmatter_defaults.all(url, collection.label.to_sym)
+          unless defaults.empty?
+            @data = defaults
+          end
           @content = File.read(path, merged_file_read_opts(opts))
           if content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
             @content = $POSTMATCH
-            @data    = SafeYAML.load($1)
+            data_file = SafeYAML.load($1)
+            unless data_file.nil?
+              @data = Utils.deep_merge_hashes(defaults, data_file)
+            end
           end
         rescue SyntaxError => e
           puts "YAML Exception reading #{path}: #{e.message}"
@@ -198,7 +215,8 @@ module Jekyll
           "content"       => content,
           "path"          => path,
           "relative_path" => relative_path,
-          "url"           => url
+          "url"           => url,
+          "collection"    => collection.label
         }
       else
         data

data/lib/jekyll/excerpt.rb

@@ -26,7 +26,7 @@ module Jekyll
     end
 
     def to_liquid
-      post.to_liquid(Post::EXCERPT_ATTRIBUTES_FOR_LIQUID)
+      post.to_liquid(post.class::EXCERPT_ATTRIBUTES_FOR_LIQUID)
     end
 
     # Fetch YAML front-matter data from related post, without layout key

data/lib/jekyll/filters.rb

@@ -193,12 +193,12 @@ module Jekyll
     # Sort an array of objects
     #
     # input - the object array
-    # key - key within each object to filter by
+    # property - property within each object to filter by
     # nils ('first' | 'last') - nils appear before or after non-nil values
     #
     # Returns the filtered array of objects
-    def sort(input, key = nil, nils = "first")
-      if key.nil?
+    def sort(input, property = nil, nils = "first")
+      if property.nil?
         input.sort
       else
         case
@@ -207,18 +207,20 @@ module Jekyll
         when nils == "last"
           order = + 1
         else
-          Jekyll.logger.error "Invalid nils order:",
-            "'#{nils}' is not a valid nils order. It must be 'first' or 'last'."
-          exit(1)
+          raise ArgumentError.new("Invalid nils order: " +
+            "'#{nils}' is not a valid nils order. It must be 'first' or 'last'.")
         end
 
-        input.sort { |a, b|
-          if !a[key].nil? && b[key].nil?
+        input.sort { |apple, orange|
+          apple_property = item_property(apple, property)
+          orange_property = item_property(orange, property)
+
+          if !apple_property.nil? && orange_property.nil?
             - order
-          elsif a[key].nil? && !b[key].nil?
+          elsif apple_property.nil? && !orange_property.nil?
             + order
           else
-            a[key] <=> b[key]
+            apple_property <=> orange_property
           end
         }
       end
@@ -231,7 +233,7 @@ module Jekyll
         input
       when String
         Time.parse(input) rescue Time.at(input.to_i)
-      when Number
+      when Numeric
         Time.at(input)
       else
         Jekyll.logger.error "Invalid Date:", "'#{input}' is not a valid datetime."
@@ -244,7 +246,9 @@ module Jekyll
     end
 
     def item_property(item, property)
-      if item.respond_to?(:data)
+      if item.respond_to?(:to_liquid)
+        item.to_liquid[property.to_s]
+      elsif item.respond_to?(:data)
         item.data[property.to_s]
       else
         item[property.to_s]

data/lib/jekyll/frontmatter_defaults.rb

@@ -41,10 +41,10 @@ module Jekyll
         old_scope = nil
         matching_sets(path, type).each do |set|
           if has_precedence?(old_scope, set['scope'])
-            defaults.merge! set['values']
+            defaults = Utils.deep_merge_hashes(defaults, set['values'])
             old_scope = set['scope']
           else
-            defaults = set['values'].merge(defaults)
+            defaults = Utils.deep_merge_hashes(set['values'], defaults)
           end
         end
         defaults
@@ -145,4 +145,4 @@ module Jekyll
       end
     end
   end
-end
+end

data/lib/jekyll/log_adapter.rb

@@ -0,0 +1,102 @@
+module Jekyll
+  class LogAdapter
+    attr_reader :writer
+
+    LOG_LEVELS = {
+      :debug => ::Logger::DEBUG,
+      :info  => ::Logger::INFO,
+      :warn  => ::Logger::WARN,
+      :error => ::Logger::ERROR
+    }
+
+    # Public: Create a new instance of Jekyll's log writer
+    #
+    # writer - Logger compatible instance
+    # log_level - (optional, symbol) the log level
+    #
+    # Returns nothing
+    def initialize(writer, level = :info)
+      @writer = writer
+      self.log_level = level
+    end
+
+    # Public: Set the log level on the writer
+    #
+    # level - (symbol) the log level
+    #
+    # Returns nothing
+    def log_level=(level)
+      writer.level = LOG_LEVELS.fetch(level)
+    end
+
+    # Public: Print a jekyll debug message
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns nothing
+    def debug(topic, message = nil)
+      writer.debug(message(topic, message))
+    end
+
+    # Public: Print a jekyll message
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns nothing
+    def info(topic, message = nil)
+      writer.info(message(topic, message))
+    end
+
+    # Public: Print a jekyll message
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns nothing
+    def warn(topic, message = nil)
+      writer.warn(message(topic, message))
+    end
+
+    # Public: Print a jekyll error message
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns nothing
+    def error(topic, message = nil)
+      writer.error(message(topic, message))
+    end
+
+    # Public: Print a Jekyll error message 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
+
+    # Internal: 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 message(topic, message)
+      formatted_topic(topic) + message.to_s.gsub(/\s+/, ' ')
+    end
+
+    # Internal: Format the topic
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    #
+    # Returns the formatted topic statement
+    def formatted_topic(topic)
+      "#{topic} ".rjust(20)
+    end
+  end
+end

data/lib/jekyll/post.rb

@@ -77,10 +77,10 @@ module Jekyll
     end
 
     def populate_categories
-      if categories.empty?
-        self.categories = Utils.pluralized_array_from_hash(data, 'category', 'categories').map {|c| c.to_s.downcase}
-      end
-      categories.flatten!
+      categories_from_data = Utils.pluralized_array_from_hash(data, 'category', 'categories')
+      self.categories = (
+        Array(categories) + categories_from_data
+      ).map {|c| c.to_s.downcase}.flatten.uniq
     end
 
     def populate_tags
@@ -256,7 +256,7 @@ module Jekyll
       # construct payload
       payload = Utils.deep_merge_hashes({
         "site" => { "related_posts" => related_posts(site_payload["site"]["posts"]) },
-        "page" => to_liquid(EXCERPT_ATTRIBUTES_FOR_LIQUID)
+        "page" => to_liquid(self.class::EXCERPT_ATTRIBUTES_FOR_LIQUID)
       }, site_payload)
 
       if generate_excerpt?

data/lib/jekyll/renderer.rb

@@ -47,11 +47,15 @@ module Jekyll
         output = render_liquid(output, payload, info)
       end
 
-      place_in_layouts(
-        convert(output),
-        payload,
-        info
-      )
+      if document.place_in_layout?
+        place_in_layouts(
+          convert(output),
+          payload,
+          info
+        )
+      else
+        convert(output)
+      end
     end
 
     # Convert the given content using the converters which match this renderer's document.

data/lib/jekyll/site.rb

@@ -196,17 +196,33 @@ module Jekyll
     # Returns nothing
     def read_data(dir)
       base = File.join(source, dir)
-      return unless File.directory?(base) && (!safe || !File.symlink?(base))
+      read_data_to(base, self.data)
+    end
 
-      entries = Dir.chdir(base) { Dir['*.{yaml,yml}'] }
-      entries.delete_if { |e| File.directory?(File.join(base, e)) }
+    # Read and parse all yaml files under <dir> and add them to the
+    # <data> variable.
+    #
+    # dir - The string absolute path of the directory to read.
+    # data - The variable to which data will be added.
+    #
+    # Returns nothing
+    def read_data_to(dir, data)
+      return unless File.directory?(dir) && (!safe || !File.symlink?(dir))
+
+      entries = Dir.chdir(dir) do
+        Dir['*.{yaml,yml,json}'] + Dir['*'].select { |fn| File.directory?(fn) }
+      end
 
       entries.each do |entry|
-        path = File.join(source, dir, entry)
+        path = File.join(dir, entry)
         next if File.symlink?(path) && safe
 
         key = sanitize_filename(File.basename(entry, '.*'))
-        self.data[key] = SafeYAML.load_file(path)
+        if File.directory?(path)
+          read_data_to(path, data[key] = {})
+        else
+          data[key] = SafeYAML.load_file(path)
+        end
       end
     end
 
@@ -314,19 +330,23 @@ module Jekyll
     #   "tags"       - The Hash of tag values and Posts.
     #                  See Site#post_attr_hash for type info.
     def site_payload
-      {"jekyll" => { "version" => Jekyll::VERSION },
-       "site"   => Utils.deep_merge_hashes(config,
-         Utils.deep_merge_hashes(Hash[collections.map{|label, coll| [label, coll.docs]}], {
-          "time"         => time,
-          "posts"        => posts.sort { |a, b| b <=> a },
-          "pages"        => pages,
-          "static_files" => static_files.sort { |a, b| a.relative_path <=> b.relative_path },
-          "html_pages"   => pages.reject { |page| !page.html? },
-          "categories"   => post_attr_hash('categories'),
-          "tags"         => post_attr_hash('tags'),
-          "collections"  => collections,
-          "documents"    => documents,
-          "data"         => site_data
+      {
+        "jekyll" => {
+          "version" => Jekyll::VERSION,
+          "environment" => Jekyll.env
+        },
+        "site"   => Utils.deep_merge_hashes(config,
+          Utils.deep_merge_hashes(Hash[collections.map{|label, coll| [label, coll.docs]}], {
+            "time"         => time,
+            "posts"        => posts.sort { |a, b| b <=> a },
+            "pages"        => pages,
+            "static_files" => static_files.sort { |a, b| a.relative_path <=> b.relative_path },
+            "html_pages"   => pages.select { |page| page.html? || page.url.end_with?("/") },
+            "categories"   => post_attr_hash('categories'),
+            "tags"         => post_attr_hash('tags'),
+            "collections"  => collections,
+            "documents"    => documents,
+            "data"         => site_data
         }))
       }
     end

data/lib/jekyll/static_file.rb

@@ -59,6 +59,7 @@ module Jekyll
       @@mtimes[path] = mtime
 
       FileUtils.mkdir_p(File.dirname(dest_path))
+      FileUtils.rm(dest_path) if File.exist?(dest_path)
       FileUtils.cp(path, dest_path)
 
       true

data/lib/jekyll/stevenson.rb

@@ -1,102 +1,58 @@
 module Jekyll
-  class Stevenson
-    attr_accessor :log_level
-
-    LOG_LEVELS = {
-      debug: 0,
-      info:  1,
-      warn:  2,
-      error: 3
-    }
-
-    # Public: Create a new instance of Stevenson, Jekyll's logger
-    #
-    # level - (optional, symbol) the log level
-    #
-    # Returns nothing
-    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 should_log(:debug)
-    end
-
-    # 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 info(topic, message = nil)
-      $stdout.puts(message(topic, message)) if should_log(:info)
-    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 warn(topic, message = nil)
-      $stderr.puts(message(topic, message).yellow) if should_log(:warn)
-    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 error(topic, message = nil)
-      $stderr.puts(message(topic, message).red) if should_log(: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.
-    # message - the message detail
-    #
-    # Returns the formatted message
-    def message(topic, message)
-      formatted_topic(topic) + message.to_s.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 formatted_topic(topic)
-      "#{topic} ".rjust(20)
-    end
-
-    # Public: Determine whether the current log level warrants logging at the
-    #         proposed level.
-    #
-    # level_of_message - the log level of the message (symbol)
-    #
-    # Returns true if the log level of the message is greater than or equal to
-    #   this logger's log level.
-    def should_log(level_of_message)
-      LOG_LEVELS.fetch(log_level) <= LOG_LEVELS.fetch(level_of_message)
+  class Stevenson < ::Logger
+    def initialize
+      @progname = nil
+      @level = DEBUG
+      @default_formatter = Formatter.new
+      @logdev = $stdout
+      @formatter = proc do |severity, datetime, progname, msg|
+        "#{msg}"
+      end
+    end
+
+    def add(severity, message = nil, progname = nil, &block)
+      severity ||= UNKNOWN
+      @logdev = set_logdevice(severity)
+
+      if @logdev.nil? or severity < @level
+        return true
+      end
+      progname ||= @progname
+      if message.nil?
+        if block_given?
+          message = yield
+        else
+          message = progname
+          progname = @progname
+        end
+      end
+      @logdev.puts(
+        format_message(format_severity(severity), Time.now, progname, message))
+      true
+    end
+
+    # Log a +WARN+ message
+    def warn(progname = nil, &block)
+      add(WARN, nil, progname.yellow, &block)
+    end
+
+    # Log an +ERROR+ message
+    def error(progname = nil, &block)
+      add(ERROR, nil, progname.red, &block)
+    end
+
+    def close
+      # No LogDevice in use
+    end
+
+    private
+
+    def set_logdevice(severity)
+      if severity > INFO
+        $stderr
+      else
+        $stdout
+      end
     end
   end
 end