bridgetown-paginate 1.3.3 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1fae0f3af745db9f4cd75071e51bab90eae7e38426f14a5da782c3014df6d71
-  data.tar.gz: 80fec7df2c171b574688b699560bc8e6b18be05989e483fa28eb23a297afd04a
+  metadata.gz: 36836aba528fdfc833dec9c1a6d90659e202837472fde5c22873a74095b3cdc9
+  data.tar.gz: c5d27698eee4d9e9ebc5c5e86d523ceb5de5c379a852e3a2387b12c13471be55
 SHA512:
-  metadata.gz: 0eeacc1d0dfa6b4f6dbc05c1419738b72b1e510cc981a7bc94578e39a5cebb0157916e3731795091670f59aab1861e534717eb88330a322b66ebaa854e02fb7a
-  data.tar.gz: 3e5a8a22f1088d2bc909071207d532c5df5c6298137ffd176dd9296d4db0a32897aa781d2d458ec9560544157f7fba20cd807b31dcd27350e42954ad67ba7a40
+  metadata.gz: d03c6b845a094ac6163133f89bd510b0501f73fb02c2944678cf2053b754cc6b5e7ddb60243d5b2fae55f833f9f950d6c7e62cb5b5e8f6542087f5f01e8aca55
+  data.tar.gz: a893f3dc381b98458b0dc6bbe66033b3a5569fe65644567f26d259d9374f7306f762c214a60e3af4d49a659cc6b187acdc8ac4da2140eaa4608a72ff8130073d

data/lib/bridgetown-paginate/hooks.rb

@@ -3,20 +3,19 @@
 # Handles Generated Pages
 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
-    if (data.pagination.present? && data.pagination.enabled != false) ||
-        (data.paginate.present? && data.paginate.enabled != false)
-      Bridgetown::Paginate::PaginationGenerator.add_matching_template(page)
-    end
+      page.site.config.dig("pagination", "enabled") && (
+        page.data.dig(:pagination, :enabled) != false ||
+        page.data.dig(:paginate, :enabled) != false
+      )
+    Bridgetown::Paginate::PaginationGenerator.add_matching_template(page)
   end
 end
 
 # Handles Resources
 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)
+      page.data.dig(:pagination, :enabled) != false ||
+      page.data.dig(:paginate, :enabled) != false
     )
     Bridgetown::Paginate::PaginationGenerator.add_matching_template(page)
   end

data/lib/bridgetown-paginate/pagination_generator.rb

@@ -97,6 +97,7 @@ module Bridgetown
           else
             site.generated_pages.delete(page_to_remove)
           end
+          page_to_remove.unmark_for_fast_refresh!
         end
 
         # Create a proc that will delegate logging

data/lib/bridgetown-paginate/pagination_page.rb

@@ -11,7 +11,15 @@ module Bridgetown
     # not read from disk
     #
     class PaginationPage < Bridgetown::GeneratedPage
+      attr_reader :page_to_copy
+
       def initialize(page_to_copy, cur_page_nr, total_pages, index_pageandext, template_ext) # rubocop:disable Lint/MissingSuper
+        self.original_resource = if page_to_copy.is_a?(Bridgetown::Resource::Base)
+                                   page_to_copy
+                                 elsif page_to_copy.original_resource
+                                   page_to_copy.original_resource
+                                 end
+        @page_to_copy = page_to_copy
         @site = page_to_copy.site
         @base = ""
         @url = ""
@@ -19,6 +27,8 @@ module Bridgetown
         @path = page_to_copy.path
         @basename = File.basename(@path, ".*")
         @ext = File.extname(@name)
+        @cur_page_r = cur_page_nr
+        @total_pages = total_pages
 
         # Only need to copy the data part of the page as it already contains the
         # layout information
@@ -31,6 +41,20 @@ module Bridgetown
         Bridgetown::Hooks.trigger :generated_pages, :post_init, self
       end
 
+      def fast_refresh!
+        page_to_copy.fast_refresh! if page_to_copy.respond_to?(:fast_refresh!)
+
+        self.data = Bridgetown::Utils.deep_merge_hashes page_to_copy.data, {}
+        self.content = page_to_copy.content
+        # Store the current page and total page numbers in the pagination_info construct
+        data["pagination_info"] = { "curr_page" => @cur_page_nr, "total_pages" => @total_pages }
+      end
+
+      def unmark_for_fast_refresh!
+        super
+        page_to_copy.unmark_for_fast_refresh! if page_to_copy.is_a?(Bridgetown::GeneratedPage)
+      end
+
       # rubocop:disable Naming/AccessorMethodName
       def set_url(url_value)
         @path = url_value.delete_prefix "/"
@@ -41,7 +65,9 @@ module Bridgetown
 
       def destination(dest)
         path = site.in_dest_dir(
-          dest, URL.unescape_path(url).delete_prefix(site.base_path(strip_slash_only: true))
+          dest, Bridgetown::Utils
+            .unencode_uri(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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-paginate
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-16 00:00:00.000000000 Z
+date: 2024-08-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.3.3
+        version: 2.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.0.0.beta1
 description:
 email: maintainers@bridgetownrb.com
 executables: []
@@ -61,11 +61,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A Bridgetown plugin to add pagination support for posts and collection indices.