bridgetown-builder 1.0.0.alpha5 → 1.0.0.alpha9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 480dce3843c12ad944e313aa1d31fadc4a4b91d7aaac47e408fd2627b9da09ab
-  data.tar.gz: e9d7a6a7878df212b3e3a96cced65f19e17649cd8f6faf29ede57739c9059627
+  metadata.gz: 5d1f6d1ad7128f8ac9cfffaa68eead1fdf1378b0612b17418db963c895bcd0a7
+  data.tar.gz: 2edb21a82e52e35e33f729a356bd25fa09b41d82cf85d3dd2138db269e276c18
 SHA512:
-  metadata.gz: f958566d2b63616e9db00315a97657b107b00d8bc2fac7c19a21f47efb72bb59299f1ce90210239fb0f5c944c56b0e1ff0ab15e6f765c736f23d1084ff7fd47e
-  data.tar.gz: c88214e34b9c7ddb0a2b43a36ee5d7d79843f813d934e0b713827781c3551f2cca0e5171c6054ec97edada9e0baff9f847832b06c6e4d12c3bf7ab6e7d130d1d
+  metadata.gz: ec5ceb02c59c8792f01e791200f5dbb6b87eb1b4a7fad65bb7a6e6ebca4e13355006ac82da2bd22e5e517e5fd96e942673dd4c3c6dc0d5a9c84e7d08c03d1834
+  data.tar.gz: 0ac5f55e8da552341b7e05555a57f90730142523190d5b8c4e02d60421feb89d05eeee581bbfe006fdcc91c0722a0aa2c12cd0b666d5e0eef54018ec4d7a6c04

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