strum 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cc3410ea8c7896616a0c101f919aec2d30679aef1059f71e9b2b7b22c132fd1
-  data.tar.gz: e9d224772544d46180aaa1dd2fb382ee593d8a1af8103a51da5a498a72a43e7b
+  metadata.gz: 512a06663fe094ba5dfdbca09886dc8a4c910fe99d0e26a7fd0032feb2acbb10
+  data.tar.gz: bb2435ca4314b5f289fc108355ce5a414ce3f215e503406ccfdfeeb86fb734cb
 SHA512:
-  metadata.gz: 84de9d475b3eaccf53b3568c01b0c869c70bbd02ccff42fe185b1fed5827d062563bd1d72695490b2aca70f8bb3ccce265343dbc90a8b0b0931ba2583dddb34a
-  data.tar.gz: 37863393861879b8c6daed953346fced5057cb30971bc5d6344b0776db7baa55887ed4b8942bc84552ee4475fd0e285567890efcdf0ea48edfbca9aa3385f4ee
+  metadata.gz: 7619fe083dbdf6919e69af561fdbb3c0ddd32bc617c84bc3240220587078c56f841bdc289ec42f127fcbe80a989aa7fa4181155b752b28c30367bbe25967cca7
+  data.tar.gz: 92cfdba8069a14ff202856a597897eb99c385c19fcf59e473b10055f4b0379cda1871cdf6079affe5d9314b5e68b2b3ed54d5add50c8b9d79572a4d6b113929a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    strum (0.0.30)
+    strum (0.0.31)
       dry-inflector (~> 0.2.0)
       dry-matcher (~> 0.8.2)
       thor (~> 0.20)

data/lib/strum/json_deserializer.rb

@@ -12,7 +12,7 @@ module Strum
     end
 
     def audit
-      clear_output!
+      # clear_output!
       add_error(:root, :data_and_errors_must_not_coexist) unless !root_data[:data] ^ !root_errors[:errors]
     end
 

data/lib/strum/json_serializer.rb

@@ -12,9 +12,9 @@ module Strum
           output(serializer_class.new(input).serializable_hash)
         end
 
-        define_method :audit do
-          clear_output!
-        end
+        # define_method :audit do
+        #   clear_output!
+        # end
       end
     end
   end

data/lib/strum/pipe.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Strum
+  class Pipe
+    include Strum::Service
+
+    def self.call(*units, input: {}, unit_input: {}, &block)
+      pipe_payload = if input.is_a?(Hash) && unit_input.is_a?(Hash)
+                       unit_input.merge(input)
+                     else
+                       input
+                    end
+      new(pipe_payload).execute(*units, input, unit_input, &block)
+    end
+
+    def execute(*units, pipe_inputs, pipe_unit_inputs, &block)
+      audit
+      output(pipe_inputs)
+      while (unit = units.shift) && valid?
+        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] || {}
+        clean_output = service_params[:clean_output] || false
+        unit_payload = if !clean_output && service_options.is_a?(Hash) && pipe_unit_inputs.is_a?(Hash) && pipe_inputs.is_a?(Hash)
+                         pipe_unit_inputs.merge(service_options).merge(output_value)
+                       else
+                         output_value
+                       end
+
+        service.public_send(:call, unit_payload) do |m|
+          m.success do |result|
+            if !clean_output && result.is_a?(Hash) && output_value.is_a?(Hash)
+              output(output_value.merge(result))
+            else
+              output(result)
+            end
+          end
+          m.failure { |errors| add_errors(errors) }
+        end
+      end
+      valid? ? valid_result(&block) : invalid_result(&block)
+    end
+  end
+end

data/lib/strum/service.rb

@@ -39,7 +39,7 @@ module Strum
     def initialize(payload)
       self.strum_errors = {}
       self.outputs = {}
-      self.clear_output = false
+      # self.clear_output = false
       self.payload = payload
       self.payload.freeze
       self.input = self.payload.dup
@@ -59,13 +59,13 @@ module Strum
       strum_errors
     end
 
-    def output_clear?
-      clear_output
-    end
+    # def output_clear?
+    #   clear_output
+    # end
 
     protected
 
-      attr_accessor :payload, :input, :strum_errors, :outputs, :clear_output
+      attr_accessor :payload, :input, :strum_errors, :outputs #, :clear_output
 
       def call
         raise Failure, "call method must be implemented"
@@ -117,9 +117,9 @@ module Strum
         self.input = [*input]
       end
 
-      def clear_output!
-        self.clear_output = true
-      end
+      # def clear_output!
+      #   self.clear_output = true
+      # end
 
     private
 
@@ -130,23 +130,24 @@ module Strum
       end
 
       def valid_result(&block)
-        result_outputs = rich_outputs
+        # result_outputs = rich_outputs
+        result_outputs = outputs
         return result_outputs[:default] || result_outputs unless block_given?
         return StrumMatcher.call([true, result_outputs[:default]], &block) if result_outputs[:default]
 
         StrumMatcher.call([true, *result_outputs.keys, result_outputs], &block)
       end
 
-      def rich_outputs
-        return outputs if output_clear?
-        return outputs if payload.nil?
-        return outputs unless payload.is_a?(Hash)
-        return payload unless outputs.count.positive?
-
-        outputs.each_with_object({}) do |(k, v), memo|
-          memo[k] = v.is_a?(Hash) ? payload.merge(v) : v
-        end
-      end
+      # def rich_outputs
+      #   return outputs if output_clear?
+      #   return outputs if payload.nil?
+      #   return outputs unless payload.is_a?(Hash)
+      #   return payload unless outputs.count.positive?
+      #
+      #   outputs.each_with_object({}) do |(k, v), memo|
+      #     memo[k] = v.is_a?(Hash) ? payload.merge(v) : v
+      #   end
+      # end
 
       def invalid_result(&block)
         return nil unless block_given?

data/lib/strum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Strum
-  VERSION = "0.0.30"
+  VERSION = "0.0.31"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strum
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Serhiy Nazarov
@@ -158,6 +158,7 @@ files:
 - lib/strum/commands/resource/service.rb
 - lib/strum/json_deserializer.rb
 - lib/strum/json_serializer.rb
+- lib/strum/pipe.rb
 - lib/strum/serializer_name.rb
 - lib/strum/service.rb
 - lib/strum/sub_command_base.rb