bridgetown-builder 1.1.0.beta1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60efa769d64aab272bb16517ea5d4411312943547b5031ea104930fbafd425d1
-  data.tar.gz: f78876a42486103772f292a57689a2f32cfdb520c2d5900b098b3a04a967a990
+  metadata.gz: b844c16c3959200386b85e0c9b24e9ceda416546c1c5143c0ee4baafb66112b4
+  data.tar.gz: e07d64aad3700b3ee79e66692755d75a7a7cdb483febb58228d5025fbce428a2
 SHA512:
-  metadata.gz: cd8890f49fc3132664fdf22392bed9ea43ae1756979e85922baee85dd455ded4bd9cb01ac6ecb0c0bfdcdca8ddd882db4acb0fb1b3d9415f1906453bf7f23466
-  data.tar.gz: 78d07a7e500fe002a3299edb0da04d75a7ba55c42d2f26406d3144a3be18f1ac5223f21ef8b8e9abf5700b70f4d5b7bc5b4767a9ec486227a0dd259a9e3a2df7
+  metadata.gz: 034dccebc509b960c3c183e1d963cf4aff2ab37259e168d88d542b8ae05a4bc52c23c3c5b802eebabfc3baabdeb4f0c9cba2eff0af0df13f314117907283d779
+  data.tar.gz: ebcb28861dfa0f1eef34b966d729e0ab98a30e04b211e406f52951cfb0c14801644d8b5a3bea9241bbb9da96cdfb2a9b97356bb2b50774b65667f8c960fb7478

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.beta1
+  version: 1.1.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-07-18 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.beta1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta1
+        version: 1.1.0
 description: 
 email: maintainers@bridgetownrb.com
 executables: []
@@ -58,9 +58,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: