strum 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 827feb2a58c035705f5d697e68a7a69ace30107728150f0204699e6bcced5320
-  data.tar.gz: e63c8d197628f51451b1518f4489173400971e001a7ad552d10f709feed2c372
+  metadata.gz: 15db517a81bd94c5d2b0e256715dcded125a9f95160adf4c057e0e17f8329919
+  data.tar.gz: fb713feb05e218bc6db956e9dce30b5c0f30297ebecc8f5d36cabdedb7c25384
 SHA512:
-  metadata.gz: 540e329e35c76b8a5fc559f098488610efbeacf59ee632ac9fec7607d879ccf4e9b2dd3fcce915351160f5d6fe06121ed863ed8de8000764c4c343ea87c4a340
-  data.tar.gz: '08138e7524bb5e08793bc6e6544ad24990bb3fb89a412b0eb20a3b5a8e23d0b763d511f4c0a74439608a6f22c2e7873a8b98a54969428d61655088ba845a815c'
+  metadata.gz: 45a8552d856ef10c54792d38bc8b5ab690b2990dad97837422af9c19170e36394246b5b5706a5cfc7e92421da193f763c943e066ca924d0416867cf4f74a541b
+  data.tar.gz: 7c64ba84549dce4473bd351be5ab49384156a6fa39c0df4f5c9ba8a58e72b00da99c02e3cde1fbdd54fa5d8ad377bd61bbecf2afda3ac1af97bc225ce80a92ac

data/Gemfile.lock

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

data/lib/strum/service.rb

@@ -122,23 +122,28 @@ module Strum
       end
 
       def valid_result(&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
+        result_outputs = rich_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] = if v.is_a?(Hash)
+                      payload.merge(v)
+                    else
+                      v
+                    end
+        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.27"
+  VERSION = "0.0.28"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strum
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Serhiy Nazarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector