dry-schema 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6bd0ccbd94f361dc0e001b71fc4d1dbd76d00605a4d57c7e6fe06788235c0f0
-  data.tar.gz: 29b3eb25a1ede9775dd331752a6abc51d2fd617764e14611899e8b07fb6f7ee8
+  metadata.gz: 442f6c2c04925f14ec6f0230394ad8e009518e9a2d7c1db22ddf68416324d530
+  data.tar.gz: 8f210323df91ba5ebf8a947b5888907b6f6f7cac504f93fbec80af8678dbdeb1
 SHA512:
-  metadata.gz: 96f5e58a3ae138e6461d33e7e2bd030655191a6f8132c0d5adada3195d35f03b011b94d79c085fe0567a299caf63859349948ee0d8e06b73ac0a7a480f6d2db9
-  data.tar.gz: c89a7b623c5ac5fc1cad6b880a4c02b892af9efad76c99e7803b0e0115a26445cf1d35d1bba4518f0186fc4d36fa6a8bf26de64ed9e9f74513f35b1e7aac04f4
+  metadata.gz: 87c2dcc7e169f2ff4c474038a0821a77e9f71420d40d2a4fe59f1d0ab722bcbbc3b9a60dcb33107d34d77cd303a82c33ebb3d084c350a49fc13e7b4cd73666f8
+  data.tar.gz: 59442e66361d9a1daf9de31480681bf0414875f22b9cdd440224db7b1a5fde818bdc479e2296cea558b00e9b698df56645aa65a55da59bb2bde2d67b4b979120

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.5.5 2020-10-08
+
+
+### Fixed
+
+- Key validation works with messages that have meta-data (issue #310 fixed via #313) (@tadeusz-niemiec)
+- Using an external schema along with a key specified as a `:hash` works as expected (issue #296 fixed via #315) (@tadeusz-niemiec + @solnic)
+- `Result#error?(path)` works correctly when the path points to an array item (issue #317 fixed via #318) (@solnic)
+
+
+[Compare v1.5.4...v1.5.5](https://github.com/dry-rb/dry-schema/compare/v1.5.4...v1.5.5)
+
 ## 1.5.4 
 
 2020-09-03

data/lib/dry/schema/macros/value.rb

@@ -28,10 +28,14 @@ module Dry
 
             import_steps(schema)
 
-            type(updated_type) unless custom_type? && !current_type.respond_to?(:of)
+            if !custom_type? || array_type?(current_type) || hash_type?(current_type)
+              type(updated_type)
+            elsif maybe_type?(current_type)
+              type(updated_type.optional)
+            end
           end
 
-          trace_opts = opts.reject { |key, _| key == :type_spec || key == :type_rule }
+          trace_opts = opts.reject { |key, _| %i[type_spec type_rule].include?(key) }
 
           if (type_rule = opts[:type_rule])
             trace.append(type_rule).evaluate(*predicates, **trace_opts)
@@ -62,10 +66,16 @@ module Dry
           primitive_inferrer[type].eql?([::Array])
         end
 
+        # @api private
         def hash_type?(type)
           primitive_inferrer[type].eql?([::Hash])
         end
 
+        # @api private
+        def maybe_type?(type)
+          type.meta[:maybe].equal?(true)
+        end
+
         # @api private
         def build_array_type(array_type, member)
           if array_type.respond_to?(:of)

data/lib/dry/schema/message_compiler.rb

@@ -116,6 +116,7 @@ module Dry
 
         Message.new(
           path: path,
+          meta: msg[:meta] || EMPTY_HASH,
           text: msg[:text],
           predicate: nil,
           input: input

data/lib/dry/schema/path.rb

@@ -90,14 +90,29 @@ module Dry
         keys.index(key)
       end
 
+      def without_index
+        self.class.new([*to_a[0..-2]])
+      end
+
       # @api private
+      #
+      # rubocop:disable Metrics/PerceivedComplexity
       def include?(other)
         return false unless same_root?(other)
         return last.equal?(other.last) if index? && other.index?
-        return self.class.new([*to_a[0..-2]]).include?(other) if index?
+        return without_index.include?(other) if index?
+
+        if !index? && other.index?
+          path = key_matches(other, :select)
+
+          return false unless path.size > 1
+
+          self.class.new(path).include?(other)
+        end
 
         self >= other && !other.key_matches(self).include?(nil)
       end
+      # rubocop:enable Metrics/PerceivedComplexity
 
       # @api private
       def <=>(other)

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = "1.5.4"
+    VERSION = "1.5.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby