dry-validation 1.0.0.rc3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a644e1a1909528377d2edf6acb339bb6e571a9c2959700f9537ed849c9b6c0bc
-  data.tar.gz: 22bce26482e71124a4c83c4c9d1a6dd2da2960d02b30080ff672540322247d42
+  metadata.gz: 4985e6191e9e249b510fceea630ed463f11c5ff07830e6f3f867e913b29860ac
+  data.tar.gz: 99cb37716fb12f4a09bb94a4048935e6ac8db658df4d5a4318be321c5aef90ff
 SHA512:
-  metadata.gz: 37ddca21e417d6f4d8a6f16c10aecfb8a26f50483115d286f77ce84420ada5b67f0369d7a877d9ca7bc8d717f2ff2f8b770ffdfe66e370e570a4ab9abc7e6f38
-  data.tar.gz: 77bcd57cbc2918991363c3cdda5302528c10370a50c1d684462e15967812643008da5129168600f41af592c31831c712c69558997c2f470bc2f8b62ca0a3c806
+  metadata.gz: 2d25a5df6a56b6a8ed32f19ed3991297f2d878d24ba5349fd8c8d0ec50a3503842c8b591d7b176ddf9303b78a847002e638faeb29691329db3b2f41d2379116b
+  data.tar.gz: a21649e2476c688f9a4275e43819640823c6e6a2caf18e4b8d03c0df97c946d5edbb517c6482918bf3b3b9bc21079e667c06986c2adc81acdeb0561b1bc264aa

data/CHANGELOG.md

@@ -1,3 +1,56 @@
+# v1.1.0 2019-06-14
+
+### Added
+
+* `key?` method available within rules, that can be used to check if there's a value under the rule's default key (refs #540) (@solnic)
+* `value` supports hash-based path specifications now (refs #547) (@solnic)
+* `value` can read multiple values when the key points to them, ie in case of `rule(geo: [:lat, :lon])` it would return an array with `lat` and `lon` (@solnic)
+
+### Fixed
+
+* Passing multiple macro names to `validate` or `each` works correctly (fixed #538 #541) (@jandudulski)
+
+[Compare v1.0.0...v1.1.0](https://github.com/dry-rb/dry-validation/compare/v1.0.0...v1.1.0)
+
+# v1.0.0 2019-06-10
+
+This release is a complete rewrite on top of `dry-schema` that uses contract classes to define schema and validation rules. It's **not backward-compatible**. This release addressed over 150 known issues, including bugs and missing features.
+
+See [the list of all addressed issues](https://github.com/dry-rb/dry-validation/issues?utf8=✓&q=is%3Aissue+is%3Aclosed+closed%3A%3E%3D2019-01-01+) as well as issues that were moved to dry-schema and [addressed there](https://github.com/dry-rb/dry-schema/issues?q=is%3Aissue+is%3Aclosed+dry-validation+milestone%3A1.0.0).
+
+### :sparkles: Release highlights :sparkles:
+
+- New `Dry::Validation::Contract` API for defining contract classes with schemas and validation rules
+- Improved message backends with support for `key` and `base` messages, and arbitrary meta-data (like error codes etc.)
+- Support for defining rules for array elements ie `rule(:items).each { ... }`
+- Support for macros that encapsulate common rule logic
+- Built-in `:acceptance` macro
+
+[Compare v0.13.3...v1.0.0](https://github.com/dry-rb/dry-validation/compare/v0.13.3...v1.0.0)
+
+# v1.0.0 2019-06-10 (compared to 1.0.0.rc3)
+
+### Added
+
+- Support for defining rules for each element of an array via `rule(:items).each { ... }` (solnic)
+- Support for parameterized macros via `rule(:foo).validate(my_macro: :some_option)` (solnic)
+- `values#[]` is now compatible with path specs (symbol, array with keys or dot-notation) (issue #528) (solnic)
+- `value` shortcut for accessing the value found under the first key specified by a rule. ie `rule(:foo) { value }` returns `values[:foo]` (solnic)
+
+### Fixed
+
+- Contract's `config.locale` option was replaced by `config.messages.default_locale` to avoid conflicts with run-time `:locale` option and/or whatever is set via `I18n` gem (solnic)
+- Macros no longer mutate `Dry::Validation::Contract.macros` when using inheritance (solnic)
+- Missing dependency on `dry-container` was added (solnic)
+
+### Changed
+
+- `rule` will raise `InvalidKeysError` when specified keys are not defined by the schema (solnic)
+- `Contract.new` will raise `SchemaMissingError` when the class doesn't have schema defined (solnic)
+- Contracts no longer support `:locale` option in the constructor. Use `Result#errors(locale: :pl)` to change locale at run-time (solnic)
+
+[Compare v1.0.0.rc3...v1.0.0](https://github.com/dry-rb/dry-validation/compare/v1.0.0.rc3...v1.0.0)
+
 # v1.0.0.rc3 2019-05-06
 
 ### Added
@@ -15,6 +68,8 @@
 
 # v1.0.0.rc2 2019-05-04
 
+This was **yanked** on rubygems.org because the bundled gem was missing `config` directory, thus it was not possible to require it. It was fixed in `rc3`.
+
 ### Added
 
 * [EXPERIMENTAL] support for registering macros via `Dry::Validation::Macros.register(:your_macro, &block)` (solnic)

data/lib/dry/validation.rb

@@ -13,6 +13,7 @@ module Dry
   # @api public
   module Validation
     extend Dry::Core::Extensions
+    extend Macros::Registrar
 
     register_extension(:monads) do
       require 'dry/validation/extensions/monads'
@@ -22,23 +23,6 @@ module Dry
       require 'dry/validation/extensions/hints'
     end
 
-    # Register a new global macro
-    #
-    # @example
-    #   Dry::Validation.register_macro(:even_numbers) do
-    #     key.failure('all numbers must be even') unless values[key_name].all?(&:even?)
-    #   end
-    #
-    # @param [Symbol] name The name of the macro
-    #
-    # @return [self]
-    #
-    # @api public
-    def self.register_macro(name, &block)
-      Macros.register(name, &block)
-      self
-    end
-
     # Define a contract and build its instance
     #
     # @example
@@ -60,5 +44,12 @@ module Dry
     def self.Contract(options = EMPTY_HASH, &block)
       Contract.build(options, &block)
     end
+
+    # This is needed by Macros::Registrar
+    #
+    # @api private
+    def self.macros
+      Macros
+    end
   end
 end

data/lib/dry/validation/config.rb

@@ -11,17 +11,13 @@ module Dry
     #
     # @api public
     class Config < Schema::Config
-      setting :locale, :en
       setting :macros, Macros::Container.new, &:dup
 
       # @api private
-      def macros
-        config.macros
-      end
-
-      # @api private
-      def locale
-        config.locale
+      def dup
+        config = super
+        config.macros = macros.dup
+        config
       end
     end
   end

data/lib/dry/validation/constants.rb

@@ -8,10 +8,29 @@ module Dry
 
     DOT = '.'
 
+    # Root path is used for base errors in hash representation of error messages
+    ROOT_PATH = [nil].freeze
+
+    # Mapping for block kwarg options used by block_options
+    #
+    # @see Rule#block_options
+    BLOCK_OPTIONS_MAPPINGS = Hash.new { |_, key| key }.update(context: :_context).freeze
+
+    # Error raised when `rule` specifies one or more keys that the schema doesn't specify
+    InvalidKeysError = Class.new(StandardError)
+
     # Error raised when a localized message was not found
     MissingMessageError = Class.new(StandardError)
 
     # Error raised when trying to define a schema in a contract class that already has a schema
     DuplicateSchemaError = Class.new(StandardError)
+
+    # Error raised during initialization of a contract that has no schema defined
+    SchemaMissingError = Class.new(StandardError) do
+      # @api private
+      def initialize(klass)
+        super("#{klass} cannot be instantiated without a schema defined")
+      end
+    end
   end
 end

data/lib/dry/validation/contract.rb

@@ -62,11 +62,6 @@ module Dry
       #   @api public
       option :config, default: -> { self.class.config }
 
-      # @!attribute [r] locale
-      #   @return [Symbol] Contract's locale (default is `:en`)
-      #   @api public
-      option :locale, default: -> { self.class.config.locale }
-
       # @!attribute [r] macros
       #   @return [Macros::Container] Configured macros
       #   @see Macros::Container#register
@@ -76,7 +71,7 @@ module Dry
       # @!attribute [r] schema
       #   @return [Dry::Schema::Params, Dry::Schema::JSON, Dry::Schema::Processor]
       #   @api private
-      option :schema, default: -> { self.class.__schema__ }
+      option :schema, default: -> { self.class.__schema__ || raise(SchemaMissingError, self.class) }
 
       # @!attribute [r] rules
       #   @return [Hash]
@@ -86,7 +81,7 @@ module Dry
       # @!attribute [r] message_resolver
       #   @return [Messages::Resolver]
       #   @api private
-      option :message_resolver, default: -> { Messages::Resolver.new(self.class.messages, locale) }
+      option :message_resolver, default: -> { Messages::Resolver.new(messages) }
 
       # Apply the contract to an input
       #
@@ -96,11 +91,13 @@ module Dry
       #
       # @api public
       def call(input)
-        Result.new(schema.(input), Concurrent::Map.new, locale: locale) do |result|
+        Result.new(schema.(input), Concurrent::Map.new) do |result|
           rules.each do |rule|
             next if rule.keys.any? { |key| error?(result, key) }
 
-            rule.(self, result).failures.each do |failure|
+            rule_result = rule.(self, result)
+
+            rule_result.failures.each do |failure|
               result.add_error(message_resolver[failure])
             end
           end
@@ -121,7 +118,7 @@ module Dry
       # @api private
       def error?(result, key)
         path = Schema::Path[key]
-        result.error?(path) || path.map.with_index { |k, i| result.error?(path.keys[0..i-2]) }.any?
+        result.error?(path) || path.map.with_index { |_k, i| result.error?(path.keys[0..i - 2]) }.any?
       end
 
       # Get a registered macro
@@ -129,8 +126,17 @@ module Dry
       # @return [Proc,#to_proc]
       #
       # @api private
-      def macro(name)
-        macros.key?(name) ? macros[name] : Macros[name]
+      def macro(name, *args)
+        (macros.key?(name) ? macros[name] : Macros[name]).with(args)
+      end
+
+      # Return configured messages backend
+      #
+      # @return [Dry::Schema::Messages::YAML, Dry::Schema::Messages::I18n]
+      #
+      # @api private
+      def messages
+        self.class.messages
       end
     end
   end

data/lib/dry/validation/contract/class_interface.rb

@@ -2,10 +2,39 @@
 
 require 'dry/schema'
 require 'dry/schema/messages'
+require 'dry/schema/path'
+require 'dry/schema/key_map'
 
 require 'dry/validation/constants'
+require 'dry/validation/macros'
 
 module Dry
+  module Schema
+    # @api private
+    class Key
+      # @api private
+      def to_dot_notation
+        [name.to_s]
+      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
+      end
+    end
+  end
+
   module Validation
     class Contract
       # Contract's class interface
@@ -14,6 +43,8 @@ module Dry
       #
       # @api public
       module ClassInterface
+        include Macros::Registrar
+
         # @api private
         def inherited(klass)
           super
@@ -43,27 +74,6 @@ module Dry
           config.macros
         end
 
-        # Register a new global macro
-        #
-        # Macros will be available for the contract class and its descendants
-        #
-        # @example
-        #   class MyContract < Dry::Validation::Contract
-        #     register_macro(:even_numbers) do
-        #       key.failure('all numbers must be even') unless values[key_name].all?(&:even?)
-        #     end
-        #   end
-        #
-        # @param [Symbol] name The name of the macro
-        #
-        # @return [self]
-        #
-        # @api public
-        def register_macro(name, &block)
-          macros.register(name, &block)
-          self
-        end
-
         # Define a params schema for your contract
         #
         # This type of schema is suitable for HTTP parameters
@@ -116,6 +126,8 @@ module Dry
         #
         # @api public
         def rule(*keys, &block)
+          ensure_valid_keys(*keys)
+
           Rule.new(keys: keys, block: block).tap do |rule|
             rules << rule
           end
@@ -166,6 +178,26 @@ module Dry
 
         private
 
+        # @api private
+        def ensure_valid_keys(*keys)
+          valid_paths = key_map.to_dot_notation.map { |value| Schema::Path[value] }
+
+          invalid_keys = Schema::KeyMap[*keys]
+            .map(&:dump)
+            .reject { |spec| valid_paths.any? { |path| path.include?(Schema::Path[spec]) } }
+
+          return if invalid_keys.empty?
+
+          raise InvalidKeysError, <<~STR.strip
+            #{name}.rule specifies keys that are not defined by the schema: #{invalid_keys.inspect}
+          STR
+        end
+
+        # @api private
+        def key_map
+          __schema__.key_map
+        end
+
         # @api private
         def schema_opts
           { parent: superclass&.__schema__, config: config }

data/lib/dry/validation/evaluator.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 require 'dry/initializer'
+
 require 'dry/validation/constants'
+require 'dry/validation/failures'
 
 module Dry
   module Validation
@@ -15,50 +17,16 @@ module Dry
     class Evaluator
       extend Dry::Initializer
 
-      ROOT_PATH = [nil].freeze
-
-      # Failure accumulator object
-      #
-      # @api public
-      class Failures
-        # @api private
-        attr_reader :path
-
-        # @api private
-        attr_reader :opts
-
-        # @api private
-        def initialize(path = ROOT_PATH)
-          @path = Dry::Schema::Path[path]
-          @opts = []
-        end
-
-        # Set failure
-        #
-        # @overload failure(message)
-        #   Set message text explicitly
-        #   @param message [String] The message text
-        #   @example
-        #     failure('this failed')
-        #
-        # @overload failure(id)
-        #   Use message identifier (needs localized messages setup)
-        #   @param id [Symbol] The message id
-        #   @example
-        #     failure(:taken)
-        #
-        # @api public
-        def failure(message, tokens = EMPTY_HASH)
-          @opts << { message: message, tokens: tokens, path: path }
-          self
-        end
-      end
-
       # @!attribute [r] _contract
       #   @return [Contract]
       #   @api private
       param :_contract
 
+      # @!attribute [r] result
+      #   @return [Result]
+      #   @api private
+      option :result
+
       # @!attribute [r] keys
       #   @return [Array<String, Symbol, Hash>]
       #   @api private
@@ -84,16 +52,30 @@ module Dry
       #   @api private
       option :values
 
+      # @!attribute [r] block_options
+      #   @return [Hash<Symbol=>Symbol>]
+      #   @api private
+      option :block_options, default: proc { EMPTY_HASH }
+
+      # @return [Hash]
+      attr_reader :_options
+
       # Initialize a new evaluator
       #
       # @api private
-      def initialize(*args, &block)
-        super(*args)
+      def initialize(contract, options, &block)
+        super(contract, options)
+
+        @_options = options
 
-        instance_exec(_context, &block) if block
+        if block
+          exec_opts = block_options.map { |key, value| [key, _options[value]] }.to_h
+          instance_exec(exec_opts, &block)
+        end
 
-        macros.each do |macro|
-          instance_exec(_context, &macro(macro))
+        macros.each do |args|
+          macro = macro(*args.flatten(1))
+          instance_exec(macro.extract_block_options(_options.merge(macro: macro)), &macro.block)
         end
       end
 
@@ -127,10 +109,15 @@ module Dry
       #
       # @api private
       def failures
-        failures = []
-        failures += @base.opts if defined?(@base)
-        failures.concat(@key.values.flat_map(&:opts)) if defined?(@key)
-        failures
+        @failures ||= []
+        @failures += @base.opts if defined?(@base)
+        @failures.concat(@key.values.flat_map(&:opts)) if defined?(@key)
+        @failures
+      end
+
+      # @api private
+      def with(new_opts, &block)
+        self.class.new(_contract, _options.merge(new_opts), &block)
       end
 
       # Return default (first) key name
@@ -142,6 +129,51 @@ module Dry
         @key_name ||= keys.first
       end
 
+      # Return the value found under the first specified key
+      #
+      # This is a convenient method that can be used in all the common cases
+      # where a rule depends on just one key and you want a quick access to
+      # the value
+      #
+      # @example
+      #   rule(:age) do
+      #     key.failure(:invalid) if value < 18
+      #   end
+      #
+      # @return [Object]
+      #
+      # @public
+      def value
+        values[key_name]
+      end
+
+      # Return if the value under the default key is available
+      #
+      # This is useful when dealing with rules for optional keys
+      #
+      # @example
+      #   rule(:age) do
+      #     key.failure(:invalid) if key? && value < 18
+      #   end
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def key?
+        values.key?(key_name)
+      end
+
+      # Check if there are any errors under the provided path
+      #
+      # @param [Symbol, String, Array] A Path-compatible spec
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def error?(path)
+        result.error?(path)
+      end
+
       # @api private
       def respond_to_missing?(meth, include_private = false)
         super || _contract.respond_to?(meth, true)

data/lib/dry/validation/failures.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'dry/schema/path'
+require 'dry/validation/constants'
+
+module Dry
+  module Validation
+    # Failure accumulator object
+    #
+    # @api public
+    class Failures
+      # The path for messages accumulated by failures object
+      #
+      # @return [Dry::Schema::Path]
+      #
+      # @api private
+      attr_reader :path
+
+      # Options for messages
+      #
+      # These options are used by MessageResolver
+      #
+      # @return [Hash]
+      #
+      # @api private
+      attr_reader :opts
+
+      # @api private
+      def initialize(path = ROOT_PATH)
+        @path = Dry::Schema::Path[path]
+        @opts = EMPTY_ARRAY.dup
+      end
+
+      # Set failure
+      #
+      # @overload failure(message)
+      #   Set message text explicitly
+      #   @param message [String] The message text
+      #   @example
+      #     failure('this failed')
+      #
+      # @overload failure(id)
+      #   Use message identifier (needs localized messages setup)
+      #   @param id [Symbol] The message id
+      #   @example
+      #     failure(:taken)
+      #
+      # @see Evaluator#key
+      # @see Evaluator#base
+      #
+      # @api public
+      def failure(message, tokens = EMPTY_HASH)
+        opts << { message: message, tokens: tokens, path: path }
+        self
+      end
+    end
+  end
+end

data/lib/dry/validation/function.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'dry/initializer'
+require 'dry/validation/constants'
+
+module Dry
+  module Validation
+    # Abstract class for handling rule blocks
+    #
+    # @see Rule
+    # @see Macro
+    #
+    # @api private
+    class Function
+      extend Dry::Initializer
+
+      # @!attribute [r] block
+      #   @return [Proc]
+      #   @api private
+      option :block
+
+      private
+
+      # Extract options for the block kwargs
+      #
+      # @return [Hash]
+      #
+      # @api private
+      def block_options
+        return EMPTY_HASH unless block
+
+        @block_options ||= block
+          .parameters
+          .select { |arg| arg[0].equal?(:keyreq) }
+          .map(&:last)
+          .map { |name| [name, BLOCK_OPTIONS_MAPPINGS[name]] }
+          .to_h
+      end
+    end
+  end
+end

data/lib/dry/validation/macro.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'dry/validation/constants'
+require 'dry/validation/function'
+
+module Dry
+  module Validation
+    # A wrapper for macro validation blocks
+    #
+    # @api public
+    class Macro < Function
+      # @!attribute [r] name
+      #   @return [Symbol]
+      #   @api public
+      param :name
+
+      # @!attribute [r] args
+      #   @return [Array]
+      #   @api public
+      option :args
+
+      # @!attribute [r] block
+      #   @return [Proc]
+      #   @api private
+      option :block
+
+      # @api private
+      def with(args)
+        self.class.new(name, args: args, block: block)
+      end
+
+      # @api private
+      def extract_block_options(options)
+        block_options.map { |key, value| [key, options[value]] }.to_h
+      end
+    end
+  end
+end

data/lib/dry/validation/macros.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'dry/container'
+require 'dry/validation/macro'
 
 module Dry
   module Validation
@@ -8,6 +9,35 @@ module Dry
     #
     # @api public
     module Macros
+      module Registrar
+        # Register a macro
+        #
+        # @example register a global macro
+        #   Dry::Validation.register_macro(:even_numbers) do
+        #     key.failure('all numbers must be even') unless values[key_name].all?(&:even?)
+        #   end
+        #
+        # @example register a contract macro
+        #   class MyContract < Dry::Validation::Contract
+        #     register_macro(:even_numbers) do
+        #       key.failure('all numbers must be even') unless values[key_name].all?(&:even?)
+        #     end
+        #   end
+        #
+        # @param [Symbol] name The name of the macro
+        # @param [Array] *args Optional default arguments for the macro
+        #
+        # @return [self]
+        #
+        # @see Macro
+        #
+        # @api public
+        def register_macro(name, *args, &block)
+          macros.register(name, *args, &block)
+          self
+        end
+      end
+
       # Registry for macros
       #
       # @api public
@@ -28,8 +58,9 @@ module Dry
         # @return [self]
         #
         # @api public
-        def register(name, &block)
-          super(name, block, call: false)
+        def register(name, *args, &block)
+          macro = Macro.new(name, args: args, block: block)
+          super(name, macro, call: false, &nil)
           self
         end
       end
@@ -52,8 +83,8 @@ module Dry
       # @return [Macros]
       #
       # @api public
-      def self.register(*args, &block)
-        container.register(*args, &block)
+      def self.register(name, *args, &block)
+        container.register(name, *args, &block)
         self
       end
 

data/lib/dry/validation/message_set.rb

@@ -27,7 +27,7 @@ module Dry
 
       # @api private
       def initialize(messages, options = EMPTY_HASH)
-        @locale = options.fetch(:locale, :en)
+        @locale = options[:locale]
         @source_messages = options.fetch(:source) { messages.dup }
         super
       end
@@ -38,7 +38,7 @@ module Dry
       #
       # @api private
       def with(other, new_options = EMPTY_HASH)
-        return self if new_options.empty?
+        return self if new_options.empty? && other.eql?(messages)
 
         self.class.new(
           (other + select { |err| err.is_a?(Message) }).uniq,

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

@@ -14,15 +14,9 @@ module Dry
         #   @api private
         attr_reader :messages
 
-        # @!attribute [r] locale
-        #   @return [Symbol] current locale
-        #   @api private
-        attr_reader :locale
-
         # @api private
-        def initialize(messages, locale = :en)
+        def initialize(messages)
           @messages = messages
-          @locale = locale
         end
 
         # Resolve Message object from provided args and path
@@ -55,9 +49,9 @@ module Dry
         # @return [String]
         #
         # @api public
-        def message(rule, tokens: EMPTY_HASH, path:, locale: self.locale, full: false)
+        def message(rule, tokens: EMPTY_HASH, locale: nil, full: false, path:)
           keys = path.to_a.compact
-          msg_opts = tokens.merge(path: keys, locale: locale)
+          msg_opts = tokens.merge(path: keys, locale: locale || messages.default_locale)
 
           if keys.empty?
             template, meta = messages["rules.#{rule}", msg_opts]

data/lib/dry/validation/rule.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require 'dry/equalizer'
-require 'dry/initializer'
 
 require 'dry/validation/constants'
+require 'dry/validation/function'
 
 module Dry
   module Validation
@@ -15,11 +15,9 @@ module Dry
     # @see Contract#rule
     #
     # @api public
-    class Rule
+    class Rule < Function
       include Dry::Equalizer(:keys, :block, inspect: false)
 
-      extend Dry::Initializer
-
       # @!attribute [r] keys
       #   @return [Array<Symbol, String, Hash>]
       #   @api private
@@ -30,11 +28,6 @@ module Dry
       #   @api private
       option :macros, default: proc { EMPTY_ARRAY.dup }
 
-      # @!attribute [r] block
-      #   @return [Proc]
-      #   @api private
-      option :block
-
       # Evaluate the rule within the provided context
       #
       # @param [Contract] contract
@@ -44,7 +37,12 @@ module Dry
       def call(contract, result)
         Evaluator.new(
           contract,
-          values: result.values, keys: keys, macros: macros, _context: result.context,
+          keys: keys,
+          macros: macros,
+          block_options: block_options,
+          result: result,
+          values: result.values,
+          _context: result.context,
           &block
         )
       end
@@ -56,11 +54,45 @@ module Dry
       #
       # @api public
       def validate(*macros, &block)
-        @macros = macros
+        @macros = parse_macros(*macros)
         @block = block if block
         self
       end
 
+      # Define a validation function for each element of an array
+      #
+      # The function will be applied only if schema checks passed
+      # for a given array item.
+      #
+      # @example
+      #   rule(:nums).each do
+      #     key.failure("must be greater than 0") if value < 0
+      #   end
+      #   rule(:nums).each(min: 3)
+      #
+      # @return [Rule]
+      #
+      # @api public
+      def each(*macros, &block)
+        root = keys
+        macros = parse_macros(*macros)
+        @keys = []
+
+        @block = proc do
+          values[root].each_with_index do |_, idx|
+            path = [*root, idx]
+
+            next if result.error?(path)
+
+            evaluator = with(macros: macros, keys: [path], &block)
+
+            failures.concat(evaluator.failures)
+          end
+        end
+
+        self
+      end
+
       # Return a nice string representation
       #
       # @return [String]
@@ -69,6 +101,22 @@ module Dry
       def inspect
         %(#<#{self.class} keys=#{keys.inspect}>)
       end
+
+      # Parse function arguments into macros structure
+      #
+      # @return [Array]
+      #
+      # @api private
+      def parse_macros(*args)
+        args.each_with_object([]) do |spec, macros|
+          case spec
+          when Hash
+            spec.each { |k, v| macros << [k, Array(v)] }
+          else
+            macros << Array(spec)
+          end
+        end
+      end
     end
   end
 end

data/lib/dry/validation/values.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require 'dry/equalizer'
+require 'dry/schema/path'
+require 'dry/validation/constants'
 
 module Dry
   module Validation
@@ -38,8 +40,40 @@ module Dry
       # @return [Object]
       #
       # @api public
-      def [](key)
-        data[key]
+      def [](*args)
+        return data.dig(*args) if args.size > 1
+
+        case (key = args[0])
+        when Symbol, String, Array, Hash
+          path = Schema::Path[key]
+          keys = path.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] }
+        else
+          raise ArgumentError, '+key+ must be a valid path specification'
+        end
+      end
+
+      # @api public
+      def key?(key, hash = data)
+        return hash.key?(key) if key.is_a?(Symbol)
+
+        Schema::Path[key].reduce(hash) do |a, e|
+          if e.is_a?(Array)
+            result = e.all? { |k| key?(k, a) }
+            return result
+          else
+            return false unless a.is_a?(Array) ? (e >= 0 && e < a.size) : a.key?(e)
+          end
+          a[e]
+        end
+
+        true
       end
 
       # @api private

data/lib/dry/validation/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Validation
-    VERSION = '1.0.0.rc3'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.1.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -52,6 +52,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: dry-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +93,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +103,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +168,9 @@ files:
 - lib/dry/validation/evaluator.rb
 - lib/dry/validation/extensions/hints.rb
 - lib/dry/validation/extensions/monads.rb
+- lib/dry/validation/failures.rb
+- lib/dry/validation/function.rb
+- lib/dry/validation/macro.rb
 - lib/dry/validation/macros.rb
 - lib/dry/validation/message.rb
 - lib/dry/validation/message_set.rb
@@ -165,9 +194,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: