dry-validation 1.2.0 → 1.5.0

data/lib/dry/validation/extensions/hints.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/monads/result'
+require "dry/monads/result"
 
 module Dry
   module Validation

data/lib/dry/validation/extensions/monads.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/monads/result'
+require "dry/monads/result"
 
 module Dry
   module Validation

data/lib/dry/validation/extensions/predicates_as_macros.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/schema/predicate_registry'
-require 'dry/validation/contract'
+require "dry/schema/predicate_registry"
+require "dry/validation/contract"
 
 module Dry
   module Validation
@@ -12,7 +12,7 @@ module Dry
       #
       # @see Dry::Validation::Contract
       WHITELIST = %i[
-        filled? gt? gteq? included_in? includes? inclusion? is? lt?
+        filled? format? gt? gteq? included_in? includes? inclusion? is? lt?
         lteq? max_size? min_size? not_eql? odd? respond_to? size? true?
         uuid_v4?
       ].freeze

data/lib/dry/validation/failures.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/schema/path'
-require 'dry/validation/constants'
+require "dry/schema/path"
+require "dry/validation/constants"
 
 module Dry
   module Validation
@@ -45,14 +45,26 @@ module Dry
       #   @example
       #     failure(:taken)
       #
+      # @overload failure(meta_hash)
+      #   Use meta_hash[:text] as a message (either explicitely or as an identifier),
+      #   setting the rest of the hash as error meta attribute
+      #   @param meta [Hash] The hash containing the message as value for the :text key
+      #   @example
+      #     failure({text: :invalid, key: value})
+      #
       # @see Evaluator#key
       # @see Evaluator#base
       #
       # @api public
       def failure(message, tokens = EMPTY_HASH)
-        opts << { message: message, tokens: tokens, path: path }
+        opts << {message: message, tokens: tokens, path: path}
         self
       end
+
+      # @api private
+      def empty?
+        opts.empty?
+      end
     end
   end
 end

data/lib/dry/validation/function.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/initializer'
-require 'dry/validation/constants'
+require "dry/initializer"
+require "dry/validation/constants"
 
 module Dry
   module Validation

data/lib/dry/validation/macro.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/validation/constants'
-require 'dry/validation/function'
+require "dry/validation/constants"
+require "dry/validation/function"
 
 module Dry
   module Validation

data/lib/dry/validation/macros.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/container'
-require 'dry/validation/macro'
+require "dry/container"
+require "dry/validation/macro"
 
 module Dry
   module Validation

data/lib/dry/validation/message.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'dry/equalizer'
+require "dry/equalizer"
 
-require 'dry/schema/constants'
-require 'dry/schema/message'
+require "dry/schema/constants"
+require "dry/schema/message"
 
 module Dry
   module Validation
@@ -52,7 +52,7 @@ module Dry
         #
         # @api public
         def evaluate(**opts)
-          evaluated_text, rest = text.(opts)
+          evaluated_text, rest = text.(**opts)
           Message.new(evaluated_text, path: path, meta: rest.merge(meta))
         end
       end

data/lib/dry/validation/message_set.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'dry/schema/message_set'
+require "dry/schema/message_set"
 
-require 'dry/validation/constants'
-require 'dry/validation/message'
+require "dry/validation/constants"
+require "dry/validation/message"
 
 module Dry
   module Validation
@@ -41,7 +41,7 @@ module Dry
         return self if new_options.empty? && other.eql?(messages)
 
         self.class.new(
-          (other + select { |err| err.is_a?(Message) }).uniq,
+          other | select { |err| err.is_a?(Message) },
           options.merge(source: source_messages, **new_options)
         ).freeze
       end
@@ -54,9 +54,9 @@ module Dry
       #
       # @api private
       def add(message)
+        @empty = nil
         source_messages << message
         messages << message
-        initialize_placeholders!
         self
       end
 
@@ -92,51 +92,6 @@ module Dry
         to_h
         self
       end
-
-      private
-
-      # @api private
-      def unique_paths
-        source_messages.uniq(&:path).map(&:path)
-      end
-
-      # @api private
-      def messages_map
-        @messages_map ||= reduce(placeholders) { |hash, msg|
-          node = msg.path.reduce(hash) { |a, e| a.is_a?(Hash) ? a[e] : a.last[e] }
-          (node[0].is_a?(::Array) ? node[0] : node) << msg.dump
-          hash
-        }
-      end
-
-      # @api private
-      #
-      # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/PerceivedComplexity
-      def initialize_placeholders!
-        @placeholders = unique_paths.each_with_object(EMPTY_HASH.dup) { |path, hash|
-          curr_idx = 0
-          last_idx = path.size - 1
-          node = hash
-
-          while curr_idx <= last_idx
-            key = path[curr_idx]
-
-            next_node =
-              if node.is_a?(Array) && key.is_a?(Symbol)
-                node_hash = (node << [] << {}).last
-                node_hash[key] || (node_hash[key] = curr_idx < last_idx ? {} : [])
-              else
-                node[key] || (node[key] = curr_idx < last_idx ? {} : [])
-              end
-
-            node = next_node
-            curr_idx += 1
-          end
-        }
-      end
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/PerceivedComplexity
     end
   end
 end

data/lib/dry/validation/messages/resolver.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/validation/message'
+require "dry/validation/message"
 
 module Dry
   module Validation
@@ -22,6 +22,8 @@ module Dry
         # Resolve Message object from provided args and path
         #
         # This is used internally by contracts when rules are applied
+        # If message argument is a Hash, then it MUST have a :text key,
+        # which value will be used as the message value
         #
         # @return [Message, Message::Localized]
         #
@@ -34,7 +36,12 @@ module Dry
             Message[message, path, meta]
           when Hash
             meta = message.dup
-            text = meta.delete(:text)
+            text = meta.delete(:text) { |key|
+              raise ArgumentError, <<~STR
+                +message+ Hash must contain :#{key} key (#{message.inspect} given)
+              STR
+            }
+
             call(message: text, tokens: tokens, path: path, meta: meta)
           else
             raise ArgumentError, <<~STR
@@ -68,11 +75,31 @@ module Dry
             STR
           end
 
-          text = template.(template.data(tokens))
+          parsed_tokens = parse_tokens(tokens)
+          text = template.(template.data(parsed_tokens))
 
           [full ? "#{messages.rule(keys.last, msg_opts)} #{text}" : text, meta]
         end
         # rubocop:enable Metrics/AbcSize
+
+        private
+
+        def parse_tokens(tokens)
+          Hash[
+            tokens.map do |key, token|
+              [key, parse_token(token)]
+            end
+          ]
+        end
+
+        def parse_token(token)
+          case token
+          when Array
+            token.join(", ")
+          else
+            token
+          end
+        end
       end
     end
   end

data/lib/dry/validation/result.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'concurrent/map'
-require 'dry/equalizer'
+require "concurrent/map"
+require "dry/equalizer"
 
-require 'dry/validation/constants'
-require 'dry/validation/message_set'
-require 'dry/validation/values'
+require "dry/validation/constants"
+require "dry/validation/message_set"
+require "dry/validation/values"
 
 module Dry
   module Validation
@@ -106,6 +106,22 @@ module Dry
         schema_result.error?(key)
       end
 
+      # Check if there's any error for the provided key
+      #
+      # This does not consider errors from the nested values
+      #
+      # @api private
+      def base_error?(key)
+        schema_result.errors.any? { |error|
+          key_path = Schema::Path[key]
+          err_path = Schema::Path[error.path]
+
+          return false unless key_path.same_root?(err_path)
+
+          key_path == err_path
+        }
+      end
+
       # Add a new error for the provided key
       #
       # @api private
@@ -163,6 +179,22 @@ module Dry
         super
       end
 
+      if RUBY_VERSION >= "2.7"
+        # Pattern matching
+        #
+        # @api private
+        def deconstruct_keys(keys)
+          values.deconstruct_keys(keys)
+        end
+
+        # Pattern matching
+        #
+        # @api private
+        def deconstruct
+          [values, context.each.to_h]
+        end
+      end
+
       private
 
       # @api private

data/lib/dry/validation/rule.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'dry/equalizer'
+require "dry/equalizer"
 
-require 'dry/validation/constants'
-require 'dry/validation/function'
+require "dry/validation/constants"
+require "dry/validation/function"
 
 module Dry
   module Validation
@@ -82,14 +82,16 @@ module Dry
         @keys = []
 
         @block = proc do
-          (values[root] || []).each_with_index do |_, idx|
-            path = [*Schema::Path[root].to_a, idx]
+          unless result.base_error?(root) || !values.key?(root)
+            values[root].each_with_index do |_, idx|
+              path = [*Schema::Path[root].to_a, idx]
 
-            next if result.error?(path)
+              next if result.error?(path)
 
-            evaluator = with(macros: macros, keys: [path], &block)
+              evaluator = with(macros: macros, keys: [path], &block)
 
-            failures.concat(evaluator.failures)
+              failures.concat(evaluator.failures)
+            end
           end
         end
 
@@ -116,12 +118,18 @@ module Dry
         args.each_with_object([]) do |spec, macros|
           case spec
           when Hash
-            spec.each { |k, v| macros << [k, Array(v)] }
+            add_macro_from_hash(macros, spec)
           else
             macros << Array(spec)
           end
         end
       end
+
+      def add_macro_from_hash(macros, spec)
+        spec.each do |k, v|
+          macros << [k, v.is_a?(Array) ? v : [v]]
+        end
+      end
     end
   end
 end

data/lib/dry/validation/schema_ext.rb

@@ -1,33 +1,18 @@
 # frozen_string_literal: true
 
-require 'dry/schema/key'
-require 'dry/schema/key_map'
+require "dry/schema/path"
 
 module Dry
   module Schema
-    # @api private
-    #
-    # TODO: this should be moved to dry-schema at some point
-    class Key
+    class Path
       # @api private
-      def to_dot_notation
-        [name.to_s]
+      def multi_value?
+        last.is_a?(Array)
       end
 
       # @api private
-      class Hash < Key
-        # @api private
-        def to_dot_notation
-          [name].product(members.map(&:to_dot_notation).flatten(1)).map { |e| e.join(DOT) }
-        end
-      end
-    end
-
-    # @api private
-    class KeyMap
-      # @api private
-      def to_dot_notation
-        @to_dot_notation ||= map(&:to_dot_notation).flatten
+      def expand
+        to_a[0..-2].product(last).map { |spec| self.class[spec] }
       end
     end
   end

data/lib/dry/validation/values.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry/equalizer'
-require 'dry/schema/path'
-require 'dry/validation/constants'
+require "dry/equalizer"
+require "dry/schema/path"
+require "dry/validation/constants"
 
 module Dry
   module Validation
@@ -45,17 +45,15 @@ module Dry
 
         case (key = args[0])
         when Symbol, String, Array, Hash
-          path = Schema::Path[key]
-          keys = path.to_a
+          keys = Schema::Path[key].to_a
 
           return data.dig(*keys) unless keys.last.is_a?(Array)
 
           last = keys.pop
           vals = self.class.new(data.dig(*keys))
-
-          last.map { |name| vals[name] }
+          vals.fetch_values(*last) { nil }
         else
-          raise ArgumentError, '+key+ must be a valid path specification'
+          raise ArgumentError, "+key+ must be a valid path specification"
         end
       end
 
@@ -91,6 +89,7 @@ module Dry
           super
         end
       end
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
   end
 end