bridgetown-builder 1.0.0.alpha6 → 1.0.0.alpha10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8971524f8867ae02f9328bb0d3f053258af1f3aeeee7036766c7521516ec6f83
-  data.tar.gz: 0e9aa42948d5894926c8e19e92a862c4774707f1df93a94c2c1751c2c2c3f4ed
+  metadata.gz: 0a8e969dadb9aaeae8f35da17b7775e3b2418bd29523e841480ce6c21921d326
+  data.tar.gz: be22bda1c5a1bb786ca384c0b79c6f39738582f54f8b488dd10679b29cba6994
 SHA512:
-  metadata.gz: 86aeb890d567bd79d9e40857648242820afaad0a62fc655f71e9295429a13a3bba8dc4e2bd1d244c7661bdbc06ec375aa4f30581a3ce37e39e36bc05e556a032
-  data.tar.gz: 810174f85545376b007088ed706a9f612b2aa07d1bcc251efc87d05a89f21107443a2fae530a6a5333e92800aa9a6b8f391cd9d08c3620ff2268ab396388b64f
+  metadata.gz: e101360dd70a25be97db10f30ae0068a30a64db9369920e7b9906529fb0260b488ed2f444976a0a0b1bab7ced58f0aff66ea26812832ddddbae75988e3326826
+  data.tar.gz: f0f68f470aa42c620e6fdaf3299d9ae080981e636fc0570d97cb188f9bb17f8c4ce23abeeff5daec2585e48917492870f42a18572b276176eec97f700f8d927a

data/lib/bridgetown-builder/builder.rb

@@ -15,16 +15,16 @@ module Bridgetown
         end
       end
 
-      ruby2_keywords def before_build(*args, &block)
-        set_callback :build, :before, *args, &block
+      def before_build(*args, **kwargs, &block)
+        set_callback :build, :before, *args, **kwargs, &block
       end
 
-      ruby2_keywords def after_build(*args, &block)
-        set_callback :build, :after, *args, &block
+      def after_build(*args, **kwargs, &block)
+        set_callback :build, :after, *args, **kwargs, &block
       end
 
-      ruby2_keywords def around_build(*args, &block)
-        set_callback :build, :around, *args, &block
+      def around_build(*args, **kwargs, &block)
+        set_callback :build, :around, *args, **kwargs, &block
       end
     end
 

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

@@ -8,13 +8,19 @@ module Bridgetown
           builder_self = self
           m = Module.new
 
-          if block && !helpers_scope
-            m.define_method helper_name do |*args|
-              builder_self.instance_exec(*args, &block)
-            end
-          else
-            block = method(method_name) if method_name
+          if block && helpers_scope
             m.define_method helper_name, &block
+          else
+            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
+            end
+            m.define_method helper_name do |*args, **kwargs, &block2|
+              builder_self.send(method_name, *args, **kwargs, &block2)
+            end
           end
 
           Bridgetown::RubyTemplateView::Helpers.include(m)

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

@@ -8,13 +8,19 @@ module Bridgetown
           builder_self = self
           m = Module.new
 
-          if block && !filters_scope
-            m.define_method filter_name do |*args|
-              builder_self.instance_exec(*args, &block)
-            end
-          else
-            block = method(method_name) if method_name
+          if block && filters_scope
             m.define_method filter_name, &block
+          else
+            method_name ||= filter_name unless block
+            unless method_name
+              method_name = :"__filter_#{filter_name}"
+              builder_self.define_singleton_method(method_name) do |*args, **kwargs|
+                block.(*args, **kwargs) # rubocop:disable Performance/RedundantBlockCall
+              end
+            end
+            m.define_method filter_name do |*args, **kwargs|
+              builder_self.send(method_name, *args, **kwargs)
+            end
           end
 
           ::Liquid::Template.register_filter(m)
@@ -23,7 +29,8 @@ module Bridgetown
         end
 
         def liquid_tag(tag_name, method_name = nil, as_block: false, &block)
-          block = method(method_name) if method_name.is_a?(Symbol)
+          method_name ||= tag_name unless block
+          block = method(method_name) if method_name
           local_name = name # pull the name method into a local variable
 
           tag_class = as_block ? ::Liquid::Block : ::Liquid::Tag

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-builder
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha6
+  version: 1.0.0.alpha10
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2021-11-16 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.0.0.alpha6
+        version: 1.0.0.alpha10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha6
+        version: 1.0.0.alpha10
 description: 
 email: maintainers@bridgetownrb.com
 executables: []