jekyll 2.2.0 → 2.3.0

data/lib/jekyll/document.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Jekyll
   class Document
     include Comparable
@@ -15,6 +17,7 @@ module Jekyll
       @site = relations[:site]
       @path = path
       @collection = relations[:collection]
+      @has_yaml_header = nil
     end
 
     # Fetch the Document's data.
@@ -77,7 +80,21 @@ module Jekyll
     # Returns true if the extname belongs to the set of extensions
     #   that asset files use.
     def asset_file?
-      %w[.sass .scss .coffee].include?(extname)
+      sass_file? || coffeescript_file?
+    end
+
+    # Determine whether the document is a Sass file.
+    #
+    # Returns true if extname == .sass or .scss, false otherwise.
+    def sass_file?
+      %w[.sass .scss].include?(extname)
+    end
+
+    # Determine whether the document is a CoffeeScript file.
+    #
+    # Returns true if extname == .coffee, false otherwise.
+    def coffeescript_file?
+      '.coffee'.eql?(extname)
     end
 
     # Determine whether the file should be rendered with Liquid.
@@ -85,7 +102,7 @@ module Jekyll
     # Returns false if the document is either an asset file or a yaml file,
     #   true otherwise.
     def render_with_liquid?
-      !(asset_file? || yaml_file?)
+      !(coffeescript_file? || yaml_file?)
     end
 
     # Determine whether the file should be placed into layouts.
@@ -172,7 +189,7 @@ module Jekyll
     #
     # Returns true if the 'published' key is specified in the YAML front-matter and not `false`.
     def published?
-      !(data.has_key?('published') && data['published'] == false)
+      !(data.key?('published') && data['published'] == false)
     end
 
     # Read in the file and assign the content and data based on the file contents.
@@ -235,7 +252,7 @@ module Jekyll
     #
     # Returns the content of the document
     def to_s
-      output || content
+      content || ''
     end
 
     # Compare this document against another document.

data/lib/jekyll/filters.rb

@@ -25,6 +25,28 @@ module Jekyll
       converter.convert(input)
     end
 
+    # Convert a Sass string into CSS output.
+    #
+    # input - The Sass String to convert.
+    #
+    # Returns the CSS formatted String.
+    def sassify(input)
+      site = @context.registers[:site]
+      converter = site.getConverterImpl(Jekyll::Converters::Sass)
+      converter.convert(input)
+    end
+
+    # Convert a Scss string into CSS output.
+    #
+    # input - The Scss String to convert.
+    #
+    # Returns the CSS formatted String.
+    def scssify(input)
+      site = @context.registers[:site]
+      converter = site.getConverterImpl(Jekyll::Converters::Scss)
+      converter.convert(input)
+    end
+
     # Format a date in short format e.g. "27 Jan 2011".
     #
     # date - the Time to format.
@@ -155,7 +177,7 @@ module Jekyll
     #
     # Returns the converted json string
     def jsonify(input)
-      input.to_json
+      as_liquid(input).to_json
     end
 
     # Group an array of items by a property
@@ -254,5 +276,9 @@ module Jekyll
         item[property.to_s]
       end
     end
+
+    def as_liquid(item)
+      item.respond_to?(:to_liquid) ? item.to_liquid : item
+    end
   end
 end

data/lib/jekyll/frontmatter_defaults.rb

@@ -10,6 +10,26 @@ module Jekyll
       @site = site
     end
 
+    def update_deprecated_types(set)
+      return set unless set.key?('scope') && set['scope'].key?('type')
+
+      set['scope']['type'] = case set['scope']['type']
+      when 'page'
+        Deprecator.defaults_deprecate_type('page', 'pages')
+        'pages'
+      when 'post'
+        Deprecator.defaults_deprecate_type('post', 'posts')
+        'posts'
+      when 'draft'
+        Deprecator.defaults_deprecate_type('draft', 'drafts')
+        'drafts'
+      else
+        set['scope']['type']
+      end
+
+      set
+    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
@@ -21,7 +41,7 @@ module Jekyll
       old_scope = nil
 
       matching_sets(path, type).each do |set|
-        if set['values'].has_key?(setting) && has_precedence?(old_scope, set['scope'])
+        if set['values'].key?(setting) && has_precedence?(old_scope, set['scope'])
           value = set['values'][setting]
           old_scope = set['scope']
         end
@@ -63,7 +83,7 @@ module Jekyll
     end
 
     def applies_path?(scope, path)
-      return true if scope['path'].empty?
+      return true if !scope.has_key?('path') || scope['path'].empty?
 
       scope_path = Pathname.new(scope['path'])
       Pathname.new(sanitize_path(path)).ascend do |path|
@@ -73,8 +93,19 @@ module Jekyll
       end
     end
 
+    # Determines whether the scope applies to type.
+    # The scope applies to the type if:
+    #   1. no 'type' is specified
+    #   2. the 'type' in the scope is the same as the type asked about
+    #
+    # scope - the Hash defaults set being asked about application
+    # type  - the type of the document being processed / asked about
+    #         its defaults.
+    #
+    # Returns true if either of the above conditions are satisfied,
+    #   otherwise returns false
     def applies_type?(scope, type)
-      !scope.has_key?('type') || scope['type'] == type.to_s
+      !scope.key?('type') || scope['type'].eql?(type.to_s)
     end
 
     # Checks if a given set of default values is valid
@@ -83,7 +114,7 @@ module Jekyll
     #
     # 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)
+      set.is_a?(Hash) && set['values'].is_a?(Hash)
     end
 
     # Determines if a new scope has precedence over an old one
@@ -100,10 +131,10 @@ module Jekyll
 
       if new_path.length != old_path.length
         new_path.length >= old_path.length
-      elsif new_scope.has_key? 'type'
+      elsif new_scope.key? 'type'
         true
       else
-        !old_scope.has_key? 'type'
+        !old_scope.key? 'type'
       end
     end
 
@@ -112,7 +143,7 @@ module Jekyll
     # Returns an array of hashes
     def matching_sets(path, type)
       valid_sets.select do |set|
-        applies?(set['scope'], path, type)
+        !set.has_key?('scope') || applies?(set['scope'], path, type)
       end
     end
 
@@ -126,12 +157,15 @@ module Jekyll
       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"
+      sets.map do |set|
+        if valid?(set)
+          update_deprecated_types(set)
+        else
+          Jekyll.logger.warn "Defaults:", "An invalid front-matter default set was found:"
+          Jekyll.logger.warn "#{set}"
+          nil
         end
-        valid?(set)
-      end
+      end.compact
     end
 
     # Sanitizes the given path by removing a leading and addding a trailing slash

data/lib/jekyll/plugin.rb

@@ -27,7 +27,7 @@ module Jekyll
     # Returns the Symbol priority.
     def self.priority(priority = nil)
       @priority ||= nil
-      if priority && PRIORITIES.has_key?(priority)
+      if priority && PRIORITIES.key?(priority)
         @priority = priority
       end
       @priority || :normal
@@ -56,6 +56,15 @@ module Jekyll
       PRIORITIES[other.priority] <=> PRIORITIES[self.priority]
     end
 
+    # Spaceship is priority [higher -> lower]
+    #
+    # other - The class to be compared.
+    #
+    # Returns -1, 0, 1.
+    def <=>(other)
+      self.class <=> other.class
+    end
+
     # Initialize a new plugin. This should be overridden by the subclass.
     #
     # config - The Hash of configuration options.

data/lib/jekyll/post.rb

@@ -60,8 +60,8 @@ module Jekyll
         site.frontmatter_defaults.find(File.join(dir, name), type, key)
       end
 
-      if data.has_key?('date')
-        self.date = Time.parse(data["date"].to_s)
+      if data.key?('date')
+        self.date = Utils.parse_date(data["date"].to_s, "Post '#{relative_path}' does not have a valid date in the YAML front matter.")
       end
 
       populate_categories
@@ -69,7 +69,7 @@ module Jekyll
     end
 
     def published?
-      if data.has_key?('published') && data['published'] == false
+      if data.key?('published') && data['published'] == false
         false
       else
         true
@@ -159,16 +159,9 @@ module Jekyll
     # Returns nothing.
     def process(name)
       m, cats, date, slug, ext = *name.match(MATCHER)
-      self.categories ||= []
-      self.categories += (cats || '').downcase.split('/')
-      self.date = Time.parse(date)
+      self.date = Utils.parse_date(date, "Post '#{relative_path}' does not have a valid date in the filename.")
       self.slug = slug
       self.ext = ext
-    rescue ArgumentError
-      path = File.join(@dir || "", name)
-      msg  =  "Post '#{path}' does not have a valid date.\n"
-      msg  << "Fix the date, or exclude the file or directory from being processed"
-      raise Errors::FatalException.new(msg)
     end
 
     # The generated directory into which the post will be placed
@@ -223,8 +216,8 @@ module Jekyll
         :month       => date.strftime("%m"),
         :day         => date.strftime("%d"),
         :title       => slug,
-        :i_day       => date.strftime("%d").to_i.to_s,
-        :i_month     => date.strftime("%m").to_i.to_s,
+        :i_day       => date.strftime("%-d"),
+        :i_month     => date.strftime("%-m"),
         :categories  => (categories || []).map { |c| c.to_s }.join('/'),
         :short_month => date.strftime("%b"),
         :short_year  => date.strftime("%y"),

data/lib/jekyll/related_posts.rb

@@ -10,7 +10,7 @@ module Jekyll
     def initialize(post)
       @post = post
       @site = post.site
-      require 'classifier' if site.lsi
+      require 'classifier-reborn' if site.lsi
     end
 
     def build
@@ -27,7 +27,7 @@ module Jekyll
 
     def build_index
       self.class.lsi ||= begin
-        lsi = Classifier::LSI.new(:auto_rebuild => false)
+        lsi = ClassifierReborn::LSI.new(:auto_rebuild => false)
         display("Populating LSI...")
 
         site.posts.each do |x|

data/lib/jekyll/renderer.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Jekyll
   class Renderer
 
@@ -47,14 +49,17 @@ module Jekyll
         output = render_liquid(output, payload, info)
       end
 
+      output = convert(output)
+      document.content = output
+
       if document.place_in_layout?
         place_in_layouts(
-          convert(output),
+          output,
           payload,
           info
         )
       else
-        convert(output)
+        output
       end
     end
 

data/lib/jekyll/site.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Jekyll
   class Site
     attr_accessor :config, :layouts, :posts, :pages, :static_files,
@@ -49,7 +51,7 @@ module Jekyll
     #
     # Returns nothing
     def reset
-      self.time = (config['time'] ? Time.parse(config['time'].to_s) : Time.now)
+      self.time = (config['time'] ? Utils.parse_date(config['time'].to_s, "Invalid time in _config.yml.") : Time.now)
       self.layouts = {}
       self.posts = []
       self.pages = []
@@ -142,7 +144,7 @@ module Jekyll
         if File.directory?(f_abs)
           f_rel = File.join(dir, f)
           read_directories(f_rel) unless dest.sub(/\/$/, '') == f_abs
-        elsif has_yaml_header?(f_abs)
+        elsif Utils.has_yaml_header?(f_abs)
           page = Page.new(self, source, dir, f)
           pages << page if publisher.publish?(page)
         else
@@ -430,7 +432,7 @@ module Jekyll
 
     def documents
       collections.reduce(Set.new) do |docs, (_, collection)|
-        docs.merge(collection.docs)
+        docs + collection.docs + collection.files
       end.to_a
     end
 
@@ -452,10 +454,6 @@ module Jekyll
       pages.any? { |page| page.uses_relative_permalinks }
     end
 
-    def has_yaml_header?(file)
-      !!(File.open(file, 'rb') { |f| f.read(5) } =~ /\A---\r?\n/)
-    end
-
     def limit_posts!
       limit = posts.length < limit_posts ? posts.length : limit_posts
       self.posts = posts[-limit, limit]

data/lib/jekyll/static_file.rb

@@ -9,11 +9,12 @@ module Jekyll
     # base - The String path to the <source>.
     # dir  - The String path between <source> and the file.
     # name - The String filename of the file.
-    def initialize(site, base, dir, name)
+    def initialize(site, base, dir, name, collection = nil)
       @site = site
       @base = base
       @dir  = dir
       @name = name
+      @collection = collection
     end
 
     # Returns source file path.
@@ -23,7 +24,11 @@ module Jekyll
 
     # Returns the source file path relative to the site source
     def relative_path
-      @relative_path ||= path.sub(/\A#{@site.source}/, '')
+      @relative_path ||= File.join(*[@dir, @name].compact)
+    end
+
+    def extname
+      File.extname(path)
     end
 
     # Obtain destination path.
@@ -32,7 +37,15 @@ module Jekyll
     #
     # Returns destination file path.
     def destination(dest)
-      File.join(*[dest, @dir, @name].compact)
+      File.join(*[dest, destination_rel_dir, @name].compact)
+    end
+
+    def destination_rel_dir
+      if @collection
+        @dir.gsub(/\A_/, '')
+      else
+        @dir
+      end
     end
 
     # Returns last modification time for this file.
@@ -47,6 +60,13 @@ module Jekyll
       @@mtimes[path] != mtime
     end
 
+    # Whether to write the file to the filesystem
+    #
+    # Returns true.
+    def write?
+      true
+    end
+
     # Write the static file to the destination directory (if modified).
     #
     # dest - The String path to the destination dir.
@@ -75,7 +95,7 @@ module Jekyll
 
     def to_liquid
       {
-        "path"          => relative_path,
+        "path"          => File.join("", relative_path),
         "modified_time" => mtime.to_s,
         "extname"       => File.extname(relative_path)
       }