date_validator 0.5.4 → 0.5.5

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/date_validator.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{date_validator}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   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

@@ -47,7 +47,7 @@ module ActiveModel
          
           
           unless is_time?(option_value) && value.to_i.send(CHECKS[option], option_value.to_i)
-            record.errors.add(attr_name, option, :default => options[:message], :value => original_value, :date => original_option_value)
+            record.errors.add(attr_name, I18n.t("errors.messages.#{option}", :value => original_option_value), :default => options[:message], :value => original_value, :date => original_option_value)
           end
         end
       end

data/locales/en.yml

@@ -5,7 +5,7 @@ en:
   errors:
     messages:
       not_a_date: "is not a date"
-      after: "must be after {{value}}"
-      after_or_equal_to: "must be after or equal to {{value}}"
-      before: "must be before {{value}}"
-      before_or_equal_to: "must be before or equal to {{value}}"
+      after: "must be after %{value}"
+      after_or_equal_to: "must be after or equal to %{value}"
+      before: "must be before %{value}"
+      before_or_equal_to: "must be before or equal to %{value}"

data/spec/date_validator_spec.rb

@@ -16,25 +16,44 @@ describe "DateValidator" do
     end
   end
 
-  [:after, :before, :after_or_equal_to, :before_or_equal_to].each do |check|
-    [:valid,:invalid].each do |should_be|
+  [:valid,:invalid].each do |should_be|
 
-      now = Time.now.to_datetime
+    _context = should_be == :valid ? 'when value validates correctly' : 'when value does not match validation requirements'
 
-      model_date = case check
-        when :after then should_be == :valid ? now + 21000 : now - 1
-        when :before then should_be == :valid ? now - 21000 : now + 1
-        when :after_or_equal_to then should_be == :valid ? now : now - 21000
-        when :before_or_equal_to then should_be == :valid ? now : now + 21000
-      end
+    context _context do
+
+      [:after, :before, :after_or_equal_to, :before_or_equal_to].each do |check|
+
+          now = Time.now.to_datetime
+
+          model_date = case check
+            when :after then should_be == :valid ? now + 21000 : now - 1
+            when :before then should_be == :valid ? now - 21000 : now + 1
+            when :after_or_equal_to then should_be == :valid ? now : now - 21000
+            when :before_or_equal_to then should_be == :valid ? now : now + 21000
+          end
+
+          it "should ensure that an attribute is #{should_be} when #{should_be == :valid ? 'respecting' : 'offending' } the #{check} check" do
+            TestRecord.validates :expiration_date, :date => {:"#{check}" => Time.now}
+            model = TestRecord.new(model_date)
+            should_be == :valid ? model.should(be_valid, "an attribute should be valid when respecting the #{check} check") : model.should_not(be_valid, "an attribute should be invalidwhen offending the #{check} check")
+          end
+
+          if _context == 'when value does not match validation requirements'
+
+            it "should yield an 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
 
-      it "should ensure that an attribute is #{should_be} when #{should_be == :valid ? 'respecting' : 'offending' } the #{check} check" do
-        TestRecord.validates :expiration_date, :date => {:"#{check}" => Time.now}
-        model = TestRecord.new(model_date)
-        should_be == :valid ? model.should(be_valid, "an attribute should be valid when respecting the #{check} check") : model.should(be_invalid, "an attribute should be invalid when offending the #{check} check")
       end
 
     end
+
   end
 
   extra_types = [:proc, :symbol]

data/spec/spec_helper.rb

@@ -8,6 +8,8 @@ require 'lib/date_validator'
 require 'rspec'
 require 'rspec/autorun'
 
+I18n.load_path += Dir[File.join('locales', '*.{rb,yml}')]
+
 class TestRecord
   include ActiveModel::Validations
   attr_accessor :expiration_date

metadata

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