bridgetown-paginate 0.21.0.beta3 → 0.21.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e69ff78c2985a922c13d4d05257bffedea3684f43bf5f68e692ab4c7b3a2d81
-  data.tar.gz: 429968e2814f8e872ff106ee3080025ab7fc656151af2e4bce9d5eccbedfcf75
+  metadata.gz: 5e9bbb0482691a59cd093b423e8872cfe31dd79f8b14066c992168d92584e148
+  data.tar.gz: 9aceeaacc6a79e1b89b63e4549a1854f611d663482d801dbcdcd6d4c0958def9
 SHA512:
-  metadata.gz: 9f2c7ac14bbce7ea881f45ecdbc4d4529a249e87bd7ac362673812a69297778a471b57160974cd04c5f0b1584551b8d627e5433df4f2adb4d9a985d9b5ac7035
-  data.tar.gz: 8db063eaa00fe29d9eb368efa958b329765a4daf3fb5282b2abcb5ef9b862188ce0ea3f2503f44c733a1751290edcfd8e53ae48088505d8a9792ef4a2efd26a1
+  metadata.gz: 1cd91a7626d55b41f866f353f437f463dc6f58aa72e07184e77fb822116fb7d7f101ff17fc828aa823ede9c3f5d0c85e7b45b477ccb010096989b12d03bdf7e2
+  data.tar.gz: 3f2ffbfe3936a2e78f50963965af1eff53b10887fc04b019745e34d329cef2b7eb05f43db1c21c08b4e4da2016fbede212006e99dcbf9916e6e482707cfa3dc9

data/lib/bridgetown-paginate/hooks.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Handles Legacy Pages
+# Handles Generated Pages
 Bridgetown::Hooks.register :pages, :post_init, reloadable: false do |page|
   if page.class != Bridgetown::Paginate::PaginationPage &&
       page.site.config.dig("pagination", "enabled")
@@ -21,3 +21,8 @@ Bridgetown::Hooks.register :resources, :post_read, reloadable: false do |page|
     Bridgetown::Paginate::PaginationGenerator.add_matching_template(page)
   end
 end
+
+# Ensure sites clear out templates before rebuild
+Bridgetown::Hooks.register :site, :after_reset, reloadable: false do |_site|
+  Bridgetown::Paginate::PaginationGenerator.matching_templates.clear
+end

data/lib/bridgetown-paginate/pagination_generator.rb

@@ -13,14 +13,13 @@ module Bridgetown
       # This generator should be passive with regard to its execution
       priority :lowest
 
-      @matching_templates = []
-
-      def self.add_matching_template(template)
-        @matching_templates << template
+      # @return [Set<Bridgetown::Page, Bridgetown::Resource::Base>]
+      def self.matching_templates
+        @matching_templates ||= Set.new
       end
 
-      class << self
-        attr_reader :matching_templates
+      def self.add_matching_template(template)
+        matching_templates << template
       end
 
       # Generate paginated pages if necessary (Default entry point)
@@ -47,7 +46,7 @@ module Bridgetown
         # Get all matching pages in the site found by the init hooks, and ensure they're
         # still in the site.pages array
         templates = self.class.matching_templates.select do |page|
-          site.pages.include?(page) || site.resources.include?(page)
+          site.generated_pages.include?(page) || site.resources.include?(page)
         end
 
         # Get the default title of the site (used as backup when there is no

metadata

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