motion_model 0.4.5 → 0.4.6

data/motion/validatable.rb

@@ -18,7 +18,7 @@ module MotionModel
           ex = ValidationSpecificationError.new('validation type not present or not a hash')
           raise ex
         end
-    
+
         validations << {field => validation_type}
       end
       alias_method :validates, :validate
@@ -56,7 +56,7 @@ module MotionModel
     end
 
     # This has two functions:
-    # 
+    #
     # * First, it triggers validations.
     #
     # * Second, it returns the result of performing the validations.
@@ -88,7 +88,8 @@ module MotionModel
 
     def validate_each(validations) #nodoc
       validations.each_pair do |field, validation|
-        @valid &&= validate_one field, validation
+        result = validate_one field, validation
+        @valid &&= result
       end
     end
 
@@ -123,7 +124,7 @@ module MotionModel
       end
       result
     end
-  
+
     def validate_one(field, validation) #nodoc
       result = true
       validation.each_pair do |validation_type, setting|
@@ -141,7 +142,7 @@ module MotionModel
     # Should catch Fixnums, Bignums and Floats. Nils and Strings should
     # be handled as well, Arrays, Hashes and other datatypes will not.
     def validate_presence(field, value, setting)
-      if(value.is_a?(Numeric)) 
+      if(value.is_a?(Numeric))
         return true
       elsif value.is_a?(String) || value.nil?
         result = value.nil? || ((value.length == 0) == setting)

data/motion/version.rb

@@ -4,5 +4,5 @@
 # or forward port their code to take advantage
 # of adapters.
 module MotionModel
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/spec/validation_spec.rb

@@ -2,7 +2,7 @@ class ValidatableTask
   include MotionModel::Model
   include MotionModel::ArrayModelAdapter
   include MotionModel::Validatable
-  columns       :name => :string, 
+  columns       :name => :string,
                 :email => :string,
                 :some_day => :string,
                 :some_float => :float,
@@ -37,7 +37,7 @@ describe "validations" do
     it "contains correct error message if name is blank" do
       task = ValidatableTask.new(@valid_tasks.except(:name))
       task.valid?
-      task.error_messages_for(:name).first.should == 
+      task.error_messages_for(:name).first.should ==
         "incorrect value supplied for name -- should be non-empty."
     end
 
@@ -52,6 +52,18 @@ describe "validations" do
       task.valid?.should === false
     end
 
+    it "contains multiple error messages if name and some_float are blank" do
+      task = ValidatableTask.new(@valid_tasks.except(:name, :some_float))
+      task.valid?
+      task.error_messages.length.should == 3
+      task.error_messages_for(:name).length.should == 2
+      task.error_messages_for(:some_float).length.should == 1
+
+      task.error_messages_for(:name).should.include 'incorrect value supplied for name -- should be non-empty.'
+      task.error_messages_for(:name).should.include "incorrect value supplied for name -- should be between 2 and 10 characters long."
+      task.error_messages_for(:some_float).should.include "incorrect value supplied for some_float -- should be non-empty."
+    end
+
     it "is true if the float is filled in" do
       task = ValidatableTask.new(@valid_tasks)
       task.valid?.should === true
@@ -86,7 +98,7 @@ describe "validations" do
       task = ValidatableTask.create(@valid_tasks.except(:name))
       task.name = '1'
       task.valid?.should === false
-      task.error_messages_for(:name).first.should == 
+      task.error_messages_for(:name).first.should ==
         "incorrect value supplied for name -- should be between 2 and 10 characters long."
     end
 
@@ -94,7 +106,7 @@ describe "validations" do
       task = ValidatableTask.create(@valid_tasks.except(:name))
       task.name = '123456709AB'
       task.valid?.should === false
-      task.error_messages_for(:name).first.should == 
+      task.error_messages_for(:name).first.should ==
         "incorrect value supplied for name -- should be between 2 and 10 characters long."
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion_model
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap