strum 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fe0b1d1b61058e17af6b6e7b9cf775cd5cdfa0c8ace295f1424f274ffbaaadf
-  data.tar.gz: 668ed074e8870bcdaa8badf23bed56b18a9f1ba98c4c91ba9f9aba9965145d2a
+  metadata.gz: af3921774101423a2f06bb8cad080738bbdd6fe2bc35da3d9b3e0e8158c8a222
+  data.tar.gz: 873c5a9d6306077dae49b3ef3342ae666f13ff0aac3c77147fc54d0a76dc94db
 SHA512:
-  metadata.gz: 9521ad19dcd7ec87e2870128bb7b4cb32a4de5a8bb3647a9a7a615fa13ae462160e98611113373fff0a2189f25bcc323e4c7b83da0808c6479c38d027fa250ac
-  data.tar.gz: '08a0b846e11138e6a0a38f9aadad666871a1d2bb6064a4270531ee33f8a901e80a13502605e2ec8d2f4429ccf464ac598c6d1dfb94b0060a17fce51971c74f9b'
+  metadata.gz: 46520355b2158efba77519750d6759fc13eb706f0d043f7a4b2ce18bdee02684f749890b0ad7d4c11ee8d012c6c68e4afcf919310e5843a3edd6c5497a1cb531
+  data.tar.gz: dccf7f3e66814ea3181430dd812fbd5fb20d44a30a0a2f2aeda85caf1ae7024a51a7d826f39aaf8b8a17e3fdd901053f4b0a53634ac655e523219072374a4c59

data/Gemfile.lock

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

data/lib/strum/chain.rb

@@ -10,16 +10,10 @@ module Strum
 
     def execute(*chain, &block)
       audit
-      @output = input
+      output(payload)
       while (service = chain.shift) && valid?
-        service.public_send(:call, output) do |m|
-          m.success do |result|
-            @output = if @output.is_a?(Hash) && result.is_a?(Hash)
-                        @output.merge(result)
-                      else
-                        result
-                      end
-          end
+        service.public_send(:call, outputs[:default]) do |m|
+          m.success { |result| output(result) }
           m.failure { |errors| add_errors(errors) }
         end
       end

data/lib/strum/json_serializer.rb

@@ -9,7 +9,7 @@ module Strum
         include Strum::Service
         define_method :call do
           serializer_class = Strum::SerializerName.call(name: name)
-          @output = serializer_class.new(input).serializable_hash
+          output(serializer_class.new(input).serializable_hash)
         end
       end
     end

data/lib/strum/serializer_name.rb

@@ -7,7 +7,7 @@ module Strum
     include Strum::Service
 
     def call
-      @output = Kernel.const_get(input[:name].to_s + "Serializer")
+      output(Kernel.const_get(input[:name].to_s + "Serializer"))
     rescue StandardError => e
       add_error(:serializer, e)
     end

data/lib/strum/service.rb

@@ -30,16 +30,19 @@ module Strum
 
     # Internal: Interactor class methods.
     module ClassMethods
-      def call(input = nil, &block)
-        new(input).execute(&block)
+      def call(payload = nil, &block)
+        new(payload).execute(&block)
       end
     end
 
     # Instance methods
-    def initialize(input)
+    def initialize(payload)
       self.strum_errors = {}
       self.outputs = {}
-      self.input = input
+      self.clear_output = false
+      self.payload = payload
+      self.payload.freeze
+      self.input = self.payload.dup
     end
 
     def execute(&block)
@@ -56,9 +59,13 @@ module Strum
       strum_errors
     end
 
+    def output_clear?
+      clear_output
+    end
+
     protected
 
-      attr_accessor :input, :strum_errors, :output, :outputs
+      attr_accessor :payload, :input, :strum_errors, :outputs, :clear_output
 
       def call
         raise Failure, "call method must be implemented"
@@ -66,6 +73,18 @@ module Strum
 
       def audit; end
 
+      def self.output=(value)
+        @outputs[:default] = value
+      end
+
+      def output(key = :default)
+        @outputs[key]
+      end
+
+      def output(key = :default, value)
+        @outputs[key] = value
+      end
+
       def add_error(field, value)
         if field.is_a?(Array)
           field.each do |key|
@@ -94,6 +113,10 @@ module Strum
         self.input = [*input]
       end
 
+      def clear_output!
+        self.clear_output = true
+      end
+
     private
 
       def key_to_sym(key)
@@ -103,10 +126,21 @@ module Strum
       end
 
       def valid_result(&block)
-        return output || outputs unless block_given?
-        return StrumMatcher.call([true, output], &block) if output
-
-        StrumMatcher.call([true, *outputs.keys, outputs], &block)
+        result_outputs = if !output_clear? && payload.is_a?(Hash)
+                           outputs.each_with_object({}) do |(k, v), memo|
+                             memo[k] = if v.is_a?(Hash)
+                                         payload.merge(v)
+                                       else
+                                         v
+                                       end
+                           end
+                         else
+                           outputs
+                        end
+        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 invalid_result(&block)

data/lib/strum/templates/service_crud/%resource_name%/create.rb.tt

@@ -12,7 +12,7 @@
 <%= ident %>    def call
 <%= ident %>      if (<%= resource_name %> = <%= resource_class_name %>.new(input)).valid?
 <%= ident %>        <%= resource_name %>.save
-<%= ident %>        @output = <%= resource_name %>
+<%= ident %>        output(%= resource_name %)
 <%= ident %>      else
 <%= ident %>        add_errors(<%= resource_name %>.errors)
 <%= ident %>      end

data/lib/strum/templates/service_crud/%resource_name%/find.rb.tt

@@ -10,7 +10,7 @@
 <%= ident %>    include Strum::Service
 
 <%= ident %>    def call
-<%= ident %>      @output = <%= resource_class_name %>.find(input)
+<%= ident %>      output(<%= resource_class_name %>.find(input))
 <%= ident %>      add_error(:<%= resource_name %>, :not_found) unless @output
 <%= ident %>    end
 

data/lib/strum/templates/service_crud/%resource_name%/search.rb.tt

@@ -10,7 +10,7 @@
 <%= ident %>    include Strum::Service
 
 <%= ident %>    def call
-<%= ident %>      @output = <%= resource_class_name %>.all
+<%= ident %>      output(<%= resource_class_name %>.all)
 <%= ident %>    end
 
 <%= ident %>    def audit

data/lib/strum/templates/service_crud/%resource_name%/update.rb.tt

@@ -9,10 +9,10 @@
 <%= ident %>  class Update
 <%= ident %>    include Strum::Service
 <%= ident %>    def call
-<%= ident %>      @output = <%= resource_class_name %>.find(id: input[:id])
-<%= ident %>      if @output
+<%= ident %>      output(<%= resource_class_name %>.find(id: input[:id]))
+<%= ident %>      if output
 <%= ident %>        input.delete(:id)
-<%= ident %>        @output.update(input)
+<%= ident %>        output.update(input)
 <%= ident %>      else
 <%= ident %>        add_error(:<%= resource_name %>, :not_found)
 <%= ident %>      end

data/lib/strum/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strum
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Serhiy Nazarov