babl-json 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1244f145154a35f410ff91f14de9dbacd4f679c9
-  data.tar.gz: fdc4821e46e72c54c248b33c406850421ec548e4
+  metadata.gz: b410d536ca032602510a9af64d29a29dc91f536c
+  data.tar.gz: 9a002b4137992699842abce14054d9a21d48a92a
 SHA512:
-  metadata.gz: 7f1256e9d5a21ba6da758a890eba6e8063b94e2a3d9e26d45c55f262ebc9db95eacbef29f7a920ec67d55626e0a23d3c0f76bcd312d41d3f4de729fc742bd9b7
-  data.tar.gz: 47b8265e9078140b733cd81bd77baa1dcf40936362998dd8a85b7ad7a3b891a8ae1849f82be60c638fc6ccc3eb5a03d09b4eed137242575a453240d21e77c93b
+  metadata.gz: bd1979b476227686cd13d3b994629a36fa95fbd1d55ff7d7cec466fa2304c1a414f5f1cec0a816d879d7eeb667e12934f18561c4a4920aa9be4dabd87d7d4ee0
+  data.tar.gz: 6b23b6086b16a94a5594cb1390fc0307881fd3fefeb8ee4e59ee67aede28c564ae7cce2d0d2a069c1417a0f108e426c16d7294bc9f5b717217fc425a546897fd

data/lib/babl.rb

@@ -11,25 +11,29 @@ module Babl
 
         def initialize
             @search_path = nil
-            @preloader = Babl::Rendering::NoopPreloader
+            @preloader = Rendering::NoopPreloader
             @pretty = true
             @cache_templates = false
         end
     end
 
     class << self
-        def compile(template: Babl::Template.new, &source)
-            if config.search_path
-                ctx = Babl::Operators::Partial::AbsoluteLookupContext.new(config.search_path)
-                template = template.with_lookup_context(ctx)
-            end
-
-            template.source(&source).compile(
+        def compile(&block)
+            source(&block).compile(
                 pretty: config.pretty,
                 preloader: config.preloader
             )
         end
 
+        def source(&block)
+            template = Template.new
+            if config.search_path
+                ctx = Operators::Partial::AbsoluteLookupContext.new(config.search_path)
+                template = template.with_lookup_context(ctx)
+            end
+            template.source(&block)
+        end
+
         def configure
             yield(config)
         end

data/lib/babl/builder/template_base.rb

@@ -38,12 +38,12 @@ module Babl
                 )
             end
 
-            protected
-
             def unscoped
                 self.class.new builder.rescope(&:itself)
             end
 
+            protected
+
             def precompile
                 builder.precompile(Nodes::TerminalValue.instance)
             end

data/lib/babl/operators/call.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'babl/utils'
 require 'babl/errors'
 
 module Babl
@@ -13,7 +14,8 @@ module Babl
                     arg = args.first
 
                     case arg
-                    when self.class then self.class.new(builder.wrap { |bound| arg.builder.bind(bound) })
+                    when Template then self.class.new(builder.wrap { |bound| arg.builder.bind(bound) })
+                    when Utils::DslProxy then call(arg.itself)
                     when ::Symbol then nav(arg)
                     when ::Proc then call(&arg)
                     when ::Hash then object(**arg.map { |k, v| [:"#{k}", v] }.to_h)

data/lib/babl/operators/source.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+require 'babl/utils'
 module Babl
     module Operators
         module Source
             module DSL
                 # Parse BABL source into a Template
                 def source(*args, &block)
-                    call(unscoped.instance_eval(*args, &block))
+                    call(block ? Utils::DslProxy.eval(unscoped, &block) : unscoped.instance_eval(*args))
                 end
             end
         end

data/lib/babl/utils.rb

@@ -2,3 +2,4 @@
 require 'babl/utils/hash'
 require 'babl/utils/ref'
 require 'babl/utils/value'
+require 'babl/utils/dsl_proxy'

data/lib/babl/utils/dsl_proxy.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+require 'set'
+
+module Babl
+    module Utils
+        # The idea is to make it possible to call method defined in block's context in addition to DSL methods.
+        # Inspired from https://github.com/ms-ati/docile/blob/master/lib/docile/fallback_context_proxy.rb, but
+        # here we do not try to handle instance variables, because as far as I know there is no way to do it
+        # correctly.
+        class DslProxy
+            NON_PROXIED_METHODS = Set[
+                :__send__, :send, :object_id, :__id__, :equal?, :instance_eval
+            ]
+
+            instance_methods.each do |method|
+                undef_method(method) unless NON_PROXIED_METHODS.include?(method)
+            end
+
+            # rubocop:disable Style/MethodMissing
+            def method_missing(method, *args, &block)
+                if @__receiver__.respond_to?(method)
+                    @__receiver__.__send__(method, *args, &block)
+                else
+                    @__fallback__.__send__(method, *args, &block)
+                end
+            end
+            # rubocop:enable Style/MethodMissing
+
+            def respond_to_missing?(method, include_private = false)
+                @__receiver__.respond_to?(method, include_private) ||
+                    @__fallback__.respond_to?(method, include_private)
+            end
+
+            def self.eval(dsl, *args, &block)
+                new(dsl, block.binding.receiver).instance_eval(&block)
+            end
+
+            def initialize(receiver, fallback)
+                @__receiver__ = receiver
+                @__fallback__ = fallback
+            end
+        end
+    end
+end

data/lib/babl/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Babl
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babl-json
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Frederic Terrazzoni
@@ -189,6 +189,7 @@ files:
 - lib/babl/schema/typed.rb
 - lib/babl/template.rb
 - lib/babl/utils.rb
+- lib/babl/utils/dsl_proxy.rb
 - lib/babl/utils/hash.rb
 - lib/babl/utils/ref.rb
 - lib/babl/utils/value.rb