dry-schema 1.10.5 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 554c25036e827be6ef861157dd83013ca2c04a401c3fb238b4b9d186bd839d90
-  data.tar.gz: 37556dbf504ed1a928771687627e36034113077437fad2a1eed54c877ab4bf70
+  metadata.gz: 2ac964a43295c0e7abbac3d3afff822e81c3116264c91ca134e6b2eaa0a93e36
+  data.tar.gz: 954e729bfc708c26bbbe9ceee51a5281bbe27323d14be76af3197527c19b47e2
 SHA512:
-  metadata.gz: 5dc91041372b0d8a944c4d43df2bcea7beadc691cde5cd446345908195af1454293bd192b31eea571fcf8f6aca657d3f814eb8ad373a66e5f44be58f4d1486f3
-  data.tar.gz: f8fb0a30337e95bc3b83781640d0d8b03931907c2b5333df52d36e41ff1d52d8c852cc6056d4d82e4fe6a5e52c81beed8bb893a5e6b82da2814f2817302c6406
+  metadata.gz: c52027ad05138f792f6dc0fe0e10b40c9b11897566f87defefd9049ea2d4d650ed636e46a15ed9912e83061881927299760327c87e5143d0c3b53c7e600d85ae
+  data.tar.gz: 6f0aa01b4f84c52a4065a800e8503e7cd500c23beca54ceba91d1179f1a2644abd639a736b41c149ffcb9b392a76d2d70b3f91b0ad7a6b98b718421156c5128f

data/CHANGELOG.md

@@ -1,6 +1,25 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
-## 1.10.5 2022-10-21
+## 1.11.0 2022-10-15
+
+
+### Changed
+
+- Use zeitwerk for auto-loading which speeds up requires (via #427) (@flash-gordon + @solnic)
+
+[Compare v1.10.6...v1.11.0](https://github.com/dry-rb/dry-schema/compare/v1.10.6...v1.11.0)
+
+## 1.10.6 2022-10-01
+
+
+### Fixed
+
+- Fix issues with rule name when top_namespace and namespace passed (issue #304 fixed via #432) (@RudskikhIvan)
+
+
+[Compare v1.10.5...v1.10.6](https://github.com/dry-rb/dry-schema/compare/v1.10.5...v1.10.6)
+
+## 1.10.5 2022-09-21
 
 
 ### Fixed
@@ -11,7 +30,7 @@
 
 [Compare v1.10.4...v1.10.5](https://github.com/dry-rb/dry-schema/compare/v1.10.4...v1.10.5)
 
-## 1.10.4 2022-10-13
+## 1.10.4 2022-09-13
 
 
 ### Fixed
@@ -21,7 +40,7 @@
 
 [Compare v1.10.3...v1.10.4](https://github.com/dry-rb/dry-schema/compare/v1.10.3...v1.10.4)
 
-## 1.10.3 2022-10-10
+## 1.10.3 2022-09-10
 
 
 ### Fixed

data/dry-schema.gemspec

@@ -35,11 +35,12 @@ Gem::Specification.new do |spec|
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_runtime_dependency "dry-configurable", "~> 0.13", ">= 0.13.0"
-  spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
+  spec.add_runtime_dependency "dry-configurable", "~> 0.16"
+  spec.add_runtime_dependency "dry-core", "~> 0.9", ">= 0.9"
   spec.add_runtime_dependency "dry-initializer", "~> 3.0"
-  spec.add_runtime_dependency "dry-logic", "~> 1.2"
-  spec.add_runtime_dependency "dry-types", "~> 1.5"
+  spec.add_runtime_dependency "dry-logic", "~> 1.3"
+  spec.add_runtime_dependency "dry-types", "~> 1.6"
+  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/dry/schema/compiler.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/logic/rule_compiler"
-require "dry/schema/namespaced_rule"
-require "dry/schema/predicate_registry"
-
 module Dry
   module Schema
     # Extended rule compiler used internally by the DSL

data/lib/dry/schema/config.rb

@@ -2,10 +2,7 @@
 
 require "dry/core/equalizer"
 require "dry/configurable"
-
 require "dry/schema/constants"
-require "dry/schema/predicate_registry"
-require "dry/schema/type_container"
 
 module Dry
   module Schema

data/lib/dry/schema/dsl.rb

@@ -1,23 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
-require "dry/logic"
-
 require "dry/schema/constants"
-require "dry/schema/path"
-require "dry/schema/config"
-require "dry/schema/compiler"
-require "dry/schema/types"
-require "dry/schema/macros"
-
-require "dry/schema/processor"
-require "dry/schema/processor_steps"
-require "dry/schema/key_map"
-require "dry/schema/key_coercer"
-require "dry/schema/key_validator"
-require "dry/schema/value_coercer"
-require "dry/schema/rule_applier"
-require "dry/schema/types_merger"
 
 module Dry
   module Schema

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/compiler"
-require "dry/schema/message"
-require "dry/schema/message_compiler"
-
 require "dry/schema/extensions/hints/compiler_methods"
 require "dry/schema/extensions/hints/message_compiler_methods"
 require "dry/schema/extensions/hints/message_set_methods"
@@ -56,6 +52,10 @@ module Dry
 
     # Hints extensions
     module Extensions
+      # @api private
+      module Hints
+      end
+
       Compiler.prepend(Hints::CompilerMethods)
       MessageCompiler.prepend(Hints::MessageCompilerMethods)
       MessageSet.prepend(Hints::MessageSetMethods)

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

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/struct"
-require "dry/schema/predicate_inferrer"
-require "dry/schema/primitive_inferrer"
-require "dry/schema/macros/dsl"
-require "dry/schema/macros/hash"
 
 module Dry
   module Schema

data/lib/dry/schema/json.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/processor"
-
 module Dry
   module Schema
     # JSON schema type

data/lib/dry/schema/key_map.rb

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

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/macros/dsl"
-
 module Dry
   module Schema
     module Macros

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

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
-
 require "dry/schema/constants"
-require "dry/schema/compiler"
-require "dry/schema/trace"
 
 module Dry
   module Schema

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

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/logic/operators"
-
-require "dry/schema/macros/core"
-require "dry/schema/predicate_inferrer"
-require "dry/schema/primitive_inferrer"
-
 module Dry
   module Schema
     module Macros

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/type"
-require "dry/schema/macros/dsl"
-
 module Dry
   module Schema
     module Macros

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/macros/value"
-
 module Dry
   module Schema
     module Macros

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/macros/schema"
-
 module Dry
   module Schema
     module Macros

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

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/processor"
-require "dry/schema/macros/dsl"
-require "dry/schema/constants"
-
 module Dry
   module Schema
     module Macros

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/macros/dsl"
-
 module Dry
   module Schema
     module Macros

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/macros/key"
-
 module Dry
   module Schema
     module Macros

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/macros/key"
-
 module Dry
   module Schema
     module Macros

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/macros/value"
-
 module Dry
   module Schema
     module Macros

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/path"
-require "dry/schema/macros/dsl"
-
 module Dry
   module Schema
     module Macros

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/message/or/abstract"
-require "dry/schema/path"
-
 module Dry
   module Schema
     class Message

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/message/or/abstract"
-
 module Dry
   module Schema
     class Message

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

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/message/or/single_path"
-require "dry/schema/message/or/multi_path"
-
 module Dry
   module Schema
     # Message objects used by message sets

data/lib/dry/schema/message.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
-require "dry/core/equalizer"
-
-require "dry/schema/path"
-require "dry/schema/message/or"
 
 module Dry
   module Schema

data/lib/dry/schema/message_compiler/visitor_opts.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/schema/constants"
-require "dry/schema/message"
 
 module Dry
   module Schema

data/lib/dry/schema/message_compiler.rb

@@ -1,12 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
-
 require "dry/schema/constants"
-require "dry/schema/message"
-require "dry/schema/message_compiler/visitor_opts"
-require "dry/schema/message_set"
-require "dry/schema/path"
 
 module Dry
   module Schema

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

@@ -2,11 +2,8 @@
 
 require "set"
 require "concurrent/map"
-require "dry/core/equalizer"
-require "dry/configurable"
 
 require "dry/schema/constants"
-require "dry/schema/messages/template"
 
 module Dry
   module Schema

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
+require "yaml"
 require "i18n"
-require "dry/schema/messages/abstract"
 
 module Dry
   module Schema

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

@@ -63,7 +63,9 @@ module Dry
         # @api private
         def rule_lookup_paths(tokens)
           base_paths = messages.rule_lookup_paths(tokens)
-          base_paths.map { |key| key.gsub("dry_schema", "dry_schema.#{namespace}") } + base_paths
+          base_paths.map { |key|
+            key.sub(config.top_namespace, "#{config.top_namespace}.#{namespace}")
+          } + base_paths
         end
 
         # @api private

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

@@ -3,9 +3,7 @@
 require "yaml"
 require "pathname"
 
-require "dry/core/equalizer"
 require "dry/schema/constants"
-require "dry/schema/messages/abstract"
 
 module Dry
   module Schema
@@ -169,11 +167,9 @@ module Dry
             text = input.gsub("%", "#")
 
             # rubocop:disable Security/Eval
-            # rubocop:disable Style/DocumentDynamicEvalDefinition
             evaluator = eval(<<~RUBY, EMPTY_CONTEXT, __FILE__, __LINE__ + 1)
               -> (#{tokens.map { |token| "#{token}:" }.join(", ")}) { "#{text}" }
             RUBY
-            # rubocop:enable Style/DocumentDynamicEvalDefinition
             # rubocop:enable Security/Eval
 
             {

data/lib/dry/schema/messages.rb

@@ -30,8 +30,3 @@ module Dry
     end
   end
 end
-
-require "dry/schema/messages/abstract"
-require "dry/schema/messages/namespaced"
-require "dry/schema/messages/yaml"
-require "dry/schema/messages/i18n" if defined?(I18n)

data/lib/dry/schema/params.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/processor"
-
 module Dry
   module Schema
     # Params schema type

data/lib/dry/schema/predicate_inferrer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/predicate_inferrer"
-
 module Dry
   module Schema
     # @api private

data/lib/dry/schema/predicate_registry.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/logic/predicates"
-require "dry/types/predicate_registry"
-
 module Dry
   module Schema
     # A registry with predicate objects from `Dry::Logic::Predicates`

data/lib/dry/schema/primitive_inferrer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/primitive_inferrer"
-
 module Dry
   module Schema
     # @api private

data/lib/dry/schema/processor.rb

@@ -1,15 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/configurable"
 require "dry/initializer"
-require "dry/logic/operators"
-
-require "dry/schema/type_registry"
-require "dry/schema/type_container"
-require "dry/schema/processor_steps"
-require "dry/schema/rule_applier"
-require "dry/schema/key_coercer"
-require "dry/schema/value_coercer"
 
 module Dry
   module Schema

data/lib/dry/schema/processor_steps.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
-
 require "dry/schema/constants"
-require "dry/schema/step"
 
 module Dry
   module Schema

data/lib/dry/schema/result.rb

@@ -3,8 +3,6 @@
 require "dry/initializer"
 require "dry/core/equalizer"
 
-require "dry/schema/path"
-
 module Dry
   module Schema
     # Processing result

data/lib/dry/schema/rule_applier.rb

@@ -1,12 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
-
 require "dry/schema/constants"
-require "dry/schema/config"
-require "dry/schema/result"
-require "dry/schema/messages"
-require "dry/schema/message_compiler"
 
 module Dry
   module Schema

data/lib/dry/schema/step.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/schema/constants"
-require "dry/schema/path"
 
 module Dry
   module Schema

data/lib/dry/schema/trace.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/constants"
-require "dry/schema/compiler"
-require "dry/schema/predicate"
-
 module Dry
   module Schema
     # Captures predicates defined within the DSL

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = "1.10.5"
+    VERSION = "1.11.0"
   end
 end

data/lib/dry/schema.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require "dry/core/extensions"
+require "zeitwerk"
 
-require "dry/schema/config"
-require "dry/schema/constants"
-require "dry/schema/dsl"
-require "dry/schema/params"
-require "dry/schema/json"
+require "dry/core"
+require "dry/configurable"
+require "dry/logic"
+require "dry/types"
 
 module Dry
   # Main interface
@@ -15,6 +14,28 @@ module Dry
   module Schema
     extend Dry::Core::Extensions
 
+    # @api private
+    def self.loader
+      @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.inflect(
+          "dsl" => "DSL",
+          "yaml" => "YAML",
+          "json" => "JSON",
+          "i18n" => "I18n"
+        )
+        loader.push_dir(root)
+        loader.ignore(
+          "#{root}/dry-schema.rb",
+          "#{root}/dry/schema/{constants,errors,version,extensions}.rb",
+          "#{root}/dry/schema/extensions"
+        )
+        loader.inflector.inflect("dsl" => "DSL")
+      end
+    end
+
     # Configuration
     #
     # @example
@@ -84,6 +105,8 @@ module Dry
     def self.JSON(**options, &block)
       define(**options, processor_type: JSON, &block)
     end
+
+    loader.setup
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.10.5
+  version: 1.11.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-21 00:00:00.000000000 Z
+date: 2022-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -30,40 +30,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
@@ -84,28 +78,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -187,7 +195,6 @@ files:
 - lib/dry/schema/key_coercer.rb
 - lib/dry/schema/key_map.rb
 - lib/dry/schema/key_validator.rb
-- lib/dry/schema/macros.rb
 - lib/dry/schema/macros/array.rb
 - lib/dry/schema/macros/core.rb
 - lib/dry/schema/macros/dsl.rb

data/lib/dry/schema/macros.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require "dry/schema/macros/array"
-require "dry/schema/macros/each"
-require "dry/schema/macros/filled"
-require "dry/schema/macros/schema"
-require "dry/schema/macros/hash"
-require "dry/schema/macros/maybe"
-require "dry/schema/macros/optional"
-require "dry/schema/macros/required"