version 3.0.4

this fixes issue for Date column types. Damn method is just too
unwieldly and should be refactored in Rails.

CHANGELOG.rdoc

@@ -1,3 +1,15 @@
+= 3.0.4 [2011-01-22]
+* Fix :between option which was being ignored (ebeigarts)
+* Use class_attribute to remove deprecated class_inheritable_accessor
+* Namespace copied validator class to ActiveModel::Validations::Timeliness for :timeliness option
+
+= 3.0.3 [2010-12-11]
+* Fix validation of values which don't respond to to_date or to_time (renatoelias)
+
+= 3.0.2 [2010-12-04]
+* Fix AR multiparameter extension for Date columns
+* Update to Timeliness 0.3.2 for zone abbreviation and offset support
+
 = 3.0.1 [2010-11-02]
 * Generate timeliness write methods in an included module to allow overriding in model class (josevalim)
 

Gemfile

@@ -3,18 +3,16 @@ source 'http://rubygems.org'
 gemspec
 
 gem 'ZenTest'
-gem 'rails', '3.0.0'
-gem 'rspec', '>= 2.0.0.beta.17'
-gem 'rspec-rails', '>= 2.0.0.beta.17'
+gem 'rails', '3.0.3'
+gem 'rspec', '~> 2.4'
+gem 'rspec-rails', '~> 2.4'
 gem 'timecop'
 gem 'rspec_tag_matchers'
-gem 'ruby-debug'
 
 group :mongoid do
-  gem 'mongoid', '2.0.0.beta.17'
-  gem 'bson_ext', '1.0.4'
+  gem 'mongoid', '2.0.0.rc.6'
 end
 
 group :active_record do
   gem 'sqlite3-ruby', :require => 'sqlite3'
-end
+end

Gemfile.lock

@@ -1,112 +1,106 @@
 PATH
   remote: .
   specs:
-    validates_timeliness (3.0.0)
-      timeliness (~> 0.1.0)
+    validates_timeliness (3.0.4)
+      timeliness (~> 0.3.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.4.0)
+    ZenTest (4.4.2)
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
-      mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    bson (1.0.4)
-    bson_ext (1.0.4)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.7)
+    bson (1.2.0)
     builder (2.1.2)
-    columnize (0.3.1)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    i18n (0.4.1)
-    linecache (0.43)
-    mail (2.2.6.1)
+    i18n (0.5.0)
+    mail (2.2.14)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
-    mongo (1.0.7)
-      bson (>= 1.0.4)
-    mongoid (2.0.0.beta.17)
-      activemodel (~> 3.0.0)
-      bson (= 1.0.4)
-      mongo (= 1.0.7)
+    mongo (1.2.0)
+      bson (>= 1.2.0)
+    mongoid (2.0.0.rc.6)
+      activemodel (~> 3.0)
+      mongo (~> 1.2)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
-    nokogiri (1.4.3.1)
+    nokogiri (1.4.4)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.4)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
-      bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-    rspec-rails (2.0.0.beta.22)
-      rspec (= 2.0.0.beta.22)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    rspec-rails (2.4.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.4.0)
     rspec_tag_matchers (1.0.0)
       nokogiri (>= 1.4.0)
       rspec-rails (>= 1.2.6)
-    ruby-debug (0.10.3)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
-      linecache (>= 0.3)
-    sqlite3-ruby (1.3.1)
-    thor (0.14.1)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    thor (0.14.6)
     timecop (0.3.5)
-    timeliness (0.1.1)
-    treetop (1.4.8)
+    timeliness (0.3.3)
+    treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.24)
     will_paginate (3.0.pre2)
 
 PLATFORMS
@@ -114,14 +108,12 @@ PLATFORMS
 
 DEPENDENCIES
   ZenTest
-  bson_ext (= 1.0.4)
-  mongoid (= 2.0.0.beta.17)
-  rails (= 3.0.0)
-  rspec (>= 2.0.0.beta.17)
-  rspec-rails (>= 2.0.0.beta.17)
+  mongoid (= 2.0.0.rc.6)
+  rails (= 3.0.3)
+  rspec (~> 2.4)
+  rspec-rails (~> 2.4)
   rspec_tag_matchers
-  ruby-debug
   sqlite3-ruby
   timecop
-  timeliness (~> 0.1.0)
+  timeliness (~> 0.3.2)
   validates_timeliness!

README.rdoc

@@ -24,6 +24,7 @@ If you a looking for the old version for Rails 2.x go here[http://github.com/adz
 
 * Supports I18n for the error messages
 
+* Supports Ruby 1.8.x, 1.9.x and Rubinius.
 
 == Installation
 
@@ -34,7 +35,7 @@ As plugin (from master)
 As gem
 
   # in Gemfile
-  gem 'validates_timeliness', '~> 3.0.0'
+  gem 'validates_timeliness', '~> 3.0.2'
 
   # Run bundler
   $ bundle install

Rakefile

@@ -22,7 +22,7 @@ spec = Gem::Specification.new do |s|
   s.homepage = "http://github.com/adzap/validates_timeliness"
   s.require_path = 'lib'
   s.files = %w(validates_timeliness.gemspec LICENSE CHANGELOG.rdoc README.rdoc Rakefile) + Dir.glob("{lib,spec}/**/*")
-  s.add_runtime_dependency 'timeliness', '~> 0.1.0'
+  s.add_runtime_dependency 'timeliness', '~> 0.3.2'
 end
 
 desc 'Default: run specs.'

lib/validates_timeliness/attribute_methods.rb

@@ -3,7 +3,7 @@ module ValidatesTimeliness
     extend ActiveSupport::Concern
 
     included do
-      class_inheritable_accessor :timeliness_validated_attributes
+      class_attribute :timeliness_validated_attributes
       self.timeliness_validated_attributes = []
     end
 

lib/validates_timeliness/conversion.rb

@@ -2,7 +2,7 @@ module ValidatesTimeliness
   module Conversion
 
     def type_cast_value(value, type)
-      return nil if value.nil?
+      return nil if value.nil? || !value.respond_to?(:to_time)
 
       value = value.in_time_zone if value.acts_like?(:time) && @timezone_aware
       value = case type

lib/validates_timeliness/extensions/date_time_select.rb

@@ -10,7 +10,6 @@ module ValidatesTimeliness
 
       included do
         alias_method_chain :datetime_selector, :timeliness
-        alias_method_chain :value, :timeliness
       end
 
       module InstanceMethods
@@ -22,13 +21,13 @@ module ValidatesTimeliness
           datetime_selector_without_timeliness(*args)
         end
 
-        def value_with_timeliness(object)
+        def value(object)
           unless @timeliness_date_or_time_tag && @template_object.params[@object_name]
-            return value_without_timeliness(object)
+            return super
           end
 
           pairs = @template_object.params[@object_name].select {|k,v| k =~ /^#{@method_name}\(/ }
-          return value_without_timeliness(object) if pairs.empty?
+          return super if pairs.empty?
 
           values = [nil] * 6
           pairs.map do |(param, value)|

lib/validates_timeliness/extensions/multiparameter_handler.rb

@@ -3,26 +3,64 @@ module ValidatesTimeliness
     module MultiparameterHandler
       extend ActiveSupport::Concern
 
+      # Stricter handling of date and time values from multiparameter 
+      # assignment from the date/time select view helpers
+
       included do
         alias_method_chain :instantiate_time_object, :timeliness
+        alias_method_chain :execute_callstack_for_multiparameter_attributes, :timeliness
       end
 
       private
 
-      # Stricter handling of date and time values from multiparameter 
-      # assignment from the date/time select view helpers
-      #
-      def instantiate_time_object_with_timeliness(name, values)
-        unless Date.valid_civil?(*values[0..2])
-          value =  [values[0], *values[1..2].map {|s| s.to_s.rjust(2,"0")} ].join("-")
-          value += ' ' + values[3..5].map {|s| s.to_s.rjust(2, "0") }.join(":") unless values[3..5].empty?
-          return value
-        end
+      def invalid_multiparameter_date_or_time_as_string(values)
+        value =  [values[0], *values[1..2].map {|s| s.to_s.rjust(2,"0")} ].join("-")
+        value += ' ' + values[3..5].map {|s| s.to_s.rjust(2, "0") }.join(":") unless values[3..5].empty?
+        value
+      end
 
-        if self.class.send(:create_time_zone_conversion_attribute?, name, column_for_attribute(name))
-          Time.zone.local(*values)
+      def instantiate_time_object_with_timeliness(name, values)
+        if Date.valid_civil?(*values[0..2])
+          instantiate_time_object_without_timeliness(name, values)
         else
-          Time.time_with_datetime_fallback(self.class.default_timezone, *values)
+          invalid_multiparameter_date_or_time_as_string(values)
+        end
+      end
+
+      def instantiate_date_object(name, values)
+        values = values.map { |v| v.nil? ? 1 : v }
+        Date.new(*values)
+      rescue ArgumentError => ex
+        invalid_multiparameter_date_or_time_as_string(values)
+      end
+
+      def execute_callstack_for_multiparameter_attributes_with_timeliness(callstack)
+        errors = []
+        callstack.each do |name, values_with_empty_parameters|
+          begin
+            klass = (self.class.reflect_on_aggregation(name.to_sym) || column_for_attribute(name)).klass
+            values = values_with_empty_parameters.reject { |v| v.nil? }
+
+            if values.empty?
+              send(name + "=", nil)
+            else
+
+              value = if Time == klass
+                instantiate_time_object(name, values)
+              elsif Date == klass
+                instantiate_date_object(name, values_with_empty_parameters)
+              else
+                klass.new(*values)
+              end
+
+              send(name + "=", value)
+            end
+          rescue => ex
+            errors << ActiveRecord::AttributeAssignmentError.new("error on assignment #{values.inspect} to #{name}", ex, name)
+          end
+        end
+        unless errors.empty?
+          raise ActiveRecord::MultiparameterAssignmentErrors.new(errors), "#{errors.size} error(s) on assignment of multiparameter attributes"
         end
       end
 

lib/validates_timeliness/validator.rb

@@ -27,12 +27,13 @@ module ValidatesTimeliness
     def initialize(options)
       @type = options.delete(:type) || :datetime
       @allow_nil, @allow_blank = options.delete(:allow_nil), options.delete(:allow_blank)
-      @restrictions_to_check = RESTRICTIONS.keys & options.keys
 
       if range = options.delete(:between)
         raise ArgumentError, ":between must be a Range or an Array" unless range.is_a?(Range) || range.is_a?(Array)
         options[:on_or_after], options[:on_or_before] = range.first, range.last
       end
+
+      @restrictions_to_check = RESTRICTIONS.keys & options.keys
       super
     end
 
@@ -72,9 +73,8 @@ module ValidatesTimeliness
     end
 
     def attribute_raw_value(record, attr_name)
-      if record.respond_to?(:_timeliness_raw_value_for)
+      record.respond_to?(:_timeliness_raw_value_for) &&
         record._timeliness_raw_value_for(attr_name)
-      end
     end
 
     def timezone_aware?(record, attr_name)
@@ -86,4 +86,4 @@ module ValidatesTimeliness
 end
 
 # Compatibility with ActiveModel validates method which matches option keys to their validator class
-TimelinessValidator = ValidatesTimeliness::Validator
+ActiveModel::Validations::TimelinessValidator = ValidatesTimeliness::Validator

lib/validates_timeliness/version.rb

@@ -1,3 +1,3 @@
 module ValidatesTimeliness
-  VERSION = '3.0.1'
+  VERSION = '3.0.4'
 end

spec/validates_timeliness/conversion_spec.rb

@@ -22,6 +22,10 @@ describe ValidatesTimeliness::Conversion do
       it "should return date part of datetime value" do
         type_cast_value(DateTime.new(2010, 1, 1, 0, 0, 0), :date).should == Date.new(2010, 1, 1)
       end
+
+      it 'should return nil for invalid value types' do
+        type_cast_value(12, :date).should == nil
+      end
     end
 
     describe "for time type" do
@@ -40,6 +44,10 @@ describe ValidatesTimeliness::Conversion do
       it "should return dummy date with time part for datetime value" do
         type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56), :time).should == Time.utc(2000, 1, 1, 12, 34, 56)
       end
+
+      it 'should return nil for invalid value types' do
+        type_cast_value(12, :time).should == nil
+      end
     end
 
     describe "for datetime type" do
@@ -63,6 +71,10 @@ describe ValidatesTimeliness::Conversion do
         result.should == Time.zone.local(2010, 1, 1, 23, 34, 56)
         result.zone.should == 'EST'
       end
+
+      it 'should return nil for invalid value types' do
+        type_cast_value(12, :datetime).should == nil
+      end
     end
 
     describe "ignore_usec option" do

spec/validates_timeliness/extensions/multiparameter_handler_spec.rb

@@ -3,19 +3,31 @@ require 'spec_helper'
 describe ValidatesTimeliness::Extensions::MultiparameterHandler do
   let(:employee) { Employee.new }
 
-  it 'should return string value for invalid dates' do
-    instantiate_time_object('birth_date', [2000, 2, 31]).should == '2000-02-31'
+  context "time column" do
+    it 'should return string value for invalid date portion' do
+      multiparameter_attribute(:birth_datetime, [2000, 2, 31, 12, 0, 0])
+      employee.birth_datetime_before_type_cast.should == '2000-02-31 12:00:00'
+    end
+     
+    it 'should return Time value for valid datetimes' do
+      multiparameter_attribute(:birth_datetime, [2000, 2, 28, 12, 0, 0])
+      employee.birth_datetime_before_type_cast.should be_kind_of(Time)
+    end
   end
 
-  it 'should return string value for invalid datetimes' do
-    instantiate_time_object('birth_datetime', [2000, 2, 31, 12, 0, 0]).should == '2000-02-31 12:00:00'
-  end
-   
-  it 'should return Time value for valid datetimes' do
-    instantiate_time_object('birth_datetime', [2000, 2, 28, 12, 0, 0]).should be_kind_of(Time)
+  context "date column" do
+    it 'should return string value for invalid date' do
+      multiparameter_attribute(:birth_date, [2000, 2, 31])
+      employee.birth_date_before_type_cast.should == '2000-02-31'
+    end
+
+    it 'should return Date value for valid date' do
+      multiparameter_attribute(:birth_date, [2000, 2, 28])
+      employee.birth_date_before_type_cast.should be_kind_of(Date)
+    end
   end
 
-  def instantiate_time_object(name, values)
-    employee.send(:instantiate_time_object, name, values)
+  def multiparameter_attribute(name, values)
+    employee.send(:execute_callstack_for_multiparameter_attributes, name.to_s => values)
   end
 end

spec/validates_timeliness/validator_spec.rb

@@ -12,10 +12,10 @@ describe ValidatesTimeliness::Validator do
     ValidatesTimeliness::Validator.kind.should == :timeliness 
   end
 
-  describe "Model.validates :timeliness option" do
+  describe "Model.validates with :timeliness option" do
     it 'should use plugin validator class' do
       Person.validates :birth_date, :timeliness => {:is_at => Date.new(2010,1,1), :type => :date}
-      Person.validators.should have(1).kind_of(TimelinessValidator)
+      Person.validators.should have(1).kind_of(ActiveModel::Validations::TimelinessValidator)
       invalid!(:birth_date, Date.new(2010,1,2))
       valid!(:birth_date, Date.new(2010,1,1))
     end
@@ -70,18 +70,26 @@ describe ValidatesTimeliness::Validator do
     describe "array value" do
       it 'should be split option into :on_or_after and :on_or_before values' do
         on_or_after, on_or_before = Date.new(2010,1,1), Date.new(2010,1,2)
-        Person.validates_time :birth_date, :between => [on_or_after, on_or_before]
+        Person.validates_date :birth_date, :between => [on_or_after, on_or_before]
         Person.validators.first.options[:on_or_after].should == on_or_after
         Person.validators.first.options[:on_or_before].should == on_or_before
+        invalid!(:birth_date, on_or_after - 1, "must be on or after 2010-01-01")
+        invalid!(:birth_date, on_or_before + 1, "must be on or before 2010-01-02")
+        valid!(:birth_date, on_or_after)
+        valid!(:birth_date, on_or_before)
       end
     end
 
     describe "range value" do
       it 'should be split option into :on_or_after and :on_or_before values' do
         on_or_after, on_or_before = Date.new(2010,1,1), Date.new(2010,1,2)
-        Person.validates_time :birth_date, :between => on_or_after..on_or_before
+        Person.validates_date :birth_date, :between => on_or_after..on_or_before
         Person.validators.first.options[:on_or_after].should == on_or_after
         Person.validators.first.options[:on_or_before].should == on_or_before
+        invalid!(:birth_date, on_or_after - 1, "must be on or after 2010-01-01")
+        invalid!(:birth_date, on_or_before + 1, "must be on or before 2010-01-02")
+        valid!(:birth_date, on_or_after)
+        valid!(:birth_date, on_or_before)
       end
     end
   end

validates_timeliness.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{validates_timeliness}
-  s.version = "3.0.1"
+  s.version = "3.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Meehan"]
-  s.date = %q{2010-11-02}
+  s.date = %q{2011-01-22}
   s.description = %q{Date and time validation plugin for Rails which allows custom formats}
   s.email = %q{adam.meehan@gmail.com}
   s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "LICENSE"]
@@ -22,11 +22,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<timeliness>, ["~> 0.1.0"])
+      s.add_runtime_dependency(%q<timeliness>, ["~> 0.3.2"])
     else
-      s.add_dependency(%q<timeliness>, ["~> 0.1.0"])
+      s.add_dependency(%q<timeliness>, ["~> 0.3.2"])
     end
   else
-    s.add_dependency(%q<timeliness>, ["~> 0.1.0"])
+    s.add_dependency(%q<timeliness>, ["~> 0.3.2"])
   end
 end