dry-schema 1.5.3 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed1f0c97144ee071608d437d3d0f17b8031e942bc53335dddd52f9701c51c1c0
-  data.tar.gz: c6d24ab22475c7794c999a7e04b3106451356080014ef4c087a4d1458bc21783
+  metadata.gz: '07179bd67f80d0a500d2484a2169f09804612a38ce9601819203d89bc0d109a1'
+  data.tar.gz: 1337a9d5197257e3bc773f87af7785e4297624b3d10699ea5b9c977be4a19a67
 SHA512:
-  metadata.gz: 91e0a095b534dc935c372830e8cfc5ae55fd854994b7641b90e59efd11e739b81296b575a486836982b99804349c3d2cd8d539ea207101b43675db95b0a0557a
-  data.tar.gz: c4e691dfe79c69a6d71e4046d9d81d23b8da16b4861b313fd66977d3d0be2a337bf7e80e6aef23c85561217608b2d589ce098c4c9626a177106eb45158e079b8
+  metadata.gz: 10b8ea1df48c45fa50bcc35be0d7e9785c90285fb29bdc0ad712745803280f9de53ea80643dccefd923df263ba20973cd2b4956dd2d773701ff4ad9050ab3742
+  data.tar.gz: 42776d375539ec537361f2c6e95c027020107e6f92bd14a866ed1b37e10af5ae0037eb0866278aa8877ce62f617222201b34f58db3e43925ae89f46585359a9a

data/CHANGELOG.md

@@ -1,3 +1,76 @@
+<!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
+
+## 1.6.1 2021-02-02
+
+
+### Fixed
+
+- Messages#[] handles meta/no meta cases more gracefully and has better interoperability with the I18n backend. This brings MessageCompiler#visit_unexpected_key up to parity with MessageCompiler#visit_predicate. Uses visit_predicate as basis for visit_unexpected_key. (@robhanlon22)
+
+
+[Compare v1.6.0...v1.6.1](https://github.com/dry-rb/dry-schema/compare/v1.6.0...v1.6.1)
+
+## 1.6.0 2021-01-21
+
+
+### Fixed
+
+- Using sum types with a i18n backend no longer crashes (issue #328 fixes via #331) (@tylerhunt)
+
+### Changed
+
+- Inferring predicates from class names is deprecated. It's very unlikely your code depends on it,
+  however, if it does, you'll get an exception with instructions. (@flash-gordon)
+
+  If you see an exception and don't rely on inferring, just disable it with:
+
+  ```ruby
+  Dry::Schema::PredicateInferrer::Compiler.infer_predicate_by_class_name false
+  ```
+
+  Otherwise, enable it explicitly:
+
+  ```ruby
+  Dry::Schema::PredicateInferrer::Compiler.infer_predicate_by_class_name true
+  ```
+
+  See https://github.com/dry-rb/dry-schema/issues/335 for rationale.
+
+[Compare v1.5.6...v1.6.0](https://github.com/dry-rb/dry-schema/compare/v1.5.6...v1.6.0)
+
+## 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
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2020 dry-rb team
+Copyright (c) 2015-2021 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

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,16 +29,15 @@ 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"
   spec.add_runtime_dependency "dry-configurable", "~> 0.8", ">= 0.8.3"
-  spec.add_runtime_dependency "dry-core", "~> 0.4"
-  spec.add_runtime_dependency "dry-equalizer", "~> 0.2"
+  spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
   spec.add_runtime_dependency "dry-initializer", "~> 3.0"
   spec.add_runtime_dependency "dry-logic", "~> 1.0"
-  spec.add_runtime_dependency "dry-types", "~> 1.4"
+  spec.add_runtime_dependency "dry-types", "~> 1.5"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/dry/schema/config.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 require "dry/configurable"
 
 require "dry/schema/constants"

data/lib/dry/schema/key_coercer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/core/cache"
-require "dry/equalizer"
+require "dry/core/equalizer"
 
 module Dry
   module Schema

data/lib/dry/schema/key_map.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 require "dry/core/cache"
 require "dry/schema/constants"
 require "dry/schema/key"

data/lib/dry/schema/key_validator.rb

@@ -32,7 +32,7 @@ module Dry
                 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.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
-require "dry/equalizer"
+require "dry/core/equalizer"
 
 require "dry/schema/path"
 require "dry/schema/message/or"

data/lib/dry/schema/message/or/multi_path.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 
 require "dry/schema/message/or/abstract"
 require "dry/schema/path"

data/lib/dry/schema/message/or/single_path.rb

@@ -38,7 +38,7 @@ module Dry
           #
           # @api public
           def dump
-            @dump ||= "#{left.dump} #{messages[:or][:text]} #{right.dump}"
+            @dump ||= "#{left.dump} #{messages[:or]} #{right.dump}"
           end
           alias_method :to_s, :dump
 

data/lib/dry/schema/message_compiler.rb

@@ -4,8 +4,9 @@ require "dry/initializer"
 
 require "dry/schema/constants"
 require "dry/schema/message"
-require "dry/schema/message_set"
 require "dry/schema/message_compiler/visitor_opts"
+require "dry/schema/message_set"
+require "dry/schema/path"
 
 module Dry
   module Schema
@@ -109,17 +110,8 @@ module Dry
       end
 
       # @api private
-      def visit_unexpected_key(node, _opts)
-        path, input = node
-
-        msg = messages.translate("errors.unexpected_key")
-
-        Message.new(
-          path: path,
-          text: msg[:text],
-          predicate: nil,
-          input: input
-        )
+      def visit_unexpected_key(node, opts)
+        visit_predicate([:unexpected_key, []], opts.dup.update(path: Path[node.first]))
       end
 
       # @api private
@@ -130,7 +122,10 @@ module Dry
 
       # @api private
       def or_translator
-        @or_translator ||= proc { |k| messages.translate(k, **default_lookup_options) }
+        @or_translator ||= proc { |k|
+          message = messages.translate(k, **default_lookup_options)
+          message.is_a?(Hash) ? message[:text] : message
+        }
       end
 
       # @api private

data/lib/dry/schema/message_set.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 
 module Dry
   module Schema

data/lib/dry/schema/messages/abstract.rb

@@ -2,7 +2,7 @@
 
 require "set"
 require "concurrent/map"
-require "dry/equalizer"
+require "dry/core/equalizer"
 require "dry/configurable"
 
 require "dry/schema/constants"

data/lib/dry/schema/messages/template.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
-require "dry/equalizer"
+require "dry/core/equalizer"
 
 require "dry/schema/constants"
 

data/lib/dry/schema/messages/yaml.rb

@@ -3,7 +3,7 @@
 require "yaml"
 require "pathname"
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 require "dry/schema/constants"
 require "dry/schema/messages/abstract"
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 require "dry/logic/operators"
 
 module Dry

data/lib/dry/schema/result.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
-require "dry/equalizer"
+require "dry/core/equalizer"
 
 require "dry/schema/path"
 

data/lib/dry/schema/value_coercer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 require "dry/initializer"
 
 module Dry

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = "1.5.3"
+    VERSION = "1.6.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -50,28 +50,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: dry-equalizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '0.5'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -253,14 +245,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Coercion and validation for data structures