motion_model 0.3.7 → 0.3.8

data/lib/motion_model/model/model.rb

@@ -402,8 +402,6 @@ module MotionModel
     # in place if not.
     def save(*)
       call_hooks 'save' do
-        @dirty = false
-
         # Existing object implies update in place
         action = 'add'
         set_auto_date_field 'created_at'
@@ -414,6 +412,7 @@ module MotionModel
         else
           collection << self
         end
+        @dirty = false
         self.class.issue_notification(self, :action => action)
       end
     end

data/lib/motion_model/validatable.rb

@@ -120,9 +120,13 @@ module MotionModel
       result
     end
 
-    # Validates that something has been entered in a field
+    # Validates that something has been endntered in a field.
+    # 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?(String) || value.nil?
+      if(value.is_a?(Numeric)) 
+        return true
+      elsif value.is_a?(String) || value.nil?
         result = value.nil? || ((value.length == 0) == setting)
         additional_message = setting ? "non-empty" : "non-empty"
         add_message(field, "incorrect value supplied for #{field.to_s.humanize} -- should be #{additional_message}.") if result

data/lib/motion_model/version.rb

@@ -1,4 +1,4 @@
 
 module MotionModel
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/spec/validation_spec.rb

@@ -3,13 +3,17 @@ class ValidatableTask
   include MotionModel::Validatable
   columns       :name => :string, 
                 :email => :string,
-                :some_day => :string
+                :some_day => :string,
+                :some_float => :float,
+                :some_int => :int
 
   validate      :name, :presence => true
   validate      :name, :length => 2..10
   validate      :email, :email => true
   validate      :some_day, :format => /\A\d?\d-\d?\d-\d\d\Z/
   validate      :some_day, :length => 8..10
+  validate      :some_float, :presence => true
+  validate      :some_int, :presence => true
 end
 
 describe "validations" do
@@ -17,7 +21,9 @@ describe "validations" do
     @valid_tasks = {
       :name => 'bob',
       :email => 'bob@domain.com',
-      :some_day => '12-12-12'
+      :some_day => '12-12-12',
+      :some_float => 1.080,
+      :some_int => 99
     }
   end
 
@@ -39,6 +45,33 @@ describe "validations" do
       task.name = 'bob'
       task.valid?.should === true
     end
+
+    it "is false if the float is nil" do
+      task = ValidatableTask.new(@valid_tasks.except(:some_float))
+      task.valid?.should === false
+    end
+
+    it "is true if the float is filled in" do
+      task = ValidatableTask.new(@valid_tasks)
+      task.valid?.should === true
+    end
+
+    it "is false if the integer is nil" do
+      task = ValidatableTask.new(@valid_tasks.except(:some_int))
+      task.valid?.should === false
+    end
+
+    it "is true if the integer is filled in" do
+      task = ValidatableTask.new(@valid_tasks)
+      task.valid?.should === true
+    end
+
+    it "is true if the Numeric datatypes are zero" do
+      task = ValidatableTask.new(@valid_tasks)
+      task.some_float = 0
+      task.some_int = 0
+      task.valid?.should === true
+    end
   end
 
   describe "length" do
@@ -99,7 +132,6 @@ describe "validations" do
       task = ValidatableTask.new
       task.validate_for(:some_day, 'a-12-12').should == false
     end
-
   end
 end
 

metadata

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