bridgetown-builder 1.0.0.alpha7 → 1.0.0.alpha8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbe353b4c0d8d4b7777c00132529c1666c75e265fad46ac95ae656b1b9eb99c2
-  data.tar.gz: 15ffffb1c35938d6104925d06507982de473e879e25575f7846348f0713ea0bd
+  metadata.gz: f0af9a4478f4060d0a7857ebd9cc1a5af44d2c76a1d66fa1395128526e0c4ec7
+  data.tar.gz: 1028fb0f08360d97ac4bc936f586e657aca87a45e488dea41e716865cefb3721
 SHA512:
-  metadata.gz: 274b7e14da077be9b652e2f080bf939e34bcf0a72d759d9405d80ae0d67fe28b9b4eacd4088b5297945345a8701b3779d48394920edc94deef13ba7c70d0dcf4
-  data.tar.gz: 8296330ca5e566c76ec7fb62e0301d00aad8ad91d634481cda9a4f1952177dfaeae694abe540350a5ad0509be65592c40d4cc96406c893e4d76e7ca99f759638
+  metadata.gz: 32568bfe3a6d2e713711354667d4e0efa938dd1e95a3c5821d017db9ca2a8352c1d263be4920ae52cd94a8cce200f3cf6c1cde45080d63094f84f2d7f593010b
+  data.tar.gz: b02d3c933c8b850af9fff8bd29728657d5d826c00e1b279b84827b033b93cd0aebbb8e4726bc7768e09b9ac39e27d1352ec959d33dac001d54601f4c25a3b8f1

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-builder
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha7
+  version: 1.0.0.alpha8
 platform: ruby
 authors:
 - Bridgetown Team
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha7
+        version: 1.0.0.alpha8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha7
+        version: 1.0.0.alpha8
 description: 
 email: maintainers@bridgetownrb.com
 executables: []