dry-validation 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea571eab29d2c8f50457cd8472a8f0d66da98bfda7f7fd1b697776532193b12d
-  data.tar.gz: 0e45ff77064b269b25e4c9dbc84219dcc78e07390bb14e75dd2fa0ab24593096
+  metadata.gz: 5c4b57593ac3fd38a26ef3eb26a31b34503bfa75a6fc118358745aa9fb772be1
+  data.tar.gz: 534dc4c9e0a8e83faec7077a78e4b3fd7e7fa5b55b6aa277479999332920bcb5
 SHA512:
-  metadata.gz: ddc760c72d530ceada83071591ebb7d214ed1c1fe7ec56486120170cd8b32a50916468dc086018820d3505a1eb14df1cbfe07a80b212da7c5f67c262dc47847b
-  data.tar.gz: d06df105ce8e8a9ef8720dd6df9748585c9621a39bca8a73067e337ad153edbdbd052581be687a6df9bc0c62e16b1ad9fb8866014a0d4ba9a2c411c31d892610
+  metadata.gz: 8268526e70a23bd00ff7825accd0b7f4ca682342a2fefab22051e756e574a8b2834d527e1c1e2cce0a7084308eb9d721dafce92b1500c793588ba9d219499e82
+  data.tar.gz: d1ca0f28f775093521f74330dc4a09142a99c83c693aefcab1571f32343692a72c5f3669bd51baf10865fc9de93074ab3893ddfbb6412edf540bf3f2ac37b47c

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## unreleased 
+
+
+### Added
+
+- `schema_error?` rule helper (@waiting-for-dev)
+- `rule_error?` rule helper (@waiting-for-dev)
+
+### Changed
+
+- dry-schema dependency was bumped to `~> 1.5` (@solnic)
+- [internal] `KeyMap` patches have been removed since dry-schema now provides required functionality (@solnic)
+
+[Compare v1.4.2...master](https://github.com/dry-rb/dry-validation/compare/v1.4.2...master)
+
 ## 1.4.2 2020-01-18
 
 

data/dry-validation.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   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.executables   = []
   spec.require_paths = ['lib']
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
@@ -23,7 +25,7 @@ Gem::Specification.new do |spec|
   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.4.0"
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
@@ -31,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "dry-core", "~> 0.4"
   spec.add_runtime_dependency "dry-equalizer", "~> 0.2"
   spec.add_runtime_dependency "dry-initializer", "~> 3.0"
-  spec.add_runtime_dependency "dry-schema", "~> 1.4", ">= 1.4.3"
+  spec.add_runtime_dependency "dry-schema", "~> 1.5"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/dry-validation.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'dry/validation'
+require "dry/validation"

data/lib/dry/validation.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry/validation/constants'
-require 'dry/validation/contract'
-require 'dry/validation/macros'
+require "dry/validation/constants"
+require "dry/validation/contract"
+require "dry/validation/macros"
 
 # Main namespace
 #
@@ -16,15 +16,15 @@ module Dry
     extend Macros::Registrar
 
     register_extension(:monads) do
-      require 'dry/validation/extensions/monads'
+      require "dry/validation/extensions/monads"
     end
 
     register_extension(:hints) do
-      require 'dry/validation/extensions/hints'
+      require "dry/validation/extensions/hints"
     end
 
     register_extension(:predicates_as_macros) do
-      require 'dry/validation/extensions/predicates_as_macros'
+      require "dry/validation/extensions/predicates_as_macros"
     end
 
     # Define a contract and build its instance
@@ -46,11 +46,9 @@ module Dry
     #
     # @api public
     #
-    # rubocop:disable Naming/MethodName
     def self.Contract(options = EMPTY_HASH, &block)
       Contract.build(options, &block)
     end
-    # rubocop:enable Naming/MethodName
 
     # This is needed by Macros::Registrar
     #

data/lib/dry/validation/config.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/schema/config'
-require 'dry/validation/macros'
+require "dry/schema/config"
+require "dry/validation/macros"
 
 module Dry
   module Validation

data/lib/dry/validation/constants.rb

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
-require 'pathname'
-require 'dry/core/constants'
+require "pathname"
+require "dry/core/constants"
 
 module Dry
   module Validation
     include Dry::Core::Constants
 
-    DOT = '.'
+    DOT = "."
 
     # Root path is used for base errors in hash representation of error messages
     ROOT_PATH = [nil].freeze
 
     # Path to the default errors locale file
-    DEFAULT_ERRORS_NAMESPACE = 'dry_validation'
+    DEFAULT_ERRORS_NAMESPACE = "dry_validation"
 
     # Path to the default errors locale file
-    DEFAULT_ERRORS_PATH = Pathname(__FILE__).join('../../../../config/errors.yml').realpath.freeze
+    DEFAULT_ERRORS_PATH = Pathname(__FILE__).join("../../../../config/errors.yml").realpath.freeze
 
     # Mapping for block kwarg options used by block_options
     #

data/lib/dry/validation/contract.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'concurrent/map'
-
-require 'dry/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 "concurrent/map"
+
+require "dry/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"
 
 module Dry
   module Validation

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'dry/schema'
-require 'dry/schema/messages'
-require 'dry/schema/path'
-require 'dry/schema/key_map'
+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'
+require "dry/validation/constants"
+require "dry/validation/macros"
+require "dry/validation/schema_ext"
 
 module Dry
   module Validation
@@ -23,7 +23,7 @@ module Dry
         # @api private
         def inherited(klass)
           super
-          klass.instance_variable_set('@config', config.dup)
+          klass.instance_variable_set("@config", config.dup)
         end
 
         # Configuration
@@ -154,28 +154,15 @@ module Dry
         private
 
         # @api private
-        # rubocop:disable Metrics/AbcSize
         def ensure_valid_keys(*keys)
-          valid_paths = key_map.to_dot_notation.map { |value| Schema::Path[value] }
-
-          invalid_keys = keys
-            .map { |key|
-              [key, Schema::Path[key]]
-            }
-            .flat_map { |(key, path)|
-              if (last = path.last).is_a?(Array)
-                last.map { |last_key|
-                  path_key = [*path.to_a[0..-2], last_key]
-                  [path_key, Schema::Path[path_key]]
-                }
-              else
-                [[key, path]]
-              end
-            }
-            .reject { |(_, path)|
-              valid_paths.any? { |valid_path| valid_path.include?(path) }
-            }
-            .map(&:first)
+          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}[]") }
+              key
+            end
+          }.compact.uniq
 
           return if invalid_keys.empty?
 
@@ -183,7 +170,28 @@ module Dry
             #{name}.rule specifies keys that are not defined by the schema: #{invalid_keys.inspect}
           STR
         end
-        # rubocop:enable Metrics/AbcSize
+
+        # @api private
+        def key_paths(keys)
+          keys.map { |key|
+            case key
+            when Hash
+              path = Schema::Path[key]
+              if path.multi_value?
+                *head, tail = Array(path)
+                [key].product(
+                  tail.map { |el| [*head, *el] }.map { |parts| parts.join(DOT) }
+                )
+              else
+                [[key, path.to_a.join(DOT)]]
+              end
+            when Array
+              [[key, Schema::Path[key].to_a.join(DOT)]]
+            else
+              [[key, key.to_s]]
+            end
+          }.flatten(1)
+        end
 
         # @api private
         def key_map
@@ -192,7 +200,7 @@ module Dry
 
         # @api private
         def core_schema_opts
-          { parent: superclass&.__schema__, config: config }
+          {parent: superclass&.__schema__, config: config}
         end
 
         # @api private
@@ -200,7 +208,7 @@ module Dry
           return __schema__ if external_schemas.empty? && block.nil?
 
           unless __schema__.nil?
-            raise ::Dry::Validation::DuplicateSchemaError, 'Schema has already been defined'
+            raise ::Dry::Validation::DuplicateSchemaError, "Schema has already been defined"
           end
 
           schema_opts = core_schema_opts

data/lib/dry/validation/evaluator.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-require 'dry/initializer'
+require "dry/initializer"
+require "dry/core/deprecations"
 
-require 'dry/validation/constants'
-require 'dry/validation/failures'
+require "dry/validation/constants"
+require "dry/validation/failures"
 
 module Dry
   module Validation
@@ -16,6 +17,9 @@ module Dry
     # @api public
     class Evaluator
       extend Dry::Initializer
+      extend Dry::Core::Deprecations[:'dry-validation']
+
+      deprecate :error?, :schema_error?
 
       # @!attribute [r] _contract
       #   @return [Contract]
@@ -163,17 +167,26 @@ module Dry
         values.key?(key_name)
       end
 
-      # Check if there are any errors under the provided path
+      # Check if there are any errors on the schema under the provided path
       #
       # @param [Symbol, String, Array] A Path-compatible spec
       #
       # @return [Boolean]
       #
       # @api public
-      def error?(path)
+      def schema_error?(path)
         result.error?(path)
       end
 
+      # Check if there are any errors on the current rule
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def rule_error?
+        !key(path).empty?
+      end
+
       # @api private
       def respond_to_missing?(meth, include_private = false)
         super || _contract.respond_to?(meth, true)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/monads/result'
+require "dry/monads/result"
 
 module Dry
   module Validation

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/monads/result'
+require "dry/monads/result"
 
 module Dry
   module Validation

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/schema/predicate_registry'
-require 'dry/validation/contract'
+require "dry/schema/predicate_registry"
+require "dry/validation/contract"
 
 module Dry
   module Validation

data/lib/dry/validation/failures.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/schema/path'
-require 'dry/validation/constants'
+require "dry/schema/path"
+require "dry/validation/constants"
 
 module Dry
   module Validation
@@ -57,9 +57,14 @@ module Dry
       #
       # @api public
       def failure(message, tokens = EMPTY_HASH)
-        opts << { message: message, tokens: tokens, path: path }
+        opts << {message: message, tokens: tokens, path: path}
         self
       end
+
+      # @api private
+      def empty?
+        opts.empty?
+      end
     end
   end
 end

data/lib/dry/validation/function.rb

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

data/lib/dry/validation/macro.rb

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

data/lib/dry/validation/macros.rb

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

data/lib/dry/validation/message.rb

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

data/lib/dry/validation/message_set.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'dry/schema/message_set'
+require "dry/schema/message_set"
 
-require 'dry/validation/constants'
-require 'dry/validation/message'
+require "dry/validation/constants"
+require "dry/validation/message"
 
 module Dry
   module Validation
@@ -57,7 +57,6 @@ module Dry
         @empty = nil
         source_messages << message
         messages << message
-        initialize_placeholders!
         self
       end
 
@@ -93,51 +92,6 @@ module Dry
         to_h
         self
       end
-
-      private
-
-      # @api private
-      def unique_paths
-        source_messages.uniq(&:path).map(&:path)
-      end
-
-      # @api private
-      def messages_map
-        @messages_map ||= reduce(placeholders) { |hash, msg|
-          node = msg.path.reduce(hash) { |a, e| a.is_a?(Hash) ? a[e] : a.last[e] }
-          (node[0].is_a?(::Array) ? node[0] : node) << msg.dump
-          hash
-        }
-      end
-
-      # @api private
-      #
-      # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/PerceivedComplexity
-      def initialize_placeholders!
-        @placeholders = unique_paths.sort_by(&:size).each_with_object(EMPTY_HASH.dup) { |path, hash|
-          curr_idx = 0
-          last_idx = path.size - 1
-          node = hash
-
-          while curr_idx <= last_idx
-            key = path[curr_idx]
-
-            next_node =
-              if node.is_a?(Array) && key.is_a?(Symbol)
-                node_hash = (node << [] << {}).last
-                node_hash[key] || (node_hash[key] = curr_idx < last_idx ? {} : [])
-              else
-                node[key] || (node[key] = curr_idx < last_idx ? {} : [])
-              end
-
-            node = next_node
-            curr_idx += 1
-          end
-        }
-      end
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/PerceivedComplexity
     end
   end
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/validation/message'
+require "dry/validation/message"
 
 module Dry
   module Validation
@@ -95,7 +95,7 @@ module Dry
         def parse_token(token)
           case token
           when Array
-            token.join(', ')
+            token.join(", ")
           else
             token
           end

data/lib/dry/validation/result.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'concurrent/map'
-require 'dry/equalizer'
+require "concurrent/map"
+require "dry/equalizer"
 
-require 'dry/validation/constants'
-require 'dry/validation/message_set'
-require 'dry/validation/values'
+require "dry/validation/constants"
+require "dry/validation/message_set"
+require "dry/validation/values"
 
 module Dry
   module Validation
@@ -179,7 +179,7 @@ module Dry
         super
       end
 
-      if RUBY_VERSION >= '2.7'
+      if RUBY_VERSION >= "2.7"
         # Pattern matching
         #
         # @api private

data/lib/dry/validation/rule.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'dry/equalizer'
+require "dry/equalizer"
 
-require 'dry/validation/constants'
-require 'dry/validation/function'
+require "dry/validation/constants"
+require "dry/validation/function"
 
 module Dry
   module Validation

data/lib/dry/validation/schema_ext.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/schema/key'
-require 'dry/schema/key_map'
+require "dry/schema/path"
 
 module Dry
   module Schema
@@ -16,31 +15,5 @@ module Dry
         to_a[0..-2].product(last).map { |spec| self.class[spec] }
       end
     end
-
-    # @api private
-    #
-    # TODO: this should be moved to dry-schema at some point
-    class Key
-      # @api private
-      def to_dot_notation
-        [name.to_s]
-      end
-
-      # @api private
-      class Hash < Key
-        # @api private
-        def to_dot_notation
-          [name].product(members.flat_map(&:to_dot_notation)).map { |e| e.join(DOT) }
-        end
-      end
-    end
-
-    # @api private
-    class KeyMap
-      # @api private
-      def to_dot_notation
-        @to_dot_notation ||= map(&:to_dot_notation).flatten
-      end
-    end
   end
 end

data/lib/dry/validation/values.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry/equalizer'
-require 'dry/schema/path'
-require 'dry/validation/constants'
+require "dry/equalizer"
+require "dry/schema/path"
+require "dry/validation/constants"
 
 module Dry
   module Validation
@@ -53,7 +53,7 @@ module Dry
           vals = self.class.new(data.dig(*keys))
           vals.fetch_values(*last) { nil }
         else
-          raise ArgumentError, '+key+ must be a valid path specification'
+          raise ArgumentError, "+key+ must be a valid path specification"
         end
       end
 

data/lib/dry/validation/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Validation
-    VERSION = '1.4.2'
+    VERSION = "1.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-18 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -92,20 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.3
+        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: 1.4.3
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement