dry-validation 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c0ec5ac402da094ae496a120274c13f2a251300df9b178adb0b688968687082
-  data.tar.gz: b07231e7542c689d1d02cf2e8de3837592cb7867cc7772c4968034129bb65012
+  metadata.gz: fb13f4dba2e8837c0cff3c3d092eacc87c29c367286f6e16f37c4b5d78179066
+  data.tar.gz: 66196d258e68914b4546dcc20033e74627f2c738fcbeadbe6d4bfff746861cc0
 SHA512:
-  metadata.gz: 7d4835f01c7c8e02d63e1583f6e140efb8db33582800c2c276c94865f6841d8533b91b3fd5832944f57ad8e59f7660dcdff930dfe77e0ae17537c18f0caa14c6
-  data.tar.gz: e8b2cba4863b18461a8f64e6581654aecaca6525b603e40e6896199faecd5a735f8e5d1a8dbd9d6bb1ac43d562d8bb09ff3bbf77cd01d9b21d9cdef8da4f8e36
+  metadata.gz: 1ccea2694b25be64dd68f01c6d9d554c20ae7992ffe78dbf2d483e5d502cdcc2bc3884f567da8d1d303a3b8fa71fa42c85b1a63977c5bef2b42d1496585228f4
+  data.tar.gz: e95cd0ce0d5fdcd583b9edb023c1ae6d0797ab5bcfad1816c1a2b9d989c50fea90b66699c89bc5aedeb09483315b8c5d33696cec2e1662e06c7cadff162e9e22

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.9.0 2022-10-15
+
+
+### Fixed
+
+- Duplicated keys mishandling in rule evaluation (issue #676 fixed via #711) (@mereghost)
+
+### Changed
+
+- Use Zeitwerk for auto-loading (via #715) (@solnic)
+
+[Compare v1.8.1...v1.9.0](https://github.com/dry-rb/dry-validation/compare/v1.8.1...v1.9.0)
+
+## 1.8.1 2022-05-28
+
+
+### Fixed
+
+- Raise an InvalidKeyErrors on substring of valid keys (issue #705 fixed via #706) (@MatElGran)
+- Using `rule(:arr).each { .. }` doesn't crash when `:arr` turns out to be `nil` (issue #708 fixed via #709) (@bautrey37)
+
+
+[Compare v1.8.0...v1.8.1](https://github.com/dry-rb/dry-validation/compare/v1.8.0...v1.8.1)
+
 ## 1.8.0 2022-02-17
 
 

data/LICENSE

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

@@ -11,7 +11,7 @@
 [![CI Status](https://github.com/dry-rb/dry-validation/workflows/ci/badge.svg)][actions]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f30e3ff5ec304c55a73868cdbf055c67)][codacy]
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/f30e3ff5ec304c55a73868cdbf055c67)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-validation.svg?branch=master)][inchpages]
+[![Inline docs](http://inch-ci.org/github/dry-rb/dry-validation.svg?branch=main)][inchpages]
 
 ## Links
 

data/dry-validation.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-validation/blob/master/CHANGELOG.md"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-validation/blob/main/CHANGELOG.md"
   spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-validation"
   spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-validation/issues"
 
@@ -31,9 +31,10 @@ Gem::Specification.new do |spec|
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
   spec.add_runtime_dependency "dry-container", "~> 0.7", ">= 0.7.1"
-  spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
+  spec.add_runtime_dependency "dry-core", "~> 0.9", ">= 0.9"
   spec.add_runtime_dependency "dry-initializer", "~> 3.0"
-  spec.add_runtime_dependency "dry-schema", "~> 1.9", ">= 1.9.1"
+  spec.add_runtime_dependency "dry-schema", "~> 1.11", ">= 1.11.0"
+  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/dry/validation/config.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/config"
-require "dry/validation/macros"
-
 module Dry
   module Validation
     # Configuration for contracts

data/lib/dry/validation/contract/class_interface.rb

@@ -1,13 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/schema"
-require "dry/schema/messages"
-require "dry/schema/path"
-require "dry/schema/key_map"
-
 require "dry/validation/constants"
-require "dry/validation/macros"
-require "dry/validation/schema_ext"
 
 module Dry
   module Validation
@@ -158,11 +151,13 @@ module Dry
           valid_paths = key_map.to_dot_notation
           key_paths = key_paths(keys)
 
-          invalid_keys = key_paths.map { |(key, path)|
-            unless valid_paths.any? { |vp| vp.include?(path) || vp.include?("#{path}[]") }
+          invalid_keys = key_paths.filter_map { |(key, path)|
+            if valid_paths.none? { |vp|
+                 vp == path || vp.start_with?("#{path}.", "#{path}[]")
+               }
               key
             end
-          }.compact.uniq
+          }.uniq
 
           return if invalid_keys.empty?
 

data/lib/dry/validation/contract.rb

@@ -2,17 +2,9 @@
 
 require "concurrent/map"
 
-require "dry/core/equalizer"
 require "dry/initializer"
-require "dry/schema/path"
-
-require "dry/validation/config"
 require "dry/validation/constants"
-require "dry/validation/rule"
-require "dry/validation/evaluator"
-require "dry/validation/messages/resolver"
-require "dry/validation/result"
-require "dry/validation/contract/class_interface"
+require "dry/validation/schema_ext"
 
 module Dry
   module Validation
@@ -140,8 +132,9 @@ module Dry
 
         path
           .to_a[0..-2]
-          .any? { |key|
-            curr_path = Schema::Path[path.keys[0..path.keys.index(key)]]
+          .each_with_index
+          .any? { |_key, index|
+            curr_path = Schema::Path[path.keys[0..index]]
 
             return false unless result.schema_error?(curr_path)
 

data/lib/dry/validation/evaluator.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
 require "dry/initializer"
-require "dry/core/deprecations"
-
 require "dry/validation/constants"
-require "dry/validation/failures"
 
 module Dry
   module Validation

data/lib/dry/validation/extensions/predicates_as_macros.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/schema/predicate_registry"
-require "dry/validation/contract"
-
 module Dry
   module Validation
     # Predicate registry with additional needed methods.

data/lib/dry/validation/macro.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/validation/constants"
-require "dry/validation/function"
 
 module Dry
   module Validation

data/lib/dry/validation/macros.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "dry/container"
-require "dry/validation/macro"
 
 module Dry
   module Validation

data/lib/dry/validation/message.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-
-require "dry/schema/constants"
-require "dry/schema/message"
-
 module Dry
   module Validation
     # Message message

data/lib/dry/validation/message_set.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/schema/message_set"
-
 require "dry/validation/constants"
-require "dry/validation/message"
 
 module Dry
   module Validation

data/lib/dry/validation/messages/resolver.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/validation/message"
-require "dry/schema/message_compiler"
-
 module Dry
   module Validation
     module Messages

data/lib/dry/validation/result.rb

@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 
 require "concurrent/map"
-require "dry/core/equalizer"
 
 require "dry/validation/constants"
-require "dry/validation/message_set"
-require "dry/validation/values"
 
 module Dry
   module Validation

data/lib/dry/validation/rule.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-
 require "dry/validation/constants"
-require "dry/validation/function"
 
 module Dry
   module Validation
@@ -76,13 +73,15 @@ module Dry
       # @return [Rule]
       #
       # @api public
+      #
+      # rubocop:disable Metrics/AbcSize
       def each(*macros, &block)
         root = keys[0]
         macros = parse_macros(*macros)
         @keys = []
 
         @block = proc do
-          unless result.base_error?(root) || !values.key?(root)
+          unless result.base_error?(root) || !values.key?(root) || values[root].nil?
             values[root].each_with_index do |_, idx|
               path = [*Schema::Path[root].to_a, idx]
 
@@ -99,6 +98,7 @@ module Dry
 
         self
       end
+      # rubocop:enable Metrics/AbcSize
 
       # Return a nice string representation
       #

data/lib/dry/validation/values.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
 require "dry/schema/path"
 require "dry/validation/constants"
 
@@ -65,7 +64,6 @@ module Dry
       def key?(key, hash = data)
         return hash.key?(key) if key.is_a?(Symbol)
 
-        # rubocop: disable Lint/DuplicateBranch
         Schema::Path[key].reduce(hash) do |a, e|
           if e.is_a?(Array)
             result = e.all? { |k| key?(k, a) }
@@ -81,8 +79,6 @@ module Dry
           end
           a[e]
         end
-        # rubocop: enable Lint/DuplicateBranch
-
         true
       end
       # rubocop: enable Metrics/PerceivedComplexity

data/lib/dry/validation/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Validation
-    VERSION = "1.8.0"
+    VERSION = "1.9.0"
   end
 end

data/lib/dry/validation.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
+require "zeitwerk"
+
+require "dry/core"
+require "dry/schema"
+
 require "dry/validation/constants"
-require "dry/validation/contract"
-require "dry/validation/macros"
 
 # Main namespace
 #
@@ -13,7 +16,22 @@ module Dry
   # @api public
   module Validation
     extend Dry::Core::Extensions
-    extend Macros::Registrar
+
+    def self.loader
+      @loader ||= Zeitwerk::Loader.new.tap do |loader|
+        root = File.expand_path("..", __dir__)
+        loader.tag = "dry-validation"
+        loader.inflector = Zeitwerk::GemInflector.new("#{root}/dry-validation.rb")
+        loader.push_dir(root)
+        loader.ignore(
+          "#{root}/dry-validation.rb",
+          "#{root}/dry/validation/schema_ext.rb",
+          "#{root}/dry/validation/{constants,errors,version}.rb",
+          "#{root}/dry/validation/extensions"
+        )
+        loader.inflector.inflect("dsl" => "DSL")
+      end
+    end
 
     register_extension(:monads) do
       require "dry/validation/extensions/monads"
@@ -56,5 +74,9 @@ module Dry
     def self.macros
       Macros
     end
+
+    loader.setup
+
+    extend Macros::Registrar
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -50,20 +50,20 @@ dependencies:
     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,20 +84,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: 1.11.0
+- !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: '2.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +193,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-validation/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-validation/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-validation
   bug_tracker_uri: https://github.com/dry-rb/dry-validation/issues
 post_install_message: