dry-validation 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cb2b0cdd55dfea0aeab8060f8628f55b304c584
-  data.tar.gz: ab8689f62590fe6029e427a9563e9da5a1eafe7d
+  metadata.gz: 02681fc0853b4f66dc7951e078dd5ef37559cbe6
+  data.tar.gz: 214d78242cec3b96d1ad065b403596c6876491c8
 SHA512:
-  metadata.gz: 35a95e790addbea7fbabd6d60c0ac130db75f30248c0ff7f51583bb893d7422c8fd2b60e6dcb462d5fb7a242e0980dede8cdc6df1076667e60110e69babcc081
-  data.tar.gz: 55cd8947019a5326256afca381c58538c6c272874ecf34ae942809dc5af3ba5d1cb294864701b0ce415b23d2a82ae7765242e8c1bcd79b8b1c20233d0ba670a7
+  metadata.gz: 1d2b0bd2955cec709349b1060913eb6bfee39e55d3b9939ddff63def27a5aaa6360a1599f1afb8442dfe0b2a4326a61adcd2af6b2e4e91c2c928d5f419a7cd9f
+  data.tar.gz: f17b2305e70319088bf4028354640eb18c37b1d88ab2ad2d29cbf2b504704a7cec594ee0115ba334b96ccfcc02b36e9db466498d6934ece8ff743884582885d8

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+# v0.7.1 2016-03-21
+
+### Added
+
+* You can use `schema` inside `each` macro (solnic)
+
+### Fixed
+
+* `confirmation` macro defines an optional key with maybe value with `_confirmation` suffix (solnic)
+* `each` macro works correctly when its inner rule specify just one key (solnic)
+* error messages for `each` rules where input is equal are now correctly generated (solnic)
+
+### Changed
+
+* Now depends on `dry-logic` >= `0.2.1` (solnic)
+
+[Compare v0.7.0...v0.7.1](https://github.com/dryrb/dry-validation/compare/v0.7.0...v0.7.1)
+
 # v0.7.0 2016-03-16
 
 ### Added

data/dry-validation.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'dry-configurable', '~> 0.1', '>= 0.1.3'
   spec.add_runtime_dependency 'dry-container', '~> 0.2', '>= 0.2.8'
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_runtime_dependency 'dry-logic', '~> 0.2', '>= 0.2.0'
+  spec.add_runtime_dependency 'dry-logic', '~> 0.2', '>= 0.2.1'
   spec.add_runtime_dependency 'dry-types', '~> 0.6', '>= 0.6.0'
 
   spec.add_development_dependency 'bundler'

data/lib/dry/validation/schema.rb

@@ -45,6 +45,20 @@ module Dry
         super(rules, default_options.merge(options))
       end
 
+      def self.create_class(target, other = nil, &block)
+        klass =
+          if other
+            Class.new(other.class)
+          else
+            Validation.Schema(target.schema_class, parent: target, build: false, &block)
+          end
+
+        klass.config.path = [target.name] if other
+        klass.config.input_processor = :noop
+
+        klass
+      end
+
       def self.option(name, default = nil)
         attr_reader(*name)
         options.update(name => default)

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

@@ -55,6 +55,10 @@ module Dry
           create_rule(to_ast)
         end
 
+        def rule_ast
+          rules.map(&:to_ast)
+        end
+
         def path
           items = [parent && parent.path, name].flatten.compact.uniq
           items.size == 1 ? items[0] : items

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

@@ -14,15 +14,8 @@ module Dry
         end
 
         def schema(other = nil, &block)
-          schema = other ? ::Class.new(other.class) : Validation.Schema(
-            target.schema_class, parent: target, build: false, &block
-          )
-
-          schema.config.path = [name] if other
-          schema.config.input_processor = :noop
-
+          schema = Schema.create_class(target, other, &block)
           rule = __send__(type, key(:hash?).and(key(schema)))
-
           add_rule(rule)
         end
 
@@ -60,6 +53,10 @@ module Dry
           target.checks
         end
 
+        def rule_ast
+          rules.size > 0 ? target.rule_ast : [to_ast]
+        end
+
         def to_ast
           if deps.empty?
             node

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

@@ -26,16 +26,27 @@ module Dry
           Value
         end
 
+        def schema(other = nil, &block)
+          schema = Schema.create_class(self, other, &block)
+          hash?.and(schema)
+        end
+
         def each(*predicates, &block)
-          val =
+          left = array?
+
+          right =
             if predicates.size > 0
-              predicates
+              inferred = predicates
                 .reduce(Value.new) { |a, e| a.__send__(*::Kernel.Array(e)) }
+
+              create_rule([:each, inferred.to_ast])
             else
-              Value[name].instance_eval(&block)
+              val = Value[name].instance_eval(&block)
+
+              create_rule([:each, [:set, val.rule_ast]])
             end
 
-          rule = array?.and(create_rule([:each, val.to_ast]))
+          rule = left.and(right)
 
           add_rule(rule) if root?
 
@@ -68,11 +79,11 @@ module Dry
         end
 
         def confirmation
-          rule = check(:"#{name}_confirmation")
-            .eql?(check(name))
-            .with(deps: [name])
+          conf = :"#{name}_confirmation"
+
+          parent.optional(conf).maybe
 
-          add_check(rule)
+          rule(conf => [conf, name]) { |left, right| left.eql?(right) }
         end
 
         def value(name)

data/lib/dry/validation/version.rb

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

data/spec/integration/schema/macros/confirmation_spec.rb

@@ -3,6 +3,8 @@ RSpec.describe 'Macros #confirmation' do
     subject(:schema) do
       Dry::Validation.Schema do
         configure do
+          config.input_processor = :sanitizer
+
           def self.messages
             Messages.default.merge(
               en: { errors: { password_confirmation: 'does not match' } }
@@ -19,7 +21,7 @@ RSpec.describe 'Macros #confirmation' do
     end
 
     it 'fails when source value is invalid' do
-      expect(schema.(password: 'fo', password_confirmation: '').messages).to eql(
+      expect(schema.(password: 'fo', password_confirmation: nil).messages).to eql(
         password: ['size cannot be less than 3']
       )
     end

data/spec/integration/schema/macros/each_spec.rb

@@ -0,0 +1,106 @@
+RSpec.describe 'Macros #each' do
+  context 'with a block' do
+    context 'with a nested key' do
+      subject(:schema) do
+        Dry::Validation.Schema do
+          key(:songs).each do
+            key(:title).required
+          end
+        end
+      end
+
+      it 'passes when all elements are valid' do
+        songs = [{ title: 'Hello' }, { title: 'World' }]
+
+        expect(schema.(songs: songs)).to be_success
+      end
+
+      it 'fails when value is not an array' do
+        expect(schema.(songs: 'oops').messages).to eql(songs: ['must be an array'])
+      end
+
+      it 'fails when not all elements are valid' do
+        songs = [{ title: 'Hello' }, { title: nil }, { title: nil }]
+
+        expect(schema.(songs: songs).messages).to eql(
+          songs: {
+            1 => { title: ['must be filled'] },
+            2 => { title: ['must be filled'] }
+          }
+        )
+      end
+    end
+
+    context 'with a nested schema' do
+      subject(:schema) do
+        Dry::Validation.Schema do
+          key(:songs).each do
+            schema do
+              key(:title).required
+              key(:author).required
+            end
+          end
+        end
+      end
+
+      it 'passes when all elements are valid' do
+        songs = [
+          { title: 'Hello', author: 'Jane' },
+          { title: 'World', author: 'Joe' }
+        ]
+
+        expect(schema.(songs: songs)).to be_success
+      end
+
+      it 'fails when value is not an array' do
+        expect(schema.(songs: 'oops').messages).to eql(songs: ['must be an array'])
+      end
+
+      it 'fails when not all elements are valid' do
+        songs = [
+          { title: 'Hello', author: 'Jane' },
+          { title: nil, author: 'Joe' },
+          { title: 'World', author: nil },
+          { title: nil, author: nil }
+        ]
+
+        expect(schema.(songs: songs).messages).to eql(
+          songs: {
+            1 => { title: ['must be filled'] },
+            2 => { author: ['must be filled'] },
+            3 => { title: ['must be filled'], author: ['must be filled'] }
+          }
+        )
+      end
+    end
+  end
+
+  context 'with inferred predicates and a form schema' do
+    subject(:schema) do
+      Dry::Validation.Form do
+        key(:songs).each(:str?)
+      end
+    end
+
+    it 'passes when all elements are valid' do
+      songs = %w(hello world)
+
+      expect(schema.(songs: songs)).to be_success
+    end
+
+    it 'fails when value is not an array' do
+      expect(schema.(songs: 'oops').messages).to eql(songs: ['must be an array'])
+    end
+
+    it 'fails when not all elements are valid' do
+      songs = ['hello', nil, 2]
+
+      expect(schema.(songs: songs).messages).to eql(
+        songs: {
+          1 => ['must be a string'],
+          2 => ['must be a string']
+        }
+      )
+    end
+  end
+end

data/spec/unit/schema/value_spec.rb

@@ -119,7 +119,7 @@ RSpec.describe Schema::Value do
       expect(rule.to_ast).to eql(
         [:and, [
           [:val, [:predicate, [:array?, []]]],
-          [:each, [:val, [:predicate, [:key?, [:method]]]]]
+          [:each, [:set, [[:val, [:predicate, [:key?, [:method]]]]]]]
         ]]
       )
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-validation
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Andy Holland
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -74,7 +74,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
@@ -215,6 +215,7 @@ files:
 - spec/integration/schema/inheriting_schema_spec.rb
 - spec/integration/schema/input_processor_spec.rb
 - spec/integration/schema/macros/confirmation_spec.rb
+- spec/integration/schema/macros/each_spec.rb
 - spec/integration/schema/macros/maybe_spec.rb
 - spec/integration/schema/macros/required_spec.rb
 - spec/integration/schema/macros/when_spec.rb
@@ -255,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A simple validation library
@@ -279,6 +280,7 @@ test_files:
 - spec/integration/schema/inheriting_schema_spec.rb
 - spec/integration/schema/input_processor_spec.rb
 - spec/integration/schema/macros/confirmation_spec.rb
+- spec/integration/schema/macros/each_spec.rb
 - spec/integration/schema/macros/maybe_spec.rb
 - spec/integration/schema/macros/required_spec.rb
 - spec/integration/schema/macros/when_spec.rb