dry-validation 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7acb8c840fe5a4c12564c86985078e25cff1bea877b9e2dc4f29b39bc892b6a5
-  data.tar.gz: ae09dc37911b0e4031918f22efabd53035501119a71da60ce08b4e0a00a3e0b6
+  metadata.gz: 3821e92d2dced61bb892e20a5e5d69b596128fcdbd05596e41fff8716767b08c
+  data.tar.gz: f797d5e46604e777966cb3d9a7a4032265227684164224a8ff109fc8ba51d1c1
 SHA512:
-  metadata.gz: 9430d9ca1660c3d280dd5c32f1787bce32c06c38ecd22987f53ccce8b581debce2679b95dc3b2eb9a96598d16c2dc0d99f5b65aa26de14fe0f2a03c5bb822a87
-  data.tar.gz: a07ad85054ae898cd155db7874219332e58956f57904c1dde445d27d34aa81aa2b7d1a431e6218f6aa320bfdb0e0fffd20fd619a98991929b12c1f643326c77a
+  metadata.gz: 7504498b77c794b9fe37e0384fba50a8fb6c99e3fecd3423e66fe018006288b3ba1a5a7a2232fb53dede256ba0a13630313748a0214b4a0d9865fc22c0b9edae
+  data.tar.gz: 654233d365e7844985f465e16335a234a2d5c2c240b97a485d286a52e6229e3ee80d8719e76d3ec95fe393d75f480617452b7813cb36b4b033021f9b98958461

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+# v1.1.1 2019-06-24
+
+### Fixed
+
+* `Rule#each` works with array values from nested hashes (@mustardnoise)
+
+[Compare v1.1.0...v1.1.1](https://github.com/dry-rb/dry-validation/compare/v1.1.0...v1.1.1)
+
+# 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.
@@ -12,7 +34,7 @@ See [the list of all addressed issues](https://github.com/dry-rb/dry-validation/
 - 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/v1.13.3...v1.0.0)
+[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)
 

data/lib/dry/validation.rb

@@ -41,9 +41,12 @@ module Dry
     # @return [Contract]
     #
     # @api public
+    #
+    # rubocop:disable Naming/MethodName
     def self.Contract(options = EMPTY_HASH, &block)
       Contract.build(options, &block)
     end
+    # rubocop:enable Naming/MethodName
 
     # This is needed by Macros::Registrar
     #

data/lib/dry/validation/constants.rb

@@ -11,6 +11,12 @@ module Dry
     # Root path is used for base errors in hash representation of error messages
     ROOT_PATH = [nil].freeze
 
+    # Path to the default errors locale file
+    DEFAULT_ERRORS_NAMESPACE = 'dry_validation'
+
+    # Path to the default errors locale file
+    DEFAULT_ERRORS_PATH = Pathname(__FILE__).join('../../../../config/errors.yml').realpath.freeze
+
     # Mapping for block kwarg options used by block_options
     #
     # @see Rule#block_options

data/lib/dry/validation/contract.rb

@@ -54,8 +54,8 @@ module Dry
       extend Dry::Initializer
       extend ClassInterface
 
-      config.messages.top_namespace = 'dry_validation'
-      config.messages.load_paths << Pathname(__FILE__).join('../../../../config/errors.yml').realpath
+      config.messages.top_namespace = DEFAULT_ERRORS_NAMESPACE
+      config.messages.load_paths << DEFAULT_ERRORS_PATH
 
       # @!attribute [r] config
       #   @return [Config] Contract's configuration object
@@ -118,7 +118,9 @@ 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

data/lib/dry/validation/evaluator.rb

@@ -147,6 +147,22 @@ module Dry
         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

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

@@ -49,6 +49,8 @@ module Dry
         # @return [String]
         #
         # @api public
+        #
+        # rubocop:disable Metrics/AbcSize
         def message(rule, tokens: EMPTY_HASH, locale: nil, full: false, path:)
           keys = path.to_a.compact
           msg_opts = tokens.merge(path: keys, locale: locale || messages.default_locale)
@@ -70,6 +72,7 @@ module Dry
 
           [full ? "#{messages.rule(keys.last, msg_opts)} #{text}" : text, meta]
         end
+        # rubocop:enable Metrics/AbcSize
       end
     end
   end

data/lib/dry/validation/result.rb

@@ -148,9 +148,9 @@ module Dry
       # @api public
       def inspect
         if context.empty?
-          "#<#{self.class}#{to_h.inspect} errors=#{errors.to_h.inspect}>"
+          "#<#{self.class}#{to_h} errors=#{errors.to_h}>"
         else
-          "#<#{self.class}#{to_h.inspect} errors=#{errors.to_h.inspect} context=#{context.each.to_h.inspect}>"
+          "#<#{self.class}#{to_h} errors=#{errors.to_h} context=#{context.each.to_h}>"
         end
       end
 

data/lib/dry/validation/rule.rb

@@ -54,7 +54,7 @@ module Dry
       #
       # @api public
       def validate(*macros, &block)
-        @macros = macros.map { |spec| Array(spec) }.map(&:flatten)
+        @macros = parse_macros(*macros)
         @block = block if block
         self
       end
@@ -68,17 +68,22 @@ module Dry
       #   rule(:nums).each do
       #     key.failure("must be greater than 0") if value < 0
       #   end
+      #   rule(:nums).each(min: 3)
+      #   rule(address: :city) do
+      #      key.failure("oops") if value != 'Munich'
+      #   end
       #
       # @return [Rule]
       #
       # @api public
       def each(*macros, &block)
-        root = keys
+        root = keys[0]
+        macros = parse_macros(*macros)
         @keys = []
 
         @block = proc do
-          values[root].each_with_index do |_, idx|
-            path = [*root, idx]
+          (values[root] || []).each_with_index do |_, idx|
+            path = [*Schema::Path[root].to_a, idx]
 
             next if result.error?(path)
 
@@ -99,6 +104,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,7 @@
 # frozen_string_literal: true
 
 require 'dry/equalizer'
+require 'dry/schema/path'
 require 'dry/validation/constants'
 
 module Dry
@@ -40,17 +41,39 @@ module Dry
       #
       # @api public
       def [](*args)
-        if args.size.equal?(1)
-          case (key = args[0])
-          when Symbol then data[key]
-          when String then self[*key.split(DOT).map(&:to_sym)]
-          when Array then self[*key]
+        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
-            raise ArgumentError, '+key+ must be a symbol, string, array, or a list of keys for dig'
+            return false unless a.is_a?(Array) ? (e >= 0 && e < a.size) : a.key?(e)
           end
-        else
-          data.dig(*args)
+          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'
+    VERSION = '1.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby