jekyll 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05e4f40f8f400d7aa40c3d15acb9fcdc8f16ceaf
-  data.tar.gz: 714e2322ba59673ee70dbc6acdf924052e3c0939
+  metadata.gz: 56c167aa9b02ffadc0482aa73eca44b948a1fbc5
+  data.tar.gz: 009cc8ae7b98a986ffd1792c382ab04a7e3ecfa9
 SHA512:
-  metadata.gz: 7bc2509f9b4705cb88834a2ffdb802c30a42e311b494a5a33662cc27e5731a7958f0e814f73f01855fe84fd08a2ee6dd8fe6d6bd900c2e743033846af0147a24
-  data.tar.gz: 10397d196e420bf2480038070cf2f6f9a3f67e4f0f321a728365d675da69c5ae1b975be1e207cbdef9819679fba09ca720ea11a125b66ce50d9f00450dd56aba
+  metadata.gz: 5f12355c33e46191613bed314fcca4d4124e5957cd1ffe394e61c99f2e99536c8c445b9dee2182f52b59d48350c7d3a785b3c49a8e86fb7665477bdcc047b8e4
+  data.tar.gz: 42e90646fb9484f3dfe61c2268074f7ed97656a0cc4674a07d21c12d985c5be8de08d58afa4a9d3f9414cd097cda30f9405f99c85157718ef8e7377c1d939f85

data/lib/jekyll/convertible.rb

@@ -28,12 +28,6 @@ module Jekyll
       !(data.key?('published') && data['published'] == false)
     end
 
-    # Returns merged option hash for File.read of self.site (if exists)
-    # and a given param
-    def merged_file_read_opts(opts)
-      (site ? site.file_read_opts : {}).merge(opts)
-    end
-
     # Read the YAML frontmatter.
     #
     # base - The String path to the dir containing the file.
@@ -46,7 +40,7 @@ module Jekyll
 
       begin
         self.content = File.read(site.in_source_dir(base, name),
-                                 merged_file_read_opts(opts))
+                                 Utils.merged_file_read_opts(site, opts))
         if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
           self.content = $POSTMATCH
           self.data = SafeYAML.load(Regexp.last_match(1))

data/lib/jekyll/document.rb

@@ -237,16 +237,6 @@ module Jekyll
       trigger_hooks(:post_write)
     end
 
-    # Returns merged option hash for File.read of self.site (if exists)
-    # and a given param
-    #
-    # opts - override options
-    #
-    # Return the file read options hash.
-    def merged_file_read_opts(opts)
-      site ? site.file_read_opts.merge(opts) : opts
-    end
-
     # Whether the file is published or not, as indicated in YAML front-matter
     #
     # Returns true if the 'published' key is specified in the YAML front-matter and not `false`.
@@ -269,7 +259,7 @@ module Jekyll
           defaults = @site.frontmatter_defaults.all(url, collection.label.to_sym)
           merge_data!(defaults, source: "front matter defaults") unless defaults.empty?
 
-          self.content = File.read(path, merged_file_read_opts(opts))
+          self.content = File.read(path, Utils.merged_file_read_opts(site, opts))
           if content =~ YAML_FRONT_MATTER_REGEXP
             self.content = $POSTMATCH
             data_file = SafeYAML.load(Regexp.last_match(1))

data/lib/jekyll/page.rb

@@ -9,6 +9,8 @@ module Jekyll
 
     alias_method :extname, :ext
 
+    FORWARD_SLASH = '/'.freeze
+
     # Attributes for Liquid templates
     ATTRIBUTES_FOR_LIQUID = %w(
       content
@@ -55,7 +57,12 @@ module Jekyll
     #
     # Returns the String destination directory.
     def dir
-      url[-1, 1] == '/' ? url : File.dirname(url)
+      if url.end_with?(FORWARD_SLASH)
+        url
+      else
+        url_dir = File.dirname(url)
+        url_dir.end_with?(FORWARD_SLASH) ? url_dir : "#{url_dir}/"
+      end
     end
 
     # The full path and filename of the post. Defined in the YAML of the post

data/lib/jekyll/renderer.rb

@@ -168,7 +168,7 @@ module Jekyll
     private
 
     def permalink_ext
-      if document.permalink
+      if document.permalink && !document.permalink.end_with?("/")
         permalink_ext = File.extname(document.permalink)
         permalink_ext unless permalink_ext.empty?
       end

data/lib/jekyll/utils.rb

@@ -273,5 +273,15 @@ module Jekyll
       end
     end
 
+    # Returns merged option hash for File.read of self.site (if exists)
+    # 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"].insert(0, "bom|")
+      end
+      merged
+    end
+
   end
 end

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-24 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid