dry-validation 1.0.0 → 1.5.6

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
@@ -54,7 +54,7 @@ module Dry
       #
       # @api public
       def validate(*macros, &block)
-        @macros = macros.map { |spec| Array(spec) }.map(&:flatten)
+        @macros = parse_macros(*macros)
         @block = block if block
         self
       end
@@ -65,29 +65,38 @@ module Dry
       # for a given array item.
       #
       # @example
-      #   rule(:nums).each do
-      #     key.failure("must be greater than 0") if value < 0
+      #   rule(:nums).each do |index:|
+      #     key([:number, index]).failure("must be greater than 0") if value < 0
+      #   end
+      #   rule(:nums).each(min: 3)
+      #   rule(address: :city) do
+      #      key.failure("oops") if value != 'Munich'
       #   end
       #
       # @return [Rule]
       #
       # @api public
       def each(*macros, &block)
-        root = keys
+        root = keys[0]
+        macros = parse_macros(*macros)
         @keys = []
 
         @block = proc do
-          values[root].each_with_index do |_, idx|
-            path = [*root, idx]
+          unless result.base_error?(root) || !values.key?(root)
+            values[root].each_with_index do |_, idx|
+              path = [*Schema::Path[root].to_a, idx]
 
-            next if result.error?(path)
+              next if result.schema_error?(path)
 
-            evaluator = with(macros: macros, keys: [path], &block)
+              evaluator = with(macros: macros, keys: [path], index: idx, &block)
 
-            failures.concat(evaluator.failures)
+              failures.concat(evaluator.failures)
+            end
           end
         end
 
+        @block_options = map_keywords(block) if block
+
         self
       end
 
@@ -99,6 +108,28 @@ module Dry
       def inspect
         %(#<#{self.class} keys=#{keys.inspect}>)
       end
+
+      # Parse function arguments into macros structure
+      #
+      # @return [Array]
+      #
+      # @api private
+      def parse_macros(*args)
+        args.each_with_object([]) do |spec, macros|
+          case spec
+          when Hash
+            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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "dry/schema/path"
+
+module Dry
+  module Schema
+    class Path
+      # @api private
+      def multi_value?
+        last.is_a?(Array)
+      end
+
+      # @api private
+      def expand
+        to_a[0..-2].product(last).map { |spec| self.class[spec] }
+      end
+    end
+  end
+end

data/lib/dry/validation/values.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry/equalizer'
-require 'dry/validation/constants'
+require "dry/equalizer"
+require "dry/schema/path"
+require "dry/validation/constants"
 
 module Dry
   module Validation
@@ -34,23 +35,48 @@ 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]
       #
       # @api public
       def [](*args)
-        if args.size.equal?(1)
-          case (key = args[0])
-          when Symbol then data[key]
-          when String then self[*key.split(DOT).map(&:to_sym)]
-          when Array then self[*key]
+        return data.dig(*args) if args.size > 1
+
+        case (key = args[0])
+        when Symbol, String, Array, Hash
+          keys = Schema::Path[key].to_a
+
+          return data.dig(*keys) unless keys.last.is_a?(Array)
+
+          last = keys.pop
+          vals = self.class.new(data.dig(*keys))
+          vals.fetch_values(*last) { nil }
+        else
+          raise ArgumentError, "+key+ must be a valid path specification"
+        end
+      end
+
+      # @api public
+      def key?(key, hash = data)
+        return hash.key?(key) if key.is_a?(Symbol)
+
+        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
           else
-            raise ArgumentError, '+key+ must be a symbol, string, array, or a list of keys for dig'
+            return false unless a.is_a?(Array) ? (e >= 0 && e < a.size) : a.key?(e)
           end
-        else
-          data.dig(*args)
+          a[e]
         end
+
+        true
       end
 
       # @api private
@@ -68,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.0.0'
+    VERSION = "1.5.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.5.6
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2020-09-04 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,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +148,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: Validation library
 email:
 - piotr.solnica@gmail.com
 executables: []
@@ -159,6 +159,7 @@ files:
 - LICENSE
 - README.md
 - config/errors.yml
+- dry-validation.gemspec
 - lib/dry-validation.rb
 - lib/dry/validation.rb
 - lib/dry/validation/config.rb
@@ -168,6 +169,7 @@ files:
 - lib/dry/validation/evaluator.rb
 - lib/dry/validation/extensions/hints.rb
 - lib/dry/validation/extensions/monads.rb
+- lib/dry/validation/extensions/predicates_as_macros.rb
 - lib/dry/validation/failures.rb
 - lib/dry/validation/function.rb
 - lib/dry/validation/macro.rb
@@ -177,12 +179,17 @@ files:
 - lib/dry/validation/messages/resolver.rb
 - lib/dry/validation/result.rb
 - lib/dry/validation/rule.rb
+- lib/dry/validation/schema_ext.rb
 - lib/dry/validation/values.rb
 - lib/dry/validation/version.rb
 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:
@@ -191,7 +198,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:
   - - ">="