date_validator 0.5.5 → 0.5.6

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.6

data/date_validator.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{date_validator}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oriol Gual", "Josep M\302\252 Bach", "Josep Jaume Rey"]

data/lib/date_validator.rb

@@ -23,10 +23,10 @@ module ActiveModel
         return if options[:allow_nil] && value.nil?
 
         unless value
-          record.errors.add(attr_name, :not_a_date, :value => value, :default => options[:message])
+          record.errors.add(attr_name, I18n.t("errors.messages.not_a_date"), :value => value, :default => options[:message])
           return
         end
-
+  
         options.slice(*CHECKS.keys).each do |option, option_value|
           option_value = option_value.call(record) if option_value.is_a?(Proc)
           option_value = record.send(option_value) if option_value.is_a?(Symbol)
@@ -45,9 +45,9 @@ module ActiveModel
             value = value.to_datetime if value.is_a?(Date)  
           end
          
-          
           unless is_time?(option_value) && value.to_i.send(CHECKS[option], option_value.to_i)
-            record.errors.add(attr_name, I18n.t("errors.messages.#{option}", :value => original_option_value), :default => options[:message], :value => original_value, :date => original_option_value)
+            error_msg = options[:message] || I18n.t("errors.messages.#{option}", :value => original_option_value)
+            record.errors.add(attr_name, error_msg, :default => options[:message], :value => original_value, :date => original_option_value)
           end
         end
       end

data/spec/date_validator_spec.rb

@@ -41,17 +41,28 @@ describe "DateValidator" do
 
           if _context == 'when value does not match validation requirements'
 
-            it "should yield an error message indicating that value must be #{check} validation requirements" do
+            it "should yield a default error message indicating that value must be #{check} validation requirements" do
               TestRecord.validates :expiration_date, :date => {:"#{check}" => Time.now}
               model = TestRecord.new(model_date)
               model.should_not be_valid
               model.errors[:expiration_date].should == ["must be " + check.to_s.gsub('_',' ') + " #{Time.now}"]
             end
-
+            
           end
 
       end
 
+      if _context == 'when value does not match validation requirements'
+
+        it "should allow for a custom validation message" do
+          TestRecord.validates :expiration_date, :date => {:before_or_equal_to => Time.now, :message => 'must be after Christmas'}
+          model = TestRecord.new(Time.now + 21000)
+          model.should_not be_valid
+          model.errors[:expiration_date].should == ["must be after Christmas"]
+        end
+
+      end
+
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: date_validator
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Oriol Gual