j1-paginator 2020.0.1 → 2021.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0291abd44383e8a8cd7c9d40e476570c0c0649989df9d07d1653854264fafed9'
-  data.tar.gz: 026e9ae32361a02400bb54da216a249f05d84500a1242306ecefca76f1d4a01e
+  metadata.gz: bf74f1bba29c33242d08fb9734ecddc619c7506473c334e0a8707c5e3682445c
+  data.tar.gz: f090acdcaa7691776d8b3f6b46fb579a978c5176bcc529475fda69483450d2b6
 SHA512:
-  metadata.gz: 426524d6cf68b4a429dc9dbaf2558f1868d145332542add93d3833f8dded0bd45d92f8112c8cd3c62bd1f500cdfb35af345253434c84b5b4bd1f5b661daec47d
-  data.tar.gz: 84508d62b690e53fd56de1ec14b7813169d5b08997c6b92ce54ceccc60e1d82f5857c0dfe54905db6967783e4c2d55f5b12d49781ee26c0e4052a879b0abb181
+  metadata.gz: 86d5e86ddee5e965afecf4d40821aea07f3b43f2736bb0ea8632368a0f6205a304047a858db51549aadbd6827dd93b6de0c308a05fd69d217fa4ff97c156714c
+  data.tar.gz: 65ed6b9de9139909302e44c0175466ae97bd8f60c3de033c5d51f6bd52b6070b5c8afc93438a53bb6104f076ddd5bfdabce7dd37bce62577d0fd0411a9bf574a

data/j1-paginator.gemspec

@@ -17,18 +17,19 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Pagination Generator for Jekyll 3}
   spec.description   = %q{An enhanced zero-configuration in-place replacement for the now decomissioned built-in jekyll-paginate gem. This pagination gem offers full backwards compatability as well as a slew of new frequently requested features with minimal additional site and page configuration. Optional features include auto-generation of paginated collection, tag and category pages.}
-  
+
   spec.files          = Dir['CODE_OF_CONDUCT.md', 'README*.md', 'LICENSE', 'Rakefile', '*.gemspec', 'Gemfile', 'lib/**/*', 'spec/**/*']
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   # Gem requires Jekyll to work
   # ~> is the pessimistic operator and is equivalent to '>= 3.0', '< 4.0'
-  #spec.add_runtime_dependency "jekyll", "~> 3.0"
-  spec.add_runtime_dependency "jekyll", '>= 3.0', '<= 4.0'
+  # spec.add_runtime_dependency "jekyll", '>= 3.0', '<= 4.0
+  # spec.add_runtime_dependency "jekyll", '> 3.0'
+  spec.add_runtime_dependency 'jekyll', '>= 3.6', '< 5.0'
 
   # Development requires more
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"                             # Fix rake vulnerability of CVE-2020-8130
   spec.add_development_dependency "minitest", '~> 5.4'
-end
+end

data/lib/j1-paginator.rb

@@ -1,8 +1,9 @@
-# Jekyll::Paginate V2 is a gem built for Jekyll 3 that generates pagiatation for posts, collections, categories and tags.
-# 
-# It is based on https://github.com/jekyll/jekyll-paginate, the original Jekyll paginator
-# which was decommissioned in Jekyll 3 release onwards. This code is currently not officially
-# supported on Jekyll versions < 3.0 (although it might work)
+# Jekyll::Paginate V2 is a gem built for Jekyll 4+ that generates
+# pagiatation for posts, collections, categories and tags.
+#
+# It is based on https://github.com/jekyll/jekyll-paginate, the original
+# Jekyll paginator which was decommissioned in Jekyll 3 release onwards.
+# This code is currently not officially supported on Jekyll versions >= 3.0.
 #
 # Author: Sverrir Sigmundarson
 # Site: https://github.com/sverrirs/j1-paginator
@@ -28,7 +29,7 @@ require "j1-paginator/autopages/pages/categoryAutoPage"
 require "j1-paginator/autopages/pages/collectionAutoPage"
 require "j1-paginator/autopages/pages/tagAutoPage"
 
-module Jekyll 
+module Jekyll
   module J1Paginator
   end # module J1Paginator
-end # module Jekyll
+end # module Jekyll

data/lib/j1-paginator/autopages/autoPages.rb

@@ -12,7 +12,7 @@ module Jekyll
       pg_settings = Jekyll::Utils.deep_merge_hashes(pg_config_defaults, pg_config_settings || {})
 
       # Get the configuration for auto pages
-      ap_config_defaults = pg_config_defaults['settings']['autopages']
+      ap_config_defaults = pg_config_defaults['defaults']['autopages']
       ap_config_settings = pg_config_settings['settings']['autopages']
       ap_settings = Jekyll::Utils.deep_merge_hashes(ap_config_defaults, ap_config_settings || {})
 
@@ -21,7 +21,7 @@ module Jekyll
 
 
       # Get the configuration for the paginator
-      pg_config_defaults = pg_config_defaults['settings']['pagination']
+      pg_config_defaults = pg_config_defaults['defaults']['pagination']
       pg_config_settings = pg_config_settings['settings']['pagination']
       pg_settings = Jekyll::Utils.deep_merge_hashes(pg_config_defaults, pg_config_settings || {})
 
@@ -49,7 +49,7 @@ module Jekyll
         site.pages << TagAutoPage.new(site, site.dest, autopage_tag_config, pagination_config, layout_name, tag, tag_original_name)
       end
       autopage_create(autopage_config, pagination_config, posts_to_use, 'tags', 'tags', createtagpage_lambda) # Call the actual function
-      
+
 
       ###############################################
       # Generate the category pages if enabled
@@ -57,14 +57,14 @@ module Jekyll
         site.pages << CategoryAutoPage.new(site, site.dest, autopage_cat_config, pagination_config, layout_name, category, category_original_name)
       end
       autopage_create(autopage_config, pagination_config,posts_to_use, 'categories', 'categories', createcatpage_lambda) # Call the actual function
-      
+
       ###############################################
       # Generate the Collection pages if enabled
       createcolpage_lambda = lambda do | autopage_col_config, pagination_config, layout_name, coll_name, coll_original_name |
         site.pages << CollectionAutoPage.new(site, site.dest, autopage_col_config, pagination_config, layout_name, coll_name, coll_original_name)
       end
       autopage_create(autopage_config, pagination_config,posts_to_use, 'collections', '__coll', createcolpage_lambda) # Call the actual function
-    
+
     end # create_autopages
 
     # STATIC: this function actually performs the steps to generate the autopages.

data/lib/j1-paginator/generator/defaults.rb

@@ -13,9 +13,9 @@ module Jekyll
       'sort_reverse' => false,
       'sort_field'   => 'date',
       'limit'        => 0, # Limit how many content objects to paginate (default: 0, means all)
-      'trail'        => { 
-          'before' => 0, # Limits how many links to show before the current page in the pagination trail (0, means off, default: 0)
-          'after' => 0,  # Limits how many links to show after the current page in the pagination trail (0 means off, default: 0)
+      'trail'        => {
+          'before'   => 0, # Limits how many links to show before the current page in the pagination trail (0, means off, default: 0)
+          'after'    => 0,  # Limits how many links to show after the current page in the pagination trail (0 means off, default: 0)
       },
       'indexpage'    => 'index', # The default name of the index pages
       'extension'    => 'html', # The default extension for the output pages (ignored if indexpage is nil)
@@ -24,4 +24,4 @@ module Jekyll
     }
 
   end # module J1Paginator
-end # module Jekyll
+end # module Jekyll

data/lib/j1-paginator/generator/paginationModel.rb

@@ -45,7 +45,7 @@ module Jekyll
             @debug = template_config['debug']
 
             self._debug_print_config_info(template_config, template.path)
-            
+
             # Only paginate the template if it is explicitly enabled
             # This makes the logic simpler by avoiding the need to determine
             # which index pages were generated automatically and which weren't
@@ -139,7 +139,7 @@ module Jekyll
       def _fix_deprecated_config_features(config)
         keys_to_delete = []
 
-        # As of v1.5.1 the title_suffix is deprecated and 'title' should be used 
+        # As of v1.5.1 the title_suffix is deprecated and 'title' should be used
         # but only if title has not been defined already!
         if( !config['title_suffix'].nil? )
           if( config['title'].nil? )
@@ -203,7 +203,7 @@ module Jekyll
         before_count = before_count.to_s.rjust(3)
         _debug_log "  Filtering by #{filter_name}", "#{before_count} => #{after_count}"
       end
-      
+
       #
       # Rolls through all the pages passed in and finds all pages that have
       # pagination enabled on them. These pages will be used as templates
@@ -221,7 +221,7 @@ module Jekyll
         end
         return candidates
       end # function discover_paginate_templates
-            
+
       # Paginates the blog's posts. Renders the index.html file into paginated
       # directories, e.g.: page2/index.html, page3/index.html, etc and adds more
       # site-wide data.
@@ -233,7 +233,7 @@ module Jekyll
       def paginate(template, config, site_title, all_posts, all_tags, all_categories, all_locales)
         # By default paginate on all posts in the site
         using_posts = all_posts
-        
+
         # Now start filtering out any posts that the user doesn't want included in the pagination
         before = using_posts.size
         using_posts = PaginationIndexer.read_config_value_and_filter_posts(config, 'category', using_posts, all_categories)
@@ -244,7 +244,7 @@ module Jekyll
         before = using_posts.size
         using_posts = PaginationIndexer.read_config_value_and_filter_posts(config, 'locale', using_posts, all_locales)
         self._debug_print_filtering_info('Locale', before, using_posts.size)
-        
+
         # Apply sorting to the posts if configured, any field for the post
         # is available for sorting
         if config['sort_field']
@@ -283,11 +283,11 @@ module Jekyll
             using_posts.reverse!
           end
         end
-               
+
         # Calculate the max number of pagination-pages based on the configured
         # per page value
         total_pages = Utils.calculate_number_of_pages(using_posts, config['per_page'])
-        
+
         # If a upper limit is set on the number of total pagination pages
         # then impose that now
         if config['limit'] && config['limit'].to_i > 0 && config['limit'].to_i < total_pages
@@ -296,7 +296,7 @@ module Jekyll
 
         #### BEFORE STARTING REMOVE THE TEMPLATE PAGE FROM THE SITE LIST!
         @page_remove_lambda.call( template )
-        
+
         # list of all newly created pages
         newpages = []
 
@@ -321,11 +321,31 @@ module Jekyll
           # construct the title, set all page.data values needed
           first_index_page_url = Utils.validate_url(template)
           paginated_page_url   = File.join(first_index_page_url, config['permalink'])
-          
+
           # 3. Create the pager logic for this page, pass in the prev and
           # next page numbers, assign pager to in-memory page
           newpage.pager = Paginator.new( config['per_page'], first_index_page_url, paginated_page_url, using_posts, cur_page_nr, total_pages, indexPageName, indexPageExt)
 
+          # Disabled for now
+          if cur_page_nr > 10000000000000
+            pagination_path = newpage.instance_variable_get(:@site).instance_variable_get(:@dest)
+            last_pagination_page = newpage.instance_variable_get(:@pager).instance_variable_get(:@last_page_path)
+            last_pagination_file = pagination_path + last_pagination_page
+
+            if config['rebuild'] == false
+              if File.exist?(last_pagination_file)
+                Jekyll.logger.info 'J1 Paginator:', 'recreate pagination pages disabled.'
+                #
+                # TODO: Keep the existing pager file|s from being cleaned by Jekyll
+                #
+                # Add the page to the site
+                @page_add_lambda.call( newpage )
+                newpages << newpage
+                return
+              end
+            end
+          end
+
           # Create the url for the new page, make sure we prepend any
           # permalinks that are defined in the template page before
           pager_path = newpage.pager.page_path
@@ -344,6 +364,7 @@ module Jekyll
           end
 
           # Transfer the title across to the new page
+          #
           tmp_title = template.data['title'] || site_title
           if cur_page_nr > 1 && config.has_key?('title')
             # If the user specified a title suffix to be added then let's
@@ -359,7 +380,7 @@ module Jekyll
           if cur_page_nr > 1
             newpage.data['autogen'] = "j1-paginator"
           end
-          
+
           # Add the page to the site
           @page_add_lambda.call( newpage )
 
@@ -388,7 +409,7 @@ module Jekyll
               if( idx_end - idx_start < trail_length )
                 # Attempt to pad the beginning if we have enough pages
                 idx_start = [idx_start - ( trail_length - (idx_end - idx_start) ), 0].max # Never go beyond the zero index
-              end              
+              end
 
               # Convert the newpages array into a two dimensional array
               # that has [index, page_url] as items
@@ -401,7 +422,7 @@ module Jekyll
 
       end # function paginate
 
-    end # class PaginationV2
+    end # class PaginationModel
 
   end # module J1Paginator
-end # module Jekyll
+end # module Jekyll

data/lib/j1-paginator/version.rb

@@ -1,10 +1,5 @@
 module Jekyll
   module J1Paginator
-    VERSION = "2020.0.1"
-    # When modifying remember to issue a new tag command in git before committing, then push the new tag
-    #   git tag -a v2.1.0 -m "Gem v2.1.0"
-    #   git push origin --tags
-    # Yanking a published Gem
-    #   gem yank j1-paginator -v VERSION
-  end # module J1Paginator
-end # module Jekyll
+    VERSION = '2021.1.1'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j1-paginator
 version: !ruby/object:Gem::Version
-  version: 2020.0.1
+  version: 2021.1.1
 platform: ruby
 authors:
 - Sverrir Sigmundarson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-13 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<="
+        version: '3.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<="
+        version: '3.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ homepage: https://github.com/sverrirs/j1-paginator
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,8 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Pagination Generator for Jekyll 3
 test_files: