date_validator 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e95b0ebaffd070517405785c04fa35a692194777
-  data.tar.gz: d902fa5d58b1c911b001a507b11ac0539a2190d7
+  metadata.gz: 10530abca992905ef4966abc59bde16277badc80
+  data.tar.gz: ec91b26e1d5c4ec2f2a021da33b785e4c60d5371
 SHA512:
-  metadata.gz: fb9ea1549680bef07e681e695d01e645c481ee1c6fa4611d41a42b918fc1a42a18b9711bd4620f8e32bfa5e85a820557a0d5c371ea59ac0febab72e5f2e7c926
-  data.tar.gz: 6b3f9f4eea74c0a52d82ef399121b7a0ea386590f5a3772cb3dfbb3de006414973186efafbbfcd40e740333f35baec7f49985501bce59bc6acc1cbf0046fd189
+  metadata.gz: 33d51b09b3101e09ceb24e72fdab255c32be4e7ee766610163bbaaac793b7ab5d64c12a27a693642238e290c233e673d34a34c60a83603d75ffbadd70035c589
+  data.tar.gz: 0bb7e42f9e6bd99894952e29c5e5b1cffa388bb643cbe896b069097a36b74d3022bfe51855d372509b0ee32022da3851d7f71bf6f7e5eb3d0b852fcdd4d06ff0

data/.travis.yml

@@ -1,8 +1,10 @@
 # http://about.travis-ci.org/docs/user/build-configuration/
 langauge: ruby
+env:
+  - ACTIVE_MODEL_VERSION=3.2
+  - ACTIVE_MODEL_VERSION=4.0
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - rbx-19mode
+  - rbx
   - jruby-19mode

data/Gemfile

@@ -1,3 +1,21 @@
 source "http://rubygems.org"
 
 gemspec
+
+active_model_version = ENV['ACTIVE_MODEL_VERSION'] || 'default'
+
+active_model_opts =
+  case active_model_version
+  when 'master'
+    { github: 'rails/rails' }
+  when 'default'
+    '~> 3'
+  else
+    "~> #{active_model_version}"
+  end
+
+gem 'activemodel', active_model_opts
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+end

data/Rakefile

@@ -41,8 +41,8 @@ begin
     repo.branch("#{source_branch}").checkout
   end
 
-  task :doc => [:docs]
+  task doc: [:docs]
 rescue LoadError
 end
 
-task :default => :test
+task default: :test

data/Readme.md

@@ -1,7 +1,7 @@
 # date_validator [![Build Status](https://travis-ci.org/codegram/date_validator.png?branch=master)](https://travis-ci.org/codegram/date_validator)
 
 
-A simple date validator for Rails 3. Should be compatible with all latest Rubies.
+A simple date validator for Rails. Should be compatible with all latest Rubies.
 
 
 ```shell
@@ -10,10 +10,16 @@ $ gem install date_validator
 
 And I mean simple. In your model:
 
+```ruby
+validates :expiration_date, date: true
+```
+
+or with some options, such as:
+
 ```ruby
 validates :expiration_date,
-          :date => {:after => Proc.new { Time.now },
-                    :before => Proc.new { Time.now + 1.year } }
+          date: { after: Proc.new { Time.now },
+                  before: Proc.new { Time.now + 1.year } }
 # Using Proc.new prevents production cache issues
 ```
 
@@ -23,30 +29,30 @@ a Symbol instead of a block:
 ```ruby
 # Ensure the expiration date is after the packaging date
 validates :expiration_date,
-          :date => {:after => :packaging_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`.
+`:after_or_equal_to`, `:before_or_equal_to` and `: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
+  date: { after: Proc.new { Date.today }, message: 'must be after today' },
+  on: :create
 ```
 
-Pretty much self-explanatory! :) 
+Pretty much self-explanatory! :)
 
 If you want to make sure an attribute is before/after another attribute, use:
 
 ```ruby
-validates :start_date, :date => {:before => :end_date }
+validates :start_date, date: { before: :end_date }
 ```
 
 ## Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/date_validator.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "date_validator"
 
-  s.add_runtime_dependency 'activemodel', '>= 3'
+  s.add_runtime_dependency 'activemodel'
 
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rake'

data/lib/active_model/validations/date_validator.rb

@@ -13,13 +13,15 @@ module ActiveModel
     class DateValidator < ActiveModel::EachValidator
 
       # Implemented checks and their associated operators.
-      CHECKS = { :after => :>, :after_or_equal_to => :>=,
-                :before => :<, :before_or_equal_to => :<=}.freeze
+      CHECKS = { after: :>,  after_or_equal_to: :>=,
+                before: :<, before_or_equal_to: :<=,
+                equal_to: :==
+      }.freeze
 
       # Call `#initialize` on the superclass, adding a default
-      # `:allow_nil => false` option.
+      # `allow_nil: false` option.
       def initialize(options)
-        super(options.reverse_merge(:allow_nil => false))
+        super(options.reverse_merge(allow_nil: false))
       end
 
       # Validates the arguments passed to the validator.
@@ -65,29 +67,29 @@ module ActiveModel
           record.errors.add(attr_name, :not_a_date, options)
           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)
-       
+
           original_value = value
           original_option_value = option_value
 
           # To enable to_i conversion, these types must be converted to Datetimes
           if defined?(ActiveSupport::TimeWithZone)
-            option_value = option_value.to_datetime if option_value.is_a?(ActiveSupport::TimeWithZone) 
-            value = value.to_datetime if value.is_a?(ActiveSupport::TimeWithZone)  
+            option_value = option_value.to_datetime if option_value.is_a?(ActiveSupport::TimeWithZone)
+            value = value.to_datetime if value.is_a?(ActiveSupport::TimeWithZone)
           end
 
           if defined?(Date)
-            option_value = option_value.to_datetime if option_value.is_a?(Date) 
-            value = value.to_datetime if value.is_a?(Date)  
+            option_value = option_value.to_datetime if option_value.is_a?(Date)
+            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, option, options.merge(
-                :value => original_value,
-                :date  => (I18n.localize(original_option_value) rescue original_option_value)
+                value: original_value,
+                date:  (I18n.localize(original_option_value) rescue original_option_value)
             ))
           end
         end
@@ -104,8 +106,8 @@ module ActiveModel
       # 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 }
+      #     validates_date_of :payment_date, after: :packaging_date
+      #     validates_date_of :expiration_date, before: Proc.new { Time.now }
       #   end
       #
       # Configuration options:
@@ -113,6 +115,7 @@ module ActiveModel
       # * <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.
+      # * <tt>:equal_to</tt> - check that a Date is equal to the specified one.
       def validates_date_of(*attr_names)
         validates_with DateValidator, _merge_attributes(attr_names)
       end

data/lib/date_validator.rb

@@ -5,8 +5,8 @@ require 'active_support/i18n'
 #
 # @example
 #    validates :expiration_date,
-#              :date => {:after => Proc.new { Time.now },
-#                        :before => Proc.new { Time.now + 1.year } }
+#              date: { after: Proc.new { Time.now },
+#                      before: Proc.new { Time.now + 1.year } }
 #    # Using Proc.new prevents production cache issues
 #
 module DateValidator

data/lib/date_validator/version.rb

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

data/locales/en.yml

@@ -6,3 +6,4 @@ en:
       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}"
+      equal_to: "must be equal to %{date}"

data/locales/it.yml

@@ -0,0 +1,8 @@
+it:
+  errors:
+    messages:
+      not_a_date: "non è una data"
+      after: "deve essere successiva a %{date}"
+      after_or_equal_to: "deve essere successiva o uguale a %{date}"
+      before: "deve essere antecedente a %{date}"
+      before_or_equal_to: "deve essere antecedente o uguale a %{date}"

data/locales/pt-BR.yml

@@ -0,0 +1,8 @@
+pt-BR:
+  errors:
+    messages:
+      not_a_date: "não é uma data válida"
+      after: "deve ser após %{date}"
+      after_or_equal_to: "deve ser após ou igual a %{date}"
+      before: "deve ser antes de %{date}"
+      before_or_equal_to: "deve ser antes ou igual a %{date}"

data/locales/ru.yml

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

data/test/date_validator_test.rb

@@ -12,7 +12,7 @@ module ActiveModel
       it "checks validity of the arguments" do
         [3, "foo", 1..6].each do |wrong_argument|
           proc {
-            TestRecord.validates(:expiration_date, :date => {:before => wrong_argument})
+            TestRecord.validates(:expiration_date, date: { before: wrong_argument })
           }.must_raise(ArgumentError, ":before must be a time, a date, a time_with_zone, a symbol or a proc")
         end
       end
@@ -20,7 +20,7 @@ module ActiveModel
       it "complains when no options are provided" do
         I18n.backend.reload!
         TestRecord.validates :expiration_date,
-                             :date => {:before => Time.now}
+                             date: { before: Time.now }
 
         model = TestRecord.new(nil)
         model.valid?.must_equal false
@@ -29,7 +29,7 @@ module ActiveModel
 
       it "works with helper methods" do
         time = Time.now
-        TestRecord.validates_date_of :expiration_date, :before => time
+        TestRecord.validates_date_of :expiration_date, before: time
         model = TestRecord.new(time + 20000)
         model.valid?.must_equal false
       end
@@ -38,19 +38,20 @@ module ActiveModel
         _context = must_be == :valid ? 'when value validates correctly' : 'when value does not match validation requirements'
 
         describe _context do
-          [:after, :before, :after_or_equal_to, :before_or_equal_to].each do |check|
+          [:after, :before, :after_or_equal_to, :before_or_equal_to, :equal_to].each do |check|
               now = Time.now.to_datetime
 
               model_date = case check
-                when :after then must_be == :valid ? now + 21000 : now - 1
-                when :before then must_be == :valid ? now - 21000 : now + 1
-                when :after_or_equal_to then must_be == :valid ? now : now - 21000
+                when :after              then must_be == :valid ? now + 21000 : now - 1
+                when :before             then must_be == :valid ? now - 21000 : now + 1
+                when :after_or_equal_to  then must_be == :valid ? now : now - 21000
                 when :before_or_equal_to then must_be == :valid ? now : now + 21000
+                when :equal_to           then must_be == :valid ? now : now + 21000
               end
 
               it "ensures that an attribute is #{must_be} when #{must_be == :valid ? 'respecting' : 'offending' } the #{check} check" do
                 TestRecord.validates :expiration_date,
-                                     :date => {:"#{check}" => now}
+                                     date: {:"#{check}" => now}
 
                 model = TestRecord.new(model_date)
                 must_be == :valid ? model.valid?.must_equal(true) : model.valid?.must_equal(false)
@@ -59,7 +60,7 @@ 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}" => now}
+                                       date: {:"#{check}" => now}
 
                   model = TestRecord.new(model_date)
                   model.valid?.must_equal false
@@ -73,8 +74,8 @@ module ActiveModel
 
             it "allows for a custom validation message" do
               TestRecord.validates :expiration_date,
-                                   :date => {:before_or_equal_to => now,
-                                             :message => 'must be after Christmas'}
+                                   date: { before_or_equal_to: now,
+                                           message: 'must be after Christmas' }
 
               model = TestRecord.new(now + 21000)
               model.valid?.must_equal false
@@ -83,9 +84,9 @@ module ActiveModel
 
             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}}})
+              I18n.backend.store_translations('en', { errors: { messages: { not_a_date: custom_message }}})
 
-              TestRecord.validates :expiration_date, :date => true
+              TestRecord.validates :expiration_date, date: true
 
               model = TestRecord.new(nil)
               model.valid?.must_equal false
@@ -104,22 +105,22 @@ module ActiveModel
         it "accepts a #{type} as an argument to a check" do
           case type
             when :proc then
-              TestRecord.validates(:expiration_date, :date => {:after => Proc.new{Time.now + 21000}}).must_be_kind_of Hash
+              TestRecord.validates(:expiration_date, date: { after: Proc.new {Time.now + 21000} }).must_be_kind_of Hash
             when :symbol then
               TestRecord.send(:define_method, :min_date, lambda { Time.now + 21000 })
-              TestRecord.validates(:expiration_date, :date => {:after => :min_date}).must_be_kind_of Hash
+              TestRecord.validates(:expiration_date, date: { after: :min_date }).must_be_kind_of Hash
             when :date then
-              TestRecord.validates(:expiration_date, :date => {:after => Time.now.to_date}).must_be_kind_of Hash
+              TestRecord.validates(:expiration_date, date: { after: Time.now.to_date }).must_be_kind_of Hash
             when :time_with_zone then
               Time.zone = "Hawaii"
-              TestRecord.validates(:expiration_date, :date => {:before => Time.zone.parse((Time.now + 21000).to_s)}).must_be_kind_of Hash
+              TestRecord.validates(:expiration_date, date: { before: Time.zone.parse((Time.now + 21000).to_s) }).must_be_kind_of Hash
           end
         end
       end
 
       it "gracefully handles an unexpected result from a proc argument evaluation" do
         TestRecord.validates :expiration_date,
-                             :date => {:after => Proc.new{ nil }}
+                             date: { after: Proc.new { nil } }
 
         TestRecord.new(Time.now).valid?.must_equal false
       end
@@ -127,7 +128,7 @@ module ActiveModel
       it "gracefully handles an unexpected result from a symbol argument evaluation" do
         TestRecord.send(:define_method, :min_date, lambda { nil })
         TestRecord.validates :expiration_date,
-                             :date => {:after => :min_date}
+                             date: { after: :min_date }
 
         TestRecord.new(Time.now).valid?.must_equal false
       end
@@ -138,12 +139,12 @@ module ActiveModel
         end
 
         it "should detect invalid date expressions when nil is allowed" do
-          TestRecord.validates(:expiration_date, :date => true, :allow_nil => true)
+          TestRecord.validates(:expiration_date, date: true, allow_nil: true)
           TestRecord.new(nil).valid?.must_equal false
         end
 
         it "should detect invalid date expressions when blank is allowed" do
-          TestRecord.validates(:expiration_date, :date => true, :allow_blank => true)
+          TestRecord.validates(:expiration_date, date: true, allow_blank: true)
           TestRecord.new(nil).valid?.must_equal false
         end
       end

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 begin
-  require 'simplecov'; 
+  require 'simplecov'
   SimpleCov.start do
     add_group "Lib", 'lib'
   end
@@ -8,9 +8,10 @@ end
 
 begin; require 'turn'; rescue LoadError; end
 
-require 'minitest/spec'
+gem 'minitest'
 require 'minitest/autorun'
 
+require 'active_support/core_ext'
 require 'active_support/time' # For testing Date and TimeWithZone objects
 
 require 'active_model'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: date_validator
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Oriol Gual
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -110,8 +110,10 @@ files:
 - locales/en.yml
 - locales/es.yml
 - locales/fr.yml
+- locales/it.yml
 - locales/nl.yml
 - locales/pl.yml
+- locales/pt-BR.yml
 - locales/ru.yml
 - test/date_validator_test.rb
 - test/test_helper.rb
@@ -134,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: date_validator
-rubygems_version: 2.0.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3, based
@@ -142,3 +144,4 @@ summary: A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3,
 test_files:
 - test/date_validator_test.rb
 - test/test_helper.rb
+has_rdoc: