carry_out 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93f80c00a226b8751663d149943b30aeb5c2dd35
-  data.tar.gz: 4561dba1b6110b7dbc1a4712ba4fde4204910608
+  metadata.gz: c9a566c008472e7b69aa21de4ce6c6948a272281
+  data.tar.gz: 854adbd99187223c1570e1a3413d1078188ba424
 SHA512:
-  metadata.gz: 3f5521e863a205ae3345357df363613e5ef14c29974a31e08f67367aab963c0c7303caa2a43fa78db1dab3d8b8890fe18825dbf4273e1a7f7f27b538ca4f84bc
-  data.tar.gz: a390316064acff75e07c46dbb9124278bdcc27baa9584a1f75de23cf4be38a894dd27adb7a27759c6edbafe9c3353222d5c0d85832199f16b88426104dbc46ea
+  metadata.gz: 021eabede07162f55d58da20cd46026c1c1a0bc13b8a9b01c299144a6707b4b1176c3745ed9bf9b20873979a4a3abe30183b01dbd25fc7cf3217fe957ef112ef
+  data.tar.gz: d5737328744baa7c38dc633a93586c204ddce4d88ff7e68e84eaa805456c8e47a9c6c8cbcef773ce5d9922119fe743328b7f8c3050e9c92893d049bb94492626

data/lib/carry_out/cloaker.rb

@@ -0,0 +1,32 @@
+# A Closure Is Not Always A Closure In Ruby - Alan Skorkin
+# http://www.skorks.com/2013/03/a-closure-is-not-always-a-closure-in-ruby/
+
+module CarryOut
+  module Cloaker
+    def cloaker(binding = nil, &b)
+      meth = self.class.class_eval do
+        define_method :cloaker_, &b
+        meth = instance_method :cloaker_
+        remove_method :cloaker_
+        meth
+      end
+      
+      with_previous_context(binding || b.binding) { meth.bind(self).call }
+    end
+   
+    def with_previous_context(binding, &block)
+      @previous_context = binding.eval('self')
+      result = block.call
+      @previous_context = nil
+      result
+    end
+   
+    def method_missing(method, *args, &block)
+      if @previous_context && @previous_context.respond_to?(method)
+        @previous_context.send(method, *args, &block)
+      else
+        super
+      end
+    end
+  end
+end

data/lib/carry_out/plan/node.rb

@@ -53,8 +53,6 @@ module CarryOut
       def method_missing(method, *args, &block)
         if respond_to?(method)
           @messages.push({ method: method, source: block || (args.length == 0 ? true : args.first) })
-        else
-          raise NoMethodError, "undefined method `#{method}' for #{@action}"
         end
       end
 

data/lib/carry_out/plan/node_context.rb

@@ -1,6 +1,10 @@
+require "carry_out/cloaker"
+
 module CarryOut
   module Plan
     class NodeContext
+      include CarryOut::Cloaker
+
       def initialize(node)
         @node = node
       end
@@ -10,7 +14,7 @@ module CarryOut
       end
 
       def context(*args)
-        -> (context) do
+        Proc.new do |context|
           args.inject(context) { |c, k| c.nil? ? nil : c[k] }
         end
       end
@@ -24,7 +28,11 @@ module CarryOut
       end
 
       def method_missing(method, *args, &block)
-        @node.send(method, *args, &block)
+        if @node.respond_to?(method)
+          @node.send(method, *args, &block)
+        else
+          super
+        end
       end
 
       def respond_to?(method)

data/lib/carry_out/plan_builder.rb

@@ -3,19 +3,26 @@ require "carry_out/plan/node_context"
 
 module CarryOut
   class PlanBuilder
+    include Cloaker
+
+    attr_reader :plan
+
     def initialize(options = {}, &block)
       @plan = Plan::Node.new
-      @wrapper = nil
       @constant_resolver = [ options[:search] ].flatten(1)
+      @block_binding = options[:block_binding]
 
       configure_node(@plan, &block) if block
     end
 
-    attr_reader :plan
-
     def self.build(options = {}, &block)
+      options = {
+        block_binding: block.binding
+      }.merge(options)
+
       builder = PlanBuilder.new(options)
-      builder.instance_eval(&block)
+
+      builder.cloaker(&block)
       builder.plan
     end
 
@@ -36,7 +43,7 @@ module CarryOut
       obj = find_object(method)
 
       if obj
-        call(method, &block)
+        call(obj, &block)
       else
         super
       end
@@ -46,7 +53,7 @@ module CarryOut
       attr_writer :current_node
 
       def configure_node(node, &block)
-        Plan::NodeContext.new(node).instance_eval(&block)
+        Plan::NodeContext.new(node).cloaker(@block_binding, &block)
       end
 
       def current_node

data/lib/carry_out/plan_runner.rb

@@ -13,8 +13,7 @@ module CarryOut
             if node_result.kind_of?(Plan::NodeResult)
               plan_result.add(node.returns_as, node_result.value)
             end
-          rescue StandardError => error
-            error = CarryOut::Error.new(error.message, error) unless error.kind_of?(CarryOut::Error)
+          rescue CarryOut::Error => error
             plan_result.add node.returns_as, error 
           end
 
@@ -26,7 +25,7 @@ module CarryOut
 
     def self.call_unit(unit, context = {}, &block)
       node = Plan::Node.new(unit)
-      Plan::NodeContext.new(node).instance_eval(&block) unless block.nil?
+      Plan::NodeContext.new(node).cloaker(&block) unless block.nil?
 
       call(node, context)
     end

data/lib/carry_out/unit.rb

@@ -5,6 +5,12 @@ module CarryOut
       raise "Expected #{self.class} to define #{self.class}#call" unless self.class == Unit
     end
 
+    def initialize
+      self.class.parameter_defaults.each do |p, d|
+        instance_variable_set("@#{p}", d)
+      end
+    end
+
     def self.call(&block)
       unit = self.new
       yield unit if block
@@ -31,13 +37,24 @@ module CarryOut
       end
     end
 
-    def self.parameter(method_name, var = nil)
+    def self.parameter(method_name, var = nil, options = {})
+      if var.kind_of?(Hash)
+        options = var 
+        var = nil
+      end
+
       var ||= method_name
 
       define_method(method_name.to_sym) do |*args|
         instance_variable_set("@#{var}", args.length == 0 ? true : args.first)
         self
       end
+
+      parameter_defaults[var] = options[:default] unless options[:default].nil?
+    end
+
+    def self.parameter_defaults
+      @parameter_defaults ||= {}
     end
   end
 end

data/lib/carry_out/version.rb

@@ -1,3 +1,3 @@
 module CarryOut
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carry_out
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ryan Fields
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,6 +102,7 @@ files:
 - bin/setup
 - carry_out.gemspec
 - lib/carry_out.rb
+- lib/carry_out/cloaker.rb
 - lib/carry_out/configurator.rb
 - lib/carry_out/error.rb
 - lib/carry_out/plan/guard.rb