dry-mutations 1.3.6 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf6bbd4522768259ef715c8355d1df37d7a1b462
-  data.tar.gz: 799202ecb31b42566979e4580fda145824b4e338
+  metadata.gz: 6ef61504d19fddc6238d0ecfc61a8a61da070075
+  data.tar.gz: d1edf21a714efcb004083cbd3e8e19e834517c05
 SHA512:
-  metadata.gz: c7c4add8813f45de0fa29a66e81b880bc2c4d7718a631b4f49c50ddb355b9a99d5b57a45bf211d9312b92e0128ede6bd1b3018b4739361da44b6bb45cc581b4e
-  data.tar.gz: 82648f98e4ac959de064884cfc26e84cacf6491f67ff1a7d40f64cc401b9be0c8d2ed40bd8f4f41a08933121643dbddbe1eba0df80d3f3e4a537a532b4ced6eb
+  metadata.gz: e75bc3759db8394d410bf62d0afee3c64f9061bdb81ef4a9ca90190ff2830ba7d7bb98ec98c39db85ee43719fbb62cd6a2a10b3d58e52600b2791273cb0bd5a4
+  data.tar.gz: e0ff36117ec61ff21a1c26fd247188325b93ecbf2fe0781dec2d8fd39591bbd7d2c1d094609b8b0175bb7dd24a16fe290be4f0802fda9c02d85b6805718189d5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dry-mutations (1.3.6)
+    dry-mutations (1.5.0)
       activesupport (>= 3.2, < 5)
       dry-transaction (~> 0.9, < 0.10)
       dry-validation (~> 0.10)

data/lib/dry/mutations/extensions/command.rb

@@ -8,12 +8,20 @@ module Dry
           fail ArgumentError, "Can not prepend #{self.class} to #{base.class}: base class must be a ::Mutations::Command descendant." unless base < ::Mutations::Command
           base.extend(DSL::Module) unless base.ancestors.include?(DSL::Module)
           base.extend(Module.new do
+            def exceptions_as_errors(value)
+              @exceptions_as_errors = value
+            end
+
+            def finalizers(outcome: nil, errors: nil)
+              @finalizers = { outcome: outcome, errors: errors }
+            end
+
             def call(*args)
-              new(*args).call
+              new(*args).()
             end
 
             def to_proc
-              ->(*args) { new(*args).call }
+              ->(*args) { new(*args) }
             end
 
             if base.name && !::Kernel.methods.include?(base_name = base.name.split('::').last.to_sym)
@@ -27,7 +35,7 @@ module Dry
 
           base.singleton_class.prepend(Module.new do
             def respond_to_missing?(method_name, include_private = false)
-              %i|call to_proc|.include?(method_name) || super
+              %i|exceptions_as_errors finalizers call to_proc|.include?(method_name) || super
             end
           end)
         end
@@ -56,6 +64,8 @@ module Dry
 
           # Run a custom validation method if supplied:
           validate unless has_errors?
+
+          finalizer(:errors, @errors) if has_errors?
         end
 
         ########################################################################
@@ -96,10 +106,11 @@ module Dry
         end
 
         def execute
-          super
+          super.tap { |outcome| finalizer(:outcome, outcome) }
         rescue => e
-          add_error(:♻, :runtime_exception, e.message)
-          raise e
+          add_error(:♻, :runtime_exception, "#{e.class.name}: #{e.message}")
+          finalizer(:errors, @errors)
+          raise e unless exceptions_as_errors?
         end
 
         def add_error(key, kind, message = nil, dry_message = nil)
@@ -123,20 +134,21 @@ module Dry
         end
 
         def messages
-          @messages ||= yield_messages.uniq
+          @messages ||= yield_messages
         end
 
         private
 
-        def yield_messages(flat = [], errors = @errors)
+        def yield_messages(flat = {}, errors = @errors)
           return flat unless errors
-          errors = errors.values if errors.is_a?(Hash)
-          errors.each_with_object(flat) do |error, acc|
-            case error
-            when Enumerable then yield_messages(acc, error)
-            when ::Dry::Mutations::Errors::ErrorAtom then acc << error.dry_message
-            when ::Mutations::ErrorAtom then acc << error.message
-            end
+
+          errors.each_with_object([]) do |(key, msg), acc|
+            acc << [key, case msg
+                         when Hash then yield_messages({}, msg)
+                         when Array then msg.map(&:dry_message).join(', ')
+                         when ::Dry::Mutations::Errors::ErrorAtom then msg.dry_message
+                         when ::Mutations::ErrorAtom then msg.message
+                         end].join(': ')
           end
         end
 
@@ -182,6 +194,21 @@ module Dry
           )
         end
 
+        def exceptions_as_errors?
+          eae = self.class.instance_variable_get :@exceptions_as_errors
+          eae.respond_to?(:call) ? eae.() : eae
+        end
+
+        def finalizer(type, outcome)
+          fin = self.class.instance_variable_get :@finalizers
+          # rubocop:disable Lint/AssignmentInCondition
+          return nil unless fin.is_a?(Hash) && finalizer = fin[type]
+          # rubocop:enable Lint/AssignmentInCondition
+          finalizer = method(finalizer) if finalizer.is_a?(Symbol)
+          return nil unless finalizer.respond_to?(:call)
+          finalizer.(outcome)
+        end
+
         def fix_accessors!
           schema.rules.keys.each do |method|
             next if respond_to?(name = method)

data/lib/dry/mutations/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Mutations
-    VERSION = '1.3.6'.freeze
+    VERSION = '1.5.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-mutations
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.5.0
 platform: ruby
 authors:
 - Aleksei Matiushkin