dry-validation 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7acb8c840fe5a4c12564c86985078e25cff1bea877b9e2dc4f29b39bc892b6a5
-  data.tar.gz: ae09dc37911b0e4031918f22efabd53035501119a71da60ce08b4e0a00a3e0b6
+  metadata.gz: 4985e6191e9e249b510fceea630ed463f11c5ff07830e6f3f867e913b29860ac
+  data.tar.gz: 99cb37716fb12f4a09bb94a4048935e6ac8db658df4d5a4318be321c5aef90ff
 SHA512:
-  metadata.gz: 9430d9ca1660c3d280dd5c32f1787bce32c06c38ecd22987f53ccce8b581debce2679b95dc3b2eb9a96598d16c2dc0d99f5b65aa26de14fe0f2a03c5bb822a87
-  data.tar.gz: a07ad85054ae898cd155db7874219332e58956f57904c1dde445d27d34aa81aa2b7d1a431e6218f6aa320bfdb0e0fffd20fd619a98991929b12c1f643326c77a
+  metadata.gz: 2d25a5df6a56b6a8ed32f19ed3991297f2d878d24ba5349fd8c8d0ec50a3503842c8b591d7b176ddf9303b78a847002e638faeb29691329db3b2f41d2379116b
+  data.tar.gz: a21649e2476c688f9a4275e43819640823c6e6a2caf18e4b8d03c0df97c946d5edbb517c6482918bf3b3b9bc21079e667c06986c2adc81acdeb0561b1bc264aa

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# v1.1.0 2019-06-14
+
+### Added
+
+* `key?` method available within rules, that can be used to check if there's a value under the rule's default key (refs #540) (@solnic)
+* `value` supports hash-based path specifications now (refs #547) (@solnic)
+* `value` can read multiple values when the key points to them, ie in case of `rule(geo: [:lat, :lon])` it would return an array with `lat` and `lon` (@solnic)
+
+### Fixed
+
+* Passing multiple macro names to `validate` or `each` works correctly (fixed #538 #541) (@jandudulski)
+
+[Compare v1.0.0...v1.1.0](https://github.com/dry-rb/dry-validation/compare/v1.0.0...v1.1.0)
+
 # v1.0.0 2019-06-10
 
 This release is a complete rewrite on top of `dry-schema` that uses contract classes to define schema and validation rules. It's **not backward-compatible**. This release addressed over 150 known issues, including bugs and missing features.
@@ -12,7 +26,7 @@ See [the list of all addressed issues](https://github.com/dry-rb/dry-validation/
 - Support for macros that encapsulate common rule logic
 - Built-in `:acceptance` macro
 
-[Compare v0.13.3...v1.0.0](https://github.com/dry-rb/dry-validation/compare/v1.13.3...v1.0.0)
+[Compare v0.13.3...v1.0.0](https://github.com/dry-rb/dry-validation/compare/v0.13.3...v1.0.0)
 
 # v1.0.0 2019-06-10 (compared to 1.0.0.rc3)
 

data/lib/dry/validation/evaluator.rb

@@ -147,6 +147,22 @@ module Dry
         values[key_name]
       end
 
+      # Return if the value under the default key is available
+      #
+      # This is useful when dealing with rules for optional keys
+      #
+      # @example
+      #   rule(:age) do
+      #     key.failure(:invalid) if key? && value < 18
+      #   end
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def key?
+        values.key?(key_name)
+      end
+
       # Check if there are any errors under the provided path
       #
       # @param [Symbol, String, Array] A Path-compatible spec

data/lib/dry/validation/rule.rb

@@ -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
@@ -68,12 +68,14 @@ module Dry
       #   rule(:nums).each do
       #     key.failure("must be greater than 0") if value < 0
       #   end
+      #   rule(:nums).each(min: 3)
       #
       # @return [Rule]
       #
       # @api public
       def each(*macros, &block)
         root = keys
+        macros = parse_macros(*macros)
         @keys = []
 
         @block = proc do
@@ -99,6 +101,22 @@ 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
+            spec.each { |k, v| macros << [k, Array(v)] }
+          else
+            macros << Array(spec)
+          end
+        end
+      end
     end
   end
 end

data/lib/dry/validation/values.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'dry/equalizer'
+require 'dry/schema/path'
 require 'dry/validation/constants'
 
 module Dry
@@ -40,17 +41,39 @@ module Dry
       #
       # @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
+          path = Schema::Path[key]
+          keys = path.to_a
+
+          return data.dig(*keys) unless keys.last.is_a?(Array)
+
+          last = keys.pop
+          vals = self.class.new(data.dig(*keys))
+
+          last.map { |name| vals[name] }
+        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
           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

data/lib/dry/validation/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Validation
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   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.1.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby