dry-mutations 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a75d0a0c9aee462be75310c21f148745b72ffdb
-  data.tar.gz: a342fb6f615e09c1a1be1209a0e3b8e535c656b2
+  metadata.gz: 9c45806cc2f3f877d39548794e64438c7cf7f2c3
+  data.tar.gz: 464ad2f0135a2ee05ab451be15966cda17542231
 SHA512:
-  metadata.gz: 73fd6cacb9b2c24adcb03133745260a4db87962b57f5b2def7faa1af6e22b2c76232d5459649da4f962deee5f244375568e31839336000768b8241973fdaf64a
-  data.tar.gz: 3eb8c0ff3ba03121948eac99d82a17d7da17f2d96664066618c428afea789eb2f98e709f6010b630fa428adc028a420b51f368c4ce73cec5048928923babd0c6
+  metadata.gz: 62264df60af3efed445dd1e336f59f0d39457c39a38949eaa4072d7ec41ac42ec2782b33fbe0a0c8a6a23639df347deb15acd7d6f8b96b58d1f9d0e62a7e1231
+  data.tar.gz: 020d8c019d8b0e5df5f681701b749e655533b28e637529b532de3a6111291d4239872e31862230d91e9dadb9f8d41b90effc021e4d3851c15782c3fbc3c640f1

data/.rubocop.yml

@@ -23,7 +23,7 @@ Metrics/ModuleLength:
   Max: 256
 
 Metrics/BlockLength:
-  Max: 64
+  Max: 128
 
 ################################################################################
 

data/Gemfile.lock

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

data/lib/dry/mutations/errors/error_atom.rb

@@ -19,8 +19,18 @@ module Dry
           return nil if set.empty?
 
           fail TypeError, "Expected: ::Dry::Validation::MessageSet; got: #{set.class}" unless set.is_a?(::Dry::Validation::MessageSet)
+
           set.map.with_index.with_object(::Mutations::ErrorHash.new) do |(msg, idx), memo|
             key = msg.path.join('.')
+            last = msg.path.pop
+            tail = msg.path.inject(memo) { |acc, curr| acc[curr.to_s] ||= ::Mutations::ErrorHash.new }
+            tail[last.to_s] = case tail[last.to_s]
+                              when ErrorAtom then ::Mutations::ErrorArray.new << tail[last.to_s]
+                              when NilClass then ::Mutations::ErrorArray.new
+                              when ::Mutations::ErrorArray then tail[last.to_s]
+                              end
+
+            tail[last.to_s] << new(last, msg.predicate, msg, message: msg.text, index: idx)
             memo[key] = new(key, msg.predicate, msg, message: msg.text, index: idx)
           end
         end

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

@@ -117,17 +117,29 @@ module Dry
 
           (@errors ||= ::Mutations::ErrorHash.new).tap do |errs|
             path.inject(errs) do |cur_errors, part|
-              cur_errors[part.to_sym] ||= ::Mutations::ErrorHash.new
+              cur_errors[part.to_s] ||= ::Mutations::ErrorHash.new
             end[last] = atom
-          end
+          end[key] = Errors::ErrorAtom.new(key, kind, dry_message, message: message)
         end
 
         def messages
-          @messages ||= @errors && @errors.values.map(&:dry_message)
+          @messages ||= yield_messages.uniq
         end
 
         private
 
+        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 ::Mutations::ErrorHash, ::Mutations::ErrorArray then yield_messages(acc, error)
+            when ::Dry::Mutations::Errors::ErrorAtom then acc << error.dry_message
+            when ::Mutations::ErrorAtom then acc << error.message
+            end
+          end
+        end
+
         def schema
           @schema ||= self.class.schema
         end

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

@@ -9,12 +9,14 @@ module Dry
 
           attr_reader :outcome, :either
 
+          # rubocop:disable Style/VariableNumber
           def initialize(outcome)
             @∨ = outcome.class.instance_variable_get(:@∨)
             @either = Right(@outcome = outcome).bind do |value|
               value.public_send(@∨[:success]) ? Right(value.public_send(@∨[:right])) : Left(value.public_send(@∨[:left]))
             end
           end
+          # rubocop:enable Style/VariableNumber
         end
 
         class Matcher # :nodoc:
@@ -23,14 +25,12 @@ module Dry
             resolve: ->(value) { value.either.value }
           )
 
-          # rubocop:disable Style/BlockDelimiters
           FAILURE = Dry::Matcher::Case.new(
-            match: -> (value, *patterns) {
+            match: ->(value, *patterns) {
               value.left? && (patterns.none? || (patterns & value.either.value.keys).any?)
             },
-            resolve: -> (value) { value.either.value }
+            resolve: ->(value) { value.either.value }
           )
-          # rubocop:enable Style/BlockDelimiters
 
           # Build the matcher
           def self.!
@@ -41,15 +41,17 @@ module Dry
           private_constant :FAILURE
         end
 
+        # rubocop:disable Style/VariableNumber
         def self.prepended base
           λ = base.instance_methods.method(:include?)
           base.instance_variable_set(:@∨, {
-            left:    [:errors, :left].detect(&λ),
-            right:   [:result, :output, :right].detect(&λ),
-            success: [:success?].detect(&λ)
+            left:    %i|errors left|.detect(&λ),
+            right:   %i|result output right|.detect(&λ),
+            success: %i|success?|.detect(&λ)
           }.reject { |_, v| v.nil? }.merge(base.instance_variable_get(:@∨) || {}))
           fail ArgumentError, "Can not have #{self} #{__callee__} to #{base}: base class must look like an either." unless base.instance_variable_get(:@∨).size == 3
         end
+        # rubocop:enable Style/VariableNumber
         singleton_class.send :alias_method, :included, :prepended
 
         def either
@@ -74,7 +76,6 @@ module Dry
         end
       end
 
-      # rubocop:disable Style/MethodName
       def self.Either input
         case input
         when Class then input.prepend Either unless input.ancestors.include?(Either)
@@ -104,7 +105,6 @@ module Dry
           fail ::Mutations::ValidationException.new(outcome.errors) unless outcome.success?
         end.value
       end
-      # rubocop:enable Style/MethodName
     end
   end
 end

data/lib/dry/mutations/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Mutations
-    VERSION = '1.1.1'.freeze
+    VERSION = '1.1.3'.freeze
   end
 end

metadata

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