strum-pipe 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f885d394b2784cc2201a011ed63ae06a273fbc7e25888cf9b9fb34d4c0b2f01
-  data.tar.gz: 5fe1fbc77839c310cdb98e12a32679922818b44ca9d51d8bb29de63be8279f4a
+  metadata.gz: b854a2683f2d748d7299eb97e3efc072f09f6d8a6c751dd3c77996b994dd5b5b
+  data.tar.gz: 124e3ba0d9accb87c49cd1e62534482d88fe22ba34fbb1abff8f6639643cfd46
 SHA512:
-  metadata.gz: cc10915b7aaa1297696bf243983ca105a9a0620389b2b3a4727d3283b52285f09c8f57abfb5039291610497f87e26f42352a4ebc815e69eec79f416a4a51fb0e
-  data.tar.gz: 90e57ec1d620ffd3e868b2fc218e6fb744ba4c747998749ebf9a7ca3e4cc4f1ccbd2d86d2ce38d10fc171c001534189ad0a313226f9ada2bed6feba18ee24655
+  metadata.gz: f920dc64b6d6c97ac0354f669bdbd1fe25d54bba25f4f5fde28e121f80f742b83a399f02dafcc58e38930b09ea26c923fb8219ec86e7fa7ec8b8f50b97fd2add
+  data.tar.gz: 58d6622a54f73fcf041749d6aa4c9a2c48f75c8a1ab07d980a9b8f8ba0389f7133b49cf4e28da67cf1c9ddbb39bf9149006b1ddcf40a5eb3c11d874bbeb53973

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    strum-pipe (0.0.1)
-      strum-service (~> 0.0.3)
+    strum-pipe (0.0.2)
+      strum-service (~> 0.1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -10,12 +10,12 @@ GEM
     ast (2.4.2)
     diff-lcs (1.4.4)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (12.3.3)
     regexp_parser (2.1.1)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -29,24 +29,24 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.11.0)
+    rubocop (1.14.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
+    rubocop-ast (1.5.0)
+      parser (>= 3.0.1.1)
     rubocop-rake (0.5.1)
       rubocop
     rubocop-rspec (2.0.1)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
-    strum-service (0.0.3)
+    strum-service (0.1.1)
     unicode-display_width (2.0.0)
 
 PLATFORMS
@@ -62,4 +62,4 @@ DEPENDENCIES
   strum-pipe!
 
 BUNDLED WITH
-   2.2.13
+   2.2.7

data/lib/strum/pipe.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 require "strum/pipe/version"
+require "strum/service"
 
 module Strum
   # Strum Pipe
-  module Pipe
+  class Pipe
+    include Strum::Service
     class Error < StandardError; end
 
     def self.call(*units, args: {}, input: {}, unit_input: {}, &block)
@@ -21,13 +23,14 @@ module Strum
       yield(self) if valid? && block_given?
       output(pipe_inputs)
       continue = true
+      pipe_context = self
       while (unit = units.shift) && valid? && continue
         service, service_params = unit
         service_params ||= {}
         raise Strum::Error, "Unit options must be a Hash" unless service_params.is_a?(Hash)
 
-        service_options = service_params[:input] || {}
-        result_place = service_params[:to]
+        service_input = service_params[:input] || {}
+        result_arg_key = service_params[:to]
         unit_args = case service_params[:args]
                     when Hash
                       service_params[:args]
@@ -38,35 +41,35 @@ module Strum
                     end
         clean_output = service_params[:clean_output] || false
         unit_payload = if !clean_output &&
-                          service_options.is_a?(Hash) &&
+                          service_input.is_a?(Hash) &&
                           pipe_unit_inputs.is_a?(Hash) &&
                           output_value.is_a?(Hash)
-                         pipe_unit_inputs.merge(service_options).merge(output_value)
+                         pipe_unit_inputs.merge(service_input).merge(output_value)
                        else
                          output_value
                        end
 
         service.public_send(:call, unit_payload, args.merge(unit_args)) do |m|
-          service_handlers[:on].each do |key, _handler|
+          pipe_context.service_handlers[:on].each do |key, _handler|
             m.on(key) { |r| hook(k, r) }
           end
 
-          service_handlers[:success].each do |key, _handler|
-            if key
-              m.success(key) do |result|
-                output(key, result)
-                continue = false
-              end
-            else
-              m.success do |result|
-                if result_place
-                  inputs[result_place] = result
-                elsif !clean_output && result.is_a?(Hash) && output_value.is_a?(Hash)
-                  output(output_value.merge(result))
-                elsif result
-                  output(result)
-                end
-              end
+          pipe_context.service_handlers[:success].each do |key, _handler|
+            next unless key
+
+            m.success(key) do |result|
+              output(key, result)
+              continue = false
+            end
+          end
+
+          m.success do |result|
+            if result_arg_key
+              pipe_context.inputs[result_arg_key] = result
+            elsif !clean_output && result.is_a?(Hash) && output_value.is_a?(Hash)
+              pipe_context.output(pipe_context.output_value.merge(result))
+            elsif result
+              pipe_context.output(result)
             end
           end
 

data/lib/strum/pipe/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Strum
-  module Pipe
-    VERSION = "0.0.1"
+  class Pipe
+    VERSION = "0.0.2"
   end
 end

data/strum-pipe.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "strum-service", "~> 0.0.3"
+  spec.add_dependency "strum-service", "~> 0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strum-pipe
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Serhiy Nazarov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strum-service
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.1
 description: Strum Pipe
 email:
 - sn@nazarov.com.ua
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Light ruby framework