dry-validation 1.0.0.alpha1 → 1.0.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60a3c6ffd96f85afae4533e24216f467888d9f3bfdb3d1f01e78b292a5cceb92
-  data.tar.gz: c6e27c162c638614e9fb876f11c8f5dde26ecc2b06edbaef62c14f6a23fd1b1d
+  metadata.gz: 288a3f0d9af21271cfeb794d48752ba6bfa93c8e4fa088e8faa9f6eb9a05e083
+  data.tar.gz: 1949525da40fb528c5eda20c610a5c017c260600613ba4fc392f23cd6a84a8d7
 SHA512:
-  metadata.gz: 884c2d19f7de54aec614eaf90c6a11040c48f5c267482f09e6b86f8439871b7df6403762cb7885eb238d1dae0835f315abc7bbae6ff84208ea024ec33dcb93c4
-  data.tar.gz: bf22f2906b4d9892015b58c1c0f637b10d82f5f63770a703c1b92e8d105fb3f44b7a9d822c20ffc4bacc1a63e882f13303157c13fdd6c2a65a1c42e0931195fb
+  metadata.gz: f4884bb2c55f0b987b0aad70bceaedc0d1bc5adc5056bd47e9606e126a9ce9bcb450f5ec7c2035b35572eb4677c4ee0c1525856fe83866b07bf559a75b97a260
+  data.tar.gz: f8f79772a1950752dfa03204269df85d7480c52114c4369d2e895e1edd02b6f02ee3bc03049a2c4ed0994042b104b82dd0e22fcb1c31882b7b0c741d414c8ae1

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# v1.0.0.alpha2 2019-03-05
+
+First round of bug fixes. Thanks for testing <3!
+
+### Fixed
+
+* Errors with nested messages are correctly built (flash-gordon)
+* Messages for nested keys are correctly resolved (solnic)
+* A message for a nested key is resolved when it's defined under `errors.rule.%{key}` too, but a message under nested key will override it (solnic)
+
+### Changed
+
+* When a message template is not found a more meaningful error is raised that includes both rule identifier and key path (solnic)
+
+[Compare v1.0.0.alpha1...v1.0.0.alpha2](https://github.com/dry-rb/dry-validation/compare/v1.0.0.alpha1...v1.0.0.alpha2)
+
 # v1.0.0.alpha1 2019-03-04
 
 Complete rewrite on top of `dry-schema`.
@@ -26,7 +42,7 @@ Complete rewrite on top of `dry-schema`.
 
 ### Changed
 
-* [internal] dyr-logic was pinned to `~> 0.4.2` (flash-gordon)
+* [internal] dry-logic was pinned to `~> 0.4.2` (flash-gordon)
 
 [Compare v0.12.2...v0.12.3](https://github.com/dry-rb/dry-validation/compare/v0.12.2...v0.12.3)
 

data/lib/dry/validation/constants.rb

@@ -6,6 +6,8 @@ module Dry
   module Validation
     include Dry::Core::Constants
 
+    DOT = '.'
+
     MissingMessageError = Class.new(StandardError)
     DuplicateSchemaError = Class.new(StandardError)
   end

data/lib/dry/validation/contract.rb

@@ -119,13 +119,19 @@ module Dry
       #
       # @api private
       def message(key, tokens: EMPTY_HASH, **opts)
-        template = messages[key, opts.merge(tokens)]
+        msg_opts = opts.merge(tokens)
+        rule_path = Array(opts.fetch(:rule)).flatten
 
-        if template
-          template.(template.data(tokens))
-        else
-          raise MissingMessageError, "Message template for #{key.inspect} was not found"
+        template = messages[key, msg_opts.merge(rule: rule_path.join(DOT))]
+        template ||= messages[key, msg_opts.merge(rule: rule_path.last)]
+
+        unless template
+          raise MissingMessageError, <<~STR
+            Message template for #{key.inspect} under #{rule_path.join(DOT).inspect} was not found
+          STR
         end
+
+        template.(template.data(tokens))
       end
     end
   end

data/lib/dry/validation/result.rb

@@ -74,7 +74,7 @@ module Dry
       #
       # @api private
       def add_error(key, message)
-        (errors[key] ||= EMPTY_ARRAY.dup) << message
+        add_to(errors, key, message)
         self
       end
 
@@ -86,7 +86,13 @@ module Dry
       #
       # @api public
       def [](key)
-        values.key?(key) && values[key] || storage.key?(key) && storage[key]
+        if values.key?(key)
+          values[key]
+        elsif storage.key?(key)
+          storage[key]
+        else
+          nil
+        end
       end
 
       # Store value under specified key
@@ -142,6 +148,17 @@ module Dry
       def storage
         @storage ||= EMPTY_HASH.dup
       end
+
+      # @api private
+      def add_to(hash, path, value)
+        if path.is_a?(Hash)
+          key = path.keys[0]
+          messages = (hash[key] ||= EMPTY_HASH.dup)
+          add_to(messages, path[key], value)
+        else
+          (hash[path] ||= EMPTY_ARRAY.dup) << value
+        end
+      end
     end
   end
 end

data/lib/dry/validation/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Validation
-    VERSION = '1.0.0.alpha1'.freeze
+    VERSION = '1.0.0.alpha2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha1
+  version: 1.0.0.alpha2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby