dry-schema 1.5.0 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45a3441f7099ddd2ea6c0af6345f1fdcff20cf0629953dfc1eedcce5f8f54995
-  data.tar.gz: 841584478740cfc72a653e50445b9e3a16c01a6ce49b2c8c8375da76811ca50d
+  metadata.gz: 442f6c2c04925f14ec6f0230394ad8e009518e9a2d7c1db22ddf68416324d530
+  data.tar.gz: 8f210323df91ba5ebf8a947b5888907b6f6f7cac504f93fbec80af8678dbdeb1
 SHA512:
-  metadata.gz: 368b80c79f2598dd4cf215c8223dbd704b75909857acf9fa51e60abed19ba3bdc2904ce5d7227ef7259b45593017131ce6ab5434ee3d713fe6b97eed643eecd8
-  data.tar.gz: 4f5ac8469feb749ed6ca95c022f99b822204d1b1cdde05969795571cabd43cd573111c86cfb4322413a22b5e99958156ba061a598c381989510ecf700fbfc7f0
+  metadata.gz: 87c2dcc7e169f2ff4c474038a0821a77e9f71420d40d2a4fe59f1d0ab722bcbbc3b9a60dcb33107d34d77cd303a82c33ebb3d084c350a49fc13e7b4cd73666f8
+  data.tar.gz: 59442e66361d9a1daf9de31480681bf0414875f22b9cdd440224db7b1a5fde818bdc479e2296cea558b00e9b698df56645aa65a55da59bb2bde2d67b4b979120

data/CHANGELOG.md

@@ -1,3 +1,64 @@
+## 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
+
+### Fixed
+
+- Key validation works correctly with a non-nested maybe hashes (issue #311 fixed via #312) (@svobom57)
+
+
+[Compare v1.5.3...master](https://github.com/dry-rb/dry-schema/compare/v1.5.3...master)
+
+## 1.5.3 2020-08-21
+
+
+### Fixed
+
+- Key validator works correctly with an array with maybe hash as its member (issue #308 fixed via #309) (@tadeusz-niemiec)
+
+### Changed
+
+- [info extension] small performance improvement in the set visitor (see #305 for more details) (@esparta)
+
+[Compare v1.5.2...v1.5.3](https://github.com/dry-rb/dry-schema/compare/v1.5.2...v1.5.3)
+
+## 1.5.2 2020-06-26
+
+
+### Fixed
+
+- `Result#{success?,failure?}` work as expected when there are only key validation failures (issue #297 fixed via #298) (@adamransom)
+
+### Changed
+
+- Using `full` option no longer adds a space between the name of a key and the message in case of languages that have no spaces between words (ie Japanese) (issue #161 closed via #292 by @tadeusz-niemiec)
+
+[Compare v1.5.1...v1.5.2](https://github.com/dry-rb/dry-schema/compare/v1.5.1...v1.5.2)
+
+## 1.5.1 2020-05-21
+
+
+### Fixed
+
+- Negated predicates support the logic operator API now (fixed via #276 by @solnic)
+- Fixed circular require warning (issue #279 closed via #282 by @landongrindheim)
+- Validating keys against an array with non-hash members no longer crashes (issue #283 fixed via #284 by @beechnut and issue #289 fixed via #288 by @tadeusz-niemiec)
+
+
+[Compare v1.5.0...v1.5.1](https://github.com/dry-rb/dry-schema/compare/v1.5.0...v1.5.1)
+
 ## 1.5.0 2020-03-11
 
 

data/lib/dry/schema/compiler.rb

@@ -30,7 +30,7 @@ module Dry
       # used as nested schemas
       #
       # @param [Array] node
-      # @param [Hash] opts
+      # @param [Hash] _opts Unused
       #
       # @return [NamespacedRule]
       #

data/lib/dry/schema/dsl.rb

@@ -2,7 +2,6 @@
 
 require "dry/initializer"
 
-require "dry/schema"
 require "dry/schema/constants"
 require "dry/schema/path"
 require "dry/schema/config"

data/lib/dry/schema/extensions/info/schema_compiler.rb

@@ -50,7 +50,7 @@ module Dry
         def visit_set(node, opts = EMPTY_HASH)
           target = (key = opts[:key]) ? self.class.new : self
 
-          node.map { |child| target.visit(child, opts) }
+          node.each { |child| target.visit(child, opts) }
 
           return unless key
 

data/lib/dry/schema/key_validator.rb

@@ -28,11 +28,11 @@ module Dry
             if path[INDEX_REGEX]
               key = path.gsub(INDEX_REGEX, BRACKETS)
 
-              unless key_paths.include?(key)
+              if key_paths.none? { |key_path| key_path.include?(key) }
                 arr = path.gsub(INDEX_REGEX) { |m| ".#{m[1]}" }
                 arr.split(DOT).map { |s| DIGIT_REGEX.match?(s) ? s.to_i : s.to_sym }
               end
-            elsif !key_paths.include?(path)
+            elsif key_paths.none? { |key_path| key_path.include?(path) }
               path
             end
 
@@ -53,7 +53,8 @@ module Dry
           when Hash
             [key].product(key_paths(hash[key])).map { |keys| keys.join(DOT) }
           when Array
-            value.flat_map.with_index { |el, idx|
+            hashes_or_arrays = value.select { |e| e.is_a?(Array) || e.is_a?(Hash) }
+            hashes_or_arrays.flat_map.with_index { |el, idx|
               key_paths(el).map { |path| ["#{key}[#{idx}]", *path].join(DOT) }
             }
           else

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

@@ -29,6 +29,14 @@ module Dry
 
       EMPTY_OPTS = VisitorOpts.new
       EMPTY_MESSAGE_SET = MessageSet.new(EMPTY_ARRAY).freeze
+      FULL_MESSAGE_WHITESPACE = Hash.new(' ').merge(
+            ja: '',
+            zh: '',
+            bn: '',
+            th: '',
+            lo: '',
+            my: '',
+          )
 
       param :messages
 
@@ -108,6 +116,7 @@ module Dry
 
         Message.new(
           path: path,
+          meta: msg[:meta] || EMPTY_HASH,
           text: msg[:text],
           predicate: nil,
           input: input
@@ -203,12 +212,12 @@ module Dry
         return text if !text || !full
 
         rule = options[:path]
-        "#{messages.rule(rule, options) || rule} #{text}"
+        [messages.rule(rule, options) || rule, text].join(FULL_MESSAGE_WHITESPACE[template.options[:locale]])
       end
 
       # @api private
       def message_tokens(args)
-        args.each_with_object({}) do |arg, hash|
+        tokens = args.each_with_object({}) do |arg, hash|
           case arg[1]
           when Array
             hash[arg[0]] = arg[1].join(LIST_SEPARATOR)
@@ -219,6 +228,14 @@ module Dry
             hash[arg[0]] = arg[1]
           end
         end
+        args.any? { |e| e.first == :size } ? append_mapped_size_tokens(tokens) : tokens
+      end
+
+      # @api private
+      def append_mapped_size_tokens(tokens)
+        # this is a temporary fix for the inconsistency in the "size" errors arguments
+        mapped_hash = tokens.each_with_object({}) { |(k, v), h| h[k.to_s.gsub("size", "num").to_sym] = v }
+        tokens.merge(mapped_hash)
       end
     end
   end

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/predicate.rb

@@ -13,6 +13,8 @@ module Dry
       #
       # @api private
       class Negation
+        include Dry::Logic::Operators
+
         # @api private
         attr_reader :predicate
 

data/lib/dry/schema/result.rb

@@ -43,7 +43,7 @@ module Dry
 
       # Return a new result scoped to a specific path
       #
-      # @param [Symbol, Array, Path]
+      # @param path [Symbol, Array, Path]
       #
       # @return [Result]
       #
@@ -121,7 +121,7 @@ module Dry
       #
       # @api public
       def success?
-        results.empty?
+        result_ast.empty?
       end
 
       # Check if the result is not successful

data/lib/dry/schema/rule_applier.rb

@@ -2,7 +2,6 @@
 
 require "dry/initializer"
 
-require "dry/schema"
 require "dry/schema/constants"
 require "dry/schema/config"
 require "dry/schema/result"

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = "1.5.0"
+    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.0
+  version: 1.5.5
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby