jekyll 3.0.0.pre.beta10 → 3.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 632b5286e2a7093e76fe77a51c398287edaad2a7
-  data.tar.gz: 1e21bd762b78a2fc59537a89c6b0776abb656352
+  metadata.gz: 46b7d3601d36e13abc6d7b4f491499c22a330892
+  data.tar.gz: 8a32e0599dcf8413d2cc9dfe2241d95c1080e20c
 SHA512:
-  metadata.gz: f35c3c3690736f43f5afe00e9e4915597e1af52680781bdce7a1590ac22672c6a75634c0e547d7b390b0976c6d6e045613cafcff5a931ce3b7d8016a85f8e2e2
-  data.tar.gz: 39908d9a537b41c7545698b80c10850eff2dcf132eb0bdcee663cf602126825ea4c960fbee0d08b72d1a4bae8427ccd3a62478de4b436e6f26d0c30f84bed3d4
+  metadata.gz: 4df79a6ea3e788be41f0edc6b115cec186cf52f57a4c098ada7da45786e5cd734040065f4bc46b047683f40ab353e35455d10ecea55ae09da615e11140bb28d5
+  data.tar.gz: 6397a49e24251b2dbbf59362df048bc241b2c4d2287ee21a29f28bc978041b19be89194f38c0a59c667592591c8eff32d0c91326a8dc22c29233b756f070fa0d

data/lib/jekyll.rb

@@ -30,7 +30,6 @@ require 'kramdown'
 require 'colorator'
 
 SafeYAML::OPTIONS[:suppress_warnings] = true
-Liquid::Template.error_mode = :strict
 
 module Jekyll
 
@@ -53,7 +52,6 @@ module Jekyll
   autoload :CollectionReader,    'jekyll/readers/collection_reader'
   autoload :DataReader,          'jekyll/readers/data_reader'
   autoload :LayoutReader,        'jekyll/readers/layout_reader'
-  autoload :DraftReader,         'jekyll/readers/draft_reader'
   autoload :PostReader,          'jekyll/readers/post_reader'
   autoload :PageReader,          'jekyll/readers/page_reader'
   autoload :StaticFileReader,    'jekyll/readers/static_file_reader'
@@ -136,7 +134,7 @@ module Jekyll
     #
     # Returns the new logger.
     def logger=(writer)
-      @logger = LogAdapter.new(writer)
+      @logger = LogAdapter.new(writer, (ENV["JEKYLL_LOG_LEVEL"] || :info).to_sym)
     end
 
     # Public: An array of sites

data/lib/jekyll/cleaner.rb

@@ -3,6 +3,7 @@ require 'set'
 module Jekyll
   # Handles the cleanup of a site's destination before it is built.
   class Cleaner
+    HIDDEN_FILE_REGEX = /\/\.{1,2}$/
     attr_reader :site
 
     def initialize(site)
@@ -12,7 +13,7 @@ module Jekyll
     # Cleans up the site's destination directory
     def cleanup!
       FileUtils.rm_rf(obsolete_files)
-      FileUtils.rm_rf(metadata_file) if @site.full_rebuild?
+      FileUtils.rm_rf(metadata_file) if !@site.incremental?
     end
 
     private
@@ -40,7 +41,7 @@ module Jekyll
       dirs = keep_dirs
 
       Dir.glob(site.in_dest_dir("**", "*"), File::FNM_DOTMATCH) do |file|
-        next if file =~ /\/\.{1,2}$/ || file =~ regex || dirs.include?(file)
+        next if file =~ HIDDEN_FILE_REGEX || file =~ regex || dirs.include?(file)
         files << file
       end
 

data/lib/jekyll/collection.rb

@@ -1,6 +1,7 @@
 module Jekyll
   class Collection
     attr_reader :site, :label, :metadata
+    attr_writer :docs
 
     # Create a new Collection.
     #
@@ -22,6 +23,23 @@ module Jekyll
       @docs ||= []
     end
 
+    # Override of normal respond_to? to match method_missing's logic for
+    # looking in @data.
+    def respond_to?(method, include_private = false)
+      docs.respond_to?(method.to_sym, include_private) || super
+    end
+
+    # Override of method_missing to check in @data for the key.
+    def method_missing(method, *args, &blck)
+      if docs.respond_to?(method.to_sym)
+        Jekyll.logger.warn "Deprecation:", "Collection##{method} should be called on the #docs array directly."
+        Jekyll.logger.warn "", "Called by #{caller.first}."
+        docs.public_send(method.to_sym, *args, &blck)
+      else
+        super
+      end
+    end
+
     # Fetch the static files in this collection.
     # Defaults to an empty array if no static files have been read in.
     #
@@ -40,7 +58,7 @@ module Jekyll
         if Utils.has_yaml_header? full_path
           doc = Jekyll::Document.new(full_path, { site: site, collection: self })
           doc.read
-          docs << doc if site.publisher.publish?(doc)
+          docs << doc if site.publisher.publish?(doc) || !write?
         else
           relative_dir = Jekyll.sanitized_path(relative_directory, File.dirname(file_path)).chomp("/.")
           files << StaticFile.new(site, site.source, relative_dir, File.basename(full_path), self)
@@ -163,7 +181,7 @@ module Jekyll
     #
     # Returns true if the 'write' metadata is true, false otherwise.
     def write?
-      !!metadata['output']
+      !!metadata.fetch('output', false)
     end
 
     # The URL template to render collection's documents at.

data/lib/jekyll/command.rb

@@ -60,7 +60,7 @@ module Jekyll
         c.option 'unpublished', '--unpublished', 'Render posts that were marked as unpublished'
         c.option 'quiet',   '-q', '--quiet', 'Silence output.'
         c.option 'verbose', '-V', '--verbose', 'Print verbose output.'
-        c.option 'full_rebuild', '-f', '--full-rebuild', 'Disable incremental rebuild.'
+        c.option 'incremental', '-I', '--incremental', 'Enable incremental rebuild.'
       end
 
     end

data/lib/jekyll/commands/build.rb

@@ -52,10 +52,10 @@ module Jekyll
           t = Time.now
           source      = options['source']
           destination = options['destination']
-          full_build  = options['full_rebuild']
+          incremental = options['incremental']
           Jekyll.logger.info "Source:", source
           Jekyll.logger.info "Destination:", destination
-          Jekyll.logger.info "Incremental build:", (full_build ? "disabled" : "enabled")
+          Jekyll.logger.info "Incremental build:", (incremental ? "enabled" : "disabled. Enable with --incremental")
           Jekyll.logger.info "Generating..."
           process_site(site)
           Jekyll.logger.info "", "done in #{(Time.now - t).round(3)} seconds."

data/lib/jekyll/configuration.rb

@@ -5,7 +5,7 @@ module Jekyll
 
     # Default options. Overridden by values in _config.yml.
     # Strings rather than symbols are used for compatibility with YAML.
-    DEFAULTS = {
+    DEFAULTS = Configuration[{
       # Where things are
       'source'        => Dir.pwd,
       'destination'   => File.join(Dir.pwd, '_site'),
@@ -13,7 +13,7 @@ module Jekyll
       'layouts_dir'   => '_layouts',
       'data_dir'      => '_data',
       'includes_dir'  => '_includes',
-      'collections'   => nil,
+      'collections'   => {},
 
       # Handling Reading
       'safe'          => false,
@@ -22,7 +22,6 @@ module Jekyll
       'keep_files'    => ['.git','.svn'],
       'encoding'      => 'utf-8',
       'markdown_ext'  => 'markdown,mkdown,mkdn,mkd,md',
-      'full_rebuild'  => false,
 
       # Filtering Content
       'show_drafts'   => nil,
@@ -39,6 +38,7 @@ module Jekyll
       'highlighter'   => 'rouge',
       'lsi'           => false,
       'excerpt_separator' => "\n\n",
+      'incremental'   => false,
 
       # Serving
       'detach'        => false,          # default to not detaching the server
@@ -80,7 +80,7 @@ module Jekyll
           'coderay_css'               => 'style'
         }
       }
-    }
+    }]
 
     # Public: Turn all keys into string
     #
@@ -186,7 +186,7 @@ module Jekyll
         $stderr.puts "#{err}"
       end
 
-      configuration.fix_common_issues.backwards_compatibilize
+      configuration.fix_common_issues.backwards_compatibilize.add_default_collections
     end
 
     # Public: Split a CSV string into an array containing its values
@@ -275,6 +275,21 @@ module Jekyll
       config
     end
 
+    def add_default_collections
+      config = clone
+
+      return config if config['collections'].nil?
+
+      if config['collections'].is_a?(Array)
+        config['collections'] = Hash[config['collections'].map{|c| [c, {}]}]
+      end
+      config['collections']['posts'] ||= {}
+      config['collections']['posts']['output'] = true
+      config['collections']['posts']['permalink'] = style_to_permalink(config['permalink'])
+
+      config
+    end
+
     def renamed_key(old, new, config, allowed_values = nil)
       if config.key?(old)
         Jekyll::Deprecator.deprecation_message "The '#{old}' configuration" +
@@ -283,5 +298,21 @@ module Jekyll
         config[new] = config.delete(old)
       end
     end
+
+    private
+    def style_to_permalink(permalink_style)
+      case permalink_style.to_sym
+      when :pretty
+        "/:categories/:year/:month/:day/:title/"
+      when :none
+        "/:categories/:title.html"
+      when :date
+        "/:categories/:year/:month/:day/:title.html"
+      when :ordinal
+        "/:categories/:year/:y_day/:title.html"
+      else
+        permalink_style.to_s
+      end
+    end
   end
 end

data/lib/jekyll/convertible.rb

@@ -135,21 +135,15 @@ module Jekyll
     #
     # Returns the type of self.
     def type
-      if is_a?(Draft)
-        :drafts
-      elsif is_a?(Post)
-        :posts
-      elsif is_a?(Page)
+      if is_a?(Page)
         :pages
       end
     end
 
     # returns the owner symbol for hook triggering
     def hook_owner
-      if is_a?(Post)
-        :post
-      elsif is_a?(Page)
-        :page
+      if is_a?(Page)
+        :pages
       end
     end
 
@@ -215,6 +209,7 @@ module Jekyll
       used = Set.new([layout])
 
       while layout
+        Jekyll.logger.debug "Rendering Layout:", path
         payload = Utils.deep_merge_hashes(payload, {"content" => output, "page" => layout.data})
 
         self.output = render_liquid(layout.content,
@@ -245,6 +240,9 @@ module Jekyll
     #
     # Returns nothing.
     def do_layout(payload, layouts)
+      Jekyll.logger.debug "Rendering:", self.relative_path
+
+      Jekyll.logger.debug "Pre-Render Hooks:", self.relative_path
       Jekyll::Hooks.trigger hook_owner, :pre_render, self, payload
       info = { :filters => [Jekyll::Filters], :registers => { :site => site, :page => payload['page'] } }
 
@@ -252,13 +250,18 @@ module Jekyll
       payload["highlighter_prefix"] = converters.first.highlighter_prefix
       payload["highlighter_suffix"] = converters.first.highlighter_suffix
 
-      self.content = render_liquid(content, payload, info, path) if render_with_liquid?
+      if render_with_liquid?
+        Jekyll.logger.debug "Rendering Liquid:", self.relative_path
+        self.content = render_liquid(content, payload, info, path)
+      end
+      Jekyll.logger.debug "Rendering Markup:", self.relative_path
       self.content = transform
 
       # output keeps track of what will finally be written
       self.output = content
 
       render_all_layouts(layouts, payload, info) if place_in_layout?
+      Jekyll.logger.debug "Post-Render Hooks:", self.relative_path
       Jekyll::Hooks.trigger hook_owner, :post_render, self
     end
 

data/lib/jekyll/document.rb

@@ -7,6 +7,8 @@ module Jekyll
     attr_reader :path, :site, :extname, :output_ext, :content, :output, :collection
 
     YAML_FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+    DATELESS_FILENAME_MATCHER = /^(.*)(\.[^.]+)$/
+    DATE_FILENAME_MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)(\.[^.]+)$/
 
     # Create a new Document.
     #
@@ -21,6 +23,17 @@ module Jekyll
       @output_ext = Jekyll::Renderer.new(site, self).output_ext
       @collection = relations[:collection]
       @has_yaml_header = nil
+
+      subdirs = relative_path.split(File::SEPARATOR).reject do |c|
+        c.empty? || c.eql?(collection.relative_directory) || c.eql?("_drafts") || c.eql?(basename)
+      end
+      merge_data!({'categories' => subdirs })
+
+      data.default_proc = proc do |hash, key|
+        site.frontmatter_defaults.find(relative_path, collection.label, key)
+      end
+
+      trigger_hooks(:post_init)
     end
 
     def output=(output)
@@ -41,6 +54,27 @@ module Jekyll
       @data ||= Hash.new
     end
 
+    # Merge some data in with this document's data.
+    #
+    # Returns the merged data.
+    def merge_data!(other)
+      if other.key?('categories') && !other['categories'].nil?
+        if other['categories'].is_a?(String)
+          other['categories'] = other['categories'].split(" ").map(&:strip)
+        end
+        other['categories'] = (data['categories'] || []) | other['categories']
+      end
+      Utils.deep_merge_hashes!(data, other)
+      if data.key?('date') && !data['date'].is_a?(Time)
+         data['date'] = Utils.parse_date(data['date'].to_s, "Document '#{relative_path}' does not have a valid date in the YAML front matter.")
+      end
+      data
+    end
+
+    def date
+      data['date'] ||= site.time
+    end
+
     # The path to the document, relative to the site source.
     #
     # Returns a String path which represents the relative path
@@ -138,11 +172,23 @@ module Jekyll
     # Returns the Hash of key-value pairs for replacement in the URL.
     def url_placeholders
       {
-        collection: collection.label,
-        path:       cleaned_relative_path,
-        output_ext: output_ext,
-        name:       Utils.slugify(basename_without_ext),
-        title:      Utils.slugify(data['slug']) || Utils.slugify(basename_without_ext)
+        collection:  collection.label,
+        path:        cleaned_relative_path,
+        output_ext:  output_ext,
+        name:        Utils.slugify(basename_without_ext),
+        title:       Utils.slugify(data['slug']) || Utils.slugify(basename_without_ext),
+        year:        date.strftime("%Y"),
+        month:       date.strftime("%m"),
+        day:         date.strftime("%d"),
+        hour:        date.strftime("%H"),
+        minute:      date.strftime("%M"),
+        second:      date.strftime("%S"),
+        i_day:       date.strftime("%-d"),
+        i_month:     date.strftime("%-m"),
+        categories:  (data['categories'] || []).map { |c| c.to_s.downcase }.uniq.join('/'),
+        short_month: date.strftime("%b"),
+        short_year:  date.strftime("%y"),
+        y_day:       date.strftime("%j"),
       }
     end
 
@@ -165,6 +211,10 @@ module Jekyll
       }).to_s
     end
 
+    def [](key)
+      data[key]
+    end
+
     # The full path to the output file.
     #
     # base_directory - the base path of the output directory
@@ -190,7 +240,7 @@ module Jekyll
         f.write(output)
       end
 
-      Jekyll::Hooks.trigger :document, :post_write, self
+      trigger_hooks(:post_write)
     end
 
     # Returns merged option hash for File.read of self.site (if exists)
@@ -218,22 +268,23 @@ module Jekyll
     def read(opts = {})
       @to_liquid = nil
 
+      Jekyll.logger.debug "Reading:", relative_path
+
       if yaml_file?
         @data = SafeYAML.load_file(path)
       else
         begin
           defaults = @site.frontmatter_defaults.all(url, collection.label.to_sym)
-          unless defaults.empty?
-            @data = defaults
-          end
+          merge_data!(defaults) unless defaults.empty?
+
           self.content = File.read(path, merged_file_read_opts(opts))
           if content =~ YAML_FRONT_MATTER_REGEXP
             self.content = $POSTMATCH
             data_file = SafeYAML.load($1)
-            unless data_file.nil?
-              @data = Utils.deep_merge_hashes(defaults, data_file)
-            end
+            merge_data!(data_file) if data_file
           end
+
+          post_read
         rescue SyntaxError => e
           puts "YAML Exception reading #{path}: #{e.message}"
         rescue Exception => e
@@ -242,19 +293,54 @@ module Jekyll
       end
     end
 
+    def post_read
+      if DATE_FILENAME_MATCHER =~ relative_path
+        m, cats, date, slug, ext = *relative_path.match(DATE_FILENAME_MATCHER)
+        merge_data!({
+          "slug" => slug,
+          "ext"  => ext
+        })
+        merge_data!({"date" => date}) if data['date'].nil? || data['date'].to_i == site.time.to_i
+        data['title'] ||= slug.split('-').select {|w| w.capitalize! || w }.join(' ')
+      end
+      populate_categories
+      populate_tags
+
+      if generate_excerpt?
+        data['excerpt'] = Jekyll::Excerpt.new(self)
+      end
+    end
+
+    def populate_categories
+      merge_data!({
+        "categories" => (
+          Array(data['categories']) + Utils.pluralized_array_from_hash(data, 'category', 'categories')
+        ).map { |c| c.to_s }.flatten.uniq
+      })
+    end
+
+    def populate_tags
+      merge_data!({
+        "tags" => Utils.pluralized_array_from_hash(data, "tag", "tags").flatten
+      })
+    end
+
     # Create a Liquid-understandable version of this Document.
     #
     # Returns a Hash representing this Document's data.
     def to_liquid
       @to_liquid ||= if data.is_a?(Hash)
-        Utils.deep_merge_hashes data, {
+        Utils.deep_merge_hashes Utils.deep_merge_hashes({
           "output"        => output,
           "content"       => content,
           "relative_path" => relative_path,
           "path"          => relative_path,
           "url"           => url,
-          "collection"    => collection.label
-        }
+          "collection"    => collection.label,
+          "next"          => next_doc,
+          "previous"      => previous_doc,
+          "id"            => id,
+        }, data), { 'excerpt' => data['excerpt'].to_s }
       else
         data
       end
@@ -272,7 +358,7 @@ module Jekyll
     #
     # Returns the content of the document
     def to_s
-      content || ''
+      output || content || 'NO CONTENT'
     end
 
     # Compare this document against another document.
@@ -281,7 +367,11 @@ module Jekyll
     # Returns -1, 0, +1 or nil depending on whether this doc's path is less than,
     #   equal or greater than the other doc's path. See String#<=> for more details.
     def <=>(anotherDocument)
-      path <=> anotherDocument.path
+      cmp = data['date'] <=> anotherDocument.data['date']
+      if 0 == cmp
+        cmp = path <=> anotherDocument.path
+      end
+      cmp
     end
 
     # Determine whether this document should be written.
@@ -292,5 +382,71 @@ module Jekyll
     def write?
       collection && collection.write?
     end
+
+    # The Document excerpt_separator, from the YAML Front-Matter or site
+    # default excerpt_separator value
+    #
+    # Returns the document excerpt_separator
+    def excerpt_separator
+      (data['excerpt_separator'] || site.config['excerpt_separator']).to_s
+    end
+
+    # Whether to generate an excerpt
+    #
+    # Returns true if the excerpt separator is configured.
+    def generate_excerpt?
+      !excerpt_separator.empty?
+    end
+
+    def next_doc
+      pos = collection.docs.index {|post| post.equal?(self) }
+      if pos && pos < collection.docs.length - 1
+        collection.docs[pos + 1]
+      else
+        nil
+      end
+    end
+
+    def previous_doc
+      pos = collection.docs.index {|post| post.equal?(self) }
+      if pos && pos > 0
+        collection.docs[pos - 1]
+      else
+        nil
+      end
+    end
+
+    def trigger_hooks(hook_name, *args)
+      Jekyll::Hooks.trigger collection.label.to_sym, hook_name, self, *args if collection
+      Jekyll::Hooks.trigger :documents, hook_name, self, *args
+    end
+
+    def id
+      @id ||= File.join(File.dirname(url), (data['slug'] || basename_without_ext).to_s)
+    end
+
+    # Calculate related posts.
+    #
+    # Returns an Array of related Posts.
+    def related_posts
+      Jekyll::RelatedPosts.new(self).build
+    end
+
+    # Override of normal respond_to? to match method_missing's logic for
+    # looking in @data.
+    def respond_to?(method, include_private = false)
+      data.key?(method.to_s) || super
+    end
+
+    # Override of method_missing to check in @data for the key.
+    def method_missing(method, *args, &blck)
+      if data.key?(method.to_s)
+        Jekyll.logger.warn "Deprecation:", "Document##{method} is now a key in the #data hash."
+        Jekyll.logger.warn "", "Called by #{caller.first}."
+        data[method.to_s]
+      else
+        super
+      end
+    end
   end
 end