bridgetown-builder 1.0.0.alpha4 → 1.0.0.alpha8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23d5a5f262d6f8aca6d45490367c468fe33cab06f6353321136418e7ab972730
-  data.tar.gz: 25ac5f20a634df624e7e7de78668eed4505573a939f5ca2c21adee147783f96d
+  metadata.gz: f0af9a4478f4060d0a7857ebd9cc1a5af44d2c76a1d66fa1395128526e0c4ec7
+  data.tar.gz: 1028fb0f08360d97ac4bc936f586e657aca87a45e488dea41e716865cefb3721
 SHA512:
-  metadata.gz: a11a81432d73c635e2344bcdf01553c979f67333704dc3280647f2b641dc97c16f03c4c1bc31853b26801bd650b78de993fffb50adc497b9ec5607830ed52732
-  data.tar.gz: 9a9cb41f7c1a81eeaa807fdc3cdb356649cdb9a7900f8811e95c039911f4bdb390cfaed3eb180204dd8f37bf458331c58b9f452ac476b69c0083f1dcd3a7cf47
+  metadata.gz: 32568bfe3a6d2e713711354667d4e0efa938dd1e95a3c5821d017db9ca2a8352c1d263be4920ae52cd94a8cce200f3cf6c1cde45080d63094f84f2d7f593010b
+  data.tar.gz: b02d3c933c8b850af9fff8bd29728657d5d826c00e1b279b84827b033b93cd0aebbb8e4726bc7768e09b9ac39e27d1352ec959d33dac001d54601f4c25a3b8f1

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.alpha4
+  version: 1.0.0.alpha8
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2021-11-05 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.alpha4
+        version: 1.0.0.alpha8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha4
+        version: 1.0.0.alpha8
 description: 
 email: maintainers@bridgetownrb.com
 executables: []