dry-validation 1.4.0 → 1.5.2

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
@@ -25,7 +25,7 @@ module Dry
         #   end
         #
         # @param [Symbol] name The name of the macro
-        # @param [Array] *args Optional default arguments for the macro
+        # @param [Array] args Optional default positional arguments for the macro
         #
         # @return [self]
         #

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
 
@@ -86,58 +85,13 @@ module Dry
       # @api private
       def freeze
         source_messages.select { |err| err.respond_to?(:evaluate) }.each do |err|
-          idx = source_messages.index(err)
+          idx = messages.index(err) || source_messages.index(err)
           msg = err.evaluate(locale: locale, full: options[:full])
           messages[idx] = msg
         end
         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
@@ -33,7 +33,7 @@ module Dry
           when Symbol
             Message[->(**opts) { message(message, path: path, tokens: tokens, **opts) }, path, meta]
           when String
-            Message[message, path, meta]
+            Message[->(**opts) { [message_text(message, path, **opts), meta] }, path, meta]
           when Hash
             meta = message.dup
             text = meta.delete(:text) { |key|
@@ -51,6 +51,18 @@ module Dry
         end
         alias_method :[], :call
 
+        # Resolve a message
+        #
+        # @return String
+        #
+        # @api public
+        def message_text(message, path, locale: nil, full: false, **opts)
+          keys = path.to_a.compact
+          msg_opts = EMPTY_HASH.merge(path: keys, locale: locale || messages.default_locale)
+
+          full ? "#{messages.rule(keys.last, msg_opts) || keys.last} #{message}" : message
+        end
+
         # Resolve a message
         #
         # @return [String]
@@ -75,11 +87,31 @@ module Dry
             STR
           end
 
-          text = template.(template.data(tokens))
+          parsed_tokens = parse_tokens(tokens)
+          text = template.(template.data(parsed_tokens))
 
           [full ? "#{messages.rule(keys.last, msg_opts)} #{text}" : text, meta]
         end
         # rubocop:enable Metrics/AbcSize
+
+        private
+
+        def parse_tokens(tokens)
+          Hash[
+            tokens.map do |key, token|
+              [key, parse_token(token)]
+            end
+          ]
+        end
+
+        def parse_token(token)
+          case token
+          when Array
+            token.join(", ")
+          else
+            token
+          end
+        end
       end
     end
   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,6 +179,22 @@ module Dry
         super
       end
 
+      if RUBY_VERSION >= "2.7"
+        # Pattern matching
+        #
+        # @api private
+        def deconstruct_keys(keys)
+          values.deconstruct_keys(keys)
+        end
+
+        # Pattern matching
+        #
+        # @api private
+        def deconstruct
+          [values, context.each.to_h]
+        end
+      end
+
       private
 
       # @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
@@ -118,12 +118,18 @@ module Dry
         args.each_with_object([]) do |spec, macros|
           case spec
           when Hash
-            spec.each { |k, v| macros << [k, Array(v)] }
+            add_macro_from_hash(macros, spec)
           else
             macros << Array(spec)
           end
         end
       end
+
+      def add_macro_from_hash(macros, spec)
+        spec.each do |k, v|
+          macros << [k, v.is_a?(Array) ? v : [v]]
+        end
+      end
     end
   end
 end

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
@@ -35,7 +35,10 @@ module Dry
       #     key.failure('must be > 18') if values[:age] <= 18
       #   end
       #
-      # @param [Symbol] key
+      # @param args [Symbol, String, Hash, Array<Symbol>] If given as a single
+      #   Symbol, String, Array or Hash, build a key array using
+      #   {Dry::Schema::Path} digging for data. If given as positional
+      #   arguments, use these with Hash#dig on the data directly.
       #
       # @return [Object]
       #
@@ -53,7 +56,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
 
@@ -65,6 +68,8 @@ module Dry
           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
           else
             return false unless a.is_a?(Array) ? (e >= 0 && e < a.size) : a.key?(e)
           end
@@ -89,6 +94,7 @@ module Dry
           super
         end
       end
+      ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
     end
   end
 end

data/lib/dry/validation/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Validation
-    VERSION = '1.4.0'
+    VERSION = "1.5.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -25,53 +25,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: dry-core
+  name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: dry-equalizer
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
@@ -92,20 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +142,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: Validation library
 email:
 - piotr.solnica@gmail.com
 executables: []
@@ -159,6 +153,7 @@ files:
 - LICENSE
 - README.md
 - config/errors.yml
+- dry-validation.gemspec
 - lib/dry-validation.rb
 - lib/dry/validation.rb
 - lib/dry/validation/config.rb
@@ -184,7 +179,11 @@ files:
 homepage: https://dry-rb.org/gems/dry-validation
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-validation/blob/master/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: 
 rdoc_options: []
 require_paths:
@@ -193,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="