bridgetown-paginate 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3065f58ab8318220ef8bd61ea6f96bb093ecdc1e3743f4d6a17f455d278f0cc0
-  data.tar.gz: 2f6319d1120d70afcfde19f18d34c6a7201eb75e0801d44640cb55f35dd46c08
+  metadata.gz: 108562c7b942bc8c4e1212fe7c6970c024c53508cfca7a30d3dfeaf721f31457
+  data.tar.gz: a82352dae39503a166cd2f59bea07dd9374209a667f2ce781c1bdb4aeffd2d6e
 SHA512:
-  metadata.gz: 73cbae538916130c049dd7c1f4044150e02ce7558314b835e8e0446874833b863775a9726b64519a3224ee3e3d7c7522984fd3b945b591257adbc3ffb6383b30
-  data.tar.gz: 573b35021fd706df9be029e6a8946a78860d15a4d2bd2d9bd02053f368e2ebab0217933bcea3a0a16286a55738cc4f828113d0f70683193c23cdb6e477d63d49
+  metadata.gz: d58f5898059fd3cb5e2cdc80c0bc5131076d9422bed5cfc156597b049f52c7fb7d1bf8ae174b02943b19bee02e96157a54491e566dd68c8d72827e02e403ceb7
+  data.tar.gz: 30f41b0e4a2cdef05ff86f224269a5fffbd85c8ec7ed42873294dcda8f62a60bf993d1e8dab651a46f6ecb8046ccf3f9f0760494876e34eab7aebdd7aeee3306

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.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-06-01 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.20.0
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
 description: 
 email: maintainers@bridgetownrb.com
 executables: []