date_validator 0.5.9 → 0.6.0

data/Gemfile

@@ -2,11 +2,11 @@
 source :gemcutter
 
 group :development do
-  gem "rspec", "2.0.0"
-  gem "jeweler"
+  gem "rspec", "~> 2.5.0"
   gem "simplecov"
-  gem "activesupport", "3.0.0"
+  gem "jeweler"
+  gem "activesupport", "~> 3.0.0"
   gem "tzinfo"
 end
 
-gem "activemodel", "3.0.0"
+gem "activemodel", "~> 3.0.0"

data/Gemfile.lock

@@ -16,16 +16,14 @@ GEM
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     simplecov (0.3.6)
@@ -38,9 +36,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (= 3.0.0)
-  activesupport (= 3.0.0)
+  activemodel (~> 3.0.0)
+  activesupport (~> 3.0.0)
   jeweler
-  rspec (= 2.0.0)
+  rspec (~> 2.5.0)
   simplecov
   tzinfo

data/README.rdoc

@@ -8,8 +8,8 @@ and Rubinius 1.1.
 
 And I mean simple. In your model:
 
-  validates :expiration_date, :date => {:after => lambda { Time.now } :before => lambda { Time.now + 1.year } }
-  # Using lambda prevents production cache issues
+  validates :expiration_date, :date => {:after => Proc.new { Time.now } :before => Proc.new { Time.now + 1.year } }
+  # Using Proc.new prevents production cache issues
 
 For now these are the available options you can use:
 

data/VERSION

@@ -1 +1 @@
-0.5.9
+0.6.0

data/date_validator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{date_validator}
-  s.version = "0.5.9"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oriol Gual", "Josep M. Bach", "Josep Jaume Rey"]
-  s.date = %q{2010-10-14}
+  s.date = %q{2011-02-10}
   s.description = %q{A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3, based on ActiveModel. Currently supporting :after, :before, :after_or_equal_to and :before_or_equal_to options.}
   s.email = %q{info@codegram.com}
   s.extra_rdoc_files = [

data/lib/date_validator.rb

@@ -23,7 +23,7 @@ module ActiveModel
         return if options[:allow_nil] && value.nil?
 
         unless value
-          record.errors.add(attr_name, I18n.t("errors.messages.not_a_date"), :value => value, :default => options[:message])
+          record.errors.add(attr_name, :not_a_date, options)
           return
         end
   
@@ -46,8 +46,7 @@ module ActiveModel
           end
          
           unless is_time?(option_value) && value.to_i.send(CHECKS[option], option_value.to_i)
-            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)
+            record.errors.add(attr_name, option, options.merge(:value => original_value, :date => original_option_value))
           end
         end
       end
@@ -59,3 +58,6 @@ module ActiveModel
     end
   end
 end
+
+require 'active_support/i18n'
+I18n.load_path += Dir[File.expand_path(File.join(File.dirname(__FILE__), '../locales', '*.yml')).to_s]

data/locales/ca.yml

@@ -1,11 +1,11 @@
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
-en:
+ca:
   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 %{date}"
+      after_or_equal_to: "must be after or equal to %{date}"
+      before: "must be before %{date}"
+      before_or_equal_to: "must be before or equal to %{date}"

data/locales/en.yml

@@ -1,8 +1,8 @@
-ca:
+en:
   errors:
     messages:
-      not_a_date: "no és una data"
-      after: "ha de ser posterior a %{value}"
-      after_or_equal_to: "ha de ser posterior o igual a %{value}"
-      before: "ha de ser abans de %{value}"
-      before_or_equal_to: "ha de ser abans o igual a %{value}"
+      not_a_date: "is not a date"
+      after: "must be after %{date}"
+      after_or_equal_to: "must be after or equal to %{date}"
+      before: "must be before %{date}"
+      before_or_equal_to: "must be before or equal to %{date}"

data/locales/es.yml

@@ -2,7 +2,7 @@ es:
   errors:
     messages:
       not_a_date: "no es una fecha"
-      after: "tiene que ser posterior a %{value}"
-      after_or_equal_to: "tiene que ser posterior o igual a %{value}"
-      before: "tiene que ser antes de %{value}"
-      before_or_equal_to: "tiene que ser antes o igual a %{value}"
+      after: "tiene que ser posterior a %{date}"
+      after_or_equal_to: "tiene que ser posterior o igual a %{date}"
+      before: "tiene que ser antes de %{date}"
+      before_or_equal_to: "tiene que ser antes o igual a %{date}"

data/spec/date_validator_spec.rb

@@ -68,6 +68,15 @@ describe "DateValidator" do
           model.errors[:expiration_date].should == ["must be after Christmas"]
         end
 
+        it "allows custom validation message to be handled by I18n" do
+          custom_message = 'Custom Date Message'
+          I18n.backend.store_translations('en', {:errors => {:messages => {:not_a_date => custom_message}}})
+          TestRecord.validates :expiration_date, :date => true
+          model = TestRecord.new(nil)
+          model.should_not be_valid
+          model.errors[:expiration_date].should == [custom_message]
+        end
+
       end
 
     end

data/spec/spec_helper.rb

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 9
-  version: 0.5.9
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Oriol Gual
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 +02:00
+date: 2011-02-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency