bridgetown-paginate 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e62fa684407f04d71210b75f98af3fd59de77e60b66a1638de5644b9a1344ec
-  data.tar.gz: 77a89ded7a4b6d4c54e6dbd555328ac37270368ac04aebd2aacd1b626e084340
+  metadata.gz: dff7281daae0650621d5a231dc67249d8549768e21351c4bd913ed6d2454301d
+  data.tar.gz: 8ca315795dc4f6d9d149fc352f3ec37d88e595673b58cc35129234d407708c00
 SHA512:
-  metadata.gz: b13e6b800070c71ce5ef28ea908cae648cb32f222f90421b3d31b6ed17c0f699016bfe71e071943fdb5d5cb71003890c5c079cd452000b5f3d897df29acb5a92
-  data.tar.gz: 0dbb08fe19f823a4415c14b7f3850731a3ed64d50e159a439282438325e1c1cf34034f4588e26ebd583b349a05dcfbb4967ed308b0ec9159be03260c03a0b70a
+  metadata.gz: 21aa0af085af0e1af5bc85c4b56cd636ac0eeca1ba21e46795d6e00334386a8932cce19fda928da6f33cd664194a77a9ead2eb26512da4008e24924b29be2732
+  data.tar.gz: ded5c64021306919a9741b5aef831bec7457ad3f89b5fe383c638f4d86b1767a632e87c685e1ebb4e72cbebb3eaf34bacc918d894251da6589e3037736a1a132

data/lib/bridgetown-paginate/pagination_model.rb

@@ -366,18 +366,7 @@ module Bridgetown
             index_page_ext
           )
 
-          # Create the url for the new page, make sure we prepend any permalinks
-          # that are defined in the template page before
-          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.paginator.page_path)
-          else
-            # Support for extensionless permalinks
-            newpage.set_url(newpage.paginator.page_path + index_page_ext.to_s)
-          end
-
+          newpage.set_url(newpage.paginator.page_path)
           newpage.data["permalink"] = newpage.paginator.page_path if template.data["permalink"]
 
           # Transfer the title across to the new page

data/lib/bridgetown-paginate/pagination_page.rb

@@ -34,7 +34,7 @@ module Bridgetown
       # rubocop:disable Naming/AccessorMethodName
       def set_url(url_value)
         @path = url_value.delete_prefix "/"
-        @dir  = File.dirname(@path)
+        @dir = @path.ends_with?("/") ? @path : File.dirname(@path)
         @url = url_value
       end
       # rubocop:enable Naming/AccessorMethodName

data/lib/bridgetown-paginate/paginator.rb

@@ -42,8 +42,8 @@ module Bridgetown
         # Ensure that the current page has correct extensions if needed
         this_page_url = Utils.ensure_full_path(
           @page == 1 ? first_index_page_url : paginated_page_url,
-          !default_indexpage || default_indexpage.empty? ? "index" : default_indexpage,
-          !default_ext || default_ext.empty? ? ".html" : default_ext
+          default_indexpage || "",
+          default_ext || ""
         )
 
         # To support customizable pagination pages we attempt to explicitly

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-paginate
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0.beta3
 description: 
 email: maintainers@bridgetownrb.com
 executables: []