jekyll 3.1.0.pre.rc1 → 3.1.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5da26c7d190e158f8259ccab996f37dbdeab27f6
-  data.tar.gz: 78d017c3d93a9a91ba2ada36ab1f3522c72d7b16
+  metadata.gz: 0c49c2ade7b29eeb1b1928c794846db916363241
+  data.tar.gz: 5713d975ac97f85c1d5cda5a4377ef8d71765268
 SHA512:
-  metadata.gz: cd566922d0e9b2f8e6e5cba893ed419d304b0e250145800d455a5e3eac66dfb6de3ce123535f76bc68600e7dfa999ab9f4759af207181b1a82c918f7b2db3d6f
-  data.tar.gz: 0d0d806095422d586cc4775197b897130ae36e0eb550d0d5b71c5503b1c2e34004d1530f9a5fbebf3a53837b7a4571494c2665ed98a786416e1d1c22a27be10e
+  metadata.gz: e4a476d032971178d64c3ab1087bedcaa16cfaf96c6b232d9a8461f8ed9f4db087e8af6b5691bdb2ece34e42facfdc083240fde62286c7d3fba06d0e08e8a8bd
+  data.tar.gz: d3b03199417ca5da4d536f30fd5d9fbd8f782acca115c613cacfdda6f74f9bb725fb7fe79658050c4c267ba2f72405f7e7d4ce24780495618c8ec8df1984a97c

data/lib/jekyll/convertible.rb

@@ -97,13 +97,7 @@ module Jekyll
     # Returns the String extension for the output file.
     #   e.g. ".html" for an HTML output file.
     def output_ext
-      if converters.all? { |c| c.is_a?(Jekyll::Converters::Identity) }
-        ext
-      else
-        converters.map do |c|
-          c.output_ext(ext) unless c.is_a?(Jekyll::Converters::Identity)
-        end.compact.last
-      end
+      Jekyll::Renderer.new(site, self).output_ext
     end
 
     # Determine which converter to use based on this convertible's

data/lib/jekyll/document.rb

@@ -59,7 +59,10 @@ module Jekyll
       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.")
+        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

data/lib/jekyll/page.rb

@@ -7,6 +7,8 @@ module Jekyll
     attr_accessor :name, :ext, :basename
     attr_accessor :data, :content, :output
 
+    alias_method :extname, :ext
+
     # Attributes for Liquid templates
     ATTRIBUTES_FOR_LIQUID = %w(
       content
@@ -160,5 +162,13 @@ module Jekyll
     def index?
       basename == 'index'
     end
+
+    def trigger_hooks(hook_name, *args)
+      Jekyll::Hooks.trigger :pages, hook_name, self, *args
+    end
+
+    def write?
+      true
+    end
   end
 end

data/lib/jekyll/renderer.rb

@@ -22,11 +22,7 @@ module Jekyll
     #
     # Returns the output extname including the leading period.
     def output_ext
-      @output_ext ||= if document.permalink
-        File.extname(document.permalink)
-      else
-        converters.first.output_ext(document.extname)
-      end
+      @output_ext ||= (permalink_ext || converter_output_ext)
     end
 
     ######################
@@ -38,10 +34,18 @@ module Jekyll
 
       payload["page"] = document.to_liquid
 
-      if document.collection.label == 'posts' && document.is_a?(Document)
+      if document.respond_to? :pager
+        payload["paginator"] = document.pager.to_liquid
+      end
+
+      if document.is_a?(Document) && document.collection.label == 'posts'
         payload['site']['related_posts'] = document.related_posts
       end
 
+      # render and transform content (this becomes the final content of the object)
+      payload['highlighter_prefix'] = converters.first.highlighter_prefix
+      payload['highlighter_suffix'] = converters.first.highlighter_suffix
+
       Jekyll.logger.debug "Pre-Render Hooks:", document.relative_path
       document.trigger_hooks(:pre_render, payload)
 
@@ -50,10 +54,6 @@ module Jekyll
         :registers => { :site => site, :page => payload['page'] }
       }
 
-      # render and transform content (this becomes the final content of the object)
-      payload['highlighter_prefix'] = converters.first.highlighter_prefix
-      payload['highlighter_suffix'] = converters.first.highlighter_suffix
-
       output = document.content
 
       if document.render_with_liquid?
@@ -164,5 +164,28 @@ module Jekyll
 
       output
     end
+
+    private
+
+    def permalink_ext
+      if document.permalink
+        permalink_ext = File.extname(document.permalink)
+        permalink_ext unless permalink_ext.empty?
+      end
+    end
+
+    def converter_output_ext
+      if output_exts.size == 1
+        output_exts.last
+      else
+        output_exts[-2]
+      end
+    end
+
+    def output_exts
+      @output_exts ||= converters.map do |c|
+        c.output_ext(document.extname)
+      end.compact
+    end
   end
 end

data/lib/jekyll/site.rb

@@ -176,7 +176,8 @@ module Jekyll
 
       pages.flatten.each do |page|
         if regenerator.regenerate?(page)
-          page.render(layouts, payload)
+          page.output = Jekyll::Renderer.new(self, page, payload).run
+          page.trigger_hooks(:post_render)
         end
       end
 

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.1.0.pre.rc1'
+  VERSION = '3.1.0.pre.rc2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.1.0.pre.rc1
+  version: 3.1.0.pre.rc2
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 2
 summary: A simple, blog aware, static site generator.