carry_out 0.1.4 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cda4d8a6853705150ef9a286b9cd50097897eb88
-  data.tar.gz: 5cd6ae6c588da5c4cb43f08687c577040277194c
+  metadata.gz: 2527666eec64444e35bf101c6b084c6a4397a20b
+  data.tar.gz: da3bd9e8d2f51dbbb758d99565858f2cd9aeb5ce
 SHA512:
-  metadata.gz: be7ecd2990dd1887f7127860256e28150017d323d3e1384461eea0d8c3e72cfcd8c43342018e889eff0ec15cca9b261db5f7f614b71721f83d380941b8839e7c
-  data.tar.gz: bbbedcb6edd30a9ab968e6a8568f6cf876b6401f8de3b5e2a531da4eabdc711244cb1d3a55be3640e8b17edfc3553bf843f7dad33a9c9f760c879681043c019b
+  metadata.gz: 25154eb134c0f970e4f23fe896278b94a87a68fc5edb1e8836a87a37b94f9226fe76da2a8b39283b2853591969eae5f111912c93c7e30ff35d761bac50f91e9f
+  data.tar.gz: 8e088f4e96b57d1f7cc80548cdfe764c72d29f8c9ee63411492b09d8ab0407ba49697f7357d579f0115e5c6d92233bc9c510025f28499438742d1e8d64c79d98

data/lib/carry_out/plan.rb

@@ -3,8 +3,9 @@ module CarryOut
     
     def initialize(unit = nil, options = {})
       @nodes = {}
+      @node_meta = {}
       @previously_added_node = nil
-      @initial_node_key = add_node(PlanNode.new)
+      @wrapper = options[:within]
 
       unless unit.nil?
         self.then(unit, options)
@@ -12,27 +13,25 @@ module CarryOut
     end
 
     def execute(&block)
-      node = @nodes[@initial_node_key]
-      label = node.next unless node.nil?
-
-      Result.new.tap do |result|
-        while node = @nodes[label] do
-          begin
-            node.execute(ResultManipulator.new(result, label), result.artifacts)
-          rescue UnitError => error
-            result.add(label, CarryOut::Error.new(error.error.message, error.error))
-            break
+      if @wrapper
+        if @wrapper.respond_to?(:execute)
+          @wrapper.execute do |context|
+            execute_internal(Result.new(context), &block)
           end
-
-          label = node.next
-        end
-
-        unless block.nil?
-          block.call(result)
+        else
+          @wrapper.call(Proc.new do |context|
+            execute_internal(Result.new(context), &block)
+          end)
         end
+      else
+        execute_internal(&block)
       end
     end
 
+    def will(*args)
+      self.then(*args)
+    end
+
     def then(unit, options = {})
       add_node(PlanNode.new(unit), options[:as])
       self
@@ -53,22 +52,43 @@ module CarryOut
 
     private
       def add_node(node, as = nil)
-        label = (as || generate_node_name)
-
-        if as.nil?
-          until @nodes[label].nil?
-            label = generate_node_name
-          end
-        end
+        id = generate_node_name
 
-        unless @previously_added_node.nil?
-          @previously_added_node.next = label
+        if @previously_added_node.nil?
+          @initial_node_key = id
+        else
+          @previously_added_node.next = id
         end
 
-        @nodes[label] = node
+        @nodes[id] = node
+        @node_meta[id] = { as: as }
         @previously_added_node = node
 
-        label
+        id
+      end
+
+      def execute_internal(result = nil, &block)
+        id = @initial_node_key
+
+        (result || Result.new).tap do |result|
+          while node = @nodes[id] do
+            publish_to = @node_meta[id][:as]
+
+            begin
+              node_result = node.execute(result.artifacts)
+              result.add(publish_to, node_result) unless publish_to.nil?
+            rescue UnitError => error
+              result.add(publish_to || id, CarryOut::Error.new(error.error.message, error.error))
+              break
+            end
+
+            id = node.next
+          end
+
+          unless block.nil?
+            block.call(result)
+          end
+        end
       end
 
       def generate_node_name

data/lib/carry_out/plan_node.rb

@@ -27,16 +27,16 @@ module CarryOut
       @unitClass.instance_methods.include?(method) || super
     end
 
-    def execute(result, artifacts)
-      unit = @unitClass.new
+    def execute(context)
+      unit = @unitClass.respond_to?(:execute) ? @unitClass : @unitClass.new
 
       @messages.each do |message|
-        arg = message[:block] ? message[:block].call(artifacts) : message[:argument]
+        arg = message[:block] ? message[:block].call(context) : message[:argument]
         unit.send(message[:method], arg)
       end
 
       begin
-        unit.execute(result)
+        unit.execute
       rescue StandardError => error
         raise UnitError.new(error)
       end

data/lib/carry_out/result.rb

@@ -1,14 +1,22 @@
 module CarryOut
   class Result
 
-    def add(group, label, object = nil)
-      if label.kind_of?(CarryOut::Error)
-        add_error(group, label)
-      elsif !object.nil?
-        group = artifacts[group] ||= {}
-        group[label] = object
+    def initialize(hash = nil)
+      @artifacts = Hash[hash] unless hash.nil?
+    end
+
+    def add(group, object)
+      if object.kind_of?(CarryOut::Error)
+        add_error(group, object)
+      elsif object.kind_of?(Result)
+        add(group, object.to_hash)
+      elsif object.kind_of?(Hash)
+        artifacts[group] ||= {}
+        object.each { |k,v| artifacts[group][k] = v }
+      elsif !artifacts[group].nil?
+        artifacts[group] = [ artifacts[group], object ].flatten
       else
-        artifacts[group] = label
+        artifacts[group] = object
       end
     end
 
@@ -24,6 +32,10 @@ module CarryOut
       @errors.nil? || @errors.empty?
     end
 
+    def to_hash
+      artifacts
+    end
+
     private
       def add_error(group, error)
         group = errors[group] ||= []

data/lib/carry_out/unit.rb

@@ -1,7 +1,7 @@
 module CarryOut
   class Unit
     
-    def execute(result)
+    def execute
     end
 
     def self.parameter(method_name, var = nil)

data/lib/carry_out/version.rb

@@ -1,3 +1,3 @@
 module CarryOut
-  VERSION = "0.1.4"
+  VERSION = "0.2.1"
 end

data/lib/carry_out.rb

@@ -4,7 +4,6 @@ require "carry_out/error"
 require "carry_out/plan"
 require "carry_out/plan_node"
 require "carry_out/result"
-require "carry_out/result_manipulator"
 require "carry_out/unit"
 require "carry_out/unit_error"
 
@@ -12,4 +11,8 @@ module CarryOut
   def self.will(*args)
     Plan.new(*args)
   end
+
+  def self.within(unit = nil, &block)
+    Plan.new(nil, within: unit || block)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carry_out
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.1
 platform: ruby
 authors:
 - Ryan Fields
@@ -92,7 +92,6 @@ files:
 - lib/carry_out/plan.rb
 - lib/carry_out/plan_node.rb
 - lib/carry_out/result.rb
-- lib/carry_out/result_manipulator.rb
 - lib/carry_out/unit.rb
 - lib/carry_out/unit_error.rb
 - lib/carry_out/version.rb

data/lib/carry_out/result_manipulator.rb

@@ -1,13 +0,0 @@
-module CarryOut
-  class ResultManipulator
-    
-    def initialize(result, group)
-      @result = result
-      @group = group
-    end
-
-    def add(label, object = nil)
-      @result.add(@group, label, object) unless @group.nil?
-    end
-  end
-end