date_validator 0.4.0 → 0.4.1

data/README.rdoc

@@ -20,6 +20,8 @@ Pretty much self-explanatory! :) And if you like remarkable, just install this g
 
   gem install remarkable_date_validator
 
+  (source on http://github.com/codegram/remarkable_date_validator/)
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/date_validator.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{date_validator}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   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"]
-  s.date = %q{2010-04-27}
+  s.date = %q{2010-05-14}
   s.description = %q{A simple date validator for Rails 3. Currently supporting :after, :before, :after_or_equal_to and :before_or_equal_to options. Remarkable-friendly :)}
   s.email = %q{info@codegram.com}
   s.extra_rdoc_files = [
@@ -56,3 +56,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
+

data/lib/date_validator.rb

@@ -11,7 +11,7 @@ module ActiveModel
       def check_validity!
         keys = CHECKS.keys
         options.slice(*keys).each do |option, value|
-          next if value.is_a?(Time) || value.is_a?(Proc) || value.is_a?(Symbol) || (defined?(Date) and value.is_a?(Date))
+          next if is_time?(value) || value.is_a?(Proc) || value.is_a?(Symbol)
           raise ArgumentError, ":#{option} must be a time, a date, a symbol or a proc"
         end
       end
@@ -29,10 +29,14 @@ module ActiveModel
           option_value = option_value.call(record) if option_value.is_a?(Proc)
           option_value = record.send(option_value) if option_value.is_a?(Symbol)
 
-          unless value.send(CHECKS[option], option_value)
+          unless is_time?(option_value) && value.send(CHECKS[option], option_value)
             record.errors.add(attr_name, option, :default => options[:message], :value => value, :date => option_value)
           end
-        end      
+        end
+      end
+
+      def is_time?(object)
+        object.is_a?(Time) || (defined?(Date) and object.is_a?(Date))
       end
 
       module ClassMethods

data/spec/date_validator_spec.rb

@@ -53,8 +53,18 @@ describe "DateValidator" do
           end
         # when :date then
         #   TestRecord.validates :expiration_date, :date => {:after => Time.now.to_date}
-      end 
+      end
     end
   end
 
+  it "should gracefully handle an unexpected result from a proc argument evaluation" do
+    TestRecord.validates :expiration_date, :date => {:after => Proc.new{ nil }}
+    TestRecord.new(Time.now).valid?.should be_false
+  end
+
+  it "should gracefully handle 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}
+    TestRecord.new(Time.now).valid?.should be_false
+  end
 end

data/spec/spec.opts

@@ -1,4 +1,2 @@
 --colour
 --format progress
---loadby mtime
---reverse

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Oriol Gual
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 +02:00
+date: 2010-05-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency