jekyll-paginate-content 1.0.4 → 1.1.0

data/lib/jekyll-paginate-content/pager.rb

@@ -10,7 +10,7 @@ module Jekyll
         :page_trail, :pages, :paginated, :previous_is_first,
         :prev_is_first, :previous_page, :prev_page, :previous_page_path,
         :previous_path, :prev_path, :prev_section, :previous_section,
-        :section, :seo, :single_page, :toc, :total_pages, :view_all
+        :section, :section_id, :seo, :single_page, :toc, :total_pages, :view_all
 
       def initialize(data)
         data.each do |k,v|
@@ -45,6 +45,7 @@ module Jekyll
           'seo' => seo,
           'single_page' => single_page,
           'section' => section,
+          'section_id' => section_id,
           'toc' => toc,
           'next_section' => next_section,
           'previous_section' => previous_section,

data/lib/jekyll-paginate-content/paginator.rb

@@ -10,23 +10,34 @@ module Jekyll
         @items = []
         @skipped = false
 
-        source_prefix = item.is_a?(Jekyll::Page) ? site.source : ''
+        is_page = item.is_a?(Jekyll::Page)
+
+        source_prefix = is_page ? site.source : ''
         source = File.join(source_prefix, item.path)
         html = item.destination('')
 
-        final_config = {}.merge(config)
+        final_config = config.dup
         if item.data.has_key?('paginate_content')
+          fm_config = {}
           item.data['paginate_content'].each do |k,v|
             s = k.downcase.strip.to_sym
-            final_config[s] = v
+            fm_config[s] = v
           end
+
+          Jekyll::Utils.deep_merge_hashes!(final_config, fm_config)
         end
+
         @config = final_config
 
-        if @config[:force] || (!File.exist?(html) || (File.mtime(html) < File.mtime(source)))
-          self.split(item)
-        else
+        if !@config[:force] && (cached_items = Generator::Cache.items(site, item))
+          @items = cached_items
           @skipped = true
+
+        else
+          split_pages = self.split(item)
+
+          # Store for later retrieval during regeneration
+          Generator::Cache.items(site, item, split_pages)
         end
       end
 
@@ -36,6 +47,7 @@ module Jekyll
 
       def split(item)
         sep = @config[:separator].downcase.strip
+
         # Update the header IDs the original document
         content = item.content
 
@@ -63,7 +75,12 @@ module Jekyll
         content.scan(/(^|\r?\n)((#+)\s*([^\r\n#]+)#*\r?\n|([^\r\n]+)\r?\n(=+|\-{4,})\s*\r?\n|<h([1-6])[^>]*>([^\r\n<]+)(\s*<\/h\7>))/mi).each do |m|
           header = m[3] || m[4] || m[7]
 
+          # Parse any Liquid page variables here so the ids also get the resulting text
+          header_template = Liquid::Template.parse(header)
+          header = header_template.render({ "page" => item.data })
+
           next if @config[:toc_exclude] && @config[:toc_exclude].include?(header)
+          next if header == '_last_'
 
           markup = m[1].strip
 
@@ -256,7 +273,7 @@ module Jekyll
               page_data = item.data
             end
 
-            paginator.merge!(page_data)
+            Jekyll::Utils.deep_merge_hashes!(paginator, page_data)
             new_part = Page.new(item, @site, dirname, filename)
           else
             new_part = Document.new(item, @site, @collection)
@@ -284,6 +301,11 @@ module Jekyll
           end
 
           paginator['section'] = section
+          if last &&  section == '_last_'
+            paginator['section_id'] = section
+          else
+            paginator['section_id'] = section.downcase.gsub(/[[:punct:]]/, '').gsub(/\s+/, '-')
+          end
 
           paginator['paginated'] = true
           paginator['page_num'] = num
@@ -340,9 +362,8 @@ module Jekyll
           _set_properties(item, new_part, 'part', user_props) if !first && !last
 
           # Don't allow these to be overriden,
-          # i.e. set/reset layout, date, title, permalink
+          # i.e. set/reset date, title, permalink
 
-          new_part.data['layout'] = item.data['layout']
           new_part.data['date'] = item.data['date']
           new_part.data['permalink'] = plink
 
@@ -356,10 +377,13 @@ module Jekyll
               'id' => id
             }
 
+          if last && (section == "_last_")
+            page.sub!(/^\s*#+\s+_last_/, '')
+          end
+
           new_part.content = header + page + footer
 
           new_items << new_part
-
           num += 1
         end
 
@@ -425,6 +449,7 @@ module Jekyll
           single.data['layout'] = item.data['layout']
           single.data['date'] = item.data['date']
           single.data['title'] = item.data['title']
+          single.data['regenerate'] = false;
 
           # Just some limited data for the single page
           seo = @config[:seo_canonical] ?
@@ -445,6 +470,8 @@ module Jekyll
           single.pager = Pager.new(single_paginator)
           single.content = item.content
 
+          single.content.sub!(/^\s*#+\s+_last_/, '<a id="_last_"></a>')
+
           new_items << single
         end
 
@@ -517,11 +544,10 @@ module Jekyll
       end
 
       def _set_properties(original, item, stage, user_props = nil)
-        stage_props = {}
-        stage_props.merge!(@config[:properties][stage])
+        stage_props = (@config[:properties][stage] || {}).dup
 
         if user_props && user_props.has_key?(stage)
-          stage_props.merge!(user_props[stage])
+          Jekyll::Utils.deep_merge_hashes!(stage_props, user_props[stage])
         end
 
         return if stage_props.empty?
@@ -541,12 +567,7 @@ module Jekyll
           end
         end
 
-        if item.respond_to?('merge_data')
-          item.merge_data!(stage_props)
-        else
-          item.data.merge!(stage_props)
-        end
-
+        Jekyll::Utils.deep_merge_hashes!(item.data, stage_props)
       end
 
       def _adjust_links(new_items, content, a_locations, num)
@@ -569,6 +590,7 @@ module Jekyll
         end
 
       end
+
     end
 
   end

data/lib/jekyll-paginate-content/version.rb

@@ -1,7 +1,7 @@
 module Jekyll
   module Paginate
     module Content
-      VERSION = "1.0.4"
+      VERSION = "1.1.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-paginate-content
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Alex Ibrado
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -59,9 +59,34 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- example/.gitignore
+- example/404.html
+- example/Gemfile
+- example/_config.yml
+- example/_demos/jpc-3page-auto.md
+- example/_includes/header.html
+- example/_includes/slides.js
+- example/_layouts/default.html
+- example/_layouts/home.html
+- example/_layouts/slides.html
+- example/_posts/2018-01-27-manual.md
+- example/_posts/2018-01-27-welcome-to-jekyll.markdown
+- example/about.md
+- example/assets/css/fontello.css
+- example/assets/css/slides.css
+- example/assets/css/syntax.scss
+- example/assets/font/fontello.eot
+- example/assets/font/fontello.svg
+- example/assets/font/fontello.ttf
+- example/assets/font/fontello.woff
+- example/assets/font/fontello.woff2
+- example/assets/images/slidebg.png
+- example/index.md
+- example/slides.md
 - jekyll-paginate-content.gemspec
 - lib/jekyll-paginate-content.rb
 - lib/jekyll-paginate-content/documentpage.rb
+- lib/jekyll-paginate-content/generator-cache.rb
 - lib/jekyll-paginate-content/generator.rb
 - lib/jekyll-paginate-content/pager.rb
 - lib/jekyll-paginate-content/paginator.rb