dry-validation 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c16031447235e4a737bb2fd2c406017b6bc082415ade63f8fe4d364c9b720be1
-  data.tar.gz: 10d0e6aaddeb0df982894c95e305eef3c6f05bbc3ac2cf229b9926f0acfe791f
+  metadata.gz: 46364c3c3ebe05837ab81f0406c1bbd6d0ad4f6359017dedc92f25627aae6bd4
+  data.tar.gz: eaefd86e8b6ce0eebd7140c8eae37f3b40eb7d85400b97cd3e7fa6cf58b8c8af
 SHA512:
-  metadata.gz: a0363485af3db4081d46ea89ad5f1918c557d2b38b9ec357640bb1feb1eec3c6fbc4cd5a8ff5650f830bcf3440abe7d4f7e570377fad8fc803fd0ccc9d91ce49
-  data.tar.gz: 7a89b67fe79eb7a8e3a63b939b33af67a13b89ad005d2d334c3d3db626bd960e19a957b25508239358bcb634deaeb116e91fab1878b393c3b106f6a028f96a8d
+  metadata.gz: ea2bf0a1bf9d3c451f6d073a6edfcbd6e2b1e33c67a6fa94d3f0c0005155d81fccc6159c9a575dc1b2736a6a00abb094fbd8bb556007f7e980b278404b9e4ed1
+  data.tar.gz: be84af9fc46f27e28afc97d7b58dbdf6f031c978d9d94e75a4d2e795a9e0bace3e0db42261259559618291b4dbf637afd8ddeea4ad9f620271dbc7033c5fd212

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 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

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

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
@@ -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 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/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.1'
+    VERSION = '1.3.0'
   end
 end

metadata

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