dry-validation 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4985e6191e9e249b510fceea630ed463f11c5ff07830e6f3f867e913b29860ac
-  data.tar.gz: 99cb37716fb12f4a09bb94a4048935e6ac8db658df4d5a4318be321c5aef90ff
+  metadata.gz: 3821e92d2dced61bb892e20a5e5d69b596128fcdbd05596e41fff8716767b08c
+  data.tar.gz: f797d5e46604e777966cb3d9a7a4032265227684164224a8ff109fc8ba51d1c1
 SHA512:
-  metadata.gz: 2d25a5df6a56b6a8ed32f19ed3991297f2d878d24ba5349fd8c8d0ec50a3503842c8b591d7b176ddf9303b78a847002e638faeb29691329db3b2f41d2379116b
-  data.tar.gz: a21649e2476c688f9a4275e43819640823c6e6a2caf18e4b8d03c0df97c946d5edbb517c6482918bf3b3b9bc21079e667c06986c2adc81acdeb0561b1bc264aa
+  metadata.gz: 7504498b77c794b9fe37e0384fba50a8fb6c99e3fecd3423e66fe018006288b3ba1a5a7a2232fb53dede256ba0a13630313748a0214b4a0d9865fc22c0b9edae
+  data.tar.gz: 654233d365e7844985f465e16335a234a2d5c2c240b97a485d286a52e6229e3ee80d8719e76d3ec95fe393d75f480617452b7813cb36b4b033021f9b98958461

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 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

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/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

@@ -69,18 +69,21 @@ module Dry
       #     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)
 

data/lib/dry/validation/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Validation
-    VERSION = '1.1.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.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-14 00:00:00.000000000 Z
+date: 2019-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby