bridgetown-paginate 0.21.0.beta2 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8384ce6839b5e3831fc17c242587d38a193c8971d3d048123b017467f2ecadaf
-  data.tar.gz: 0a0c85cd602469c1fdc1784e52a012c022b269afb265fd05c45969954da2074b
+  metadata.gz: 73658b671ce99dcb98aaac7ed5cae7b2d00be40cba39cdfb5c2736a802028c05
+  data.tar.gz: 49a274756b395c33b7645420de58d1bf9ae2192021937b8b47253d295d231d09
 SHA512:
-  metadata.gz: 74f3cc60cf66d90bac4244add894e373cbe3ff23ee2fb975273d76280a16c3775e38e0cd29297a7acc32d615965e52ff8d3e181f35181b3407193da5b91acbf2
-  data.tar.gz: fd57a38ac98898dec45e158fe0e872767943f7e5a23534c98ad5f91cbc5502038de7e78babea2e938297959511e5df1290027ed2a55b2ab764ad9303407d9c98
+  metadata.gz: 0cc12d7f28da3ebe4fd35564d747e5d0c23ab85e5694bfd62e813448207824cf37de3a9c2180ea5430975e3df7ff2de94b65b9d36246fb070ae63c82fa5ef1db
+  data.tar.gz: 83e2e18c1b007f730fc8e8e984ed9b831f84866a413672c6c2986be4cd34af754acb32d2cbda78188aee29ceafd42a283f14c7c6cc5b82cf763b167b6dd36378

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.beta2
+  version: 0.21.1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2021-07-19 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.beta2
+        version: 0.21.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0.beta2
+        version: 0.21.1
 description: 
 email: maintainers@bridgetownrb.com
 executables: []
@@ -57,9 +57,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: