dslblend 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef1b7e343e127a2b8235cda96b45387384cedca06b2970bc1f22c1c86bdf37b7
-  data.tar.gz: 4d241a1657d4c4061fd5a19cc6cf133194abe2d038c0c4e3125de31f89087aa4
+  metadata.gz: c89e926215c62c9780f739ed69deda2f20629633836b896bcae2be7eca49abe4
+  data.tar.gz: c9a07e5b73ab6a4dc20c3ff5cbfb4c10702c78de51c655771775d208083c7658
 SHA512:
-  metadata.gz: a30895d4f9305a45c3bb455d54d8270e766fcd51e39b4aa8b4016f49da0ba8712c9b4c408b75484b81248d1f7122004ffa440f2b4f4518c18fe3cef6a569e9b8
-  data.tar.gz: dc53c5878eb746849cba89ae388f4fb935639e8ea37ef6248c2ddc160a7e4a5d94cff995ccbb53c297a63c22f3533ee9b728f9ab43267a51b078e24dfe634180
+  metadata.gz: c431581d08341cfcffa1bb085296cec9afa250e87c50a6fa5f4c0de6ac442c7f3a317bec9053c61712b0fea353bb65df4c6c4b04a4a21f25956d6472a7f10825
+  data.tar.gz: 730bf193a796e2d3ad39cac1ae63c8d70d234823c636615232f13c8639558ecb9957421f697fb2c63421e3ae5671f4d23a61e5c1cac013b4b98ffb5d8d002431

data/lib/dslblend/base.rb

@@ -6,38 +6,52 @@ module Dslblend
       @_additional_providers = additional_providers
     end
 
-    def evaluate(backfire_vars: false, &block)
-      # Auto-detect main provider if it is not given yet
+    # Usually, you will not need to use the methods prefixed with `_dslblend_`. However, they can come in
+    # useful if you have special needs such as preparing a context for HAML engine etc.
+
+    # Auto-detect main provider if it is not given yet
+    def _dslblend_detect_main_provider(block)
       @_main_provider ||= eval 'self', block.binding, __FILE__, __LINE__
+    end
 
-      # Transfer instance variables from main provider instance to dsl instance, ignore those starting with "_"
+    # Transfer instance variables from main provider instance to dsl instance, ignore those starting with "_"
+    def _dslblend_transfer_inst_vars_from_main_provider
       @_main_provider.instance_variables.each do |instance_variable|
         next if instance_variable.to_s.start_with?('@_')
         instance_variable_set(instance_variable, @_main_provider.instance_variable_get(instance_variable))
       end
+    end
+
+    # Transfer dsl instance variables back to main provider instance, ignore those starting with "_"
+    def _dslblend_backfire_inst_vars_to_main_provider
+      instance_variables.each do |instance_variable|
+        next if instance_variable.to_s.start_with?('@_')
+        @_main_provider.instance_variable_set(instance_variable, instance_variable_get(instance_variable))
+      end
+    end
+
+    def evaluate(backfire_vars: false, &block)
+      # Prepare this instance
+      _dslblend_detect_main_provider(block)
+      _dslblend_transfer_inst_vars_from_main_provider
 
       # Evaluate block within the DSL
       block_return_value = instance_eval(&block)
 
-      # If backfire is enabled, transfer dsl instance variables back to main provider instance, ignore those starting with "_"
-      if backfire_vars
-        instance_variables.each do |instance_variable|
-          next if instance_variable.to_s.start_with?('@_')
-
-          @_main_provider.instance_variable_set(instance_variable, instance_variable_get(instance_variable))
-        end
-      end
+      # Write back vars if requested
+      _dslblend_backfire_inst_vars_to_main_provider if backfire_vars
 
+      # Allow sending back information from the block to the caller of `evaluate`
       return block_return_value
     end
 
-    def method_missing(method, *args, &block)
+    def method_missing(method, *args, **kwargs, &block)
       @_additional_providers.each do |additional_provider|
         if additional_provider.respond_to?(method)
-          return additional_provider.send(method, *args, &block)
+          return additional_provider.send(method, *args, **kwargs, &block)
         end
       end
-      @_main_provider.send method, *args, &block
+      @_main_provider.send method, *args, **kwargs, &block
     end
 
     def respond_to_missing?(method, include_all)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dslblend
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Sandro Kalbermatter