mirror of
https://github.com/ditkrg/validates_timeliness.git
synced 2026-01-23 06:16:44 +00:00
Stricter method signature for _timeliness_raw_value_for to take string
Add basic validation specs to each ORM shim
This commit is contained in:
parent
df12d6dad0
commit
4aa20bb002
@ -82,7 +82,7 @@ module ValidatesTimeliness
|
|||||||
end
|
end
|
||||||
|
|
||||||
def _timeliness_raw_value_for(attr_name)
|
def _timeliness_raw_value_for(attr_name)
|
||||||
@timeliness_cache && @timeliness_cache[attr_name.to_s]
|
@timeliness_cache && @timeliness_cache[attr_name]
|
||||||
end
|
end
|
||||||
|
|
||||||
def _clear_timeliness_cache
|
def _clear_timeliness_cache
|
||||||
|
|||||||
@ -77,7 +77,7 @@ module ValidatesTimeliness
|
|||||||
|
|
||||||
def attribute_raw_value(record, attr_name)
|
def attribute_raw_value(record, attr_name)
|
||||||
record.respond_to?(:_timeliness_raw_value_for) &&
|
record.respond_to?(:_timeliness_raw_value_for) &&
|
||||||
record._timeliness_raw_value_for(attr_name)
|
record._timeliness_raw_value_for(attr_name.to_s)
|
||||||
end
|
end
|
||||||
|
|
||||||
def timezone_aware?(record, attr_name)
|
def timezone_aware?(record, attr_name)
|
||||||
|
|||||||
@ -14,6 +14,30 @@ describe ValidatesTimeliness, 'ActiveRecord' do
|
|||||||
Employee.new.should respond_to(:validates_time)
|
Employee.new.should respond_to(:validates_time)
|
||||||
Employee.new.should respond_to(:validates_datetime)
|
Employee.new.should respond_to(:validates_datetime)
|
||||||
end
|
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
|
end
|
||||||
|
|
||||||
it 'should determine type for attribute' do
|
it 'should determine type for attribute' do
|
||||||
@ -23,13 +47,26 @@ describe ValidatesTimeliness, 'ActiveRecord' do
|
|||||||
context "attribute write method" do
|
context "attribute write method" do
|
||||||
class EmployeeWithCache < ActiveRecord::Base
|
class EmployeeWithCache < ActiveRecord::Base
|
||||||
set_table_name 'employees'
|
set_table_name 'employees'
|
||||||
validates_datetime :birth_datetime
|
validates_date :birth_date, :allow_blank => true
|
||||||
|
validates_datetime :birth_datetime, :allow_blank => true
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should cache attribute raw value' do
|
context 'value cache' do
|
||||||
r = EmployeeWithCache.new
|
context 'for datetime column' do
|
||||||
r.birth_datetime = date_string = '2010-01-01'
|
it 'should store raw value' do
|
||||||
r._timeliness_raw_value_for('birth_datetime').should == date_string
|
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
|
end
|
||||||
|
|
||||||
context "with plugin parser" do
|
context "with plugin parser" do
|
||||||
@ -37,8 +74,8 @@ describe ValidatesTimeliness, 'ActiveRecord' do
|
|||||||
|
|
||||||
class EmployeeWithParser < ActiveRecord::Base
|
class EmployeeWithParser < ActiveRecord::Base
|
||||||
set_table_name 'employees'
|
set_table_name 'employees'
|
||||||
validates_date :birth_date
|
validates_date :birth_date, :allow_blank => true
|
||||||
validates_datetime :birth_datetime
|
validates_datetime :birth_datetime, :allow_blank => true
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should parse a string value' do
|
it 'should parse a string value' do
|
||||||
@ -47,7 +84,13 @@ describe ValidatesTimeliness, 'ActiveRecord' do
|
|||||||
r.birth_date = '2010-01-01'
|
r.birth_date = '2010-01-01'
|
||||||
end
|
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
|
it 'should store a date value after parsing string' do
|
||||||
r = EmployeeWithParser.new
|
r = EmployeeWithParser.new
|
||||||
r.birth_date = '2010-01-01'
|
r.birth_date = '2010-01-01'
|
||||||
@ -77,10 +120,11 @@ describe ValidatesTimeliness, 'ActiveRecord' do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context "cached value" do
|
context "reload" do
|
||||||
it 'should be cleared on reload' do
|
it 'should clear cache value' do
|
||||||
r = Employee.create!
|
r = Employee.create!
|
||||||
r.birth_date = '2010-01-01'
|
r.birth_date = '2010-01-01'
|
||||||
|
|
||||||
r.reload
|
r.reload
|
||||||
|
|
||||||
r._timeliness_raw_value_for('birth_date').should be_nil
|
r._timeliness_raw_value_for('birth_date').should be_nil
|
||||||
|
|||||||
@ -38,6 +38,30 @@ describe ValidatesTimeliness, 'Mongoid' do
|
|||||||
Article.new.should respond_to(:validates_time)
|
Article.new.should respond_to(:validates_time)
|
||||||
Article.new.should respond_to(:validates_datetime)
|
Article.new.should respond_to(:validates_datetime)
|
||||||
end
|
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
|
end
|
||||||
|
|
||||||
it 'should determine type for attribute' do
|
it 'should determine type for attribute' do
|
||||||
@ -48,7 +72,7 @@ describe ValidatesTimeliness, 'Mongoid' do
|
|||||||
it 'should cache attribute raw value' do
|
it 'should cache attribute raw value' do
|
||||||
r = Article.new
|
r = Article.new
|
||||||
r.publish_datetime = date_string = '2010-01-01'
|
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
|
end
|
||||||
|
|
||||||
context "with plugin parser" do
|
context "with plugin parser" do
|
||||||
@ -95,7 +119,7 @@ describe ValidatesTimeliness, 'Mongoid' do
|
|||||||
r = Article.create!
|
r = Article.create!
|
||||||
r.publish_date = '2010-01-01'
|
r.publish_date = '2010-01-01'
|
||||||
r.reload
|
r.reload
|
||||||
r._timeliness_raw_value_for(:publish_date).should be_nil
|
r._timeliness_raw_value_for('publish_date').should be_nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user