dry-schema 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2703b501037f07e55a7018b8e0e048525e591d2f5cb5e369717a0635aacd443
-  data.tar.gz: e199bafff541bee970435b2dd26ce10b888c2167d5aec919dafbf91b089311ea
+  metadata.gz: 7a41a84d107f4694b4009a58065e603b2489e87b55c91fba3884b2af2562d3ef
+  data.tar.gz: fce0be0f38499c070f1fd1dc55c3c3407decef76aba778b3a27a839440bd888f
 SHA512:
-  metadata.gz: b7512d9308582c306717a507ad4c218e50137e13699dacadcdb4d9f5d8bb01cfae635cdd78a27d4466e620c13e43d63b4cc7f27112d1bbaf74bdc5e7c7e1d384
-  data.tar.gz: 58bc3d577e79752c8495749af8dc9304d1bcae753f6a612fbf744f4dc9586a65aafceb038c9ec6198361edd0b7f930e8f59abd600c74b3ba562de32a5d967e70
+  metadata.gz: 3fb5a9045111eadb411f2afc39819dba78651a9170968b212eaebfd613376f7a22db40660e90b3ac6d264177a1e8d1ead05736f8ed2b13a5d3bdaf1e382f2c44
+  data.tar.gz: c995cfb2e5e4c5f90d6109cbd01a81e627027ac730034422a3d1fbb791ab248bc9572d59fef5ff7c54cb69baeaeb6d8e21914e5641ba81f560e3cff4fc31673d

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 1.3.1 2019-07-08
+
+### Fixed
+
+* `Result#error?` works correctly with nested hashes and arrays (@solnic)
+* `:hints` extension no longer causes a crash where base messages are generated too (issue #165) (@solnic)
+
+[Compare v1.3.0...v1.3.1](https://github.com/dry-rb/dry-schema/compare/v1.3.0...v1.3.1)
+
 # 1.3.0 2019-07-06
 
 ### Added

data/lib/dry/schema/extensions/hints/message_set_methods.rb

@@ -12,7 +12,7 @@ module Dry
           #
           # @return [Array<Message::Hint>]
           attr_reader :hints
-          
+
           # Configuration option to enable/disable showing errors
           #
           # @return [Boolean]
@@ -37,6 +37,53 @@ module Dry
             @to_h ||= failures ? messages_map : messages_map(hints)
           end
           alias_method :to_hash, :to_h
+
+          private
+
+          # @api private
+          def unique_paths
+            messages.uniq(&:path).map(&:path)
+          end
+
+          # @api private
+          def messages_map(messages = self.messages)
+            return EMPTY_HASH if empty?
+
+            messages.reduce(placeholders) { |hash, msg|
+              node = msg.path.reduce(hash) { |a, e| a.is_a?(Hash) ? a[e] : a.last[e] }
+              (node[0].is_a?(::Array) ? node[0] : node) << msg.dump
+              hash
+            }
+          end
+
+          # @api private
+          #
+          # rubocop:disable Metrics/AbcSize
+          # rubocop:disable Metrics/PerceivedComplexity
+          def initialize_placeholders!
+            @placeholders = unique_paths.each_with_object(EMPTY_HASH.dup) { |path, hash|
+              curr_idx = 0
+              last_idx = path.size - 1
+              node = hash
+
+              while curr_idx <= last_idx
+                key = path[curr_idx]
+
+                next_node =
+                  if node.is_a?(Array) && key.is_a?(Symbol)
+                    node_hash = (node << [] << {}).last
+                    node_hash[key] || (node_hash[key] = curr_idx < last_idx ? {} : [])
+                  else
+                    node[key] || (node[key] = curr_idx < last_idx ? {} : [])
+                  end
+
+                node = next_node
+                curr_idx += 1
+              end
+            }
+          end
+          # rubocop:enable Metrics/AbcSize
+          # rubocop:enable Metrics/PerceivedComplexity
         end
       end
     end

data/lib/dry/schema/message.rb

@@ -60,7 +60,7 @@ module Dry
       #
       # If a string is passed, it will be compared with the text
       #
-      # @param [Message,String]
+      # @param other [Message,String]
       #
       # @return [Boolean]
       #

data/lib/dry/schema/path.rb

@@ -65,8 +65,10 @@ module Dry
       # @api private
       def include?(other)
         return false unless same_root?(other)
-        return false if index? && other.index? && !last.equal?(other.last)
-        self >= other
+        return last.equal?(other.last) if index? && other.index?
+        return self.class.new([*to_a[0..-2]]).include?(other) if index?
+
+        self >= other && !other.key_matches(self).include?(nil)
       end
 
       # @api private
@@ -75,14 +77,16 @@ module Dry
 
         return 0 if keys.eql?(other.keys)
 
-        res =
-          map { |key| (idx = other.index(key)) && keys[idx].equal?(key) }
-            .compact
-            .reject { |value| value.equal?(false) }
+        res = key_matches(other).compact.reject { |value| value.equal?(false) }
 
         res.size < count ? 1 : -1
       end
 
+      # @api private
+      def key_matches(other)
+        map { |key| (idx = other.index(key)) && keys[idx].equal?(key) }
+      end
+
       # @api private
       def last
         keys.last

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-06 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby