bridgetown-paginate 1.0.0.alpha10 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2142f44e4875bb8ccc35047eb846039c3c16cd9f5ec7f08da66d70c7e349eb16
-  data.tar.gz: c20cf3e7c07e5dbf8981441c1e76651901599873c0f4475aef40b1e88f82a1c2
+  metadata.gz: dff7281daae0650621d5a231dc67249d8549768e21351c4bd913ed6d2454301d
+  data.tar.gz: 8ca315795dc4f6d9d149fc352f3ec37d88e595673b58cc35129234d407708c00
 SHA512:
-  metadata.gz: c5541b5eb94794f0b43549f302aa87ce1cef8342b76989bb795b40ceab32f838dc1dd1bc81607ce63f7cd812d94a0967fdf0072322fc13f99273d804ac72dfce
-  data.tar.gz: 869f623b5f58c928b6ef24435e6aca26e08dee17fdc788a36a6d78a84de03d9fb207e9db1a539ff9f25dda73fcc238dedaec652eed2913f4ea54881639ac92e7
+  metadata.gz: 21aa0af085af0e1af5bc85c4b56cd636ac0eeca1ba21e46795d6e00334386a8932cce19fda928da6f33cd664194a77a9ead2eb26512da4008e24924b29be2732
+  data.tar.gz: ded5c64021306919a9741b5aef831bec7457ad3f89b5fe383c638f4d86b1767a632e87c685e1ebb4e72cbebb3eaf34bacc918d894251da6589e3037736a1a132

data/lib/bridgetown-paginate/hooks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Handles Generated Pages
-Bridgetown::Hooks.register :generated_pages, :post_init, reloadable: false do |page|
+Bridgetown::Hooks.register_one :generated_pages, :post_init, reloadable: false do |page|
   if page.class != Bridgetown::Paginate::PaginationPage &&
       page.site.config.dig("pagination", "enabled")
     data = page.data.with_dot_access
@@ -13,7 +13,7 @@ Bridgetown::Hooks.register :generated_pages, :post_init, reloadable: false do |p
 end
 
 # Handles Resources
-Bridgetown::Hooks.register :resources, :post_read, reloadable: false do |page|
+Bridgetown::Hooks.register_one :resources, :post_read, reloadable: false do |page|
   if page.site.config.dig("pagination", "enabled") && (
       (page.data.pagination.present? && page.data.pagination.enabled != false) ||
       (page.data.paginate.present? && page.data.paginate.enabled != false)
@@ -23,6 +23,6 @@ Bridgetown::Hooks.register :resources, :post_read, reloadable: false do |page|
 end
 
 # Ensure sites clear out templates before rebuild
-Bridgetown::Hooks.register :site, :after_reset, reloadable: false do |_site|
+Bridgetown::Hooks.register_one :site, :after_reset, reloadable: false do |_site|
   Bridgetown::Paginate::PaginationGenerator.matching_templates.clear
 end

data/lib/bridgetown-paginate/pagination_model.rb

@@ -269,7 +269,7 @@ module Bridgetown
             puts "#{"Pagination: ".rjust(20)}Rolling through the date fields for all documents"
           end
           using_posts.each do |u_post|
-            next unless u_post.respond_to?("date")
+            next unless u_post.respond_to?(:date)
 
             tmp_date = u_post.date
             next unless !tmp_date || tmp_date.nil?
@@ -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

data/lib/bridgetown-paginate/utils.rb

@@ -80,7 +80,7 @@ module Bridgetown
         return 1 if !a.nil? && b.nil?
         return a.downcase <=> b.downcase if a.is_a?(String)
 
-        if a.respond_to?("to_datetime") && b.respond_to?("to_datetime")
+        if a.respond_to?(:to_datetime) && b.respond_to?(:to_datetime)
           return a.to_datetime <=> b.to_datetime
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-paginate
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha10
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-16 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.alpha10
+        version: 1.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha10
+        version: 1.0.0.beta3
 description: 
 email: maintainers@bridgetownrb.com
 executables: []