From 54ba4a038c4013767640589ccafd7b8b568cf542 Mon Sep 17 00:00:00 2001 From: Adam Meehan Date: Sat, 22 Jan 2011 10:48:40 +1100 Subject: [PATCH] use namespaced validator class name for the :timeliness option --- lib/validates_timeliness/validator.rb | 2 +- spec/validates_timeliness/validator_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/validates_timeliness/validator.rb b/lib/validates_timeliness/validator.rb index 44f5404..f413bab 100644 --- a/lib/validates_timeliness/validator.rb +++ b/lib/validates_timeliness/validator.rb @@ -86,4 +86,4 @@ module ValidatesTimeliness end # Compatibility with ActiveModel validates method which matches option keys to their validator class -TimelinessValidator = ValidatesTimeliness::Validator +ActiveModel::Validations::TimelinessValidator = ValidatesTimeliness::Validator diff --git a/spec/validates_timeliness/validator_spec.rb b/spec/validates_timeliness/validator_spec.rb index f03e203..ede36c0 100644 --- a/spec/validates_timeliness/validator_spec.rb +++ b/spec/validates_timeliness/validator_spec.rb @@ -12,10 +12,10 @@ describe ValidatesTimeliness::Validator do ValidatesTimeliness::Validator.kind.should == :timeliness end - describe "Model.validates :timeliness option" do + describe "Model.validates with :timeliness option" do it 'should use plugin validator class' do Person.validates :birth_date, :timeliness => {:is_at => Date.new(2010,1,1), :type => :date} - Person.validators.should have(1).kind_of(TimelinessValidator) + Person.validators.should have(1).kind_of(ActiveModel::Validations::TimelinessValidator) invalid!(:birth_date, Date.new(2010,1,2)) valid!(:birth_date, Date.new(2010,1,1)) end