dry-validation 1.0.0.rc1 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e07b84e6d69b8ff4c887a633dba3862ebb44219d1aa36b0a4394e08761b8e0
-  data.tar.gz: 18a796e79f03f85f288307038a29c913a0340e6a1c77e2b6b138b96397b0aff9
+  metadata.gz: a644e1a1909528377d2edf6acb339bb6e571a9c2959700f9537ed849c9b6c0bc
+  data.tar.gz: 22bce26482e71124a4c83c4c9d1a6dd2da2960d02b30080ff672540322247d42
 SHA512:
-  metadata.gz: f3f8fd949d909e6823c5e5aced8fb055eec20263f06247b98e066187efc57a1e987b0c016f472b99693a79191aafc64c63b0ec68d64ef8148b2f4901a861335f
-  data.tar.gz: c146b67aaab383aa39f908b3e487fa249f7eeb9d13b7e2c165a2c845cb5450775c52f3fc3811a900d6a1c2a2e36fc79fc002b2c04a843d0fa1e635888abb7e6a
+  metadata.gz: 37ddca21e417d6f4d8a6f16c10aecfb8a26f50483115d286f77ce84420ada5b67f0369d7a877d9ca7bc8d717f2ff2f8b770ffdfe66e370e570a4ab9abc7e6f38
+  data.tar.gz: 77bcd57cbc2918991363c3cdda5302528c10370a50c1d684462e15967812643008da5129168600f41af592c31831c712c69558997c2f470bc2f8b62ca0a3c806

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+# v1.0.0.rc3 2019-05-06
+
+### Added
+
+* [EXPERIMENTAL] `Validation.register_macro` for registering global macros (solnic)
+* [EXPERIMENTAL] `Contract.register_macro` for registering macros available to specific contract classes (solnic)
+* `Dry::Validation.Contract` shortcut for quickly defining a contract and getting its instance back (solnic)
+* New configuration option `config.locale` for setting the default locale (solnic)
+
+### Fixed
+
+* `config/errors.yml` are now bundled with the gem, **`rc2` was broken because of this** (solnic)
+
+[Compare v1.0.0.rc2...v1.0.0.rc3](https://github.com/dry-rb/dry-validation/compare/v1.0.0.rc2...v1.0.0.rc3)
+
+# v1.0.0.rc2 2019-05-04
+
+### Added
+
+* [EXPERIMENTAL] support for registering macros via `Dry::Validation::Macros.register(:your_macro, &block)` (solnic)
+* [EXPERIMENTAL] `:acceptance` as the first built-in macro (issue #157) (solnic)
+
+### Fixed
+
+* Passing invalid argument to `failure` will raise a meaningful error instead of crashing (solnic)
+
+### Changed
+
+* In rule validation blocks, `values` is now an instance of a hash-like `Dry::Validation::Values` class, rather than `Dry::Schema::Result`. This gives more convenient access to data within rules (solnic)
+* Dependency on `dry-schema` was updated to `~> 1.0` (solnic)
+
+[Compare v1.0.0.rc1...v1.0.0.rc2](https://github.com/dry-rb/dry-validation/compare/v1.0.0.rc1...v1.0.0.rc2)
+
 # v1.0.0.rc1 2019-04-26
 
 ### Added

data/README.md

@@ -14,7 +14,8 @@
 
 ## Links
 
-* [Documentation](http://dry-rb.org/gems/dry-validation)
+* [User documentation](https://dry-rb.org/gems/dry-validation)
+* [API documentation](http://rubydoc.info/gems/dry-validation)
 * [Guidelines for contributing](CONTRIBUTING.md)
 
 ## Supported Ruby versions
@@ -24,8 +25,6 @@ This library officially supports following Ruby versions:
 * MRI >= `2.4`
 * jruby >= `9.2`
 
-It **should** work on MRI `2.3.x` too, but there's no official support for this version.
-
 ## License
 
 See `LICENSE` file.

data/config/errors.yml

@@ -0,0 +1,4 @@
+en:
+  dry_validation:
+    errors:
+      acceptance: "must accept %{key}"

data/lib/dry/validation.rb

@@ -1,11 +1,16 @@
 # frozen_string_literal: true
 
+require 'dry/validation/constants'
 require 'dry/validation/contract'
+require 'dry/validation/macros'
 
+# Main namespace
+#
+# @api public
 module Dry
   # Main library namespace
   #
-  # @api private
+  # @api public
   module Validation
     extend Dry::Core::Extensions
 
@@ -16,5 +21,44 @@ module Dry
     register_extension(:hints) do
       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
+    #   my_contract = Dry::Validation.Contract do
+    #     params do
+    #       required(:name).filled(:string)
+    #     end
+    #   end
+    #
+    #   my_contract.call(name: "Jane")
+    #
+    # @param [Hash] options Contract options
+    #
+    # @see Contract
+    #
+    # @return [Contract]
+    #
+    # @api public
+    def self.Contract(options = EMPTY_HASH, &block)
+      Contract.build(options, &block)
+    end
   end
 end

data/lib/dry/validation/config.rb

@@ -1,10 +1,28 @@
 # frozen_string_literal: true
 
 require 'dry/schema/config'
+require 'dry/validation/macros'
 
 module Dry
   module Validation
+    # Configuration for contracts
+    #
+    # @see Contract#config
+    #
+    # @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
+      end
     end
   end
 end

data/lib/dry/validation/constants.rb

@@ -8,7 +8,10 @@ module Dry
 
     DOT = '.'
 
+    # 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)
   end
 end

data/lib/dry/validation/contract.rb

@@ -4,6 +4,7 @@ require 'concurrent/map'
 
 require 'dry/equalizer'
 require 'dry/initializer'
+require 'dry/schema/path'
 
 require 'dry/validation/config'
 require 'dry/validation/constants'
@@ -54,16 +55,23 @@ module Dry
       extend ClassInterface
 
       config.messages.top_namespace = 'dry_validation'
+      config.messages.load_paths << Pathname(__FILE__).join('../../../../config/errors.yml').realpath
 
       # @!attribute [r] config
-      #   @return [Config]
+      #   @return [Config] Contract's configuration object
       #   @api public
       option :config, default: -> { self.class.config }
 
       # @!attribute [r] locale
-      #   @return [Symbol]
+      #   @return [Symbol] Contract's locale (default is `:en`)
       #   @api public
-      option :locale, default: -> { :en }
+      option :locale, default: -> { self.class.config.locale }
+
+      # @!attribute [r] macros
+      #   @return [Macros::Container] Configured macros
+      #   @see Macros::Container#register
+      #   @api public
+      option :macros, default: -> { config.macros }
 
       # @!attribute [r] schema
       #   @return [Dry::Schema::Params, Dry::Schema::JSON, Dry::Schema::Processor]
@@ -80,7 +88,9 @@ module Dry
       #   @api private
       option :message_resolver, default: -> { Messages::Resolver.new(self.class.messages, locale) }
 
-      # Apply contract to an input
+      # Apply the contract to an input
+      #
+      # @param [Hash] input The input to validate
       #
       # @return [Result]
       #
@@ -88,9 +98,9 @@ module Dry
       def call(input)
         Result.new(schema.(input), Concurrent::Map.new, locale: locale) do |result|
           rules.each do |rule|
-            next if rule.keys.any? { |key| result.error?(key) }
+            next if rule.keys.any? { |key| error?(result, key) }
 
-            rule.(self, result, result.context).failures.each do |failure|
+            rule.(self, result).failures.each do |failure|
               result.add_error(message_resolver[failure])
             end
           end
@@ -105,6 +115,23 @@ module Dry
       def inspect
         %(#<#{self.class} schema=#{schema.inspect} rules=#{rules.inspect}>)
       end
+
+      private
+
+      # @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?
+      end
+
+      # Get a registered macro
+      #
+      # @return [Proc,#to_proc]
+      #
+      # @api private
+      def macro(name)
+        macros.key?(name) ? macros[name] : Macros[name]
+      end
     end
   end
 end

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

@@ -10,6 +10,8 @@ module Dry
     class Contract
       # Contract's class interface
       #
+      # @see Contract
+      #
       # @api public
       module ClassInterface
         # @api private
@@ -20,6 +22,11 @@ module Dry
 
         # Configuration
         #
+        # @example
+        #   class MyContract < Dry::Validation::Contract
+        #     config.messages.backend = :i18n
+        #   end
+        #
         # @return [Config]
         #
         # @api public
@@ -27,11 +34,42 @@ module Dry
           @config ||= Validation::Config.new
         end
 
+        # Return macros registered for this class
+        #
+        # @return [Macros::Container]
+        #
+        # @api public
+        def macros
+          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
         #
         # @return [Dry::Schema::Params]
+        # @see https://dry-rb.org/gems/dry-schema/params/
         #
         # @api public
         def params(&block)
@@ -43,6 +81,7 @@ module Dry
         # This type of schema is suitable for JSON data
         #
         # @return [Dry::Schema::JSON]
+        # @see https://dry-rb.org/gems/dry-schema/json/
         #
         # @api public
         def json(&block)
@@ -54,6 +93,7 @@ module Dry
         # This type of schema does not offer coercion out of the box
         #
         # @return [Dry::Schema::Processor]
+        # @see https://dry-rb.org/gems/dry-schema/
         #
         # @api public
         def schema(&block)
@@ -72,19 +112,31 @@ module Dry
         #     failure('please provide a valid street address') if valid_street?(values[:street])
         #   end
         #
-        # @return [Array<Rule>]
+        # @return [Rule]
         #
         # @api public
         def rule(*keys, &block)
-          rules << Rule.new(keys: keys, block: block)
-          rules
+          Rule.new(keys: keys, block: block).tap do |rule|
+            rules << rule
+          end
         end
 
         # A shortcut that can be used to define contracts that won't be reused or inherited
         #
+        # @example
+        #   my_contract = Dry::Validation::Contract.build do
+        #     params do
+        #       required(:name).filled(:string)
+        #     end
+        #   end
+        #
+        #   my_contract.call(name: "Jane")
+        #
+        # @return [Contract]
+        #
         # @api public
-        def build(option = nil, &block)
-          Class.new(self, &block).new(option)
+        def build(options = EMPTY_HASH, &block)
+          Class.new(self, &block).new(options)
         end
 
         # @api private
@@ -92,6 +144,10 @@ module Dry
           @__schema__ if defined?(@__schema__)
         end
 
+        # Return rules defined in this class
+        #
+        # @return [Array<Rule>]
+        #
         # @api private
         def rules
           @rules ||= EMPTY_ARRAY
@@ -99,6 +155,10 @@ module Dry
             .concat(superclass.respond_to?(:rules) ? superclass.rules : EMPTY_ARRAY)
         end
 
+        # Return messages configured for this class
+        #
+        # @return [Dry::Schema::Messages]
+        #
         # @api private
         def messages
           @messages ||= Schema::Messages.setup(config.messages)

data/lib/dry/validation/evaluator.rb

@@ -11,7 +11,7 @@ module Dry
     # method calls to the contracts, so that you can use your contract
     # methods within rule blocks
     #
-    # @api private
+    # @api public
     class Evaluator
       extend Dry::Initializer
 
@@ -64,9 +64,14 @@ module Dry
       #   @api private
       option :keys
 
+      # @!attribute [r] macros
+      #   @return [Array<Symbol>]
+      #   @api private
+      option :macros, optional: true, default: proc { EMPTY_ARRAY.dup }
+
       # @!attribute [r] _context
       #   @return [Concurrent::Map]
-      #   @api public
+      #   @api private
       option :_context
 
       # @!attribute [r] path
@@ -84,10 +89,15 @@ module Dry
       # @api private
       def initialize(*args, &block)
         super(*args)
-        instance_exec(_context, &block)
+
+        instance_exec(_context, &block) if block
+
+        macros.each do |macro|
+          instance_exec(_context, &macro(macro))
+        end
       end
 
-      # Get failures object for the default or provided path
+      # Get `Failures` object for the default or provided path
       #
       # @param [Symbol,String,Hash,Array<Symbol>] path
       #
@@ -100,7 +110,7 @@ module Dry
         (@key ||= EMPTY_HASH.dup)[path] ||= Failures.new(path)
       end
 
-      # Get failures object for base errors
+      # Get `Failures` object for base errors
       #
       # @return [Failures]
       #
@@ -123,6 +133,15 @@ module Dry
         failures
       end
 
+      # Return default (first) key name
+      #
+      # @return [Symbol]
+      #
+      # @api public
+      def key_name
+        @key_name ||= keys.first
+      end
+
       # @api private
       def respond_to_missing?(meth, include_private = false)
         super || _contract.respond_to?(meth, true)

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

@@ -4,7 +4,7 @@ require 'dry/monads/result'
 
 module Dry
   module Validation
-    # Hints extension for contract results
+    # Hints extension
     #
     # @example
     #   Dry::Validation.load_extensions(:hints)
@@ -23,33 +23,41 @@ module Dry
     #
     # @api public
     module Hints
+      # Hints extensions for Result
+      #
+      # @api public
       module ResultExtensions
         # Return error messages excluding hints
         #
+        # @macro errors-options
         # @return [MessageSet]
         #
         # @api public
-        def errors(new_opts = EMPTY_HASH)
-          opts = new_opts.merge(hints: false)
+        def errors(new_options = EMPTY_HASH)
+          opts = new_options.merge(hints: false)
           @errors.with(schema_errors(opts), opts)
         end
 
         # Return errors and hints
         #
+        # @macro errors-options
+        #
         # @return [MessageSet]
         #
         # @api public
-        def messages(new_opts = EMPTY_HASH)
-          errors.with(hints.to_a, options.merge(**new_opts))
+        def messages(new_options = EMPTY_HASH)
+          errors.with(hints.to_a, options.merge(**new_options))
         end
 
         # Return hint messages
         #
+        # @macro errors-options
+        #
         # @return [MessageSet]
         #
         # @api public
-        def hints(new_opts = EMPTY_HASH)
-          values.hints(new_opts)
+        def hints(new_options = EMPTY_HASH)
+          schema_result.hints(new_options)
         end
       end
 

data/lib/dry/validation/macros.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'dry/container'
+
+module Dry
+  module Validation
+    # API for registering and accessing Rule macros
+    #
+    # @api public
+    module Macros
+      # Registry for macros
+      #
+      # @api public
+      class Container
+        include Dry::Container::Mixin
+
+        # Register a new macro
+        #
+        # @example in a contract class
+        #   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(name, &block)
+          super(name, block, call: false)
+          self
+        end
+      end
+
+      # Return a registered macro
+      #
+      # @param [Symbol] name The name of the macro
+      #
+      # @return [Proc]
+      #
+      # @api public
+      def self.[](name)
+        container[name]
+      end
+
+      # Register a global macro
+      #
+      # @see Container#register
+      #
+      # @return [Macros]
+      #
+      # @api public
+      def self.register(*args, &block)
+        container.register(*args, &block)
+        self
+      end
+
+      # @api private
+      def self.container
+        @container ||= Container.new
+      end
+    end
+
+    # Acceptance macro
+    #
+    # @api public
+    Macros.register(:acceptance) do
+      key.failure(:acceptance, key: key_name) unless values[key_name].equal?(true)
+    end
+  end
+end

data/lib/dry/validation/message.rb

@@ -13,20 +13,43 @@ module Dry
     class Message < Schema::Message
       include Dry::Equalizer(:text, :path, :meta)
 
-      # @!attribute [r] text
-      #   @return [String] text The error message text
+      # The error message text
+      #
+      # @return [String] text
+      #
+      # @api public
       attr_reader :text
 
-      # @!attribute [r] path
-      #   @return [Array<Symbol, Integer>] path The path to the value with the error
+      # The path to the value with the error
+      #
+      # @return [Array<Symbol, Integer>]
+      #
+      # @api public
       attr_reader :path
 
-      # @!attribute [r] meta
-      #   @return [Hash] meta Optional hash with meta-data
+      # Optional hash with meta-data
+      #
+      # @return [Hash]
+      #
+      # @api public
       attr_reader :meta
 
+      # A localized message type
+      #
+      # Localized messsages can be translated to other languages at run-time
+      #
       # @api public
       class Localized < Message
+        # Evaluate message text using provided locale
+        #
+        # @example
+        #   result.errors[:email].evaluate(locale: :en, full: true)
+        #   # "email is invalid"
+        #
+        # @param [Hash] opts
+        # @option opts [Symbol] :locale Which locale to use
+        # @option opts [Boolean] :full Whether message text should include the key name
+        #
         # @api public
         def evaluate(**opts)
           evaluated_text, rest = text.(opts)
@@ -38,7 +61,7 @@ module Dry
       #
       # @return [Message, Message::Localized]
       #
-      # @api public
+      # @api private
       def self.[](text, path, meta)
         klass = text.respond_to?(:call) ? Localized : Message
         klass.new(text, path: path, meta: meta)

data/lib/dry/validation/message_set.rb

@@ -11,15 +11,18 @@ module Dry
     #
     # @api public
     class MessageSet < Schema::MessageSet
-      # @!attribute [r] source
-      #   Return the source set of messages used to produce final evaluated messages
-      #   @return [Array<Message, Message::Localized, Schema::Message>]
-      #   @api private
+      # Return the source set of messages used to produce final evaluated messages
+      #
+      # @return [Array<Message, Message::Localized, Schema::Message>]
+      #
+      # @api private
       attr_reader :source_messages
 
-      # @!attribute [r] locale
-      #   @return [Symbol] locale
-      #   @api public
+      # Configured locale
+      #
+      # @return [Symbol]
+      #
+      # @api public
       attr_reader :locale
 
       # @api private
@@ -64,10 +67,10 @@ module Dry
       # may need.
       #
       # @example get a list of base messages
-      #   message_set = contract.(input).message_set
+      #   message_set = contract.(input).errors
       #   message_set.filter(:base?)
       #
-      # @param [Array<Symbol>] *predicates
+      # @param [Array<Symbol>] predicates
       #
       # @return [MessageSet]
       #

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

@@ -42,6 +42,10 @@ module Dry
             meta = message.dup
             text = meta.delete(:text)
             call(message: text, tokens: tokens, path: path, meta: meta)
+          else
+            raise ArgumentError, <<~STR
+              +message+ must be either a Symbol, String or Hash (#{message.inspect} given)
+            STR
           end
         end
         alias_method :[], :call

data/lib/dry/validation/result.rb

@@ -5,6 +5,7 @@ require 'dry/equalizer'
 
 require 'dry/validation/constants'
 require 'dry/validation/message_set'
+require 'dry/validation/values'
 
 module Dry
   module Validation
@@ -12,46 +13,67 @@ module Dry
     #
     # @api public
     class Result
-      include Dry::Equalizer(:values, :context, :errors)
+      include Dry::Equalizer(:schema_result, :context, :errors, inspect: false)
 
       # Build a new result
       #
-      # @param [Dry::Schema::Result]
+      # @param [Dry::Schema::Result] schema_result
       #
       # @api private
-      def self.new(values, context = ::Concurrent::Map.new, options = EMPTY_HASH)
+      def self.new(schema_result, context = ::Concurrent::Map.new, options = EMPTY_HASH)
         result = super
         yield(result) if block_given?
         result.freeze
       end
 
-      # @!attribute [r] values
-      #   @return [Dry::Schema::Result]
-      #   @api private
-      attr_reader :values
-
-      # @!attribute [r] context
-      #   @return [Concurrent::Map]
-      #   @api public
+      # Context that's shared between rules
+      #
+      # @return [Concurrent::Map]
+      #
+      # @api public
       attr_reader :context
 
-      # @!attribute [r] options
-      #   @return [Hash]
-      #   @api private
+      # Result from contract's schema
+      #
+      # @return [Dry::Schema::Result]
+      #
+      # @api private
+      attr_reader :schema_result
+
+      # Result options
+      #
+      # @return [Hash]
+      #
+      # @api private
       attr_reader :options
 
       # Initialize a new result
       #
       # @api private
-      def initialize(values, context, options)
-        @values = values
+      def initialize(schema_result, context, options)
+        @schema_result = schema_result
         @context = context
         @options = options
         @errors = initialize_errors
       end
 
+      # Return values wrapper with the input processed by schema
+      #
+      # @return [Values]
+      #
+      # @api public
+      def values
+        @values ||= Values.new(schema_result.to_h)
+      end
+
       # Get error set
       #
+      # @!macro errors-options
+      #   @param [Hash] new_options
+      #   @option new_options [Symbol] :locale Set locale for messages
+      #   @option new_options [Boolean] :hints Enable/disable hints
+      #   @option new_options [Boolean] :full Get messages that include key names
+      #
       # @return [MessageSet]
       #
       # @api public
@@ -81,7 +103,7 @@ module Dry
       #
       # @api private
       def error?(key)
-        values.error?(key)
+        schema_result.error?(key)
       end
 
       # Add a new error for the provided key
@@ -136,6 +158,7 @@ module Dry
       #
       # @api private
       def freeze
+        values.freeze
         errors.freeze
         super
       end
@@ -149,7 +172,7 @@ module Dry
 
       # @api private
       def schema_errors(options)
-        values.message_set(options).to_a
+        schema_result.message_set(options).to_a
       end
     end
   end

data/lib/dry/validation/rule.rb

@@ -3,22 +3,34 @@
 require 'dry/equalizer'
 require 'dry/initializer'
 
+require 'dry/validation/constants'
+
 module Dry
   module Validation
-    # Rules are created by contracts
+    # Rules capture configuration and evaluator blocks
+    #
+    # When a rule is applied, it creates an `Evaluator` using schema result and its
+    # block will be evaluated in the context of the evaluator.
+    #
+    # @see Contract#rule
     #
-    # @api private
+    # @api public
     class Rule
       include Dry::Equalizer(:keys, :block, inspect: false)
 
       extend Dry::Initializer
 
-      # @!atrribute [r] keys
+      # @!attribute [r] keys
       #   @return [Array<Symbol, String, Hash>]
       #   @api private
       option :keys
 
-      # @!atrribute [r] block
+      # @!attribute [r] macros
+      #   @return [Array<Symbol>]
+      #   @api private
+      option :macros, default: proc { EMPTY_ARRAY.dup }
+
+      # @!attribute [r] block
       #   @return [Proc]
       #   @api private
       option :block
@@ -27,11 +39,26 @@ module Dry
       #
       # @param [Contract] contract
       # @param [Result] result
-      # @param [Concurrent::Map] context
       #
       # @api private
-      def call(contract, result, context)
-        Evaluator.new(contract, values: result, keys: keys, _context: context, &block)
+      def call(contract, result)
+        Evaluator.new(
+          contract,
+          values: result.values, keys: keys, macros: macros, _context: result.context,
+          &block
+        )
+      end
+
+      # Define which macros should be executed
+      #
+      # @see Contract#rule
+      # @return [Rule]
+      #
+      # @api public
+      def validate(*macros, &block)
+        @macros = macros
+        @block = block if block
+        self
       end
 
       # Return a nice string representation

data/lib/dry/validation/values.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'dry/equalizer'
+
+module Dry
+  module Validation
+    # A convenient wrapper for data processed by schemas
+    #
+    # Values are available within the rule blocks. They act as hash-like
+    # objects and expose a convenient API for accessing data.
+    #
+    # @api public
+    class Values
+      include Enumerable
+      include Dry::Equalizer(:data)
+
+      # Schema's result output
+      #
+      # @return [Hash]
+      #
+      # @api private
+      attr_reader :data
+
+      # @api private
+      def initialize(data)
+        @data = data
+      end
+
+      # Read from the provided key
+      #
+      # @example
+      #   rule(:age) do
+      #     key.failure('must be > 18') if values[:age] <= 18
+      #   end
+      #
+      # @param [Symbol] key
+      #
+      # @return [Object]
+      #
+      # @api public
+      def [](key)
+        data[key]
+      end
+
+      # @api private
+      def respond_to_missing?(meth, include_private = false)
+        super || data.respond_to?(meth, include_private)
+      end
+
+      private
+
+      # @api private
+      def method_missing(meth, *args, &block)
+        if data.respond_to?(meth)
+          data.public_send(meth, *args, &block)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/dry/validation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -70,22 +70,16 @@ dependencies:
   name: dry-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +132,7 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
+- config/errors.yml
 - lib/dry-validation.rb
 - lib/dry/validation.rb
 - lib/dry/validation/config.rb
@@ -147,11 +142,13 @@ files:
 - lib/dry/validation/evaluator.rb
 - lib/dry/validation/extensions/hints.rb
 - lib/dry/validation/extensions/monads.rb
+- lib/dry/validation/macros.rb
 - lib/dry/validation/message.rb
 - lib/dry/validation/message_set.rb
 - lib/dry/validation/messages/resolver.rb
 - lib/dry/validation/result.rb
 - lib/dry/validation/rule.rb
+- lib/dry/validation/values.rb
 - lib/dry/validation/version.rb
 homepage: https://dry-rb.org/gems/dry-validation
 licenses: