bridgetown-builder 1.3.4 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba0aa68627e53754dfcd113621877b2e078baad0ae85e642bfa1d4150935bb00
-  data.tar.gz: 6315eb5d983efc7b58e99e3473882fe6313ea386cb6e00c2bc4e5cba862c4758
+  metadata.gz: be80790b8d2984c7d6fd2eb4e1b8a00ab76aff9130b25a3cd4064dd3bbadfd82
+  data.tar.gz: b96958d6a9b1bd6cdc1a180af7ae53f54069290d7e679a0ec0adcfc0d85835b5
 SHA512:
-  metadata.gz: e58f5415f1f4479dbcb82d1c79804796e1f0ccef250148a14fd20f19ca45d2b26c9318cabed64d9a315331e22609526548bd24cd211f8b804aa2e22a58dd6b6f
-  data.tar.gz: c5b73e93eb2024b95b4de65f006c482f10587b51405034c1db27dded504d64994bd797336a4450de98103e12aa28fe0f59c1976bdb3d0634661ed8d79ea6ccb7
+  metadata.gz: d428ae3dd232c91771cbe169510daaddb332d62421003ca877c8c7d0c6dc176d5ad20640bc6f0d2070f0adf5189a6ce62cbe969e3905c0de2578931fd55d4f9e
+  data.tar.gz: 06ce5dd04af8f8c25277200d6f22d7754ad2f0436dbcf83ef3725fb245f05a21eb826b556976bd99e8e768e741dec90f86ca571b956bb6a5a6b06047b679fd05

data/lib/bridgetown-builder/builder.rb

@@ -3,31 +3,33 @@
 module Bridgetown
   # Superclass for a website's SiteBuilder abstract class
   class Builder < Bridgetown::Builders::PluginBuilder
-    extend ActiveSupport::DescendantsTracker
-    include ActiveSupport::Callbacks
-
-    define_callbacks :build
-
     class << self
       def register
         Bridgetown::Builders::PluginBuilder.plugin_registrations << self
       end
 
-      def before_build(*args, **kwargs, &block)
-        set_callback :build, :before, *args, **kwargs, &block
+      def before_build(...)
+        add_callback(:before, ...)
+      end
+
+      def after_build(...)
+        add_callback(:after, ...)
       end
 
-      def after_build(*args, **kwargs, &block)
-        set_callback :build, :after, *args, **kwargs, &block
+      def callbacks
+        @callbacks ||= {}
       end
 
-      def around_build(*args, **kwargs, &block)
-        set_callback :build, :around, *args, **kwargs, &block
+      def add_callback(name, method_name = nil, &block)
+        callbacks[name] ||= []
+        callbacks[name] << (block || proc { send(method_name) })
       end
     end
 
     def build_with_callbacks
-      run_callbacks(:build) { build }
+      self.class.callbacks[:before]&.each { instance_exec(&_1) }
+      build
+      self.class.callbacks[:after]&.each { instance_exec(&_1) }
       self
     end
 

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

@@ -29,7 +29,7 @@ module Bridgetown
           site.generators << anon_generator.new(site.config)
           site.generators.sort!
 
-          functions << { name: name, generator: anon_generator }
+          functions << { name:, generator: anon_generator }
         end
       end
     end

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

@@ -8,36 +8,28 @@ module Bridgetown
           @helpers # could be nil
         end
 
-        def helper(helper_name, method_name = nil, helpers_scope: false, &block)
+        def helper(helper_name, method_name = nil, &block)
           m = Module.new
 
-          if block && helpers_scope
-            Deprecator.deprecation_message(
-              "The `helpers_scope' functionality is deprecated. Use the `helpers' builder " \
-              "method to access the helpers scope in your plugin."
-            )
-            m.define_method helper_name, &block
-          else
-            builder_self = self
-            method_name ||= helper_name unless block
-            unless method_name
-              method_name = :"__helper_#{helper_name}"
-              builder_self.define_singleton_method(method_name) do |*args, **kwargs, &block2|
-                block.(*args, **kwargs, &block2)
-              end
+          builder_self = self
+          method_name ||= helper_name unless block
+          unless method_name
+            method_name = :"__helper_#{helper_name}"
+            builder_self.define_singleton_method(method_name) do |*args, **kwargs, &block2|
+              block.(*args, **kwargs, &block2)
             end
-            m.define_method helper_name do |*args, **kwargs, &block2|
-              prev_var = builder_self.instance_variable_get(:@helpers)
-              builder_self.instance_variable_set(:@helpers, self)
-              builder_self.send(method_name, *args, **kwargs, &block2).tap do
-                builder_self.instance_variable_set(:@helpers, prev_var)
-              end
+          end
+          m.define_method helper_name do |*args, **kwargs, &block2|
+            prev_var = builder_self.instance_variable_get(:@helpers)
+            builder_self.instance_variable_set(:@helpers, self)
+            builder_self.send(method_name, *args, **kwargs, &block2).tap do
+              builder_self.instance_variable_set(:@helpers, prev_var)
             end
           end
 
           Bridgetown::RubyTemplateView::Helpers.include(m)
 
-          functions << { name: name, filter: m }
+          functions << { name:, filter: m }
         end
       end
     end

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

@@ -13,8 +13,8 @@ module Bridgetown
         )
           block = method(method_name) if method_name.is_a?(Symbol)
 
-          hook_block = Bridgetown::Hooks.register_one(owner, event, priority: priority, &block)
-          functions << { name: name, hook: [owner, event, priority, hook_block] }
+          hook_block = Bridgetown::Hooks.register_one(owner, event, priority:, &block)
+          functions << { name:, hook: [owner, event, priority, hook_block] }
         end
 
         def add_data(data_key)

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

@@ -8,7 +8,7 @@ module Bridgetown
       module HTTP
         def get(url, headers: {}, parse_json: true, **params)
           body = begin
-            connection(parse_json: parse_json).get(url, params, headers).body
+            connection(parse_json:).get(url, params, headers).body
           rescue Faraday::ParsingError
             Bridgetown.logger.error(
               "Faraday::ParsingError",
@@ -22,7 +22,7 @@ module Bridgetown
         def connection(headers: {}, parse_json: true)
           headers["Content-Type"] = "application/json" if parse_json
 
-          Faraday.new(headers: headers) do |faraday|
+          Faraday.new(headers:) do |faraday|
             faraday.response :follow_redirects
 
             if parse_json

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

@@ -41,7 +41,7 @@ module Bridgetown
 
           ::Liquid::Template.register_filter(m)
 
-          functions << { name: name, filter: m }
+          functions << { name:, filter: m }
         end
 
         def liquid_tag(tag_name, method_name = nil, as_block: false, &block)
@@ -68,7 +68,7 @@ module Bridgetown
           end
 
           ::Liquid::Template.register_tag tag_name, tag
-          functions << { name: name, tag: [tag_name, tag] }
+          functions << { name:, tag: [tag_name, tag] }
         end
       end
     end

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

@@ -9,7 +9,7 @@ module Bridgetown
         end
 
         def add_resource(collection_name, path, &block) # rubocop:todo Metrics/AbcSize
-          data = Bridgetown::Utils::RubyFrontMatter.new(scope: self).tap do |fm|
+          data = Bridgetown::FrontMatter::RubyFrontMatter.new(scope: self).tap do |fm|
             fm.define_singleton_method(:___) do |hsh|
               hsh.each do |k, v|
                 fm.set k, v

data/lib/bridgetown-builder/plugin.rb

@@ -41,23 +41,7 @@ module Bridgetown
         self.functions = Set.new
         self.name = name || self.class.name
         self.site = current_site || Bridgetown::Current.site
-
-        self.config = if defined?(self.class::CONFIG_DEFAULTS)
-                        Deprecator.deprecation_message(
-                          "Using `CONFIG_DEFAULTS' in your builder is deprecated. " \
-                          "Switch to defining config data via an initializer instead."
-                        )
-                        Bridgetown::Utils.deep_merge_hashes(
-                          self.class::CONFIG_DEFAULTS.with_dot_access, site.config
-                        )
-                      else
-                        site.config
-                      end
-      end
-
-      def doc(*)
-        raise Bridgetown::Errors::FatalException,
-              "The `doc' method has been removed. Please use the `new_resource' builder DSL instead"
+        self.config = site.config
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-builder
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-28 00:00:00.000000000 Z
+date: 2024-08-02 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.3.4
+        version: 2.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 2.0.0.beta1
 description:
 email: maintainers@bridgetownrb.com
 executables: []
@@ -62,11 +62,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: A Bridgetown plugin to provide a sophisticated DSL for writing plugins at