bridgetown-paginate 1.0.0.beta2 → 1.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e62fa684407f04d71210b75f98af3fd59de77e60b66a1638de5644b9a1344ec
-  data.tar.gz: 77a89ded7a4b6d4c54e6dbd555328ac37270368ac04aebd2aacd1b626e084340
+  metadata.gz: d8d7266c5e0dc1ca064eb708a40837bdc7d2b3ae8110271578e94f47a686f7f4
+  data.tar.gz: 4a83ea0e7bd905b8dfeaa04275bf0fda96a8fd01ca8b9e4f0cad9af56980a32e
 SHA512:
-  metadata.gz: b13e6b800070c71ce5ef28ea908cae648cb32f222f90421b3d31b6ed17c0f699016bfe71e071943fdb5d5cb71003890c5c079cd452000b5f3d897df29acb5a92
-  data.tar.gz: 0dbb08fe19f823a4415c14b7f3850731a3ed64d50e159a439282438325e1c1cf34034f4588e26ebd583b349a05dcfbb4967ed308b0ec9159be03260c03a0b70a
+  metadata.gz: 3f7a48a98d34b3f12e45256268186c36199eabaa29ea771a23201d4423d8caf73d85043140c86ded5ad3f33120f5d057842aefe7ef4841710b3c0ccde92e3f04
+  data.tar.gz: 785620faeb604237353ab31793a7dac6c645fad9c9897a43d5cfdb5b50f5bb291342a4f38d94c227deb055a735f4c2900c6f712db9f45372787c0d57ef691701

data/lib/bridgetown-paginate/pagination_indexer.rb

@@ -41,7 +41,7 @@ module Bridgetown
           document_data = document.data[index_key]
           document_data = document_data.split(%r!;|,!) if document_data.is_a?(String)
 
-          document_data.each do |key|
+          Array(document_data).each do |key|
             key = key.to_s.downcase.strip
             # If the key is a delimetered list of values
             # (meaning the user didn't use an array but a string with commas)

data/lib/bridgetown-paginate/pagination_model.rb

@@ -66,6 +66,11 @@ module Bridgetown
 
           next unless template_config["enabled"]
 
+          if template.site.config.available_locales.size > 1 && !template_config["locale"]
+            template_config["locale"] =
+              template.data["locale"].to_s
+          end
+
           @logging_lambda.call "found page: #{template.path}", "debug" unless @debug
 
           # Request all documents in all collections that the user has requested
@@ -366,18 +371,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,10 +34,19 @@ 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
+
+      def destination(dest)
+        path = site.in_dest_dir(
+          dest, URL.unescape_path(url).delete_prefix(site.base_path(strip_slash_only: true))
+        )
+        path = File.join(path, "index") if url.end_with?("/")
+        path << output_ext unless path.end_with? output_ext
+        path
+      end
     end
   end
 end

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.1.0.beta1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-06-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: 1.0.0.beta2
+        version: 1.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.1.0.beta1
 description: 
 email: maintainers@bridgetownrb.com
 executables: []