date_validator 0.6.3 → 0.6.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ad328bfcd91fe2dd14dffada0d846bbc8098de12
+  data.tar.gz: ca2397f4635d7f6ca4fc7e13430de2138ac1df41
+SHA512:
+  metadata.gz: 5dbb18aba6310ee0846aeec876f46b98d53b1ee96a75037e2f285055e1948647e74a5c5bb1f60af11d75ad08d8690948634f6f25506a7b97b7d21ddb43bf6f41
+  data.tar.gz: 46a423f1e6dd42f08e5fadb1d1a42cd440ee308025679e562f316a55f9b873cabec519e1705d90a04efbc0b9734ea8ae8a0a9a8635a9b60d9fedb1500acd0d9d

data/.rvmrc

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

data/.travis.yml

@@ -1,8 +1,8 @@
 # http://about.travis-ci.org/docs/user/build-configuration/
+langauge: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
-  - ree
-  - ruby-head
-  - rbx
-  - rbx-2.0
+  - 1.9.3
+  - 2.0.0
+  - rbx-19mode
+  - jruby-19mode

data/date_validator.gemspec

@@ -14,12 +14,12 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "date_validator"
 
-  s.add_runtime_dependency 'activemodel', ['~> 3.0']
+  s.add_runtime_dependency 'activemodel', '>= 3'
 
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'activesupport', ['~> 3.0']
-  s.add_development_dependency 'tzinfo', '~> 0.3.0'
+  s.add_development_dependency 'activesupport'
+  s.add_development_dependency 'tzinfo'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/active_model/validations/date_validator.rb

@@ -33,10 +33,33 @@ module ActiveModel
         end
       end
 
+      # Overridden because standard allow_nil and allow_blank checks don't work with
+      # string expressions that cannot be type cast to dates. We have to validate
+      # the pre-type cast values.
+      def validate(record)
+        attributes.each do |attribute|
+          value = record.read_attribute_for_validation(attribute)
+          validate_each(record, attribute, value)
+        end
+      end
+
       # The actual validator method. It is called when ActiveRecord iterates
       # over all the validators.
       def validate_each(record, attr_name, value)
-        return if options[:allow_nil] && value.nil?
+        before_type_cast = :"#{attr_name}_before_type_cast"
+
+        value_before_type_cast = if record.respond_to?(before_type_cast)
+          record.send(before_type_cast)
+        else
+          nil
+        end
+
+        if value_before_type_cast.present? && value.nil?
+          record.errors.add(attr_name, :not_a_date, options)
+          return
+        end
+
+        return if (value.nil? && options[:allow_nil]) || (value.blank? && options[:allow_blank])
 
         unless value
           record.errors.add(attr_name, :not_a_date, options)

data/lib/date_validator/version.rb

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

data/locales/de.yml

@@ -0,0 +1,8 @@
+de:
+  errors:
+    messages:
+      not_a_date: "ist kein Datum"
+      after: "muss nach %{date} sein"
+      after_or_equal_to: "muss nach oder gleich %{date} sein"
+      before: "muss vor %{date} sein"
+      before_or_equal_to: "muss vor oder gleich %{date} sein"

data/locales/fr.yml

@@ -0,0 +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.
+
+fr:
+  errors:
+    messages:
+      not_a_date: "n'est pas une date"
+      after: "doit être après %{date}"
+      after_or_equal_to: "doit être supérieur ou égal à %{date}"
+      before: "doit être avant %{date}"
+      before_or_equal_to: "doit être inférieur ou égal à %{date}"

data/test/date_validator_test.rb

@@ -131,6 +131,22 @@ module ActiveModel
 
         TestRecord.new(Time.now).valid?.must_equal false
       end
+
+      describe "with type cast attributes" do
+        before do
+          TestRecord.send(:define_method, :expiration_date_before_type_cast, lambda { 'last year' })
+        end
+
+        it "should detect invalid date expressions when nil is allowed" do
+          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.new(nil).valid?.must_equal false
+        end
+      end
     end
 
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: date_validator
 version: !ruby/object:Gem::Version
-  version: 0.6.3
-  prerelease: 
+  version: 0.6.4
 platform: ruby
 authors:
 - Oriol Gual
@@ -11,63 +10,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-22 00:00:00.000000000Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70140810524120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70140810524120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70140810523700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70140810523700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70140810523240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70140810523240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70140810522720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70140810522720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70140810522220 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70140810522220
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 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.
@@ -92,35 +106,36 @@ files:
 - lib/date_validator.rb
 - lib/date_validator/version.rb
 - locales/ca.yml
+- locales/de.yml
 - locales/en.yml
 - locales/es.yml
+- locales/fr.yml
 - locales/nl.yml
 - locales/ru.yml
 - test/date_validator_test.rb
 - test/test_helper.rb
 homepage: http://github.com/codegram/date_validator
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: date_validator
-rubygems_version: 1.8.10
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3, based
   on ActiveModel.
 test_files: