dry-schema 1.11.3 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c69bd3fc92a8084c35a9049bc7df4c9b68345c70b5b52936c3a3c99bbb89b77
-  data.tar.gz: dc2f132989df78249c206510a9743422174cd4401b566c09d7c828133c3a8fe0
+  metadata.gz: 01ee230572b92457f6619423c9963be605d79e86cfb4cef112767eda78e5223d
+  data.tar.gz: e9584df52d3c640691168703536546654a97eec2960fc96d932ea69ba5cedc50
 SHA512:
-  metadata.gz: 95987f2ccf19ae51fb68971a10f8d71dd2d3b3d86b48c53f88c3800cc7734386c789f2e0af3f193af3be5e31a86fcdf7bc7c33661acc67d923a3de8b298f1770
-  data.tar.gz: 0c77455225be4a21a698abb51952e5ba7929ee0c861936834e9eebe0b104bce36d8f6aaa6856ea04cc9e7a55724631c3633930ba1aebf8dda14cfdb05756a152
+  metadata.gz: b4fa2334f3093e9a18ecea268e8f977204d40104f93c3db75c23bd82001b8b0636f9d8a4053f101b94e7a73982b5bdee67e65b5de13e7709bc1893f3a6c01061
+  data.tar.gz: 2ae6ef323db1a53ae6c375d2bdf1986379aacf5627385394549d784463fc6ebe621bcaaf73b391aa719661e66d47a7a52fd90b5539fe68e681fa4d90e268f2ca

data/CHANGELOG.md

@@ -1,5 +1,47 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.13.2 2023-05-31
+
+
+### Fixed
+
+- Fix custom predicates setting (via #460) (@solnic)
+
+
+[Compare v1.13.1...v1.13.2](https://github.com/dry-rb/dry-schema/compare/v1.13.1...v1.13.2)
+
+## 1.13.1 2023-04-07
+
+
+### Fixed
+
+- Support sum types of hashes (issue #446 fixed via #457) (@segiddins)
+
+
+[Compare v1.13.0...v1.13.1](https://github.com/dry-rb/dry-schema/compare/v1.13.0...v1.13.1)
+
+## 1.13.0 2022-11-24
+
+
+### Fixed
+
+- Change required metadata back to true to fix regressions (issue #438 fixed via 439) (@robhanlon22)
+- Compatibility with dry-configurable 1.0.1 (@flash-gordon)
+- Warnings about using pattern matching on Ruby 2.7 (issue #441 fixed via #442) (@r7kamura)
+- Make message cache fully thread-safe (via #440) (@mensfeld)
+
+
+[Compare v1.12.0...v1.13.0](https://github.com/dry-rb/dry-schema/compare/v1.12.0...v1.13.0)
+
+## 1.12.0 2022-11-04
+
+
+### Changed
+
+- This version depends on dry-core 1.0 and dry-configurable 1.0 (@flash-gordon)
+
+[Compare v1.11.3...v1.12.0](https://github.com/dry-rb/dry-schema/compare/v1.11.3...v1.12.0)
+
 ## 1.11.3 2022-10-21
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2022 dry-rb team
+Copyright (c) 2015-2023 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

@@ -1,29 +1,21 @@
 <!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-schema
 [actions]: https://github.com/dry-rb/dry-schema/actions
-[codacy]: https://www.codacy.com/gh/dry-rb/dry-schema
-[chat]: https://dry-rb.zulipchat.com
-[inchpages]: http://inch-ci.org/github/dry-rb/dry-schema
 
-# dry-schema [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
-
-[![Gem Version](https://badge.fury.io/rb/dry-schema.svg)][gem]
-[![CI Status](https://github.com/dry-rb/dry-schema/workflows/ci/badge.svg)][actions]
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/961f5c776f1d49218b2cede3745e059c)][codacy]
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/961f5c776f1d49218b2cede3745e059c)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-schema.svg?branch=main)][inchpages]
+# dry-schema [![Gem Version](https://badge.fury.io/rb/dry-schema.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-schema/workflows/CI/badge.svg)][actions]
 
 ## Links
 
 * [User documentation](https://dry-rb.org/gems/dry-schema)
 * [API documentation](http://rubydoc.info/gems/dry-schema)
+* [Forum](https://discourse.dry-rb.org)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 2.7.0`
-* jruby `>= 9.3` (postponed until 2.7 is supported)
+* MRI `>= 3.0.0`
+* jruby `>= 9.4` (not tested on CI)
 
 ## License
 

data/dry-schema.gemspec

@@ -31,15 +31,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.7.0"
+  spec.required_ruby_version = ">= 2.7"
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_runtime_dependency "dry-configurable", "~> 0.16", ">= 0.16"
-  spec.add_runtime_dependency "dry-core", "~> 0.9", ">= 0.9"
+  spec.add_runtime_dependency "dry-configurable", "~> 1.0", ">= 1.0.1"
+  spec.add_runtime_dependency "dry-core", "~> 1.0", "< 2"
   spec.add_runtime_dependency "dry-initializer", "~> 3.0"
-  spec.add_runtime_dependency "dry-logic", "~> 1.3"
-  spec.add_runtime_dependency "dry-types", "~> 1.6"
+  spec.add_runtime_dependency "dry-logic", ">= 1.4", "< 2"
+  spec.add_runtime_dependency "dry-types", ">= 1.7", "< 2"
   spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler"

data/lib/dry/schema/config.rb

@@ -22,7 +22,9 @@ module Dry
       # @return [Schema::PredicateRegistry]
       #
       # @api public
-      setting :predicates, default: Schema::PredicateRegistry.new
+      setting :predicates, default: PredicateRegistry.new, constructor: -> predicates {
+        predicates.is_a?(PredicateRegistry) ? predicates : PredicateRegistry.new(predicates)
+      }
 
       # @!method types
       #

data/lib/dry/schema/dsl.rb

@@ -39,9 +39,6 @@ module Dry
 
       extend Dry::Initializer
 
-      # @return [Compiler] The rule compiler object
-      option :compiler, default: -> { Compiler.new }
-
       # @return [Compiler] The type of the processor (Params, JSON, or a custom sub-class)
       option :processor_type, default: -> { Processor }
 
@@ -84,6 +81,7 @@ module Dry
       def self.new(**options, &block)
         dsl = super
         dsl.instance_eval(&block) if block
+        dsl.instance_variable_set("@compiler", options[:compiler]) if options[:compiler]
         dsl
       end
 
@@ -106,6 +104,16 @@ module Dry
         self
       end
 
+      # @api private
+      def compiler
+        @compiler ||= Compiler.new(predicates)
+      end
+
+      # @api private
+      def predicates
+        @predicates ||= config.predicates
+      end
+
       # Return a macro with the provided name
       #
       # @param [Symbol] name
@@ -293,8 +301,8 @@ module Dry
       # @return [Dry::Types::Safe]
       #
       # @api private
-      def new(**options, &block)
-        self.class.new(**options, processor_type: processor_type, config: config, &block)
+      def new(klass: self.class, **options, &block)
+        klass.new(**options, processor_type: processor_type, config: config, &block)
       end
 
       # Set a type for the given key name
@@ -307,7 +315,7 @@ module Dry
       # @api private
       def set_type(name, spec)
         type = resolve_type(spec)
-        meta = {required: true, maybe: type.optional?}
+        meta = {required: false, maybe: type.optional?}
 
         @types[name] = type.meta(meta)
       end

data/lib/dry/schema/extensions/struct.rb

@@ -5,20 +5,42 @@ require "dry/struct"
 module Dry
   module Schema
     module Macros
+      class StructToSchema < ::Dry::Struct::Compiler
+        def call(struct)
+          visit(struct.to_ast)
+        end
+
+        # strip away structs from AST
+        def visit_struct(node)
+          _, ast = node
+          visit(ast)
+        end
+      end
+
+      Hash.option :struct_compiler, default: proc { StructToSchema.new(schema_dsl.config.types) }
+
       Hash.prepend(::Module.new {
         def call(*args)
-          if args.size >= 1 && args[0].is_a?(::Class) && args[0] <= ::Dry::Struct
+          if args.size >= 1 && struct?(args[0])
             if block_given?
               raise ArgumentError, "blocks are not supported when using "\
                                    "a struct class (#{name.inspect} => #{args[0]})"
             end
 
-            super(args[0].schema, *args.drop(1))
-            type(schema_dsl.types[name].constructor(args[0].schema))
+            schema = struct_compiler.(args[0])
+
+            super(schema, *args.drop(1))
+            type(schema_dsl.types[name].constructor(schema))
           else
             super
           end
         end
+
+        private
+
+        def struct?(type)
+          type.is_a?(::Class) && type <= ::Dry::Struct
+        end
       })
     end
 

data/lib/dry/schema/key_validator.rb

@@ -9,8 +9,8 @@ module Dry
     class KeyValidator
       extend Dry::Initializer
 
-      INDEX_REGEX = /\[\d+\]/.freeze
-      DIGIT_REGEX = /\A\d+\z/.freeze
+      INDEX_REGEX = /\[\d+\]/
+      DIGIT_REGEX = /\A\d+\z/
       BRACKETS = "[]"
 
       # @api private

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

@@ -19,10 +19,10 @@ module Dry
         option :compiler, default: proc { Compiler.new }
 
         # @api private
-        option :trace, default: proc { Trace.new }
+        option :schema_dsl, optional: true
 
         # @api private
-        option :schema_dsl, optional: true
+        option :trace, default: proc { Trace.new(schema_dsl&.compiler || Compiler.new) }
 
         # @api private
         def new(**options)

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

@@ -122,7 +122,6 @@ module Dry
             macro.call(...)
           end
         end
-        ruby2_keywords :schema if respond_to?(:ruby2_keywords, true)
 
         # Specify a nested hash with enforced `hash?` type-check
         #
@@ -137,7 +136,6 @@ module Dry
             macro.call(...)
           end
         end
-        ruby2_keywords :hash if respond_to?(:ruby2_keywords, true)
 
         # Specify predicates that should be applied to each element of an array
         #
@@ -161,7 +159,6 @@ module Dry
             macro.value(...)
           end
         end
-        ruby2_keywords :each if respond_to?(:ruby2_keywords, true)
 
         # Like `each` but sets `array?` type-check
         #
@@ -181,7 +178,6 @@ module Dry
             macro.value(...)
           end
         end
-        ruby2_keywords :array if respond_to?(:ruby2_keywords, true)
 
         # Set type spec
         #
@@ -220,6 +216,8 @@ module Dry
         end
 
         # @api private
+        # rubocop: disable Metrics/AbcSize
+        # rubocop: disable Metrics/CyclomaticComplexity
         # rubocop: disable Metrics/PerceivedComplexity
         def extract_type_spec(args, nullable: false, set_type: true)
           type_spec = args[0] unless schema_or_predicate?(args[0])
@@ -232,6 +230,10 @@ module Dry
 
             if type_spec.is_a?(::Array)
               type_rule = type_spec.map { |ts| new(chain: false).value(ts) }.reduce(:|)
+            elsif type_spec.is_a?(Dry::Types::Sum) && set_type
+              type_rule = [type_spec.left, type_spec.right].map { |ts|
+                new(klass: Core, chain: false).value(ts)
+              }.reduce(:|)
             else
               type_predicates = predicate_inferrer[resolved_type]
 
@@ -249,6 +251,8 @@ module Dry
             yield(*predicates, type_spec: type_spec, type_rule: nil)
           end
         end
+        # rubocop: enable Metrics/AbcSize
+        # rubocop: enable Metrics/CyclomaticComplexity
         # rubocop: enable Metrics/PerceivedComplexity
 
         # @api private

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

@@ -26,7 +26,6 @@ module Dry
           (filter_schema_dsl[name] || filter_schema_dsl.optional(name)).value(...)
           self
         end
-        ruby2_keywords(:filter) if respond_to?(:ruby2_keywords, true)
 
         # Coerce macro to a rule
         #

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

@@ -45,13 +45,7 @@ module Dry
 
         # @api private
         def self.setting_names
-          # TODO: this is compatibility tweak to make it work with dry-configurable < 0.16.1
-          #       and should be removed in dry-schema 2.0.0
-          @setting_names ||= settings
-            .map { |setting|
-              setting.respond_to?(:name) ? setting.name : setting
-            }
-            .map(&:to_sym)
+          @setting_names ||= settings.map { _1.name.to_sym }
         end
 
         # @api private

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

@@ -13,7 +13,7 @@ module Dry
       # @api public
       class YAML < Abstract
         LOCALE_TOKEN = "%<locale>s"
-        TOKEN_REGEXP = /%{(\w*)}/.freeze
+        TOKEN_REGEXP = /%{(\w*)}/
         EMPTY_CONTEXT = Object.new.tap { |ctx|
           def ctx.context
             binding
@@ -70,7 +70,9 @@ module Dry
 
         # @api private
         def self.cache
-          @cache ||= Concurrent::Map.new { |h, k| h[k] = Concurrent::Map.new }
+          @cache ||= Concurrent::Map.new do |h, k|
+            h.compute_if_absent(k) { Concurrent::Map.new }
+          end
         end
 
         # @api private
@@ -82,7 +84,7 @@ module Dry
         def initialize(data: EMPTY_HASH, config: nil)
           super()
           @data = data
-          @config = config if config
+          @__config__ = config if config
           @t = proc { |key, locale: default_locale| get("%<locale>s.#{key}", locale: locale) }
         end
 

data/lib/dry/schema/predicate.rb

@@ -46,6 +46,9 @@ module Dry
       # @api private
       attr_reader :args
 
+      # @api private
+      attr_reader :arity
+
       # @api private
       attr_reader :block
 
@@ -55,6 +58,8 @@ module Dry
         @name = name
         @args = args
         @block = block
+        # Cater for optional second argument like in case of `eql?` or `respond_to?`
+        @arity = compiler.predicates[name].arity.abs
       end
 
       # Negate a predicate
@@ -71,7 +76,7 @@ module Dry
 
       # @api private
       def ensure_valid
-        if compiler.predicates[name].arity - 1 != args.size
+        if arity - 1 != args.size
           raise ArgumentError, "#{name} predicate arity is invalid"
         end
       end

data/lib/dry/schema/predicate_registry.rb

@@ -9,11 +9,13 @@ module Dry
       # @api private
       def arg_list(name, *values)
         predicate = self[name]
+        # Cater for optional second argument like in case of `eql?` or `respond_to?`
+        arity = predicate.arity.abs
 
         predicate
           .parameters
           .map(&:last)
-          .zip(values + Array.new(predicate.arity - values.size, Undefined))
+          .zip(values + Array.new(arity - values.size, Undefined))
       end
     end
   end

data/lib/dry/schema/result.rb

@@ -72,6 +72,8 @@ module Dry
       # Dump result to a hash returning processed and validated data
       #
       # @return [Hash]
+      #
+      # @api private
       def output
         path.equal?(Path::EMPTY) ? @output : @output.dig(*path)
       end

data/lib/dry/schema/type_container.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/container"
+require "dry/core/container"
 require "dry/types"
 
 module Dry
@@ -13,7 +13,7 @@ module Dry
     #
     # @api public
     class TypeContainer
-      include Dry::Container::Mixin
+      include Dry::Core::Container::Mixin
 
       def initialize(types_container = Dry::Types.container)
         super()

data/lib/dry/schema/types_merger.rb

@@ -66,17 +66,61 @@ module Dry
         alias_method :merge_and, :merge_ordered
         alias_method :merge_implication, :merge_ordered
 
-        # @api private
-        def merge_unwrapped_types(unwrapped_old, unwrapped_new)
-          case [unwrapped_old, unwrapped_new]
-          in Dry::Types::Schema, Dry::Types::Schema
-            merge_schemas(unwrapped_old, unwrapped_new)
-          in [Dry::Types::AnyClass, _] | [Dry::Types::Hash, Dry::Types::Schema]
-            unwrapped_new
-          in [Dry::Types::Schema, Dry::Types::Hash] | [_, Dry::Types::AnyClass]
-            unwrapped_old
-          else
-            merge_equivalent_types(unwrapped_old, unwrapped_new)
+        if RUBY_VERSION >= "3.0"
+          class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
+            # @api private
+            def merge_unwrapped_types(unwrapped_old, unwrapped_new)
+              case [unwrapped_old, unwrapped_new]
+              in Dry::Types::Schema, Dry::Types::Schema
+                merge_schemas(unwrapped_old, unwrapped_new)
+              in [Dry::Types::AnyClass, _] | [Dry::Types::Hash, Dry::Types::Schema]
+                unwrapped_new
+              in [Dry::Types::Schema, Dry::Types::Hash] | [_, Dry::Types::AnyClass]
+                unwrapped_old
+              else
+                merge_equivalent_types(unwrapped_old, unwrapped_new)
+              end
+            end
+          RUBY
+        else
+          # @api private
+          def merge_unwrapped_types(unwrapped_old, unwrapped_new)
+            if change_from_schema_to_schema?(unwrapped_old, unwrapped_new)
+              merge_schemas(unwrapped_old, unwrapped_new)
+            elsif change_from_any?(unwrapped_old) || change_from_hash_to_schema?(unwrapped_old,
+                                                                                 unwrapped_new)
+              unwrapped_new
+            elsif change_from_schema_to_hash?(unwrapped_old,
+                                              unwrapped_new) || change_to_any?(unwrapped_new)
+              unwrapped_old
+            else
+              merge_equivalent_types(unwrapped_old, unwrapped_new)
+            end
+          end
+
+          # @api private
+          def change_from_any?(unwrapped_old)
+            unwrapped_old.is_a?(Dry::Types::AnyClass)
+          end
+
+          # @api private
+          def change_to_any?(unwrapped_new)
+            unwrapped_new.is_a?(Dry::Types::AnyClass)
+          end
+
+          # @api private
+          def change_from_hash_to_schema?(unwrapped_old, unwrapped_new)
+            unwrapped_old.is_a?(Dry::Types::Hash) && unwrapped_new.is_a?(Dry::Types::Schema)
+          end
+
+          # @api private
+          def change_from_schema_to_hash?(unwrapped_old, unwrapped_new)
+            unwrapped_old.is_a?(Dry::Types::Schema) && unwrapped_new.is_a?(Dry::Types::Hash)
+          end
+
+          # @api private
+          def change_from_schema_to_schema?(unwrapped_old, unwrapped_new)
+            unwrapped_old.is_a?(Dry::Types::Schema) && unwrapped_new.is_a?(Dry::Types::Schema)
           end
         end
 

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = "1.11.3"
+    VERSION = "1.13.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.13.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-21 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -30,40 +30,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
@@ -82,30 +82,42 @@ dependencies:
   name: dry-logic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -262,14 +274,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Coercion and validation for data structures