dry-validation 1.5.5 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7416252f8c05238652ca9116ec461448e2024c8d68f7c588e3ef401f7a2ed6
-  data.tar.gz: 4137cfee57067480713402f0dd571cb06fde1ef6cafa6feb717596939cbfac1d
+  metadata.gz: 5c0ec5ac402da094ae496a120274c13f2a251300df9b178adb0b688968687082
+  data.tar.gz: b07231e7542c689d1d02cf2e8de3837592cb7867cc7772c4968034129bb65012
 SHA512:
-  metadata.gz: 01cae726d99151eed0bb1ef1514e8db05f9d10c8d341ffdb8ef7329de9456b63511f5eb390b25113c4da06241dfb1070ca1110ae24a5e050b6c6d5e03e2100a5
-  data.tar.gz: 849817760314b9a9e4cc120bc618fc42a302cc08150dcc23eb20c726b1a9b79481b19ca0013674f544608600d7d573d5cf1d1436e826bbcf7d25cf9bd3bad3e6
+  metadata.gz: 7d4835f01c7c8e02d63e1583f6e140efb8db33582800c2c276c94865f6841d8533b91b3fd5832944f57ad8e59f7660dcdff930dfe77e0ae17537c18f0caa14c6
+  data.tar.gz: e8b2cba4863b18461a8f64e6581654aecaca6525b603e40e6896199faecd5a735f8e5d1a8dbd9d6bb1ac43d562d8bb09ff3bbf77cd01d9b21d9cdef8da4f8e36

data/CHANGELOG.md

@@ -1,13 +1,62 @@
-## 1.5.5 
+<!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
+
+## 1.8.0 2022-02-17
+
+
+### Added
+
+- New rule helper `base_rule_error?` which checks if there's any base error set (via #690) (@wuarmin)
+
+### Changed
+
+- Dependency on dry-schema was bumped to 1.9.1 (@solnic)
+
+[Compare v1.7.0...v1.8.0](https://github.com/dry-rb/dry-validation/compare/v1.7.0...v1.8.0)
+
+## 1.7.0 2021-09-12
+
+
+### Changed
+
+- [internal] Upgraded to new `setting` API provided in dry-configurable 0.13.0 (@timriley in #686 and 3f8f7d8)
+- Bumped dry-schema dependency to 1.8.0 (in part, to ensure dry-configurable 0.13.0 is available) (@timriley)
+
+[Compare v1.6.0...v1.7.0](https://github.com/dry-rb/dry-validation/compare/v1.6.0...v1.7.0)
+
+## 1.6.0 2020-12-05
+
+
+### Added
+
+- You can now pass a key name or path to `rule_error?` predicate (issue #658 closed via #673) (@moofkit)
+- You can now pass initial context object to `Contract#call` (issue #674 via #675) (@pyromaniac)
+
+### Fixed
+
+- Checking `key?` within a rule no longer crashes when value is `nil` or an empty string (issue #670 fixed via #672) (@alexxty7)
+
+
+[Compare v1.5.6...v1.6.0](https://github.com/dry-rb/dry-validation/compare/v1.5.6...v1.6.0)
+
+## 1.5.6 2020-09-04
+
+
+### Fixed
+
+- Dependency on dry-schema was bumped to >= 1.5.1. This time for real (@solnic)
+
+
+[Compare v1.5.5...v1.5.6](https://github.com/dry-rb/dry-validation/compare/v1.5.5...v1.5.6)
+
+## 1.5.5 2020-09-03
 
-2020-09-03
 
 ### Fixed
 
 - Dependency on dry-schema was bumped to >= 1.5.2 (see #666 for more info) (@artofhuman)
 
 
-[Compare v1.5.4...master](https://github.com/dry-rb/dry-validation/compare/v1.5.4...master)
+[Compare v1.5.4...v1.5.5](https://github.com/dry-rb/dry-validation/compare/v1.5.4...v1.5.5)
 
 ## 1.5.4 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

@@ -1,3 +1,4 @@
+<!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-validation
 [actions]: https://github.com/dry-rb/dry-validation/actions
 [codacy]: https://www.codacy.com/gh/dry-rb/dry-validation
@@ -14,15 +15,15 @@
 
 ## Links
 
-* [User documentation](http://dry-rb.org/gems/dry-validation)
+* [User documentation](https://dry-rb.org/gems/dry-validation)
 * [API documentation](http://rubydoc.info/gems/dry-validation)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.4`
-* jruby >= `9.2`
+* MRI `>= 2.7.0`
+* jruby `>= 9.3` (postponed until 2.7 is supported)
 
 ## License
 

data/dry-validation.gemspec

@@ -1,39 +1,39 @@
 # frozen_string_literal: true
-# this file is managed by dry-rb/devtools project
 
-lib = File.expand_path('lib', __dir__)
+# this file is synced from dry-rb/template-gem project
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dry/validation/version'
+require "dry/validation/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'dry-validation'
+  spec.name          = "dry-validation"
   spec.authors       = ["Piotr Solnica"]
   spec.email         = ["piotr.solnica@gmail.com"]
-  spec.license       = 'MIT'
+  spec.license       = "MIT"
   spec.version       = Dry::Validation::VERSION.dup
 
   spec.summary       = "Validation library"
   spec.description   = spec.summary
-  spec.homepage      = 'https://dry-rb.org/gems/dry-validation'
+  spec.homepage      = "https://dry-rb.org/gems/dry-validation"
   spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-validation.gemspec", "lib/**/*", "config/*.yml"]
-  spec.bindir        = 'bin'
+  spec.bindir        = "bin"
   spec.executables   = []
-  spec.require_paths = ['lib']
+  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['source_code_uri']   = 'https://github.com/dry-rb/dry-validation'
-  spec.metadata['bug_tracker_uri']   = 'https://github.com/dry-rb/dry-validation/issues'
+  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["source_code_uri"]   = "https://github.com/dry-rb/dry-validation"
+  spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-validation/issues"
 
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # 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.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-schema", "~> 1.5"
+  spec.add_runtime_dependency "dry-schema", "~> 1.9", ">= 1.9.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/dry/validation/config.rb

@@ -11,7 +11,7 @@ module Dry
     #
     # @api public
     class Config < Schema::Config
-      setting :macros, Macros::Container.new, &:dup
+      setting :macros, default: Macros::Container.new, constructor: :dup.to_proc
 
       # @api private
       def dup

data/lib/dry/validation/contract.rb

@@ -2,7 +2,7 @@
 
 require "concurrent/map"
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 require "dry/initializer"
 require "dry/schema/path"
 
@@ -68,6 +68,11 @@ module Dry
       #   @api public
       option :macros, default: -> { config.macros }
 
+      # @!attribute [r] default_context
+      #   @return [Hash] Default context for rules
+      #   @api public
+      option :default_context, default: -> { EMPTY_HASH }
+
       # @!attribute [r] schema
       #   @return [Dry::Schema::Params, Dry::Schema::JSON, Dry::Schema::Processor]
       #   @api private
@@ -86,12 +91,19 @@ module Dry
       # Apply the contract to an input
       #
       # @param [Hash] input The input to validate
+      # @param [Hash] context Initial context for rules
       #
       # @return [Result]
       #
       # @api public
-      def call(input)
-        Result.new(schema.(input), Concurrent::Map.new) do |result|
+      # rubocop: disable Metrics/AbcSize
+      def call(input, context = EMPTY_HASH)
+        context_map = Concurrent::Map.new.tap do |map|
+          default_context.each { |key, value| map[key] = value }
+          context.each { |key, value| map[key] = value }
+        end
+
+        Result.new(schema.(input), context_map) do |result|
           rules.each do |rule|
             next if rule.keys.any? { |key| error?(result, key) }
 
@@ -103,6 +115,7 @@ module Dry
           end
         end
       end
+      # rubocop: enable Metrics/AbcSize
 
       # Return a nice string representation
       #

data/lib/dry/validation/evaluator.rb

@@ -17,7 +17,7 @@ module Dry
     # @api public
     class Evaluator
       extend Dry::Initializer
-      extend Dry::Core::Deprecations[:'dry-validation']
+      extend Dry::Core::Deprecations[:"dry-validation"]
 
       deprecate :error?, :schema_error?
 
@@ -73,7 +73,7 @@ module Dry
         @_options = options
 
         if block
-          exec_opts = block_options.map { |key, value| [key, _options[value]] }.to_h
+          exec_opts = block_options.transform_values { _options[_1] }
           instance_exec(**exec_opts, &block)
         end
 
@@ -187,11 +187,26 @@ module Dry
 
       # Check if there are any errors on the current rule
       #
+      # @param path [Symbol, String, Array] A Path-compatible spec
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def rule_error?(path = nil)
+        if path.nil?
+          !key(self.path).empty?
+        else
+          result.rule_error?(path)
+        end
+      end
+
+      # Check if there are any base rule errors
+      #
       # @return [Boolean]
       #
       # @api public
-      def rule_error?
-        !key(path).empty?
+      def base_rule_error?
+        !base.empty? || result.base_rule_error?
       end
 
       # @api private

data/lib/dry/validation/function.rb

@@ -36,8 +36,7 @@ module Dry
         block
           .parameters
           .select { |arg,| arg.equal?(:keyreq) }
-          .map { |_, name| [name, BLOCK_OPTIONS_MAPPINGS[name]] }
-          .to_h
+          .to_h { [_2, BLOCK_OPTIONS_MAPPINGS[_2]] }
       end
     end
   end

data/lib/dry/validation/macro.rb

@@ -31,7 +31,7 @@ module Dry
 
       # @api private
       def extract_block_options(options)
-        block_options.map { |key, value| [key, options[value]] }.to_h
+        block_options.transform_values { options[_1] }
       end
     end
   end

data/lib/dry/validation/message.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 
 require "dry/schema/constants"
 require "dry/schema/message"
@@ -70,11 +70,13 @@ module Dry
       # Initialize a new error object
       #
       # @api private
+      # rubocop: disable Lint/MissingSuper
       def initialize(text, path:, meta: EMPTY_HASH)
         @text = text
         @path = Array(path)
         @meta = meta
       end
+      # rubocop: enable Lint/MissingSuper
 
       # Check if this is a base error not associated with any key
       #

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

@@ -61,7 +61,8 @@ module Dry
         # @api public
         #
         # rubocop:disable Metrics/AbcSize
-        def message(rule, tokens: EMPTY_HASH, locale: nil, full: false, path:)
+        # rubocop:disable Metrics/PerceivedComplexity
+        def message(rule, path:, tokens: EMPTY_HASH, locale: nil, full: false)
           keys = path.to_a.compact
           msg_opts = tokens.merge(path: keys, locale: locale || messages.default_locale)
 
@@ -88,6 +89,7 @@ module Dry
 
           [message_text(text, path: path, locale: locale, full: full), meta]
         end
+        # rubocop:enable Metrics/PerceivedComplexity
         # rubocop:enable Metrics/AbcSize
 
         private
@@ -110,11 +112,7 @@ module Dry
         end
 
         def parse_tokens(tokens)
-          Hash[
-            tokens.map do |key, token|
-              [key, parse_token(token)]
-            end
-          ]
+          tokens.transform_values { parse_token(_1) }
         end
 
         def parse_token(token)

data/lib/dry/validation/result.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "concurrent/map"
-require "dry/equalizer"
+require "dry/core/equalizer"
 
 require "dry/validation/constants"
 require "dry/validation/message_set"
@@ -113,6 +113,20 @@ module Dry
         schema_result.error?(key)
       end
 
+      # Check if the rules includes an error for the provided key
+      #
+      # @api private
+      def rule_error?(key)
+        !schema_error?(key) && error?(key)
+      end
+
+      # Check if the result contains any base rule errors
+      #
+      # @api private
+      def base_rule_error?
+        !errors.filter(:base?).empty?
+      end
+
       # Check if there's any error for the provided key
       #
       # This does not consider errors from the nested values

data/lib/dry/validation/rule.rb

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

data/lib/dry/validation/values.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/equalizer"
+require "dry/core/equalizer"
 require "dry/schema/path"
 require "dry/validation/constants"
 
@@ -61,23 +61,31 @@ module Dry
       end
 
       # @api public
+      # rubocop: disable Metrics/PerceivedComplexity
       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) }
             return result
           elsif e.is_a?(Symbol) && a.is_a?(Array)
             return false
+          elsif a.nil?
+            return false
+          elsif a.is_a?(String)
+            return false
           else
             return false unless a.is_a?(Array) ? (e >= 0 && e < a.size) : a.key?(e)
           end
           a[e]
         end
+        # rubocop: enable Lint/DuplicateBranch
 
         true
       end
+      # rubocop: enable Metrics/PerceivedComplexity
 
       # @api private
       def respond_to_missing?(meth, include_private = false)

data/lib/dry/validation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.8.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2022-02-17 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
@@ -92,14 +84,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -192,14 +190,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.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.6
 signing_key: 
 specification_version: 4
 summary: Validation library