crack_pipe 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee187d314abb9bfab155824f0d2c92825ef2f0e7
-  data.tar.gz: fc720da093abcfbf35c625488d3904012114b193
+  metadata.gz: 33e156e850dd1455ecf3bb6f49d52b2441531dae
+  data.tar.gz: 9c20ce57c7b9bdca028fe10facdbe000429d243b
 SHA512:
-  metadata.gz: 4704be40ad6adbf04cd9ed32a03915294e36479481aa1b2711171023d12d9ec17176b0286dd109e74c296fef46fc147e67211f1a27e79d55b257811137378052
-  data.tar.gz: fcfef7cacbaafd4ab99ccdc65ee8fe7daeb5b5c6cf0769ddbc3d841faee17a29e9b896217ed7b68feae10fde546c40920c342e57f172465d45066779eed5f8f6
+  metadata.gz: 1bdd788b6e58171c7ef9ca8c667f9931749bf6e08453f7a9a5c13406003df0ebc0bd0a3d11ca173d41acd5d49092050f46b3b91dda6c29720148e4573a9efff5
+  data.tar.gz: 10466088e351eb02413af98ac0fc6baf83846e8ee94801f66234cbbe9e8a6d3c857527d963e21a5e493a29ba68889052c0563a6cce0c02c920138f5807bfc3ed

data/lib/crack_pipe/action/exec.rb

@@ -7,23 +7,16 @@ module CrackPipe
     module Exec
       class << self
         def call(action, context, track = :default)
-          Result.new(action(action, context, [], track))
+          Result.new(action(action, context, track))
         end
 
-        def action(action, context, results = [], track = :default)
-          action.steps.each_with_object(results) do |s, rslts|
+        def action(action, context, track = :default)
+          action.steps.each_with_object([]) do |s, results|
             next unless track == s.track
-
-            if s.exec.is_a?(Action)
-              self.action(s.exec, context, rslts)
-            else
-              rslts << step(action, s, context)
-            end
-
-            rslts.last.tap do |r|
+            results!(results, action, s, context).last.tap do |r|
               context = r[:context]
               track = r[:next]
-              return rslts if r[:signal] == :halt
+              return results if r[:signal] == :halt
             end
           end
         end
@@ -68,12 +61,20 @@ module CrackPipe
             end
           end
 
-          action.after_step(flow_control_hash(action, step, context, output))
+          action.after_step(output)
         end
 
         def success_with_step?(action, step, output)
           step.always_pass? || step.track != :fail && !action.failure?(output)
         end
+
+        private
+
+        def results!(results, action, step, context)
+          o = step(action, step, context)
+          return results.concat(o.history) if o.is_a?(Result)
+          results << flow_control_hash(action, step, context, o)
+        end
       end
     end
   end

data/lib/crack_pipe/action.rb

@@ -52,7 +52,7 @@ module CrackPipe
       @steps = steps ? steps.dup : self.class.steps
     end
 
-    def call(context)
+    def call(context, **)
       context = @__default_context__.merge(context)
       return @__wrapper__.call(Exec.(self, context)) if @__wrapper__
       Exec.(self, context)
@@ -63,8 +63,8 @@ module CrackPipe
     # for output or adding values to the context. A common example would be
     # returning some kind of default failure object in place of a literal `nil`
     # or `false`.
-    def after_step(flow_control_hash)
-      flow_control_hash
+    def after_step(output)
+      output
     end
 
     def fail!(output)
@@ -72,7 +72,7 @@ module CrackPipe
     end
 
     def failure?(output)
-      !output
+      output.is_a?(Result) ? output.failure? : !output
     end
 
     def pass!(output)

data/lib/crack_pipe/version.rb

@@ -3,7 +3,7 @@
 module CrackPipe
   MAJOR = 0
   MINOR = 2
-  TINY  = 0
+  TINY  = 1
   VERSION = [MAJOR, MINOR, TINY].join('.').freeze
 
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crack_pipe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Joshua
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler