jekyll 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da4a384123184e24eac3e77cca8dfe0ddc86c55c
-  data.tar.gz: 1b50d6473eae20b98d00816f179e1a244463c68f
+  metadata.gz: 0c8892e6c24d91e7bb872ababcdf1fc3c473fb2a
+  data.tar.gz: f65449e305df03d45e5981cd20758880e0d64e3b
 SHA512:
-  metadata.gz: 1521cccd09c634740f50581b5263a437b51df9f2c3d008aa80cea2cc94c3b09968ab9e96b686c50cbe7e9fbc3c92707e18d5c0525f2a5a6553912d9da6b2e2de
-  data.tar.gz: 7df670b70cb204ad179f07e111c707f365fae94d9ff3ae14b5bf4daa820fc84e70f99281a9e153a74829890e6eafb9ad7e4b4d422f7c4123b0cc88d3cc06e988
+  metadata.gz: d2bf3e0ff6ddbbe01bbe533598776c4080d905b43f01f01c059518afd39fa37ee0dcd9cfc1018137149e685260c2a23928428ba0afafd07f52b466c49bd93e20
+  data.tar.gz: 8effefaa97451ea446b29eec58e77dc04fed9626d960fdb2ce38455ba263d959f78cfafdd38f525cfdbadd3865a7477c21f7fdb9c792eb1f355a618b97508410

data/.rubocop.yml

@@ -1,6 +1,6 @@
 ---
 AllCops:
-  TargetRubyVersion: 2.0
+  TargetRubyVersion: 2.1
   Include:
     - lib/**/*.rb
   Exclude:
@@ -117,8 +117,6 @@ Style/Documentation:
     - !ruby/regexp /features\/.*.rb$/
 Style/DoubleNegation:
   Enabled: false
-Style/Encoding:
-  EnforcedStyle: when_needed
 Style/GuardClause:
   Enabled: false
 Style/HashSyntax:

data/lib/jekyll/commands/build.rb

@@ -96,7 +96,7 @@ module Jekyll
             )
           end
         end
-      end # end of class << self
+      end
     end
   end
 end

data/lib/jekyll/configuration.rb

@@ -206,7 +206,7 @@ module Jekyll
       rescue ArgumentError => err
         Jekyll.logger.warn "WARNING:", "Error reading configuration. " \
                      "Using defaults (and options)."
-        $stderr.puts err
+        warn err
       end
 
       configuration.fix_common_issues.backwards_compatibilize.add_default_collections

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

@@ -47,7 +47,7 @@ class Jekyll::Converters::Markdown::RedcarpetParser
   end
 
   module WithRouge
-    def block_code(code, lang)
+    def block_code(_code, lang)
       code = "<pre>#{super}</pre>"
 
       "<div class=\"highlight\">#{add_code_tags(code, lang)}</div>"

data/lib/jekyll/renderer.rb

@@ -143,7 +143,7 @@ module Jekyll
     # Returns String rendered content
     def place_in_layouts(content, payload, info)
       output = content.dup
-      layout = layouts[document.data["layout"]]
+      layout = layouts[document.data["layout"].to_s]
       validate_layout(layout)
 
       used = Set.new([layout])

data/lib/jekyll/site.rb

@@ -444,6 +444,7 @@ module Jekyll
     def configure_file_read_opts
       self.file_read_opts = {}
       self.file_read_opts[:encoding] = config["encoding"] if config["encoding"]
+      self.file_read_opts = Jekyll::Utils.merged_file_read_opts(self, {})
     end
 
     private

data/lib/jekyll/utils.rb

@@ -301,6 +301,9 @@ module Jekyll
     # and a given param
     def merged_file_read_opts(site, opts)
       merged = (site ? site.file_read_opts : {}).merge(opts)
+      if merged[:encoding] && !merged[:encoding].start_with?("bom|")
+        merged[:encoding] = "bom|#{merged[:encoding]}"
+      end
       if merged["encoding"] && !merged["encoding"].start_with?("bom|")
         merged["encoding"] = "bom|#{merged["encoding"]}"
       end

data/lib/jekyll/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.6.1".freeze
+  VERSION = "3.6.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable