validate 1.3.1 → 1.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 214d7269a6988fd34fe6097ea8ae7cf7fc8fc7ed
+  data.tar.gz: e804d91ebdfdd17544cf88baf7a6ad12d0f91495
+SHA512:
+  metadata.gz: 65d8ec175b1271eb374f2c3d8134a071966f71dfb28f7de20fb4550db372924f59563f358633c154b50ef2943a4599e740aac656d34ebe972139b697ba377da2
+  data.tar.gz: bcdabb6bdc7b2dbae1d5d4a07cb87ae62265b56f0302b80c27eeb3a0232244bf944e9d1b2902a6f34cb4759a4b30356ae30459163788cd27e7a5675bd44b14c1

data/LICENSE

@@ -0,0 +1,27 @@
+The Azure License
+
+Copyright (c) 2013 Kenneth Ballenegger
+
+Attribute to Kenneth Ballenegger - http://kswizz.com/
+
+You (the licensee) are hereby granted permission, free of charge, to deal in
+this software or source code (this "Software") without restriction, including
+without limitation the rights to use, copy, modify, merge, publish, distribute,
+and/or sublicense this Software, subject to the following conditions:
+
+You must give attribution to the party mentioned above, by name and by
+hyperlink, in the about box, credits document and/or documentation of any
+derivative work using a substantial portion of this Software.
+
+You may not use the name of the copyright holder(s) to endorse or promote
+products derived from this Software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THIS SOFTWARE OR THE USE OR OTHER DEALINGS IN THIS
+SOFTWARE.
+
+http://license.azuretalon.com/

data/lib/validate/validator.rb

@@ -32,17 +32,30 @@ module Validate
           # fetch reasons
           {reason: (v[:opts] || {})[:reason] || ValidationMethods.reason(v[:name])}.merge(v)
         end
-        .map do |v|
+        .reduce({}) do |a,v|
+          # group validations by key
+          a[v[:fields]] ||= []
+          a[v[:fields]] << v
+          a
+        end
+        .map do |_, vs|
           # lastly, execute validation
-          validator = if v[:validations]
-            Validator.new(v[:validations])
-          end
-          success = ValidationMethods.new.send(v[:name], context_hash, v[:fields], v[:opts], validator)
-          unless success
-            reason = v[:reason].is_a?(Proc) ?
-              ValidationMethods::ArgumentFailureBlockScope.new(context_hash, v[:fields], v[:opts], validator).instance_exec(&v[:reason]) :
-              v[:reason]
-            {v[:fields] => reason}
+          catch(:ValidateFailure) do
+            vs.each do |v|
+              validator = if v[:validations]
+                Validator.new(v[:validations])
+              end
+              success = ValidationMethods.new.send(v[:name], context_hash, v[:fields], v[:opts], validator)
+              unless success
+                reason = v[:reason].is_a?(Proc) ?
+                  ValidationMethods::ArgumentFailureBlockScope.new(context_hash, v[:fields], v[:opts], validator).instance_exec(&v[:reason]) :
+                  v[:reason]
+                # after one failure for a field, do not execute further
+                # validations
+                throw(:ValidateFailure, {v[:fields] => reason})
+              end
+            end
+            nil
           end
         end.select {|v| !v.nil? } # discard successes
 

data/lib/validate/version.rb

@@ -1,3 +1,3 @@
 module Validate
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/spec/validate_spec.rb

@@ -451,7 +451,10 @@ describe Validate do
 
           validates_presence_of :secret
 
-          validates_inclusion_of :type, in: %w(paid free)
+          validates_inclusion_of :type, in: %w(paid free),
+            reason: 'reason1'
+          validates :type, with: -> { $block_executed = true; self != 'free' },
+            reason: 'reason2'
 
           # validate a block in the data structure that must evaluate to true
           validates :block, with: -> { self.call == true }
@@ -543,6 +546,35 @@ describe Validate do
       test = TestClass.new(hash)
       test.validates?.should == false
     end
+
+    it 'executes multiple validations for a single field' do
+      $block_executed = false
+      hash = @valid_hash.dup
+      hash[:type] = 'paid'
+      test = TestClass.new(hash)
+      test.validates?.should == true
+      $block_executed.should == true
+    end
+
+    it 'does not execute subsequent validations for a field that already failed' do
+      $block_executed = false
+      hash = @valid_hash.dup
+      hash[:type] = 'bogus'
+      test = TestClass.new(hash)
+      test.validates?.should == false
+      test.failures.should == [{type: 'reason1'}]
+      $block_executed.should == false
+    end
+
+    it 'fails the first invalid block when there are multiple validations for one field' do
+      $block_executed = false
+      hash = @valid_hash.dup
+      hash[:type] = 'free'
+      test = TestClass.new(hash)
+      test.validates?.should == false
+      test.failures.should == [{type: 'reason2'}]
+      $block_executed.should == true
+    end
   end
 
 

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: validate
 version: !ruby/object:Gem::Version
-  version: 1.3.1
-  prerelease: 
+  version: 1.3.2
 platform: ruby
 authors:
 - Kenneth Ballenegger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Validations is a library for validating data structures.
@@ -34,9 +31,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - lib/validate.rb
@@ -51,27 +48,26 @@ files:
 - validate.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Validations is a library for validating data structures.
 test_files:
 - spec/validate_spec.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2013 Kenneth Ballenegger
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.