j1-paginator 2020.0.3 → 2021.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b0bdc5faee84012ec99f511e6214081ffbcaf23352818eefa419105b9fc8f53
-  data.tar.gz: d68d737651fc63f4ee5b8f83fbd93b3cbc22387cc80f34e76859b70ae1641cdd
+  metadata.gz: 865c3980e0c22c262396c3f33aa3b65fce731ade700cf278d276c9f4bb1b7041
+  data.tar.gz: 06ea8a1a2301c6e0b0f8710fe6d76403da6c7c394d1e593a8268a0948478bf7e
 SHA512:
-  metadata.gz: 616fd9f60febd1c8bcdb059b42dfd47447513888446afedff2543df11e5ae8ad7644f1eeabee2afe0e233d9c468f4716f8937fdc1ca7ece6162dcc5ba48f1586
-  data.tar.gz: b1dc28cb49b5d73c7dab3b0699f7d295c84443127ea13e71af8c61828192099ea135ccf5fb31130f9393f7ccc20316286456e6a7e4333b1e9be7d2398fbedf40
+  metadata.gz: 446392e22ef0e3af071bf3250b03f083556cfe856b833362bc4aa25b0454ec6057362992defbb5caba41547e34bfb7425cffa6fa41fb0be3a167010342b07eb2
+  data.tar.gz: d716686bf92c6820af619c65a01c791d321747666ef61c29410376534bbc0956eabda491d3ba986cd460478e58cbc809da71ac831ec3065ac9cba238eb0951bf

data/j1-paginator.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |spec|
   # Gem requires Jekyll to work
   # ~> is the pessimistic operator and is equivalent to '>= 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.0'
+  spec.add_runtime_dependency 'jekyll', '>= 3.6', '< 5.0'
 
   # Development requires more
   spec.add_development_dependency "bundler", "~> 2.0"

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,6 +1,6 @@
 module Jekyll
   module J1Paginator
-    VERSION = "2020.0.3"
+    VERSION = "2021.1.0"
     # 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

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: j1-paginator
 version: !ruby/object:Gem::Version
-  version: 2020.0.3
+  version: 2021.1.0
 platform: ruby
 authors:
 - Sverrir Sigmundarson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +117,7 @@ homepage: https://github.com/sverrirs/j1-paginator
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,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: