dry-schema 1.13.3 → 1.14.0

data/lib/dry/schema/types_merger.rb

@@ -27,14 +27,14 @@ module Dry
 
         # @api private
         def call
-          if op_class <= Dry::Logic::Operations::Or
+          if op_class <= ::Dry::Logic::Operations::Or
             merge_or
-          elsif op_class <= Dry::Logic::Operations::And
+          elsif op_class <= ::Dry::Logic::Operations::And
             merge_and
-          elsif op_class <= Dry::Logic::Operations::Implication
+          elsif op_class <= ::Dry::Logic::Operations::Implication
             merge_implication
           else
-            raise ArgumentError, <<~MESSAGE
+            raise ::ArgumentError, <<~MESSAGE
               Can't merge operations, op_class=#{op_class}
             MESSAGE
           end
@@ -58,7 +58,7 @@ module Dry
 
           rule = [old_rule, new_rule].compact.reduce { op_class.new(_1, _2) }
 
-          type = Dry::Types::Constrained.new(type, rule: rule) if rule
+          type = ::Dry::Types::Constrained.new(type, rule: rule) if rule
 
           type
         end
@@ -66,61 +66,17 @@ module Dry
         alias_method :merge_and, :merge_ordered
         alias_method :merge_implication, :merge_ordered
 
-        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)
+        # @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
 
@@ -142,7 +98,7 @@ module Dry
           elsif unwrapped_new.primitive <= unwrapped_old.primitive
             unwrapped_old
           else
-            raise ArgumentError, <<~MESSAGE
+            raise ::ArgumentError, <<~MESSAGE
               Can't merge types, unwrapped_old=#{unwrapped_old.inspect}, unwrapped_new=#{unwrapped_new.inspect}
             MESSAGE
           end
@@ -157,7 +113,7 @@ module Dry
 
             if type.optional?
               type = type.left.primitive?(nil) ? type.right : type.left
-            elsif type.is_a?(Dry::Types::Decorator)
+            elsif type.is_a?(::Dry::Types::Decorator)
               type = type.type
             else
               break

data/lib/dry/schema/value_coercer.rb

@@ -9,7 +9,7 @@ module Dry
     #
     # @api private
     class ValueCoercer
-      extend Dry::Initializer
+      extend ::Dry::Initializer
       include ::Dry::Equalizer(:type_schema)
 
       # @api private

data/lib/dry/schema/version.rb

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

data/lib/dry/schema.rb

@@ -12,14 +12,14 @@ module Dry
   #
   # @api public
   module Schema
-    extend Dry::Core::Extensions
+    extend ::Dry::Core::Extensions
 
     # @api private
     def self.loader
-      @loader ||= Zeitwerk::Loader.new.tap do |loader|
-        root = File.expand_path("..", __dir__)
+      @loader ||= ::Zeitwerk::Loader.new.tap do |loader|
+        root = ::File.expand_path("..", __dir__)
         loader.tag = "dry-schema"
-        loader.inflector = Zeitwerk::GemInflector.new("#{root}/dry-schema.rb")
+        loader.inflector = ::Zeitwerk::GemInflector.new("#{root}/dry-schema.rb")
         loader.inflector.inflect(
           "dsl" => "DSL",
           "yaml" => "YAML",
@@ -32,6 +32,7 @@ module Dry
           "#{root}/dry/schema/{constants,errors,version,extensions}.rb",
           "#{root}/dry/schema/extensions"
         )
+        loader.do_not_eager_load("#{root}/dry/schema/messages/i18n.rb")
         loader.inflector.inflect("dsl" => "DSL")
       end
     end
@@ -63,8 +64,8 @@ module Dry
     # @see DSL.new
     #
     # @api public
-    def self.define(**options, &block)
-      DSL.new(**options, &block).call
+    def self.define(...)
+      DSL.new(...).call
     end
 
     # Define a schema suitable for HTTP params
@@ -82,10 +83,10 @@ module Dry
     # @see Schema#define
     #
     # @api public
-    def self.Params(**options, &block)
-      define(**options, processor_type: Params, &block)
+    def self.Params(**options, &)
+      define(**options, processor_type: Params, &)
     end
-    singleton_class.send(:alias_method, :Form, :Params)
+    singleton_class.alias_method(:Form, :Params)
 
     # Define a schema suitable for JSON data
     #
@@ -102,8 +103,8 @@ module Dry
     # @see Schema#define
     #
     # @api public
-    def self.JSON(**options, &block)
-      define(**options, processor_type: JSON, &block)
+    def self.JSON(**options, &)
+      define(**options, processor_type: JSON, &)
     end
 
     loader.setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.13.3
+  version: 1.14.0
 platform: ruby
 authors:
 - Piotr Solnica
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-26 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -50,74 +50,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: dry-logic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.4'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -132,48 +114,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |+
   dry-schema provides a DSL for defining schemas with keys and rules that should be applied to
   values. It supports coercion, input sanitization, custom types and localized error messages
@@ -266,7 +206,8 @@ metadata:
   changelog_uri: https://github.com/dry-rb/dry-schema/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-schema
   bug_tracker_uri: https://github.com/dry-rb/dry-schema/issues
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -274,15 +215,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Coercion and validation for data structures
 test_files: []
+...