v3.0.11

Add basic validation specs to each ORM shim

CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+= 3.0.11 [2012-04-01]
+* Change dependency on Timeliness version due to a broken release
+
+= 3.0.10 [2012-03-26]
+* Fix for ActiveRecord shim and validation with :allow_blank => true in AR 3.1+. Fixes issue#52.
+
 = 3.0.9 [2012-03-26]
 * ActiveRecord 3.1+ suport
 * Fixes for multiparameter extension with empty date values (thanks @mogox, @Sharagoz)

lib/validates_timeliness/attribute_methods.rb

@@ -82,7 +82,7 @@ module ValidatesTimeliness
     end
 
     def _timeliness_raw_value_for(attr_name)
-      @timeliness_cache && @timeliness_cache[attr_name.to_s]
+      @timeliness_cache && @timeliness_cache[attr_name]
     end
 
     def _clear_timeliness_cache

lib/validates_timeliness/validator.rb

@@ -77,7 +77,7 @@ module ValidatesTimeliness
 
     def attribute_raw_value(record, attr_name)
       record.respond_to?(:_timeliness_raw_value_for) &&
-        record._timeliness_raw_value_for(attr_name)
+        record._timeliness_raw_value_for(attr_name.to_s)
     end
 
     def timezone_aware?(record, attr_name)

lib/validates_timeliness/version.rb

@@ -1,3 +1,3 @@
 module ValidatesTimeliness
-  VERSION = '3.0.9'
+  VERSION = '3.0.11'
 end

spec/validates_timeliness/orm/active_record_spec.rb

@@ -14,6 +14,30 @@ describe ValidatesTimeliness, 'ActiveRecord' do
       Employee.new.should respond_to(:validates_time)
       Employee.new.should respond_to(:validates_datetime)
     end
+
+    it "should validate a valid value string" do
+      r = Employee.new
+      r.birth_date = '2012-01-01'
+
+      r.valid?
+      r.errors[:birth_date].should be_empty
+    end
+
+    it "should validate a invalid value string" do
+      r = Employee.new
+      r.birth_date = 'not a date'
+
+      r.valid?
+      r.errors[:birth_date].should_not be_empty
+    end
+
+    it "should validate a nil value" do
+      r = Employee.new
+      r.birth_date = nil
+
+      r.valid?
+      r.errors[:birth_date].should be_empty
+    end
   end
 
   it 'should determine type for attribute' do
@@ -23,13 +47,26 @@ describe ValidatesTimeliness, 'ActiveRecord' do
   context "attribute write method" do
     class EmployeeWithCache < ActiveRecord::Base
       set_table_name 'employees'
-      validates_datetime :birth_datetime
+      validates_date :birth_date, :allow_blank => true
+      validates_datetime :birth_datetime, :allow_blank => true
     end
 
-    it 'should cache attribute raw value' do
-      r = EmployeeWithCache.new
-      r.birth_datetime = date_string = '2010-01-01'
-      r._timeliness_raw_value_for('birth_datetime').should == date_string
+    context 'value cache' do
+      context 'for datetime column' do
+        it 'should store raw value' do
+          r = EmployeeWithCache.new
+          r.birth_datetime = date_string = '2010-01-01'
+          r._timeliness_raw_value_for('birth_datetime').should == date_string
+        end
+      end
+
+      context 'for date column' do
+        it 'should store raw value' do
+          r = EmployeeWithCache.new
+          r.birth_date = date_string = '2010-01-01'
+          r._timeliness_raw_value_for('birth_date').should == date_string
+        end
+      end
     end
 
     context "with plugin parser" do
@@ -37,8 +74,8 @@ describe ValidatesTimeliness, 'ActiveRecord' do
 
       class EmployeeWithParser < ActiveRecord::Base
         set_table_name 'employees'
-        validates_date :birth_date
-        validates_datetime :birth_datetime
+        validates_date :birth_date, :allow_blank => true
+        validates_datetime :birth_datetime, :allow_blank => true
       end
 
       it 'should parse a string value' do
@@ -47,7 +84,13 @@ describe ValidatesTimeliness, 'ActiveRecord' do
         r.birth_date = '2010-01-01'
       end
 
-      context "for a date column", :active_record => '3.0' do
+      it 'should parse a invalid string value as nil' do
+        Timeliness::Parser.should_receive(:parse)
+        r = EmployeeWithParser.new
+        r.birth_date = 'not a date'
+      end
+
+      context "for a date column" do
         it 'should store a date value after parsing string' do
           r = EmployeeWithParser.new
           r.birth_date = '2010-01-01'
@@ -77,10 +120,11 @@ describe ValidatesTimeliness, 'ActiveRecord' do
     end
   end
 
-  context "cached value" do
-    it 'should be cleared on reload' do
+  context "reload" do
+    it 'should clear cache value' do
       r = Employee.create!
       r.birth_date = '2010-01-01'
+      
       r.reload
 
       r._timeliness_raw_value_for('birth_date').should be_nil

spec/validates_timeliness/orm/mongoid_spec.rb

@@ -38,6 +38,30 @@ describe ValidatesTimeliness, 'Mongoid' do
       Article.new.should respond_to(:validates_time)
       Article.new.should respond_to(:validates_datetime)
     end
+
+    it "should validate a valid value string" do
+      r = Article.new
+      r.publish_date = '2012-01-01'
+
+      r.valid?
+      r.errors[:publish_date].should be_empty
+    end
+
+    it "should validate a invalid value string" do
+      r = Article.new
+      r.publish_date = 'not a date'
+
+      r.valid?
+      r.errors[:publish_date].should_not be_empty
+    end
+
+    it "should validate a nil value" do
+      r = Article.new
+      r.publish_date = nil
+
+      r.valid?
+      r.errors[:publish_date].should be_empty
+    end
   end
 
   it 'should determine type for attribute' do
@@ -48,7 +72,7 @@ describe ValidatesTimeliness, 'Mongoid' do
     it 'should cache attribute raw value' do
       r = Article.new
       r.publish_datetime = date_string = '2010-01-01'
-      r._timeliness_raw_value_for(:publish_datetime).should == date_string
+      r._timeliness_raw_value_for('publish_datetime').should == date_string
     end
 
     context "with plugin parser" do
@@ -95,7 +119,7 @@ describe ValidatesTimeliness, 'Mongoid' do
       r = Article.create!
       r.publish_date = '2010-01-01'
       r.reload
-      r._timeliness_raw_value_for(:publish_date).should be_nil
+      r._timeliness_raw_value_for('publish_date').should be_nil
     end
   end
 

validates_timeliness.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "LICENSE"]
 
-  s.add_runtime_dependency(%q<timeliness>, ["~> 0.3.4"])
+  s.add_runtime_dependency(%q<timeliness>, ["~> 0.3.6"])
 end