bridgetown-builder 1.1.0.beta2 → 1.1.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e95e26924a3b4cfb3fb95fe5af3d2a7be3630a7d3aaf8dc738b24102ea0dc16
-  data.tar.gz: 2ae5a954e86865d3886eed2b4ecd146c892b1b5c47acc903d9d5d83611f73415
+  metadata.gz: bbc911c29c7452724a7aac033623d55d478c210e0c0016b17cc615bd81ca3432
+  data.tar.gz: 3ef397e52602f72936aacecda5ba216a00a74108f8032fcc1548483d5490ddd6
 SHA512:
-  metadata.gz: b308dbf4bd761cead11ec7f5fba42ab136b549ba48b226b5b321ca5488d41bd527555267ce88df7b077f484506cdd5eff092d4925c82ca0f4fd24b21aa0e1775
-  data.tar.gz: ae39eb4841a8075f3d6c278450837434ed64f836ab2f4df5d4e5deff0e35326de617ea89b10bc3c89428f59e66165ae6daf378f5705b9663b3b01359cddcaacd
+  metadata.gz: 91f62d820a391edad6b285bd1411648de5177a3c66b27c5e5d4151b46b979cffc84c648bf74cd6a143f503a23ac79b75a14be3f3ab0020ebd1531ab3d6d6855c
+  data.tar.gz: 8fa3a72a20b0b6008fbbc3f6cee4436a953541c08ba77aea9d49dfa6570e61dd697e46f83eb51d24141c4ff15d772f232b9900912bea6a090a1117b66b622fee

data/lib/bridgetown-builder/builder.rb

@@ -10,9 +10,7 @@ module Bridgetown
 
     class << self
       def register
-        Bridgetown::Hooks.register_one :site, :pre_read, reloadable: false do |site|
-          new(name, site).build_with_callbacks
-        end
+        Bridgetown::Builders::PluginBuilder.plugin_registrations << self
       end
 
       def before_build(*args, **kwargs, &block)

data/lib/bridgetown-builder/dsl/inspectors.rb

@@ -20,7 +20,7 @@ module Bridgetown
           # Are there inspectors available? Is it an .htm* file?
           def self.can_run?(resource, inspectors)
             inspectors &&
-              resource.destination&.output_ext&.starts_with?(".htm") &&
+              resource.output_ext&.starts_with?(".htm") &&
               !resource.data.bypass_inspectors
           end
 
@@ -42,7 +42,7 @@ module Bridgetown
         module XML
           # Strip the resource's initial extension dot. `.rss` => `rss`
           def self.resource_ext(resource)
-            resource.destination&.output_ext&.delete_prefix(".")
+            resource.output_ext&.delete_prefix(".")
           end
 
           # Are there any inspectors available which match the resource extension?
@@ -103,6 +103,12 @@ module Bridgetown
 
               resource.output = Inspectors.process_html(resource, @_html_inspectors)
             end
+
+            hook :generated_pages, :post_render do |page|
+              next unless HTML.can_run?(page, @_html_inspectors)
+
+              page.output = Inspectors.process_html(page, @_html_inspectors)
+            end
           end
 
           @_html_inspectors << block
@@ -123,6 +129,12 @@ module Bridgetown
 
               resource.output = Inspectors.process_xml(resource, @_xml_inspectors)
             end
+
+            hook :generated_pages, :post_render do |page|
+              next unless Inspectors::XML.can_run?(page, @_xml_inspectors)
+
+              page.output = Inspectors.process_xml(page, @_xml_inspectors)
+            end
           end
 
           (@_xml_inspectors[extension.to_s] ||= []).tap do |arr|

data/lib/bridgetown-builder/plugin.rb

@@ -31,6 +31,12 @@ module Bridgetown
 
       attr_accessor :functions, :name, :site, :config
 
+      class << self
+        def plugin_registrations
+          @plugin_registrations ||= Set.new
+        end
+      end
+
       def initialize(name = nil, current_site = nil)
         self.functions = Set.new
         self.name = name || self.class.name

data/lib/bridgetown-builder.rb

@@ -12,12 +12,14 @@ module Bridgetown
 end
 
 Bridgetown::Hooks.register_one :site, :pre_read, priority: :low, reloadable: false do |site|
+  builders = Bridgetown::Builders::PluginBuilder.plugin_registrations.to_a
+
   # SiteBuilder is the superclass sites can subclass to create any number of
   # builders, but if the site hasn't defined it explicitly, this is a no-op
-  if defined?(SiteBuilder)
-    SiteBuilder.descendants.sort.map do |c|
-      c.new(c.name, site).build_with_callbacks
-    end
+  builders += SiteBuilder.descendants if defined?(SiteBuilder)
+
+  builders.sort.map do |c|
+    c.new(c.name, site).build_with_callbacks
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-builder
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta2
+  version: 1.1.0.beta3
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-06-28 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.1.0.beta2
+        version: 1.1.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta2
+        version: 1.1.0.beta3
 description: 
 email: maintainers@bridgetownrb.com
 executables: []