jekyll 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8d95eee0017fdee0b1bd50cd4ecd98ce21c1c93
-  data.tar.gz: 01041195decd799ee53f3f789a198e77a4fa64c4
+  metadata.gz: 98ba3fa55cb0c26a1d2a7e7e6dc1bef322f54e75
+  data.tar.gz: 37ed86cfd716d25d054bc3401d7213a2bbb14ea8
 SHA512:
-  metadata.gz: 2db44561c9c9a3c0e2ab910c001bdf10f5666eea637897d3ab84ca99964826bac9198de11a9d6ca4444d0928463d6f3d6591abf3e8b498aef9a138475800fe22
-  data.tar.gz: 63f973c0b2cd718f45076b6813cfa3acebf8eed763775ee335dfc670ab6079b5b16fb686d2265c41c2a67201af4dd46df3777a21976e8a8dfc1f27a14a1406c4
+  metadata.gz: 8d2b0d3e0f6f478dbeac2242463226b9f58ee1e52ef274ce9a6361eabd4f5d877a95b6bda6e80be1fab597737d1b2c9bcbe184af2e89c7c0d2692288c87733d4
+  data.tar.gz: 49a95f70354cd9bce8fa4bdca2690d6bf291a4046b2265b84c7ebc220637b2aa3a0ec82426811b83e521dc64f3beeb6583a2342e9120bd3f057cdce4ed46acb9

data/lib/jekyll.rb

@@ -96,14 +96,13 @@ module Jekyll
     #
     # Returns the final configuration Hash.
     def configuration(override = Hash.new)
-      config = Configuration[Configuration::DEFAULTS]
-      override = Configuration[override].stringify_keys
+      config = Configuration.new
       unless override.delete('skip_config_files')
         config = config.read_config_files(config.config_files(override))
       end
 
       # Merge DEFAULTS < _config.yml < override
-      config = Utils.deep_merge_hashes(config, override).stringify_keys
+      config = Configuration.from Utils.deep_merge_hashes(config, override).stringify_keys
       set_timezone(config['timezone']) if config['timezone']
 
       config

data/lib/jekyll/configuration.rb

@@ -80,7 +80,24 @@ module Jekyll
           'coderay_css'               => 'style'
         }
       }
-    }]
+    }].freeze
+
+    class << self
+      # Static: Produce a Configuration ready for use in a Site.
+      # It takes the input, fills in the defaults where values do not
+      # exist, and patches common issues including migrating options for
+      # backwards compatiblity. Except where a key or value is being fixed,
+      # the user configuration will override the defaults.
+      #
+      # user_config - a Hash or Configuration of overrides.
+      #
+      # Returns a Configuration filled with defaults and fixed for common
+      # problems and backwards-compatibility.
+      def from(user_config)
+        Utils.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys).
+          fix_common_issues.backwards_compatibilize.add_default_collections
+      end
+    end
 
     # Public: Turn all keys into string
     #
@@ -177,6 +194,7 @@ module Jekyll
 
       begin
         files.each do |config_file|
+          next if config_file.nil? or config_file.empty?
           new_config = read_config_file(config_file)
           configuration = Utils.deep_merge_hashes(configuration, new_config)
         end
@@ -243,7 +261,7 @@ module Jekyll
             " as a list of comma-separated values."
           config[option] = csv_to_array(config[option])
         end
-        config[option].map!(&:to_s)
+        config[option].map!(&:to_s) if config[option]
       end
 
       if (config['kramdown'] || {}).key?('use_coderay')
@@ -278,14 +296,22 @@ module Jekyll
     def add_default_collections
       config = clone
 
+      # It defaults to `{}`, so this is only if someone sets it to null manually.
       return config if config['collections'].nil?
 
+      # Ensure we have a hash.
       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['collections'] = Utils.deep_merge_hashes(
+        { 'posts' => {} }, config['collections']
+      ).tap do |collections|
+        collections['posts']['output'] = true
+        if config['permalink']
+          collections['posts']['permalink'] ||= style_to_permalink(config['permalink'])
+        end
+      end
 
       config
     end

data/lib/jekyll/document.rb

@@ -289,7 +289,7 @@ module Jekyll
         @data = SafeYAML.load_file(path)
       else
         begin
-          defaults = @site.frontmatter_defaults.all(url, collection.label.to_sym)
+          defaults = @site.frontmatter_defaults.all(relative_path, collection.label.to_sym)
           merge_data!(defaults, source: "front matter defaults") unless defaults.empty?
 
           self.content = File.read(path, merged_file_read_opts(opts))

data/lib/jekyll/site.rb

@@ -273,7 +273,7 @@ module Jekyll
             "html_pages"   => pages.select { |page| page.html? || page.url.end_with?("/") },
             "categories"   => post_attr_hash('categories'),
             "tags"         => post_attr_hash('tags'),
-            "collections"  => collections.values.map(&:to_liquid),
+            "collections"  => collections.values.sort_by(&:label).map(&:to_liquid),
             "documents"    => documents,
             "data"         => site_data
         }))

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.0.3'
+  VERSION = '3.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid