bridgetown-paginate 0.16.0.beta1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02cfaa818f31009a2c5c30c83ca0ae9ea6fbf88b11caacaed537cc132038f05f
-  data.tar.gz: cba2edbc596782fb0c030c4c7e21291ae384fabfd78b85b1512af6a61e53f11b
+  metadata.gz: 661268942dccb1db7a6606dd119ed4aa384eccbe5ff0de33e58299ea2f740a33
+  data.tar.gz: f73d95e0da8bcbe070dc534238ad6d4ecef2268ec0b089fda997c3c2b273895a
 SHA512:
-  metadata.gz: db9cd60fee45190b4b42d538a76ad8a93ad4a9441a28ee605b7fb5a20ad683b2867a19f5b98683fae3e6fb6e3da4cd5383c0c3efa6f9b4ca752a0514dac8b638
-  data.tar.gz: 9d84cfa90d2306e432525b693ec2d98acbc478c79893d508e760ec783419f33c479196b555ae57178d9324cfb4c27fe6d05b86fcaceff3a387443fa974b7e469
+  metadata.gz: c6f1ef2d8963d9ad1ff7fabe0e7b6316f56eb6c19febdd7a0a05e5c9b1f423b22257c6ba4b1d117b6bdcca4f0d4e165f1c0602b006b1038f67fe18d462e6e3f5
+  data.tar.gz: 3f8e17e3ca527e53fa0487164615bce28fe8ed6b1c709bc2747c2c66e20f56d26ce30cce5ba7cd4f4906ada54145081239f6ca7bf72790534d788a90d0b36630

data/lib/bridgetown-paginate/pagination_model.rb

@@ -311,7 +311,7 @@ module Bridgetown
 
         # Now for each pagination page create it and configure the ranges for
         # the collection
-        # The .pager member is a built in thing in Bridgetown and references the
+        # The .paginator member is a built in thing in Bridgetown and references the
         # paginator implementation
         # rubocop:disable Metrics/BlockLength
         (1..total_pages).each do |cur_page_nr|
@@ -338,9 +338,10 @@ module Bridgetown
                                  end
           paginated_page_url = File.join(first_index_page_url, paginated_page_url)
 
-          # 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(
+          # 3. Create the paginator logic for this page, pass in the prev and next
+          # page numbers, assign paginator to in-memory page
+          # TODO: remove .pager by v1.0, deprecated
+          newpage.paginator = newpage.pager = Paginator.new(
             config["per_page"],
             first_index_page_url,
             paginated_page_url,
@@ -353,17 +354,17 @@ module Bridgetown
 
           # Create the url for the new page, make sure we prepend any permalinks
           # that are defined in the template page before
-          if newpage.pager.page_path.end_with? "/"
-            newpage.set_url(File.join(newpage.pager.page_path, index_page_with_ext))
-          elsif newpage.pager.page_path.end_with? index_page_ext.to_s
+          if newpage.paginator.page_path.end_with? "/"
+            newpage.set_url(File.join(newpage.paginator.page_path, index_page_with_ext))
+          elsif newpage.paginator.page_path.end_with? index_page_ext.to_s
             # Support for direct .html files
-            newpage.set_url(newpage.pager.page_path)
+            newpage.set_url(newpage.paginator.page_path)
           else
             # Support for extensionless permalinks
-            newpage.set_url(newpage.pager.page_path + index_page_ext.to_s)
+            newpage.set_url(newpage.paginator.page_path + index_page_ext.to_s)
           end
 
-          newpage.data["permalink"] = newpage.pager.page_path if template.data["permalink"]
+          newpage.data["permalink"] = newpage.paginator.page_path if template.data["permalink"]
 
           # Transfer the title across to the new page
           tmp_title = if !template.data["title"]
@@ -416,7 +417,7 @@ module Bridgetown
           if trail_before.positive? || trail_after.positive?
             newpages.select do |npage|
               # Selecting the beginning of the trail
-              idx_start = [npage.pager.page - trail_before - 1, 0].max
+              idx_start = [npage.paginator.page - trail_before - 1, 0].max
               # Selecting the end of the trail
               idx_end = [idx_start + trail_length, newpages.size.to_i].min
 
@@ -433,11 +434,11 @@ module Bridgetown
 
               # Convert the newpages array into a two dimensional array that has
               # [index, page_url] as items
-              npage.pager.page_trail = newpages[idx_start...idx_end] \
+              npage.paginator.page_trail = newpages[idx_start...idx_end] \
                 .each_with_index.map do |ipage, idx|
                 PageTrail.new(
                   idx_start + idx + 1,
-                  ipage.pager.page_path,
+                  ipage.paginator.page_path,
                   ipage.data["title"]
                 )
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-paginate
 version: !ruby/object:Gem::Version
-  version: 0.16.0.beta1
+  version: 0.18.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0.beta1
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0.beta1
+        version: 0.18.0
 description: 
 email: maintainers@bridgetownrb.com
 executables: []
@@ -57,11 +57,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A Bridgetown plugin to add pagination support for posts and collection indices.