date_validator 0.6.1 → 0.6.2

data/.rvmrc

@@ -1 +1 @@
-rvm --create use ruby-1.9.2@date_validator
+rvm use ruby-1.9.2@date_validator --create

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     date_validator (0.6.1)
-      activemodel (~> 3.0.0)
+      activemodel (>= 3.0.0, < 3.2.0)
 
 GEM
   remote: http://rubygems.org/

data/LICENSE

@@ -0,0 +1,8 @@
+Copyright (c) 2011 Codegram
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/Readme.md

@@ -3,19 +3,40 @@
 A simple date validator for Rails 3. Compatible with Ruby 1.8.7, 1.9.2 and
 Rubinius 1.2.2.
 
-    $ gem sources -a http://gemcutter.org/
-    $ gem install date_validator
+```shell
+$ gem sources -a http://gemcutter.org/
+$ gem install date_validator
+```
 
 And I mean simple. In your model:
 
-    validates :expiration_date,
-              :date => {:after => Proc.new { Time.now },
-                        :before => Proc.new { Time.now + 1.year } }
-    # Using Proc.new prevents production cache issues
+```ruby
+validates :expiration_date,
+          :date => {:after => Proc.new { Time.now },
+                    :before => Proc.new { Time.now + 1.year } }
+# Using Proc.new prevents production cache issues
+```
+
+If you want to check the date against another attribute, you can pass it
+a Symbol instead of a block:
+
+```ruby
+# Ensure the expiration date is after the packaging date
+validates :expiration_date,
+          :date => {:after => :packaging_date}
+```
 
 For now the available options you can use are `:after`, `:before`,
 `:after_or_equal_to` and `:before_or_equal_to`.
 
+If you want to specify a custom message, you can do so in the options hash:
+
+```ruby
+validates :start_date,
+  :date => {:after => Date.today, :message => 'must be after today'},
+  :on => :create
+```
+
 Pretty much self-explanatory! :) 
 
 ## Note on Patches/Pull Requests

data/date_validator.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "date_validator"
 
-  s.add_runtime_dependency 'activemodel', '~>3.0.0'
+  s.add_runtime_dependency 'activemodel', ['>= 3.0.0', '< 3.2.0']
 
   s.add_development_dependency 'rspec', '~> 2.5.0'
   s.add_development_dependency 'simplecov'

data/lib/active_model/validations/date_validator.rb

@@ -24,7 +24,7 @@ module ActiveModel
 
       # Validates the arguments passed to the validator.
       #
-      # They must be either any kind of <Time>, a <Proc>, or a <Symbol>.
+      # They must be either any kind of Time, a Proc, or a Symbol.
       def check_validity!
         keys = CHECKS.keys
         options.slice(*keys).each do |option, value|
@@ -62,7 +62,10 @@ module ActiveModel
           end
          
           unless is_time?(option_value) && value.to_i.send(CHECKS[option], option_value.to_i)
-            record.errors.add(attr_name, option, options.merge(:value => original_value, :date => original_option_value))
+            record.errors.add(attr_name, option, options.merge(
+                :value => original_value,
+                :date  => (I18n.localize(original_option_value) rescue original_option_value)
+            ))
           end
         end
       end
@@ -73,5 +76,23 @@ module ActiveModel
         object.is_a?(Time) || (defined?(Date) and object.is_a?(Date)) || (defined?(ActiveSupport::TimeWithZone) and object.is_a?(ActiveSupport::TimeWithZone))
       end
     end
+
+    module HelperMethods
+      # Validates whether the value of the specified attribute is a validate Date
+      #
+      #   class Person < ActiveRecord::Base
+      #     validates_date_of :payment_date, :after => :packaging_date
+      #     validates_date_of :expiration_date, :before => Proc.new { Time.now }
+      #   end
+      #
+      # Configuration options:
+      # * <tt>:after</tt> - check that a Date is after the specified one.
+      # * <tt>:before</tt> - check that a Date is before the specified one.
+      # * <tt>:after_or_equal_to</tt> - check that a Date is after or equal to the specified one.
+      # * <tt>:before_or_equal_to</tt> - check that a Date is before or equal to the specified one.
+      def validates_date_of(*attr_names)
+        validates_with DateValidator, _merge_attributes(attr_names)
+      end
+    end
   end
 end

data/lib/date_validator/version.rb

@@ -1,4 +1,4 @@
 module DateValidator
   # The version number.
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/locales/nl.yml

@@ -0,0 +1,8 @@
+nl:
+  errors:
+    messages:
+      not_a_date: "is geen datum"
+      after: "moet na %{date} liggen"
+      after_or_equal_to: "moet gelijk zijn aan of na %{date} liggen"
+      before: "moet voor %{date} liggen"
+      before_or_equal_to: "moet gelijk zijn of voor %{date} liggen"

data/locales/ru.yml

@@ -0,0 +1,8 @@
+ru:
+  errors:
+    messages:
+      not_a_date: "неверный формат"
+      after: "должна быть позднее чем %{date}"
+      after_or_equal_to: "должна равняться или быть позднее чем %{date}"
+      before: "должна быть ранее чем %{date}"
+      before_or_equal_to: "должна равняться или быть ранее чем %{date}"

data/spec/date_validator_spec.rb

@@ -27,6 +27,13 @@ module ActiveModel
         model.errors[:expiration_date].should eq(["is not a date"])
       end
 
+      it "works with helper methods" do
+        time = Time.now
+        TestRecord.validates_date_of :expiration_date, :before => time
+        model = TestRecord.new(time + 20000)
+        model.should_not be_valid
+      end
+
       [:valid,:invalid].each do |should_be|
         _context = should_be == :valid ? 'when value validates correctly' : 'when value does not match validation requirements'
 
@@ -43,7 +50,7 @@ module ActiveModel
 
               it "ensures that an attribute is #{should_be} when #{should_be == :valid ? 'respecting' : 'offending' } the #{check} check" do
                 TestRecord.validates :expiration_date,
-                                     :date => {:"#{check}" => Time.now}
+                                     :date => {:"#{check}" => now}
 
                 model = TestRecord.new(model_date)
                 should_be == :valid ? model.should(be_valid, "an attribute should be valid when respecting the #{check} check")\
@@ -53,22 +60,24 @@ module ActiveModel
               if _context == 'when value does not match validation requirements'
                 it "yields a default error message indicating that value must be #{check} validation requirements" do
                   TestRecord.validates :expiration_date,
-                                       :date => {:"#{check}" => Time.now}
+                                       :date => {:"#{check}" => now}
 
                   model = TestRecord.new(model_date)
                   model.should_not be_valid
-                  model.errors[:expiration_date].should eq(["must be " + check.to_s.gsub('_',' ') + " #{Time.now}"])
+                  model.errors[:expiration_date].should eq(["must be " + check.to_s.gsub('_',' ') + " #{I18n.localize(now)}"])
                 end
               end
           end
 
           if _context == 'when value does not match validation requirements'
+            now = Time.now.to_datetime
+
             it "allows for a custom validation message" do
               TestRecord.validates :expiration_date,
-                                   :date => {:before_or_equal_to => Time.now,
+                                   :date => {:before_or_equal_to => now,
                                              :message => 'must be after Christmas'}
 
-              model = TestRecord.new(Time.now + 21000)
+              model = TestRecord.new(now + 21000)
               model.should_not be_valid
               model.errors[:expiration_date].should eq(["must be after Christmas"])
             end

metadata

@@ -2,7 +2,7 @@
 name: date_validator
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Oriol Gual
@@ -12,8 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 +01:00
-default_executable: 
+date: 2011-06-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
@@ -21,9 +20,12 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version 
+        version: 3.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -109,6 +111,7 @@ files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - Rakefile
 - Readme.md
 - date_validator.gemspec
@@ -118,9 +121,10 @@ files:
 - locales/ca.yml
 - locales/en.yml
 - locales/es.yml
+- locales/nl.yml
+- locales/ru.yml
 - spec/date_validator_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/codegram/date_validator
 licenses: []
 
@@ -144,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: date_validator
-rubygems_version: 1.5.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3, based on ActiveModel.