dry-validation 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aadb0a6e283c3de0438b2ddf7335262e276c206021e95f4aaa7eb70be040f268
-  data.tar.gz: e2c9949f4f69ded243970367602b997c8eba80c5d18b223f7f14d30d914b4886
+  metadata.gz: f61fe3205cc418d53bd0f2217bdd49a0e49119a69cae87ecf24e76a89567f845
+  data.tar.gz: 4ca306db1fd196c3253a78a6376fe0d4c197c5c8d625636bc37038b9caa3278b
 SHA512:
-  metadata.gz: 7cd158435b3998c6864a594d61315760b974a4b8d8a8728bdff42cc3684209416a23a154e0efe9537ab54839f96819b4b11f434104b2ba5b2be6dd4fce4c39b5
-  data.tar.gz: d796476595c68a33dca5cf26cb11f3aff0c3fc2be73165f5693bb9b62c94c02a917ff8f559cc62055909805d95928dc96189e8a1391657177a21674ab15b58f5
+  metadata.gz: d0c6a082c4a7077bd428e1bbe2f8ec4677950ea0f073d15cb955568307e2924b75e9d4bfb0f023b65739df7d061569e1aa8a3941968c263d68f4fd3fe12a61d5
+  data.tar.gz: 50fa2999ebe80ce40fe244b10bac6cf3644f4dd7e7825913726e8cc2587a901f0d2d164d1c29e17b55f613bd7258dc13d672a5787334f90afc4059d0480312b9

data/CHANGELOG.md

@@ -1,3 +1,38 @@
+# v1.3.1 2019-08-16
+
+### Changed
+
+* You can now set an external schema without providing a block (alassek)
+
+[Compare v1.3.0...v1.3.1](https://github.com/dry-rb/dry-validation/compare/v1.3.0...v1.3.1)
+
+# v1.3.0 2019-08-14
+
+### Added
+
+* Support for setting an external schema (that can be extended too) (fixed #574) (@solnic)
+
+### Fixed
+
+* Using a hash spec to define rule keys with more than one value is properly handled by rule guard now (fixed #576) (@solnic)
+
+### Changed
+
+* `values` within rules uses `Hash#fetch_values` internally now, which improves performance (@esparta)
+
+[Compare v1.2.1...v1.3.0](https://github.com/dry-rb/dry-validation/compare/v1.2.1...v1.3.0)
+
+# v1.2.1 2019-07-16
+
+### Fixed
+
+* Defining an abstract contract class that has no schema no longer crashes (issue #565) (@solnic)
+* Fixed an issue where `Rule#each` would crash when the value is not an array (issue #567) (@solnic)
+* Fixed an issue where guarding a rule would crash when keys are missing in the input (issue #569) (@solnic)
+* Added missing "pathname" require (issue #570) (@solnic)
+
+[Compare v1.2.0...v1.2.1](https://github.com/dry-rb/dry-validation/compare/v1.2.0...v1.2.1)
+
 # v1.2.0 2019-07-08
 
 ### Added

data/lib/dry/validation/constants.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'pathname'
 require 'dry/core/constants'
 
 module Dry

data/lib/dry/validation/contract.rb

@@ -119,6 +119,10 @@ module Dry
       def error?(result, spec)
         path = Schema::Path[spec]
 
+        if path.multi_value?
+          return path.expand.any? { |nested_path| error?(result, nested_path) }
+        end
+
         return true if result.error?(path)
 
         path
@@ -128,7 +132,9 @@ module Dry
 
             return false unless result.error?(curr_path)
 
-            result.errors.any? { |err| Schema::Path[err.path] == curr_path }
+            result.errors.any? { |err|
+              (other = Schema::Path[err.path]).same_root?(curr_path) && other == curr_path
+            }
           }
       end
 

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

@@ -53,36 +53,36 @@ module Dry
         #
         # This type of schema is suitable for HTTP parameters
         #
-        # @return [Dry::Schema::Params]
+        # @return [Dry::Schema::Params,NilClass]
         # @see https://dry-rb.org/gems/dry-schema/params/
         #
         # @api public
-        def params(&block)
-          define(:Params, &block)
+        def params(external_schema = nil, &block)
+          define(:Params, external_schema, &block)
         end
 
         # Define a JSON schema for your contract
         #
         # This type of schema is suitable for JSON data
         #
-        # @return [Dry::Schema::JSON]
+        # @return [Dry::Schema::JSON,NilClass]
         # @see https://dry-rb.org/gems/dry-schema/json/
         #
         # @api public
-        def json(&block)
-          define(:JSON, &block)
+        def json(external_schema = nil, &block)
+          define(:JSON, external_schema, &block)
         end
 
         # Define a plain schema for your contract
         #
         # This type of schema does not offer coercion out of the box
         #
-        # @return [Dry::Schema::Processor]
+        # @return [Dry::Schema::Processor,NilClass]
         # @see https://dry-rb.org/gems/dry-schema/
         #
         # @api public
-        def schema(&block)
-          define(:schema, &block)
+        def schema(external_schema = nil, &block)
+          define(:schema, external_schema, &block)
         end
 
         # Define a rule for your contract
@@ -101,7 +101,7 @@ module Dry
         #
         # @api public
         def rule(*keys, &block)
-          ensure_valid_keys(*keys)
+          ensure_valid_keys(*keys) if __schema__
 
           Rule.new(keys: keys, block: block).tap do |rule|
             rules << rule
@@ -192,16 +192,22 @@ module Dry
         end
 
         # @api private
-        def schema_opts
+        def core_schema_opts
           { parent: superclass&.__schema__, config: config }
         end
 
         # @api private
-        def define(method_name, &block)
-          if defined?(@__schema__)
+        def define(method_name, external_schema, &block)
+          return __schema__ if external_schema.nil? && block.nil?
+
+          unless __schema__.nil?
             raise ::Dry::Validation::DuplicateSchemaError, 'Schema has already been defined'
           end
 
+          schema_opts = core_schema_opts
+
+          schema_opts.update(parent: external_schema) if external_schema
+
           case method_name
           when :schema
             @__schema__ = Schema.define(schema_opts, &block)

data/lib/dry/validation/result.rb

@@ -106,6 +106,22 @@ module Dry
         schema_result.error?(key)
       end
 
+      # Check if there's any error for the provided key
+      #
+      # This does not consider errors from the nested values
+      #
+      # @api private
+      def base_error?(key)
+        schema_result.errors.any? { |error|
+          key_path = Schema::Path[key]
+          err_path = Schema::Path[error.path]
+
+          return false unless key_path.same_root?(err_path)
+
+          key_path == err_path
+        }
+      end
+
       # Add a new error for the provided key
       #
       # @api private

data/lib/dry/validation/rule.rb

@@ -82,14 +82,16 @@ module Dry
         @keys = []
 
         @block = proc do
-          (values[root] || []).each_with_index do |_, idx|
-            path = [*Schema::Path[root].to_a, 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.error?(path)
 
-            evaluator = with(macros: macros, keys: [path], &block)
+              evaluator = with(macros: macros, keys: [path], &block)
 
-            failures.concat(evaluator.failures)
+              failures.concat(evaluator.failures)
+            end
           end
         end
 

data/lib/dry/validation/schema_ext.rb

@@ -5,6 +5,18 @@ require 'dry/schema/key_map'
 
 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
+
     # @api private
     #
     # TODO: this should be moved to dry-schema at some point

data/lib/dry/validation/values.rb

@@ -45,15 +45,13 @@ module Dry
 
         case (key = args[0])
         when Symbol, String, Array, Hash
-          path = Schema::Path[key]
-          keys = path.to_a
+          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))
-
-          last.map { |name| vals[name] }
+          vals.fetch_values(*last) { nil }
         else
           raise ArgumentError, '+key+ must be a valid path specification'
         end

data/lib/dry/validation/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Validation
-    VERSION = '1.2.0'
+    VERSION = '1.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby