bridgetown-builder 1.0.0.alpha7 → 1.0.0.alpha11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbe353b4c0d8d4b7777c00132529c1666c75e265fad46ac95ae656b1b9eb99c2
-  data.tar.gz: 15ffffb1c35938d6104925d06507982de473e879e25575f7846348f0713ea0bd
+  metadata.gz: 07531111dde6e954929b95bbface302ab23bb8447b7ab11059f75119982f295a
+  data.tar.gz: e571f7c404fc5ce4ac6edbc25c34e01af537662463b2f2b7e290161a477971ea
 SHA512:
-  metadata.gz: 274b7e14da077be9b652e2f080bf939e34bcf0a72d759d9405d80ae0d67fe28b9b4eacd4088b5297945345a8701b3779d48394920edc94deef13ba7c70d0dcf4
-  data.tar.gz: 8296330ca5e566c76ec7fb62e0301d00aad8ad91d634481cda9a4f1952177dfaeae694abe540350a5ad0509be65592c40d4cc96406c893e4d76e7ca99f759638
+  metadata.gz: 969d8ab776e8d08b3acd2268be938c4aeee848f02b6d6e11085ee3980bf0fbad77e8891038dbe64f5b55ea020ec7fe3b9ec21b2a1c7deb9712a2c862c506e7f9
+  data.tar.gz: f3bde3e6fb89a7168544a5b613e093172361351ca46f610d7b29038b9efaa034787a2636c549374f98906062d6a6ed7ac09967fda01150332dfd2cb8995c95c9

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