dry-validation 1.0.0.beta2 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 705706b2bc77cae54a87647ce3d85d685aa2fe619e40950533e1d96a513d1ca0
-  data.tar.gz: a0ad40a08b44475bafa4510707870603517145602e5567bb10cd39f98a1895af
+  metadata.gz: 97e07b84e6d69b8ff4c887a633dba3862ebb44219d1aa36b0a4394e08761b8e0
+  data.tar.gz: 18a796e79f03f85f288307038a29c913a0340e6a1c77e2b6b138b96397b0aff9
 SHA512:
-  metadata.gz: 7f2a5347e9b057d76cf9d99c0c313c7437133c1884e750a6c54d095e00f66eb600d7d79a033c2ba561a32c92b783c3153cbd8d88e62c715cd75e9d238f2a034a
-  data.tar.gz: 0a6312efffe80b0156da48da466a9c4384e0b636ef34a93587097592e72a9a2d72f9503e8aa6e556399fc8ad9a18399cc1e5fea2ddb9e66b6268509fcb796d4a
+  metadata.gz: f3f8fd949d909e6823c5e5aced8fb055eec20263f06247b98e066187efc57a1e987b0c016f472b99693a79191aafc64c63b0ec68d64ef8148b2f4901a861335f
+  data.tar.gz: c146b67aaab383aa39f908b3e487fa249f7eeb9d13b7e2c165a2c845cb5450775c52f3fc3811a900d6a1c2a2e36fc79fc002b2c04a843d0fa1e635888abb7e6a

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+# v1.0.0.rc1 2019-04-26
+
+### Added
+
+* `:hints` extension is back (solnic)
+* `Result` objects have access to the context object which is shared between rules (flash-gordon)
+
+### Fixed
+
+* Multiple hint messages no longer crash message set (flash-gordon)
+* `Contract#inspect` no longer crashes (solnic)
+
+### Changed
+
+* Dependency on `dry-schema` was bumped to `~> 0.6` - this pulls in `dry-types 1.0.0` and `dry-logic 1.0.0` (solnic)
+* Dependency on `dry-initializer` was bumped to `~> 3.0` (solnic)
+
+[Compare v1.0.0.beta2...v1.0.0.rc1](https://github.com/dry-rb/dry-validation/compare/v1.0.0.beta2...v1.0.0.rc1)
+
 # v1.0.0.beta2 2019-04-04
 
 ### Added

data/lib/dry/validation.rb

@@ -12,5 +12,9 @@ module Dry
     register_extension(:monads) do
       require 'dry/validation/extensions/monads'
     end
+
+    register_extension(:hints) do
+      require 'dry/validation/extensions/hints'
+    end
   end
 end

data/lib/dry/validation/contract.rb

@@ -25,7 +25,7 @@ module Dry
     # your rules.
     #
     # @example
-    #   class NewUser < Dry::Validation::Contract
+    #   class NewUserContract < Dry::Validation::Contract
     #     params do
     #       required(:email).filled(:string)
     #       required(:age).filled(:integer)
@@ -35,11 +35,11 @@ module Dry
     #     end
     #
     #     rule(:password) do
-    #       failure('is required') if values[:login] && !values[:password]
+    #       key.failure('is required') if values[:login] && !values[:password]
     #     end
     #
     #     rule(:age) do
-    #       failure('must be greater or equal 18') if values[:age] < 18
+    #       key.failure('must be greater or equal 18') if values[:age] < 18
     #     end
     #   end
     #
@@ -48,7 +48,7 @@ module Dry
     #
     # @api public
     class Contract
-      include Dry::Equalizer(:schema, :rules, :messages)
+      include Dry::Equalizer(:schema, :rules, :messages, inspect: false)
 
       extend Dry::Initializer
       extend ClassInterface
@@ -86,18 +86,25 @@ module Dry
       #
       # @api public
       def call(input)
-        Result.new(schema.(input), locale: locale) do |result|
-          context = Concurrent::Map.new
-
+        Result.new(schema.(input), Concurrent::Map.new, locale: locale) do |result|
           rules.each do |rule|
             next if rule.keys.any? { |key| result.error?(key) }
 
-            rule.(self, result, context).failures.each do |failure|
+            rule.(self, result, result.context).failures.each do |failure|
               result.add_error(message_resolver[failure])
             end
           end
         end
       end
+
+      # Return a nice string representation
+      #
+      # @return [String]
+      #
+      # @api public
+      def inspect
+        %(#<#{self.class} schema=#{schema.inspect} rules=#{rules.inspect}>)
+      end
     end
   end
 end

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'dry/monads/result'
+
+module Dry
+  module Validation
+    # Hints extension for contract results
+    #
+    # @example
+    #   Dry::Validation.load_extensions(:hints)
+    #
+    #   contract = Dry::Validation::Contract.build do
+    #     schema do
+    #       required(:name).filled(:string, min_size?: 2..4)
+    #     end
+    #   end
+    #
+    #   contract.call(name: "fo").hints
+    #   # {:name=>["size must be within 2 - 4"]}
+    #
+    #   contract.call(name: "").messages
+    #   # {:name=>["must be filled", "size must be within 2 - 4"]}
+    #
+    # @api public
+    module Hints
+      module ResultExtensions
+        # Return error messages excluding hints
+        #
+        # @return [MessageSet]
+        #
+        # @api public
+        def errors(new_opts = EMPTY_HASH)
+          opts = new_opts.merge(hints: false)
+          @errors.with(schema_errors(opts), opts)
+        end
+
+        # Return errors and hints
+        #
+        # @return [MessageSet]
+        #
+        # @api public
+        def messages(new_opts = EMPTY_HASH)
+          errors.with(hints.to_a, options.merge(**new_opts))
+        end
+
+        # Return hint messages
+        #
+        # @return [MessageSet]
+        #
+        # @api public
+        def hints(new_opts = EMPTY_HASH)
+          values.hints(new_opts)
+        end
+      end
+
+      Dry::Schema.load_extensions(:hints)
+
+      Result.prepend(ResultExtensions)
+    end
+  end
+end

data/lib/dry/validation/message_set.rb

@@ -25,7 +25,7 @@ module Dry
       # @api private
       def initialize(messages, options = EMPTY_HASH)
         @locale = options.fetch(:locale, :en)
-        @source_messages = options.fetch(:source, messages.dup)
+        @source_messages = options.fetch(:source) { messages.dup }
         super
       end
 
@@ -38,7 +38,7 @@ module Dry
         return self if new_options.empty?
 
         self.class.new(
-          other + select { |err| err.is_a?(Message) },
+          (other + select { |err| err.is_a?(Message) }).uniq,
           options.merge(source: source_messages, **new_options)
         ).freeze
       end
@@ -101,7 +101,7 @@ module Dry
       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.size > 1 ? node[0] : node) << msg.dump
+          (node[0].is_a?(::Array) ? node[0] : node) << msg.dump
           hash
         }
       end

data/lib/dry/validation/result.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'concurrent/map'
 require 'dry/equalizer'
 
 require 'dry/validation/constants'
@@ -11,14 +12,14 @@ module Dry
     #
     # @api public
     class Result
-      include Dry::Equalizer(:values, :errors)
+      include Dry::Equalizer(:values, :context, :errors)
 
       # Build a new result
       #
       # @param [Dry::Schema::Result]
       #
       # @api private
-      def self.new(values, options = EMPTY_HASH)
+      def self.new(values, context = ::Concurrent::Map.new, options = EMPTY_HASH)
         result = super
         yield(result) if block_given?
         result.freeze
@@ -29,6 +30,11 @@ module Dry
       #   @api private
       attr_reader :values
 
+      # @!attribute [r] context
+      #   @return [Concurrent::Map]
+      #   @api public
+      attr_reader :context
+
       # @!attribute [r] options
       #   @return [Hash]
       #   @api private
@@ -37,8 +43,9 @@ module Dry
       # Initialize a new result
       #
       # @api private
-      def initialize(values, options)
+      def initialize(values, context, options)
         @values = values
+        @context = context
         @options = options
         @errors = initialize_errors
       end
@@ -51,7 +58,6 @@ module Dry
       def errors(new_options = EMPTY_HASH)
         new_options.empty? ? @errors : @errors.with(schema_errors(new_options), new_options)
       end
-      alias_method :messages, :errors
 
       # Check if result is successful
       #
@@ -82,7 +88,7 @@ module Dry
       #
       # @api private
       def add_error(error)
-        errors.add(error)
+        @errors.add(error)
         self
       end
 
@@ -119,7 +125,11 @@ module Dry
       #
       # @api public
       def inspect
-        "#<#{self.class}#{to_h.inspect} errors=#{errors.to_h.inspect}>"
+        if context.empty?
+          "#<#{self.class}#{to_h.inspect} errors=#{errors.to_h.inspect}>"
+        else
+          "#<#{self.class}#{to_h.inspect} errors=#{errors.to_h.inspect} context=#{context.each.to_h.inspect}>"
+        end
       end
 
       # Freeze result and its error set

data/lib/dry/validation/rule.rb

@@ -9,7 +9,7 @@ module Dry
     #
     # @api private
     class Rule
-      include Dry::Equalizer(:name, :block)
+      include Dry::Equalizer(:keys, :block, inspect: false)
 
       extend Dry::Initializer
 
@@ -33,6 +33,15 @@ module Dry
       def call(contract, result, context)
         Evaluator.new(contract, values: result, keys: keys, _context: context, &block)
       end
+
+      # Return a nice string representation
+      #
+      # @return [String]
+      #
+      # @api public
+      def inspect
+        %(#<#{self.class} keys=#{keys.inspect}>)
+      end
     end
   end
 end

data/lib/dry/validation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -64,34 +58,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: dry-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +145,7 @@ files:
 - lib/dry/validation/contract.rb
 - lib/dry/validation/contract/class_interface.rb
 - lib/dry/validation/evaluator.rb
+- lib/dry/validation/extensions/hints.rb
 - lib/dry/validation/extensions/monads.rb
 - lib/dry/validation/message.rb
 - lib/dry/validation/message_set.rb