bridgetown-paginate 0.15.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 438d92163146a903aea89cd447bd21fb93d32276ec8a28e25010183eea2791fa
-  data.tar.gz: d4fe63ba29c9d7b2eaa1e73565e94a20cc797e0be1dec0e7dacd06bb56284c25
+  metadata.gz: df77a1915c24e17c2228663b2bfeae828d41a1bc7a6a74084567d6bf86780f9e
+  data.tar.gz: ddf253c13ea5ee94878d47510ba1eeb1c52d5d947a18dfbae36b7cbd4fa340a6
 SHA512:
-  metadata.gz: 264a93c4a99e3edc945e7a554aea809620a96c2968b50a8623b80fa345457dfb32bc122dcbc9ea03cf542676793a21064fc412db9f68c4ebfd8306dc45bd876d
-  data.tar.gz: f527a4eb07f6707c5d0b4747f0effe1876c66a0d125eae0f4b76ae6cde33134dc0dbdb195a33de17890beeb341ba8754262c825c0a05ca83c25ac28bf374e65e
+  metadata.gz: b9bbdf8203813db0c2d13a27be7f2a7487684e38ad22f1a58745cc318b942fc842513dfd7dd097b57afba33334bb5e66f9485490a7ae20c1f1e7db69cebde59a
+  data.tar.gz: 3d4846a1f14536ee7e3767f3459a80880e18124f2db310a2ce09ab91ab852e36f37e0e82fd896c3791ff8c76e8d16dfe58968cca1644ba8c9cd373c00f87f7be

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.15.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-10-02 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.15.0
+        version: 0.17.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.17.1
 description: 
 email: maintainers@bridgetownrb.com
 executables: []