dry-validation 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02681fc0853b4f66dc7951e078dd5ef37559cbe6
-  data.tar.gz: 214d78242cec3b96d1ad065b403596c6876491c8
+  metadata.gz: 3c372ced33f2c8865c3ecac3fe917610dc414d89
+  data.tar.gz: 50e61628de4b84caf57bcc874fbf74a4ba3925b8
 SHA512:
-  metadata.gz: 1d2b0bd2955cec709349b1060913eb6bfee39e55d3b9939ddff63def27a5aaa6360a1599f1afb8442dfe0b2a4326a61adcd2af6b2e4e91c2c928d5f419a7cd9f
-  data.tar.gz: f17b2305e70319088bf4028354640eb18c37b1d88ab2ad2d29cbf2b504704a7cec594ee0115ba334b96ccfcc02b36e9db466498d6934ece8ff743884582885d8
+  metadata.gz: 2a79910c2cd2e54c8076ca4b218976d972d06f99db6063005d57d7c9e47f96433bd380a53c4504a76c41cc4a810706fb383e3c298c2122416578276626b1fa2b
+  data.tar.gz: d731cd50af1a2b58ac03baccb1706fb2cb66acbb98ae4931f363d19fb13eebada0b766d8030a3404efe5a30d43264805a69321518467777c3a8f639b2f0e5596

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# v0.7.2 2016-03-28
+
+### Added
+
+* Support for nested schemas inside high-level rules (solnic)
+* `Schema#to_proc` so that you can do `data.each(&schema)` (solnic)
+
+[Compare v0.7.1...v0.7.2](https://github.com/dryrb/dry-validation/compare/v0.7.1...v0.7.2)
+
 # v0.7.1 2016-03-21
 
 ### Added

data/lib/dry/validation/schema.rb

@@ -191,6 +191,14 @@ module Dry
         end
       end
 
+      def curry(*args)
+        to_proc.curry.(*args)
+      end
+
+      def to_proc
+        -> input { self.call(input) }
+      end
+
       private
 
       def apply(input)

data/lib/dry/validation/schema/check.rb

@@ -6,6 +6,16 @@ module Dry
           Check
         end
 
+        def schema(other = nil, &block)
+          schema = Schema.create_class(self, other, &block)
+
+          if other
+            schema.config.input_processor = other.class.config.input_processor
+          end
+
+          hash?.and(create_rule([:check, [name, schema.to_ast], [path]]))
+        end
+
         private
 
         def method_missing(meth, *meth_args)

data/lib/dry/validation/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Validation
-    VERSION = '0.7.1'.freeze
+    VERSION = '0.7.2'.freeze
   end
 end

data/spec/integration/schema/check_rules_spec.rb

@@ -79,4 +79,41 @@ RSpec.describe Schema, 'using high-level rules' do
       )
     end
   end
+
+  describe 'with nested schemas' do
+    subject(:schema) do
+      Dry::Validation.Schema do
+        key(:command).required(:str?, inclusion?: %w(First Second))
+
+        key(:args).required(:hash?)
+
+        rule(first_args: [:command, :args]) do |command, args|
+          command.eql?('First')
+            .then(args.schema { key(:first).required(:bool?) })
+        end
+
+        rule(second_args: [:command, :args]) do |command, args|
+          command.eql?('Second')
+            .then(args.schema { key(:second).required(:bool?) })
+        end
+      end
+    end
+
+    it 'generates check rule matching on value' do
+      expect(schema.(command: 'First', args: { first: true })).to be_success
+      expect(schema.(command: 'Second', args: { second: true })).to be_success
+
+      expect(schema.(command: 'oops', args: { such: 'validation' }).messages).to eql(
+        command: ['must be one of: First, Second']
+      )
+
+      expect(schema.(command: 'First', args: { second: true }).messages).to eql(
+        args: { first: ['is missing'] }
+      )
+
+      expect(schema.(command: 'Second', args: { first: true }).messages).to eql(
+        args: { second: ['is missing'] }
+      )
+    end
+  end
 end

data/spec/integration/schema/form_spec.rb

@@ -119,4 +119,42 @@ RSpec.describe Dry::Validation::Schema::Form, 'defining a schema' do
       )
     end
   end
+
+  describe 'with nested schema in a high-level rule' do
+    subject(:schema) do
+      Dry::Validation.Form do
+        key(:address).maybe
+
+        key(:delivery).required(:bool?)
+
+        rule(address: [:delivery, :address]) do |delivery, address|
+          delivery.true?.then(address.schema(AddressSchema))
+        end
+      end
+    end
+
+    before do
+      AddressSchema = Dry::Validation.Form do
+        key(:city).required
+        key(:zipcode).required(:int?)
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :AddressSchema)
+    end
+
+    it 'applies nested form schema' do
+      result = schema.(delivery: '1', address: { city: 'NYC', zipcode: '123' })
+      expect(result).to be_success
+
+      result = schema.(delivery: '1', address: { city: 'NYC', zipcode: 'foo' })
+      expect(result.messages).to eql(
+        address: { zipcode: ['must be an integer'] }
+      )
+
+      result = schema.(delivery: '0', address: nil)
+      expect(result).to be_success
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Andy Holland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple validation library
@@ -301,4 +301,3 @@ test_files:
 - spec/unit/schema/rule_spec.rb
 - spec/unit/schema/value_spec.rb
 - spec/unit/schema_spec.rb
-has_rdoc: