dry-schema 1.5.1 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c56536db764858bb0d594688d581e4f38fd46f949f75829c20a63d67902f3704
-  data.tar.gz: f99af785ccdee69c8cc5d4398b4802612c2b3456e4d472a25d591d593ac9d2bb
+  metadata.gz: 26cb433ca43bd564e72496a3662035e91cec686962c2c5a3ba9bad0a0c8da5a0
+  data.tar.gz: 8a2decf348bf29e1e2c38e27a0237a872ea78db8b19af32ccdb11adc4928c7dd
 SHA512:
-  metadata.gz: d6f538d54f0ab58595f14e94340e1cb2a3da45a5a4909e8aa5e3bb1a6d68fcd5992debf4d6a8c7909fb25166c11160d970dfb06ac4266e87869117ca984574b1
-  data.tar.gz: 3a26179c03e7f4fccce53ae19c6d9133af913407ba64d05bf28a1b173fbdc5e922176edf94c48842829c5b52eda16f5589aa1b98b2848b3094e3713fc2844716
+  metadata.gz: 5d6b9d1a6cb3033aadfead9b2dac136cab561c2c0fd2cd97fbd58087168b42ee1cb9e5be34e745c9292d094c6ca2a621aa412b8126b7610d324fdd60f364a373
+  data.tar.gz: 97dc3d3283afbc0c996da01cc2ff566f409dce596a43b5f8158e9f44529e6a0f3427406c9b919bbfb4f9b2884ddb2567dbdb5379e8eb9d4fc49addccee41885c

data/CHANGELOG.md

@@ -1,3 +1,62 @@
+## 1.5.6 2020-10-21
+
+
+### Fixed
+
+- Fixed stack error which was a regression introduced in 1.5.5 (issue #322 fixed via #323) (@flash-gordon)
+
+
+[Compare v1.5.5...v1.5.6](https://github.com/dry-rb/dry-schema/compare/v1.5.5...v1.5.6)
+
+## 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
 
 

data/README.md

@@ -21,7 +21,7 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.4`
+* MRI >= `2.5
 * jruby >= `9.2`
 
 ## License

data/dry-schema.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri']   = 'https://github.com/dry-rb/dry-schema'
   spec.metadata['bug_tracker_uri']   = 'https://github.com/dry-rb/dry-schema/issues'
 
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"

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
 

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,13 +90,25 @@ module Dry
         keys.index(key)
       end
 
+      def without_index
+        self.class.new(to_a[0..-2])
+      end
+
       # @api private
       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?
-
-        self >= other && !other.key_matches(self).include?(nil)
+        if !same_root?(other)
+          false
+        elsif index?
+          if other.index?
+            last.equal?(other.last)
+          else
+            without_index.include?(other)
+          end
+        elsif other.index? && key_matches(other, :select).size < 2
+          false
+        else
+          self >= other && !other.key_matches(self).include?(nil)
+        end
       end
 
       # @api private

data/lib/dry/schema/result.rb

@@ -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/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = "1.5.1"
+    VERSION = "1.5.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.6
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -253,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="