jekyll 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e88fc19236626a5262042dcee0eba9e824f2eb1
-  data.tar.gz: 69faaa1a1f0ac7eb621619a6658010a26bd991ca
+  metadata.gz: e7a714a746d474d294968912e1d95d793174165c
+  data.tar.gz: a8d08a44906ec34cba1c3fd3889db31ca5bfafb8
 SHA512:
-  metadata.gz: 1878376020d78eb078bc4835d5a5c4536ff63f944afcf21310f003f1c5939bd81d693a3fc34f03c85c090326e714acd5dd0f8ac878d5f93835c8cbf574a2e252
-  data.tar.gz: a8acc42139aa5a7fe374c5428a7d79e9d5f10e6809715a056dad5c252026e5f404a89181290c9a17267e4c93104e3521c1493b60620bdcba862cbdbd1b915b17
+  metadata.gz: 3da575bed2b088a6b33dbbbe5bde105adb4fee9bf6812a4274030bbcac74816084071a9a1b345c27178c0b40625c668cf61f3a80e9838045ec3119228fde7fc7
+  data.tar.gz: 0dd32ac1af7b9a182df355f6bb6f04f210c070f0d159651b9e5872941be77b4e9b0df537ecb65517669f2d8257d97a9ae61cd51483f6212c110c9b63c3d7384e

data/README.markdown

@@ -14,6 +14,10 @@ Jekyll is a simple, blog-aware, static site generator perfect for personal, proj
 
 Jekyll does what you tell it to do — no more, no less. It doesn't try to outsmart users by making bold assumptions, nor does it burden them with needless complexity and configuration. Put simply, Jekyll gets out of your way and allows you to concentrate on what truly matters: your content.
 
+## Having trouble with OS X El Capitan?
+
+See: http://jekyllrb.com/docs/troubleshooting/#jekyll-amp-mac-os-x-1011
+
 ## Getting Started
 
 * [Install](http://jekyllrb.com/docs/installation/) the gem

data/lib/jekyll.rb

@@ -58,7 +58,6 @@ module Jekyll
   autoload :LogAdapter,          'jekyll/log_adapter'
   autoload :Page,                'jekyll/page'
   autoload :PluginManager,       'jekyll/plugin_manager'
-  autoload :Post,                'jekyll/post'
   autoload :Publisher,           'jekyll/publisher'
   autoload :Reader,              'jekyll/reader'
   autoload :Regenerator,         'jekyll/regenerator'

data/lib/jekyll/commands/doctor.rb

@@ -49,7 +49,7 @@ module Jekyll
           conflicting_urls = false
           urls = {}
           urls = collect_urls(urls, site.pages, site.dest)
-          urls = collect_urls(urls, site.posts, site.dest)
+          urls = collect_urls(urls, site.posts.docs, site.dest)
           urls.each do |url, paths|
             if paths.size > 1
               conflicting_urls = true

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

@@ -5,6 +5,11 @@ module Jekyll
         def initialize(config)
           require 'kramdown'
           @config = config
+          # If kramdown supported highlighter enabled, use that
+          highlighter = @config['highlighter']
+          if highlighter == 'rouge' || highlighter == 'coderay'
+            @config['kramdown']['syntax_highlighter'] ||= highlighter
+          end
         rescue LoadError
           STDERR.puts 'You are missing a library required for Markdown. Please run:'
           STDERR.puts '  $ [sudo] gem install kramdown'

data/lib/jekyll/convertible.rb

@@ -109,7 +109,7 @@ module Jekyll
     #
     # Returns the converted content
     def render_liquid(content, payload, info, path)
-      site.liquid_renderer.file(path).parse(content).render(payload, info)
+      site.liquid_renderer.file(path).parse(content).render!(payload, info)
     rescue Tags::IncludeTagError => e
       Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}, included in #{path || self.path}"
       raise e

data/lib/jekyll/document.rb

@@ -24,10 +24,11 @@ module Jekyll
       @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)
+      if draft?
+        categories_from_path("_drafts")
+      else
+        categories_from_path(collection.relative_directory)
       end
-      merge_data!({'categories' => subdirs })
 
       data.default_proc = proc do |hash, key|
         site.frontmatter_defaults.find(relative_path, collection.label, key)
@@ -75,6 +76,15 @@ module Jekyll
       data['date'] ||= site.time
     end
 
+    # Returns whether the document is a draft. This is only the case if
+    # the document is in the 'posts' collection but in a different
+    # directory than '_posts'.
+    #
+    # Returns whether the document is a draft.
+    def draft?
+      data['draft'] ||= relative_path.index(collection.relative_directory).nil? && collection.label == "posts"
+    end
+
     # The path to the document, relative to the site source.
     #
     # Returns a String path which represents the relative path
@@ -176,7 +186,9 @@ module Jekyll
         path:        cleaned_relative_path,
         output_ext:  output_ext,
         name:        Utils.slugify(basename_without_ext),
-        title:       Utils.slugify(data['slug']) || Utils.slugify(basename_without_ext),
+        title:       Utils.slugify(data['slug'], mode: "pretty", cased: true) || Utils
+                       .slugify(basename_without_ext, mode: "pretty", cased: true),
+        slug:        Utils.slugify(data['slug']) || Utils.slugify(basename_without_ext),
         year:        date.strftime("%Y"),
         month:       date.strftime("%m"),
         day:         date.strftime("%d"),
@@ -311,9 +323,21 @@ module Jekyll
       end
     end
 
+    # Add superdirectories of the special_dir to categories.
+    # In the case of es/_posts, 'es' is added as a category.
+    # In the case of _posts/es, 'es' is NOT added as a category.
+    #
+    # Returns nothing.
+    def categories_from_path(special_dir)
+      superdirs = relative_path.sub(/#{special_dir}(.*)/, '').split(File::SEPARATOR).reject do |c|
+        c.empty? || c.eql?(special_dir) || c.eql?(basename)
+      end
+      merge_data!({ 'categories' => superdirs })
+    end
+
     def populate_categories
       merge_data!({
-        "categories" => (
+        'categories' => (
           Array(data['categories']) + Utils.pluralized_array_from_hash(data, 'category', 'categories')
         ).map { |c| c.to_s }.flatten.uniq
       })
@@ -366,11 +390,10 @@ 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)
-      cmp = data['date'] <=> anotherDocument.data['date']
-      if 0 == cmp
-        cmp = path <=> anotherDocument.path
-      end
+    def <=>(other)
+      return nil if !other.respond_to?(:data)
+      cmp = data['date'] <=> other.data['date']
+      cmp = path <=> other.path if cmp == 0
       cmp
     end
 

data/lib/jekyll/filters.rb

@@ -45,7 +45,7 @@ module Jekyll
     # Returns the given filename or title as a lowercase URL String.
     # See Utils.slugify for more detail.
     def slugify(input, mode=nil)
-      Utils.slugify(input, mode)
+      Utils.slugify(input, mode: mode)
     end
 
     # Format a date in short format e.g. "27 Jan 2011".

data/lib/jekyll/hooks.rb

@@ -15,6 +15,7 @@ module Jekyll
         after_reset: [],
         post_read: [],
         pre_render: [],
+        post_render: [],
         post_write: [],
       },
       :pages => {
@@ -30,6 +31,7 @@ module Jekyll
         post_write: [],
       },
       :documents => {
+        post_init: [],
         pre_render: [],
         post_render: [],
         post_write: [],

data/lib/jekyll/regenerator.rb

@@ -130,7 +130,9 @@ module Jekyll
     #
     # Returns nothing.
     def write_metadata
-      File.binwrite(metadata_file, Marshal.dump(metadata))
+      unless disabled?
+        File.binwrite(metadata_file, Marshal.dump(metadata))
+      end
     end
 
     # Produce the absolute path of the metadata file

data/lib/jekyll/site.rb

@@ -179,6 +179,8 @@ module Jekyll
           page.render(layouts, payload)
         end
       end
+
+      Jekyll::Hooks.trigger :site, :post_render, self, payload
     rescue Errno::ENOENT
       # ignore missing layout dir
     end

data/lib/jekyll/utils.rb

@@ -121,10 +121,12 @@ module Jekyll
     #
     # string - the filename or title to slugify
     # mode - how string is slugified
+    # cased - whether to replace all  uppercase letters with their
+    # lowercase counterparts
     #
-    # When mode is "none", return the given string in lowercase.
+    # When mode is "none", return the given string.
     #
-    # When mode is "raw", return the given string in lowercase,
+    # When mode is "raw", return the given string,
     # with every sequence of spaces characters replaced with a hyphen.
     #
     # When mode is "default" or nil, non-alphabetic characters are
@@ -133,6 +135,9 @@ module Jekyll
     # When mode is "pretty", some non-alphabetic characters (._~!$&'()+,;=@)
     # are not replaced with hyphen.
     #
+    # If cased is true, all uppercase letters in the result string are
+    # replaced with their lowercase counterparts.
+    #
     # Examples:
     #   slugify("The _config.yml file")
     #   # => "the-config-yml-file"
@@ -140,11 +145,17 @@ module Jekyll
     #   slugify("The _config.yml file", "pretty")
     #   # => "the-_config.yml-file"
     #
+    #   slugify("The _config.yml file", "pretty", true)
+    #   # => "The-_config.yml file"
+    #
     # Returns the slugified string.
-    def slugify(string, mode=nil)
+    def slugify(string, mode: nil, cased: false)
       mode ||= 'default'
       return nil if string.nil?
-      return string.downcase unless SLUGIFY_MODES.include?(mode)
+
+      unless SLUGIFY_MODES.include?(mode)
+        return cased ? string : string.downcase
+      end
 
       # Replace each character sequence with a hyphen
       re = case mode
@@ -158,13 +169,13 @@ module Jekyll
         SLUGIFY_PRETTY_REGEXP
       end
 
-      string.
+      slug = string.
         # Strip according to the mode
         gsub(re, '-').
         # Remove leading/trailing hyphen
-        gsub(/^\-|\-$/i, '').
-        # Downcase
-        downcase
+        gsub(/^\-|\-$/i, '')
+
+      cased ? slug : slug.downcase
     end
 
     # Add an appropriate suffix to template so that it matches the specified

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 2
 summary: A simple, blog aware, static site generator.