updated version number (1.1.7)

renamed enable action view extension method and enable both extensions in the one method as they are needed together

.gitignore

@@ -0,0 +1 @@
+pkg/

CHANGELOG

@@ -1,28 +1,76 @@
-[2008-11-13]
+= 1.1.7 [2009-03-26]
-  - allow uppercase meridian to be valid [reported by Alex (http://alex.digns.com/)]
+- Minor change to multiparameter attributes which I had not properly implemented for chaining
 
-[2008-10-28]
+= 1.1.6 [2009-03-19]
-  - fixed bug when dirty attributes not reflecting change when attribute changed from time value to nil [reported by Brad (pvjq)]
+- Rail 2.3 support
-  - fixes for Rails 2.2 compatibility. Will refactor in to Rails version specific branches in the future.
+- Added :with_date and :with_time options. They allow an attribute to be combined with another attribute or value to make a datetime value for validation against the temporal restrictions
+- Added :equal_to option
+- Option key validation
+- Better behaviour with other plugins using alias_method_chain on read_attribute and define_attribute_methods
+- Added option to enable datetime_select extension for future use to optionally enable. Enabled by default until version 2.
+- Added :ignore_usec option for datetime restrictions to be compared without microsecond
+- some refactoring
 
-[2008-09-24]
+= 1.1.5 [2009-01-21]
-  - refactored attribute write method definitions
+- Fixed regex for 'yy' format token which wasn't greedy enough for date formats ending with year when a datetime string parsed as date with a 4 digit year
 
-[2008-08-25]
+= 1.1.4 [2009-01-13]
-  - fixed bug for non-timezone write method not updating changed attributes hash [reported by Sylvestre Mergulhão]
+- Make months names respect i18n in Formats
 
-[2008-08-22]
+= 1.1.3 [2009-01-13]
-  - fixed bug with attribute cache not clearing on write for date and time columns [reported by Sylvestre Mergulhão]
+- Fixed bug where time and date attributes still being parsed on read using Rails default parser [reported by Brad (pvjq)]
-  - parse method returns Date object for date column assigned string as per normal Rails behaviour
-  - parse method returns same object type when assigned Date or Time object as per normal Rails behaviour
 
-[2008-08-07]
+= 1.1.2 [2009-01-12]
-  - modified matcher option value parsing to allow same value types as validation method
+- Fixed bugs
-  - fixed matcher message
+ - matcher failing for custom error message without interpolation keys using I18n
+ - validator custom error messages not being extracted
 
-[2008-08-02]
+= 1.1.1 [2009-01-03]
-  - refactored validation
+- Fixed bug in matcher for options local variable
-  - refactored matcher
 
-[2008-07-30]
+= 1.1.0 [2009-01-01]
-  - removed setting values to nil when validation fails to preserve before_type_cast value
+- Added between option
+
+= 1.0.0 [2008-12-06]
+- Gemified!
+- Refactor of plugin into a Data Mapper style validator class which makes for a cleaner implementation and possible future Merb\Data Mapper support
+- Added Rails 2.2 i18n support. Plugin error messages can specified in locale files. See README.
+- ignore_datetime_restriction_errors setting has been moved from AR to ValidatesTimeliness::Validator.ignore_restriction_errors
+- date_time_error_value_formats setting has been moved from AR to ValidatesTimeliness::Validator.error_value_formats
+- Namespaced modules and specs 
+- Clean up of specs
+- fixed a few bugs
+  - accessor methods not generating properly due method name stored as symbol in generated_attributes which fails on lookup
+  - force value assigned to time/datetime attributes to time objects
+
+= 0.1.0 [2008-12-06]
+- Tagged plugin as version 0.1.0
+
+= 2008-11-13
+- allow uppercase meridian to be valid [reported by Alex (http://alex.digns.com/)]
+
+= 2008-10-28
+- fixed bug when dirty attributes not reflecting change when attribute changed from time value to nil [reported by Brad (pvjq)]
+- fixes for Rails 2.2 compatibility. Will refactor in to Rails version specific branches in the future.
+
+= 2008-09-24
+- refactored attribute write method definitions
+
+= 2008-08-25
+- fixed bug for non-timezone write method not updating changed attributes hash [reported by Sylvestre Mergulhão]
+
+= 2008-08-22
+- fixed bug with attribute cache not clearing on write for date and time columns [reported by Sylvestre Mergulhão]
+- parse method returns Date object for date column assigned string as per normal Rails behaviour
+- parse method returns same object type when assigned Date or Time object as per normal Rails behaviour
+
+= 2008-08-07
+- modified matcher option value parsing to allow same value types as validation method
+- fixed matcher message
+
+= 2008-08-02
+- refactored validation
+- refactored matcher
+
+= 2008-07-30
+- removed setting values to nil when validation fails to preserve before_type_cast value

README.rdoc

@@ -1,7 +1,7 @@
 = validates_timeliness
 
-  * Source:  http://github.com/adzap/validates_timeliness
+* Source:  http://github.com/adzap/validates_timeliness
-  * Tickets: http://adzap.lighthouseapp.com/projects/14111-validates_timeliness
+* Bugs:    http://adzap.lighthouseapp.com/projects/14111-validates_timeliness
 
 == DESCRIPTION:
 
@@ -24,12 +24,26 @@ think should be a valid date or time string.
 
 * Respects new timezone features of Rails 2.1.
 
+* Supports Rails 2.2 I18n for the error messages
+
+* Rspec matcher for testing model validation of dates and times
+
 
 == INSTALLATION:
 
-  ./script/plugin git://github.com/adzap/validates_timeliness
+As plugin (from master)
+
+  ./script/plugin install git://github.com/adzap/validates_timeliness.git
+
+As gem
+
+  sudo gem install validates_timeliness
+
+  # in environment.rb
+
+  config.gem 'validates_timeliness'
+
 
-  
 == USAGE:
 
 To validate a model with a date, time or datetime attribute you just use the 
@@ -41,47 +55,54 @@ validation method
   end
   
 The list of validation methods available are as follows:
-
+  validates_date     - validate value as date
-  * validates_date     - validate value as date
+  validates_time     - validate value as time only i.e. '12:20pm'
-  
+  validates_datetime - validate value as a full date and time
-  * validates_time     - validate value as time only i.e. '12:20pm'
-  
-  * validates_datetime - validate value as a full date and time
   
 The validation methods take the usual options plus some specific ones to restrict
 the valid range of dates or times allowed
 
-  Temporal options:  
+Temporal options (or restrictions):
-    :before       - Attribute must be before this value to be valid
+  :equal_to     - Attribute must be equal to value to be valid
-    :on_or_before - Attribute must be equal to or before this value to be valid
+  :before       - Attribute must be before this value to be valid
-    :after        - Attribute must be after this value to be valid
+  :on_or_before - Attribute must be equal to or before this value to be valid
-    :on_or_after  - Attribute must be equal to or after this value to be valid
+  :after        - Attribute must be after this value to be valid
+  :on_or_after  - Attribute must be equal to or after this value to be valid
+  :between      - Attribute must be between the values to be valid. Takes an array of two values or a range
 
-  Regular validation options:  
+Regular validation options:
-    :allow_nil    - Allow a nil value to be valid
+  :allow_nil    - Allow a nil value to be valid
-    :allow_blank  - Allows a nil or empty string value to be valid
+  :allow_blank  - Allows a nil or empty string value to be valid
-    :if           - Execute validation when :if evaluates true
+  :if           - Execute validation when :if evaluates true
-    :unless       - Execute validation when :unless evaluates false
+  :unless       - Execute validation when :unless evaluates false
 
-  Message options: - Use these to override the default error messages
+Special options:
-    :invalid_date_message
+  :with_time    - Validate a date attribute value combined with a time value against any temporal restrictions
-    :invalid_time_message
+  :with_date    - Validate a time attribute value combined with a date value against any temporal restrictions 
-    :invalid_datetime_message
+  :ignore_usec  - Ignores microsecond value on datetime restrictions
-    :before_message
+  
-    :on_or_before_message
+Message options: - Use these to override the default error messages
-    :after_message
+  :invalid_date_message
-    :on_or_after_message
+  :invalid_time_message
+  :invalid_datetime_message
+  :equal_to_message
+  :before_message
+  :on_or_before_message
+  :after_message
+  :on_or_after_message
+  :between_message
 
-The temporal options can take 4 different value types:
+The temporal restrictions, with_date and with_time can take 4 different value types:
+* String value
+* Date, Time, or DateTime object value
+* Proc or lambda object which may take an optional parameter being the record object
+* A symbol matching the method name in the model
 
-  * String value
+When an attribute value is compared to temporal restrictions, they are compared as 
-  * Date, Time, or DateTime object value
-  * Proc or lambda object
-  * A symbol matching the method name in the model  
-
-When an attribute value is compared to temporal options, they are compared as 
 the same type as the validation method type. So using validates_date means all
-values are compared as dates.
+values are compared as dates. This is except in the case of with_time and with_date
+options which effectively force the value to validated as a datetime against the
+temporal options.
 
 == EXAMPLES:
 
@@ -94,6 +115,8 @@ values are compared as dates.
                                   :allow_nil => true
 
   validates_datetime :appointment_date, :before => Proc.new { 1.week.from_now }
+
+  validates_date :entry_date, :with_time => '17:00', :on_or_before => :competition_closing
  
 
 === DATE/TIME FORMATS:
@@ -107,44 +130,43 @@ be happy to know that is exactly the format you can use to define your own if
 you want. No complex regular expressions or duck punching (monkey patching) the
 plugin is needed.
 
-  Time formats:  
+==== Time formats:
-    hh:nn:ss
+  hh:nn:ss
-    hh-nn-ss
+  hh-nn-ss
-    h:nn
+  h:nn
-    h.nn
+  h.nn
-    h nn
+  h nn
-    h-nn
+  h-nn
-    h:nn_ampm
+  h:nn_ampm
-    h.nn_ampm 
+  h.nn_ampm
-    h nn_ampm
+  h nn_ampm
-    h-nn_ampm
+  h-nn_ampm
-    h_ampm
+  h_ampm
-  
-  NOTE: Any time format without a meridian token (the 'ampm' token) is considered 
-        in 24 hour time.
-  
-  Date formats:  
-    yyyy/mm/dd
-    yyyy-mm-dd
-    yyyy.mm.dd
-    m/d/yy  OR  d/m/yy
-    m\d\yy  OR  d\m\yy
-    d-m-yy
-    d.m.yy
-    d mmm yy
-  
-  NOTE: To use non-US date formats see US/EURO FORMATS section
-  
-  Datetime formats:  
-    m/d/yy h:nn:ss   OR  d/m/yy hh:nn:ss
-    m/d/yy h:nn      OR  d/m/yy h:nn
-    m/d/yy h:nn_ampm OR  d/m/yy h:nn_ampm
-    yyyy-mm-dd hh:nn:ss
-    yyyy-mm-dd h:nn
-    ddd mmm d hh:nn:ss zo yyyy # Ruby time string
-    yyyy-mm-ddThh:nn:ss(?:Z|zo) # ISO 8601
 
-  NOTE: To use non-US date formats see US/EURO FORMATS section
+NOTE: Any time format without a meridian token (the 'ampm' token) is considered in 24 hour time.
+
+==== Date formats:
+  yyyy/mm/dd
+  yyyy-mm-dd
+  yyyy.mm.dd
+  m/d/yy  OR  d/m/yy
+  m\d\yy  OR  d\m\yy
+  d-m-yy
+  d.m.yy
+  d mmm yy
+
+NOTE: To use non-US date formats see US/EURO FORMATS section
+
+==== Datetime formats:
+  m/d/yy h:nn:ss   OR  d/m/yy hh:nn:ss
+  m/d/yy h:nn      OR  d/m/yy h:nn
+  m/d/yy h:nn_ampm OR  d/m/yy h:nn_ampm
+  yyyy-mm-dd hh:nn:ss
+  yyyy-mm-dd h:nn
+  ddd mmm d hh:nn:ss zo yyyy # Ruby time string
+  yyyy-mm-ddThh:nn:ss(?:Z|zo) # ISO 8601
+
+NOTE: To use non-US date formats see US/EURO FORMATS section
 
 Here is what each format token means:
 
@@ -206,7 +228,7 @@ Done! That format is no longer considered valid. Easy!
 Ok, now I hear you say "Well I have format that I want to use but you don't have it".
 Ahh, then add it yourself. Again stick this in an initializer file
 
-    ValidatesTimeliness::Formats.add_formats(:time, "d o'clock")
+  ValidatesTimeliness::Formats.add_formats(:time, "d o'clock")
 
 Now "10 o'clock" will be a valid value. So easy, no more whingeing!
 
@@ -221,29 +243,23 @@ with an existing format, will mean your format is ignored. If you need to make
 your new format higher precedence than an existing format, you can include the 
 before option like so
 
-    ValidatesTimeliness::Formats.add_formats(:time, 'ss:nn:hh', :before => 'hh:nn:ss')
+  ValidatesTimeliness::Formats.add_formats(:time, 'ss:nn:hh', :before => 'hh:nn:ss')
 
 Now a time of '59:30:23' will be interpreted as 11:30:59 pm. This option saves
 you adding a new one and deleting an old one to get it to work.
 
 
-=== TEMPORAL OPTION ERRORS:
+=== TEMPORAL RESTRICTION ERRORS:
 
-When using the validation temporal options there are times when the restriction
+When using the validation temporal restrictions there are times when the restriction
 value itself may be invalid. Normally this will add an error to the model such as
 'restriction :before value was invalid'. These can be annoying if you are using 
 procs or methods as restrictions and don't care if they don't evaluate properly
 and you want the validation to complete. In these situations you turn them off.
 
-To turn them off globally:
+To turn them off:
 
-  ActiveRecord::Base.ignore_datetime_restriction_errors = true
+  ValidatesTimeliness::Validator.ignore_restriction_errors = true
-
-To switch them on or off per model:
-
-  class Person < ActiveRecord::Base
-    self.ignore_datetime_restriction_errors = false
-  end
 
 A word of warning though, as this may hide issues with the model and make those
 corner cases a little harder to test. In general if you are using procs or 
@@ -252,9 +268,11 @@ return nil in all other situations. Restrictions are skipped if they are nil.
 
 === OTHER CUSTOMISATION:
 
-The error messages for each temporal option can also be globally overridden by 
+The error messages for each temporal restrictions can also be globally overridden by 
 updating the default AR error messages like so
 
+For Rails 2.0/2.1:
+
   ActiveRecord::Errors.default_error_messages.update(
     :invalid_date     => "is not a valid date",
     :invalid_time     => "is not a valid time",
@@ -262,13 +280,29 @@ updating the default AR error messages like so
     :before           => "must be before %s",
     :on_or_before     => "must be on or before %s",
     :after            => "must be after %s",
-    :on_or_after      => "must be on or after %s"
+    :on_or_after      => "must be on or after %s",
+    :between          => "must be between %s and %s"
   )
 
-Or for something a little more specific you can override the format of the values
+Where %s is the interpolation value for the restriction.
-inserted in the error messages for temporal options like so
 
-  ActiveRecord::Errors.date_time_error_value_formats.update(
+Rails 2.2+ using the I18n system to define new defaults:
+
+  en:
+    activerecord:
+      errors:
+        messages:
+          on_or_before: "must be equal to or before {{restriction}}"
+          on_or_after:  "must be equal to or after {{restriction}}"
+          between: "must be between {{earliest}} and {{latest}}"
+
+The {{restriction}} signifies where the interpolation value for the restriction
+will be inserted.
+
+And for something a little more specific you can override the format of the interpolation
+values inserted in the error messages for temporal restrictions like so
+
+  ValidatesTimeliness::Validator.error_value_formats.update(
     :time     => '%H:%M:%S',
     :date     => '%Y-%m-%d',
     :datetime => '%Y-%m-%d %H:%M:%S'
@@ -285,7 +319,6 @@ with the plugin or better yet *before* you write them! You just use the
 validation options you want as you would with the validation method. Those 
 options are then verified and reported if they fail. Use it like so:
 
-
    @person.should validate_date(:birth_date, :before => Time.now, :before_message => 'should be before today')
 
 

Rakefile

@@ -1,14 +1,55 @@
-require 'rake'
+require 'rubygems'
-require 'rake/testtask'
+require 'rake/gempackagetask'
-require 'rake/rdoctask'
+require 'rubygems/specification'
+require 'date'
 require 'spec/rake/spectask'
 
-spec_files = Rake::FileList["spec/**/*_spec.rb"]
+GEM = "validates_timeliness"
+GEM_VERSION = "1.1.7"
+AUTHOR = "Adam Meehan"
+EMAIL = "adam.meehan@gmail.com"
+HOMEPAGE = "http://github.com/adzap/validates_timeliness"
+SUMMARY = "Date and time validation plugin for Rails 2.x which allows custom formats"
 
-desc "Run specs"
+spec = Gem::Specification.new do |s|
-Spec::Rake::SpecTask.new do |t|
+  s.name = GEM
-  t.spec_files = spec_files
+  s.version = GEM_VERSION
-  t.spec_opts = ["-c"]
+  s.platform = Gem::Platform::RUBY
+  s.rubyforge_project = "validatestime"
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE", "TODO", "CHANGELOG"]
+  s.summary = SUMMARY
+  s.description = s.summary
+  s.author = AUTHOR
+  s.email = EMAIL
+  s.homepage = HOMEPAGE
+  
+  s.require_path = 'lib'
+  s.autorequire = GEM
+  s.files = %w(LICENSE README.rdoc Rakefile TODO CHANGELOG) + Dir.glob("{lib,spec}/**/*")
 end
 
 task :default => :spec
+
+desc "Run specs"
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = %w(-fs --color)
+end
+
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.gem_spec = spec
+end
+
+desc "install the gem locally"
+task :install => [:package] do
+  sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
+end
+
+desc "create a gemspec file"
+task :make_spec do
+  File.open("#{GEM}.gemspec", "w") do |file|
+    file.puts spec.to_ruby
+  end
+end

TODO

@@ -0,0 +1,3 @@
+- :format option
+- valid formats could come from locale file
+- add replace_formats instead add_formats :before

lib/validates_timeliness.rb

@@ -1,21 +1,57 @@
-require 'validates_timeliness/attribute_methods'
-require 'validates_timeliness/validations'
 require 'validates_timeliness/formats'
-require 'validates_timeliness/multiparameter_attributes'
+require 'validates_timeliness/validator'
-require 'validates_timeliness/instance_tag'
+require 'validates_timeliness/validation_methods'
-require 'validates_timeliness/validate_timeliness_matcher' if ENV['RAILS_ENV'] == 'test'
+require 'validates_timeliness/spec/rails/matchers/validate_timeliness' if ENV['RAILS_ENV'] == 'test'
+
+require 'validates_timeliness/active_record/attribute_methods'
+require 'validates_timeliness/active_record/multiparameter_attributes'
+require 'validates_timeliness/action_view/instance_tag'
 
 require 'validates_timeliness/core_ext/time'
 require 'validates_timeliness/core_ext/date'
 require 'validates_timeliness/core_ext/date_time'
 
-ActiveRecord::Base.send(:include, ValidatesTimeliness::AttributeMethods)
+module ValidatesTimeliness
-ActiveRecord::Base.send(:include, ValidatesTimeliness::Validations)
+  
-ActiveRecord::Base.send(:include, ValidatesTimeliness::MultiparameterAttributes)
+  mattr_accessor :default_timezone
-ActionView::Helpers::InstanceTag.send(:include, ValidatesTimeliness::InstanceTag)
 
-Time.send(:include, ValidatesTimeliness::CoreExtensions::Time)
+  self.default_timezone = :utc 
-Date.send(:include, ValidatesTimeliness::CoreExtensions::Date)
-DateTime.send(:include, ValidatesTimeliness::CoreExtensions::DateTime)
 
-ValidatesTimeliness::Formats.compile_format_expressions
+  LOCALE_PATH = File.expand_path(File.dirname(__FILE__) + '/validates_timeliness/locale/en.yml')
+
+  class << self
+
+    def enable_datetime_select_extension!
+      enable_datetime_select_invalid_value_extension!
+      enable_multiparameter_attributes_extension!
+    end
+
+    def load_error_messages
+      if defined?(I18n)
+        I18n.load_path += [ LOCALE_PATH ]
+        I18n.reload!
+      else
+        messages = YAML::load(IO.read(LOCALE_PATH))
+        errors = messages['en']['activerecord']['errors']['messages'].inject({}) {|h,(k,v)| h[k.to_sym] = v.gsub(/\{\{\w*\}\}/, '%s');h }
+        ::ActiveRecord::Errors.default_error_messages.update(errors)
+      end
+    end
+    
+    def default_error_messages
+      if Rails::VERSION::STRING < '2.2'
+        ::ActiveRecord::Errors.default_error_messages
+      else
+        I18n.translate('activerecord.errors.messages')
+      end
+    end
+
+    def setup_for_rails
+      major, minor = Rails::VERSION::MAJOR, Rails::VERSION::MINOR
+      self.default_timezone = ::ActiveRecord::Base.default_timezone
+      self.enable_datetime_select_extension!
+      self.load_error_messages
+    end
+  end
+end
+
+ValidatesTimeliness.setup_for_rails

lib/validates_timeliness/action_view/instance_tag.rb

@@ -0,0 +1,48 @@
+module ValidatesTimeliness
+
+  def self.enable_datetime_select_invalid_value_extension!
+    ::ActionView::Helpers::InstanceTag.send(:include, ValidatesTimeliness::ActionView::InstanceTag)
+  end
+
+  module ActionView
+
+    # Intercepts the date and time select helpers to allow the 
+    # attribute value before type cast to be used as in the select helpers.
+    # This means that an invalid date or time will be redisplayed rather than the
+    # type cast value which would be nil if invalid.
+    module InstanceTag    
+    
+      def self.included(base)
+        selector_method = Rails::VERSION::STRING < '2.2' ? :date_or_time_select : :datetime_selector
+        base.class_eval do
+          alias_method :datetime_selector_without_timeliness, selector_method
+          alias_method selector_method, :datetime_selector_with_timeliness
+        end
+        base.alias_method_chain :value, :timeliness
+      end
+      
+      TimelinessDateTime = Struct.new(:year, :month, :day, :hour, :min, :sec)      
+        
+      def datetime_selector_with_timeliness(*args)
+        @timeliness_date_or_time_tag = true
+        datetime_selector_without_timeliness(*args)
+      end
+    
+      def value_with_timeliness(object)
+        return value_without_timeliness(object) unless @timeliness_date_or_time_tag
+        
+        raw_value = value_before_type_cast(object)
+        
+        if raw_value.nil? || raw_value.acts_like?(:time) || raw_value.is_a?(Date)
+          return value_without_timeliness(object)
+        end
+        
+        time_array = ParseDate.parsedate(raw_value)
+        
+        TimelinessDateTime.new(*time_array[0..5])
+      end      
+       
+    end
+
+  end   
+end

lib/validates_timeliness/active_record/attribute_methods.rb

@@ -0,0 +1,134 @@
+module ValidatesTimeliness
+  module ActiveRecord
+
+    # Rails 2.1 removed the ability to retrieve the raw value of a time or datetime
+    # attribute. The raw value is necessary to properly validate a string time or 
+    # datetime value instead of the internal Rails type casting which is very limited 
+    # and does not allow custom formats. These methods restore that ability while 
+    # respecting the automatic timezone handling.
+    #
+    # The automatic timezone handling sets the assigned attribute value to the current
+    # zone in Time.zone. To preserve this localised value and capture the raw value 
+    # we cache the localised value on write and store the raw value in the attributes
+    # hash for later retrieval and possibly validation. Any value from the database
+    # will not be in the attribute cache on first read so will be considered in default
+    # timezone and converted to local time. It is then stored back in the attributes
+    # hash and cached to avoid the need for any subsequent differentiation.
+    module AttributeMethods
+
+      def self.included(base)
+        base.extend ClassMethods
+        base.class_eval do
+          alias_method_chain :read_attribute, :timeliness
+          class << self
+            alias_method_chain :define_attribute_methods, :timeliness
+          end
+        end
+      end
+
+      # Adds check for cached date/time attributes which have been type cast already
+      # and value can be used from cache. This prevents the raw date/time value from
+      # being type cast using default Rails type casting when writing values
+      # to the database.
+      def read_attribute_with_timeliness(attr_name)
+        attr_name = attr_name.to_s
+        if !(value = @attributes[attr_name]).nil?
+          column = column_for_attribute(attr_name)
+          if column && [:date, :time, :datetime].include?(column.type) && @attributes_cache.has_key?(attr_name)
+            return @attributes_cache[attr_name]
+          end
+        end
+        read_attribute_without_timeliness(attr_name)
+      end
+
+      # If Rails dirty attributes is enabled then the value is added to
+      # changed attributes if changed. Can't use the default dirty checking
+      # implementation as it chains the write_attribute method which deletes
+      # the attribute from the cache.
+      def write_date_time_attribute(attr_name, value, type, time_zone_aware)
+        new = self.class.parse_date_time(value, type)
+
+        if new && type != :date
+          new = new.to_time
+          new = new.in_time_zone if time_zone_aware
+        end
+
+        if defined?(::ActiveRecord::Dirty) && !changed_attributes.include?(attr_name)
+          old = read_attribute(attr_name)
+          if old != new
+            changed_attributes[attr_name] = (old.duplicable? ? old.clone : old)
+          end
+        end
+        @attributes_cache[attr_name] = new
+        @attributes[attr_name] = value
+      end
+
+      # If reloading then check if cached, which means its in local time.
+      # If local, convert with parser as local timezone, otherwise use 
+      # read_attribute method for quick default type cast of values from
+      # database using default timezone.
+      def read_date_time_attribute(attr_name, type, time_zone_aware, reload = false)
+        cached = @attributes_cache[attr_name]
+        return cached if @attributes_cache.has_key?(attr_name) && !reload
+
+        if @attributes_cache.has_key?(attr_name)
+          time = read_attribute_before_type_cast(attr_name)
+          time = self.class.parse_date_time(time, type)
+        else
+          time = read_attribute(attr_name)
+          @attributes[attr_name] = time && time_zone_aware ? time.in_time_zone : time
+        end
+        @attributes_cache[attr_name] = time && time_zone_aware ? time.in_time_zone : time
+      end
+
+      module ClassMethods
+
+        # Define attribute reader and writer method for date, time and
+        # datetime attributes to use plugin parser.
+        def define_attribute_methods_with_timeliness
+          return if generated_methods?
+          columns_hash.each do |name, column|
+            unless instance_method_already_implemented?(name)
+              if [:date, :time, :datetime].include?(column.type)
+                time_zone_aware = create_time_zone_conversion_attribute?(name, column) rescue false
+                define_read_method_for_dates_and_times(name, column.type, time_zone_aware)
+              end
+            end
+
+            unless instance_method_already_implemented?("#{name}=")
+              if [:date, :time, :datetime].include?(column.type)
+                time_zone_aware = create_time_zone_conversion_attribute?(name, column) rescue false
+                define_write_method_for_dates_and_times(name, column.type, time_zone_aware)
+              end
+            end
+          end
+          define_attribute_methods_without_timeliness
+        end
+
+        # Define write method for date, time and datetime columns
+        def define_write_method_for_dates_and_times(attr_name, type, time_zone_aware)
+          method_body = <<-EOV
+            def #{attr_name}=(value)
+              write_date_time_attribute('#{attr_name}', value, #{type.inspect}, #{time_zone_aware})
+            end
+          EOV
+          evaluate_attribute_method attr_name, method_body, "#{attr_name}="
+        end
+
+        def define_read_method_for_dates_and_times(attr_name, type, time_zone_aware)
+          method_body = <<-EOV
+            def #{attr_name}(reload = false)
+              read_date_time_attribute('#{attr_name}', #{type.inspect}, #{time_zone_aware}, reload)
+            end
+          EOV
+          evaluate_attribute_method attr_name, method_body
+        end
+
+      end
+
+    end
+
+  end
+end
+
+ActiveRecord::Base.send(:include, ValidatesTimeliness::ActiveRecord::AttributeMethods)

lib/validates_timeliness/active_record/multiparameter_attributes.rb

@@ -0,0 +1,66 @@
+module ValidatesTimeliness
+
+  def self.enable_multiparameter_attributes_extension!
+    ::ActiveRecord::Base.send(:include, ValidatesTimeliness::ActiveRecord::MultiparameterAttributes)
+  end
+
+  module ActiveRecord
+    module MultiparameterAttributes
+      
+      def self.included(base)
+        base.alias_method_chain :execute_callstack_for_multiparameter_attributes, :timeliness
+      end    
+    
+      # Overrides AR method to store multiparameter time and dates as string
+      # allowing validation later.
+      def execute_callstack_for_multiparameter_attributes_with_timeliness(callstack)
+        errors = []
+        callstack.each do |name, values|
+          column = column_for_attribute(name)
+          if column && [:date, :time, :datetime].include?(column.type)
+            begin
+              callstack.delete(name)
+              if values.empty?
+                send("#{name}=", nil)
+              else
+                value = time_array_to_string(values, column.type)
+                send("#{name}=", value)
+              end
+            rescue => ex
+              errors << ::ActiveRecord::AttributeAssignmentError.new("error on assignment #{values.inspect} to #{name}", ex, name)
+            end
+          end
+        end
+        unless errors.empty?
+          raise ::ActiveRecord::MultiparameterAssignmentErrors.new(errors), "#{errors.size} error(s) on assignment of multiparameter attributes"
+        end
+        execute_callstack_for_multiparameter_attributes_without_timeliness(callstack)
+      end
+      
+      def time_array_to_string(values, type)
+        values = values.map {|v| v.to_s }
+                
+        case type
+        when :date
+          extract_date_from_multiparameter_attributes(values)
+        when :time
+          extract_time_from_multiparameter_attributes(values)
+        when :datetime
+          date_values, time_values = values.slice!(0, 3), values
+          extract_date_from_multiparameter_attributes(date_values) + " " + extract_time_from_multiparameter_attributes(time_values)
+        end
+      end   
+         
+      def extract_date_from_multiparameter_attributes(values)
+        [values[0], *values.slice(1, 2).map { |s| s.rjust(2, "0") }].join("-")
+      end
+      
+      def extract_time_from_multiparameter_attributes(values)
+        values = values.size > 3 ? values[3..5] : values
+        values.map { |s| s.rjust(2, "0") }.join(":")
+      end
+      
+    end
+
+  end
+end

lib/validates_timeliness/attribute_methods.rb

@@ -1,150 +0,0 @@
-module ValidatesTimeliness
-
-  # The crux of the plugin is being able to store raw user entered values
-  # while not interfering with the Rails 2.1 automatic timezone handling. This
-  # requires us to distinguish a user entered value from a value read from the
-  # database. Both maybe in string form, but only the database value should be
-  # interpreted as being in the default timezone which is normally UTC. The user
-  # entered value should be interpreted as being in the current zone as indicated
-  # by Time.zone.
-  #
-  # To do this we must cache the user entered values on write and store the raw
-  # value in the attributes hash for later retrieval and possibly validation.
-  # Any value from the database will not be in the attribute cache on first
-  # read so will be considered in default timezone and converted to local time.
-  # It is then stored back in the attributes hash and cached to avoid the need
-  # for any subsequent differentiation.
-  #
-  # The wholesale replacement of the Rails time type casting is not done to
-  # preserve the quickest conversion for timestamp columns and also any value
-  # which is never changed during the life of the record object.
-  module AttributeMethods
-
-    def self.included(base)
-      base.extend ClassMethods
-
-      if Rails::VERSION::STRING < '2.1'
-        base.class_eval do
-          class << self
-            def create_time_zone_conversion_attribute?(name, column)
-              false
-            end
-          end
-        end
-      end
-    end
-
-    # Adds check for cached date/time attributes which have been type cast already
-    # and value can be used from cache. This prevents the raw date/time value from
-    # being type cast using default Rails type casting when writing values
-    # to the database.
-    def read_attribute(attr_name)
-      attr_name = attr_name.to_s
-      if !(value = @attributes[attr_name]).nil?
-        if column = column_for_attribute(attr_name)
-          if unserializable_attribute?(attr_name, column)
-            unserialize_attribute(attr_name)
-          elsif [:date, :time, :datetime].include?(column.type) && @attributes_cache.has_key?(attr_name)
-            @attributes_cache[attr_name]
-          else
-            column.type_cast(value)
-          end
-        else
-          value
-        end
-      else
-        nil
-      end
-    end
-
-    # Writes attribute value by storing raw value in attributes hash,
-    # then convert it with parser and cache it.
-    #
-    # If Rails dirty attributes is enabled then the value is added to
-    # changed attributes if changed. Can't use the default dirty checking
-    # implementation as it chains the write_attribute method which deletes
-    # the attribute from the cache.
-    def write_date_time_attribute(attr_name, value)
-      attr_name = attr_name.to_s
-      column = column_for_attribute(attr_name)
-      old = read_attribute(attr_name) if defined?(ActiveRecord::Dirty)
-      new = self.class.parse_date_time(value, column.type)
-
-      if self.class.send(:create_time_zone_conversion_attribute?, attr_name, column)
-        new = new.in_time_zone rescue nil
-      end
-      @attributes_cache[attr_name] = new
-
-      if defined?(ActiveRecord::Dirty) && !changed_attributes.include?(attr_name) && old != new
-        changed_attributes[attr_name] = (old.duplicable? ? old.clone : old)
-      end
-      @attributes[attr_name] = value
-    end
-
-    module ClassMethods
-
-      # Override AR method to define attribute reader and writer method for
-      # date, time and datetime attributes to use plugin parser.
-      def define_attribute_methods
-        return if generated_methods?
-        columns_hash.each do |name, column|
-          unless instance_method_already_implemented?(name)
-            if self.serialized_attributes[name]
-              define_read_method_for_serialized_attribute(name)
-            elsif create_time_zone_conversion_attribute?(name, column)
-              define_read_method_for_time_zone_conversion(name.to_sym)
-            else
-              define_read_method(name.to_sym, name, column)
-            end
-          end
-
-          unless instance_method_already_implemented?("#{name}=")
-            if [:date, :time, :datetime].include?(column.type)
-              define_write_method_for_dates_and_times(name.to_sym)
-            else
-              define_write_method(name.to_sym)
-            end
-          end
-
-          unless instance_method_already_implemented?("#{name}?")
-            define_question_method(name)
-          end
-        end
-      end
-
-      # Define write method for date, time and datetime columns
-      def define_write_method_for_dates_and_times(attr_name)
-        method_body = <<-EOV
-          def #{attr_name}=(value)
-             write_date_time_attribute('#{attr_name}', value)
-          end
-        EOV
-        evaluate_attribute_method attr_name, method_body
-      end
-
-      # Define time attribute reader. If reloading then check if cached,
-      # which means its in local time. If local, convert with parser as local
-      # timezone, otherwise use read_attribute method for quick default type
-      # cast of values from database using default timezone.
-      def define_read_method_for_time_zone_conversion(attr_name)
-        method_body = <<-EOV
-          def #{attr_name}(reload = false)
-            cached = @attributes_cache['#{attr_name}']
-            return cached if @attributes_cache.has_key?('#{attr_name}') && !reload
-            if @attributes_cache.has_key?('#{attr_name}')
-              time = read_attribute_before_type_cast('#{attr_name}')
-              time = self.class.parse_date_time(date, :datetime)
-            else
-              time = read_attribute('#{attr_name}')
-              @attributes['#{attr_name}'] = time.in_time_zone rescue nil
-            end
-            @attributes_cache['#{attr_name}'] = time.in_time_zone rescue nil
-          end
-        EOV
-        evaluate_attribute_method attr_name, method_body
-      end
-
-    end
-
-  end
-end

lib/validates_timeliness/core_ext/date.rb

@@ -3,9 +3,11 @@ module ValidatesTimeliness
     module Date
     
       def to_dummy_time
-        ::Time.mktime(2000, 1, 1, 0, 0, 0)
+        ::Time.send(ValidatesTimeliness.default_timezone, 2000, 1, 1, 0, 0, 0)
       end
 
     end
   end
 end
+
+Date.send(:include, ValidatesTimeliness::CoreExtensions::Date)

lib/validates_timeliness/core_ext/date_time.rb

@@ -3,9 +3,11 @@ module ValidatesTimeliness
     module DateTime
 
       def to_dummy_time
-        ::Time.mktime(2000, 1, 1, hour, min, sec) 
+        ::Time.send(ValidatesTimeliness.default_timezone, 2000, 1, 1, hour, min, sec)
       end
 
     end
   end
 end
+
+DateTime.send(:include, ValidatesTimeliness::CoreExtensions::DateTime)

lib/validates_timeliness/core_ext/time.rb

@@ -3,9 +3,11 @@ module ValidatesTimeliness
     module Time 
 
       def to_dummy_time
-        self.class.mktime(2000, 1, 1, hour, min, sec) 
+        self.class.send(ValidatesTimeliness.default_timezone, 2000, 1, 1, hour, min, sec) 
       end
 
     end
   end
 end
+
+Time.send(:include, ValidatesTimeliness::CoreExtensions::Time)

lib/validates_timeliness/formats.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module ValidatesTimeliness
   
   # A date and time format regular expression generator. Allows you to 
@@ -10,16 +12,14 @@ module ValidatesTimeliness
   # string values.
   #
   class Formats
-    cattr_accessor :time_formats
+    cattr_accessor :time_formats,
-    cattr_accessor :date_formats
+                   :date_formats,
-    cattr_accessor :datetime_formats
+                   :datetime_formats,
-    
+                   :time_expressions,
-    cattr_accessor :time_expressions
+                   :date_expressions,
-    cattr_accessor :date_expressions
+                   :datetime_expressions,
-    cattr_accessor :datetime_expressions
+                   :format_tokens,
-    
+                   :format_proc_args
-    cattr_accessor :format_tokens
-    cattr_accessor :format_proc_args
     
     # Format tokens:   
     #       y = year
@@ -115,7 +115,7 @@ module ValidatesTimeliness
       { 'mm'   => [ /m{2}/,  '(\d{2})',   :month ] },
       { 'm'    => [ /(\A|[^ap])m{1}/, '(\d{1,2})', :month ] },
       { 'yyyy' => [ /y{4,}/, '(\d{4})',   :year ] },
-      { 'yy'   => [ /y{2,}/, '(\d{2}|\d{4})', :year ] },
+      { 'yy'   => [ /y{2,}/, '(\d{4}|\d{2})', :year ] },
       { 'hh'   => [ /h{2,}/, '(\d{2})',   :hour ] },
       { 'h'    => [ /h{1}/,  '(\d{1,2})', :hour ] },
       { 'nn'   => [ /n{2,}/, '(\d{2})',   :min ]  },
@@ -139,13 +139,13 @@ module ValidatesTimeliness
     # should just be the arg name.
     #
     @@format_proc_args = {
-      :year     => [0, 'y', 'unambiguous_year(y)'],
+      :year     => [0,   'y', 'unambiguous_year(y)'],
-      :month    => [1, 'm', 'month_index(m)'],
+      :month    => [1,   'm', 'month_index(m)'],
-      :day      => [2, 'd', 'd'],
+      :day      => [2,   'd', 'd'],
-      :hour     => [3, 'h', 'full_hour(h,md)'],
+      :hour     => [3,   'h', 'full_hour(h,md)'],
-      :min      => [4, 'n', 'n'],
+      :min      => [4,   'n', 'n'],
-      :sec      => [5, 's', 's'],
+      :sec      => [5,   's', 's'],
-      :usec     => [6, 'u', 'microseconds(u)'],
+      :usec     => [6,   'u', 'microseconds(u)'],
       :meridian => [nil, 'md', nil]
     }
     
@@ -163,17 +163,18 @@ module ValidatesTimeliness
       # Returns 7 part time array.
       def parse(string, type, strict=true)
         return string unless string.is_a?(String)
-        
+
-        expressions = expression_set(type, string)
+        matches = nil
-        time_array = nil
+        exp, processor = expression_set(type, string).find do |regexp, proc|
-        expressions.each do |(regexp, processor)|
+          full = /\A#{regexp}\Z/ if strict
-          regexp = strict || type == :datetime ? /\A#{regexp}\Z/ : (type == :date ? /\A#{regexp}/ : /#{regexp}\Z/)
+          full ||= case type
-          if matches = regexp.match(string.strip)
+          when :date     then /\A#{regexp}/
-            time_array = processor.call(*matches[1..7])
+          when :time     then /#{regexp}\Z/
-            break
+          when :datetime then /\A#{regexp}\Z/
           end
+          matches = full.match(string.strip)
         end
-        return time_array
+        processor.call(*matches[1..7]) if matches
       end   
       
       # Delete formats of specified type. Error raised if format not found.
@@ -223,7 +224,7 @@ module ValidatesTimeliness
       def format_expression_generator(string_format)
         regexp = string_format.dup      
         order  = {}
-        regexp.gsub!(/([\.\\])/, '\\\\\1') # escapes dots and backslashes ]/
+        regexp.gsub!(/([\.\\])/, '\\\\\1') # escapes dots and backslashes
         
         format_tokens.each do |token|
           token_name = token.keys.first
@@ -237,8 +238,7 @@ module ValidatesTimeliness
 
         return Regexp.new(regexp), format_proc(order)
       rescue
-        puts "The following format regular expression failed to compile: #{regexp}\n from format #{string_format}."
+        raise "The following format regular expression failed to compile: #{regexp}\n from format #{string_format}."
-        raise
       end
       
       # Generates a proc which when executed maps the regexp capture groups to a 
@@ -261,24 +261,24 @@ module ValidatesTimeliness
       end
       
       def compile_formats(formats)
-        formats.collect { |format| regexp, format_proc = format_expression_generator(format) }
+        formats.map { |format| regexp, format_proc = format_expression_generator(format) }
       end
   
       # Pick expression set and combine date and datetimes for 
       # datetime attributes to allow date string as datetime
       def expression_set(type, string)
         case type
-          when :date
+        when :date
-            date_expressions
+          date_expressions
-          when :time
+        when :time
-            time_expressions
+          time_expressions
-          when :datetime
+        when :datetime
-            # gives a speed-up for date string as datetime attributes
+          # gives a speed-up for date string as datetime attributes
-            if string.length < 11
+          if string.length < 11
-              date_expressions + datetime_expressions
+            date_expressions + datetime_expressions
-            else
+          else
-              datetime_expressions + date_expressions
+            datetime_expressions + date_expressions
-            end
+          end
         end
       end
  
@@ -299,12 +299,22 @@ module ValidatesTimeliness
       
       def month_index(month)
         return month.to_i if month.to_i.nonzero?
-        Date::ABBR_MONTHNAMES.index(month.capitalize) || Date::MONTHNAMES.index(month.capitalize)
+        abbr_month_names.index(month.capitalize) || month_names.index(month.capitalize)
       end
-    
+
+      def month_names
+        defined?(I18n) ? I18n.t('date.month_names') : Date::MONTHNAMES
+      end
+
+      def abbr_month_names
+        defined?(I18n) ? I18n.t('date.abbr_month_names') : Date::ABBR_MONTHNAMES
+      end
+
       def microseconds(usec)
         (".#{usec}".to_f * 1_000_000).to_i
       end
     end
   end
 end
+
+ValidatesTimeliness::Formats.compile_format_expressions

lib/validates_timeliness/instance_tag.rb

@@ -1,40 +0,0 @@
-module ValidatesTimeliness
-
-  # Intercepts the date and time select helpers to allow the 
-  # attribute value before type cast to be used as in the select helpers.
-  # This means that an invalid date or time will be redisplayed rather than the
-  # type cast value which would be nil if invalid.
-  module InstanceTag    
-  
-    def self.included(base)
-      selector_method = Rails::VERSION::STRING < '2.2' ? :date_or_time_select : :datetime_selector
-      base.class_eval do
-        alias_method :datetime_selector_without_timeliness, selector_method
-        alias_method selector_method, :datetime_selector_with_timeliness
-      end
-      base.alias_method_chain :value, :timeliness
-    end
-    
-    TimelinessDateTime = Struct.new(:year, :month, :day, :hour, :min, :sec)      
-      
-    def datetime_selector_with_timeliness(*args)
-      @timeliness_date_or_time_tag = true
-      datetime_selector_without_timeliness(*args)
-    end
-  
-    def value_with_timeliness(object)
-      return value_without_timeliness(object) unless @timeliness_date_or_time_tag
-      
-      raw_value = value_before_type_cast(object)
-      
-      if raw_value.nil? || raw_value.acts_like?(:time) || raw_value.is_a?(Date)
-        return value_without_timeliness(object)
-      end
-      
-      time_array = ParseDate.parsedate(raw_value)
-      
-      TimelinessDateTime.new(*time_array[0..5])
-    end      
-     
-  end
-end

lib/validates_timeliness/locale/en.yml

@@ -0,0 +1,13 @@
+en:
+  activerecord:
+    errors:
+      messages:
+        invalid_date: "is not a valid date"
+        invalid_time: "is not a valid time"
+        invalid_datetime: "is not a valid datetime"
+        equal_to: "must be equal to {{restriction}}"
+        before: "must be before {{restriction}}"
+        on_or_before: "must be on or before {{restriction}}"
+        after: "must be after {{restriction}}"
+        on_or_after: "must be on or after {{restriction}}"
+        between: "must be between {{earliest}} and {{latest}}"

lib/validates_timeliness/multiparameter_attributes.rb

@@ -1,58 +0,0 @@
-module ValidatesTimeliness
-  module MultiparameterAttributes
-    
-    def self.included(base)
-      base.alias_method_chain :execute_callstack_for_multiparameter_attributes, :timeliness
-    end    
-  
-    # Overrides AR method to store multiparameter time and dates as string
-    # allowing validation later.
-    def execute_callstack_for_multiparameter_attributes_with_timeliness(callstack)
-      errors = []
-      callstack.each do |name, values|
-        klass = (self.class.reflect_on_aggregation(name.to_sym) || column_for_attribute(name)).klass
-        if values.empty?
-          send(name + "=", nil)
-        else
-          column = column_for_attribute(name)
-          begin
-            value = if [:date, :time, :datetime].include?(column.type)
-              time_array_to_string(values, column.type)  
-            else
-              klass.new(*values)
-            end
-            send(name + "=", value)
-          rescue => ex
-            errors << ActiveRecord::AttributeAssignmentError.new("error on assignment #{values.inspect} to #{name}", ex, name)
-          end
-        end
-      end
-      unless errors.empty?
-        raise ActiveRecord::MultiparameterAssignmentErrors.new(errors), "#{errors.size} error(s) on assignment of multiparameter attributes"
-      end
-    end
-    
-    def time_array_to_string(values, type)
-      values = values.map(&:to_s)
-              
-      case type
-        when :date
-          extract_date_from_multiparameter_attributes(values)
-        when :time
-          extract_time_from_multiparameter_attributes(values)
-        when :datetime
-          date_values, time_values = values.slice!(0, 3), values
-          extract_date_from_multiparameter_attributes(date_values) + " " + extract_time_from_multiparameter_attributes(time_values)
-      end
-    end   
-       
-    def extract_date_from_multiparameter_attributes(values)
-      [values[0], *values.slice(1, 2).map { |s| s.rjust(2, "0") }].join("-")
-    end
-    
-    def extract_time_from_multiparameter_attributes(values)
-      values.last(3).map { |s| s.rjust(2, "0") }.join(":")
-    end
-    
-  end
-end

lib/validates_timeliness/spec/rails/matchers/validate_timeliness.rb

@@ -0,0 +1,158 @@
+module Spec
+  module Rails
+    module Matchers
+      class ValidateTimeliness
+   
+        VALIDITY_TEST_VALUES = {
+          :date     => {:pass => '2000-01-01', :fail => '2000-01-32'},
+          :time     => {:pass => '12:00',      :fail => '25:00'},
+          :datetime => {:pass => '2000-01-01 00:00:00', :fail => '2000-01-32 00:00:00'}
+        }
+
+        OPTION_TEST_SETTINGS = {
+          :before       => { :method => :-, :modify_on => :valid },
+          :after        => { :method => :+, :modify_on => :valid },
+          :on_or_before => { :method => :+, :modify_on => :invalid },
+          :on_or_after  => { :method => :-, :modify_on => :invalid }
+        }
+
+        def initialize(attribute, options)
+          @expected, @options = attribute, options
+          @validator = ValidatesTimeliness::Validator.new(options)
+        end
+
+        def matches?(record)
+          @record = record
+          @type = @options[:type]
+          
+          valid = test_validity
+
+          valid = test_option(:before) if @options[:before] && valid
+          valid = test_option(:after) if @options[:after] && valid
+          
+          valid = test_option(:on_or_before) if @options[:on_or_before] && valid
+          valid = test_option(:on_or_after) if @options[:on_or_after] && valid
+
+          valid = test_between if @options[:between] && valid
+
+          return valid
+        end
+      
+        def failure_message
+          "expected model to validate #{@type} attribute #{@expected.inspect} with #{@last_failure}"
+        end
+        
+        def negative_failure_message
+          "expected not to validate #{@type} attribute #{@expected.inspect}"
+        end
+        
+        def description
+          "have validated #{@type} attribute #{@expected.inspect}"
+        end
+        
+       private
+       
+        def test_validity
+          invalid_value = VALIDITY_TEST_VALUES[@type][:fail]
+          valid_value   = parse_and_cast(VALIDITY_TEST_VALUES[@type][:pass])
+          error_matching(invalid_value, "invalid_#{@type}".to_sym) &&
+            no_error_matching(valid_value, "invalid_#{@type}".to_sym)
+        end
+
+        def test_option(option)
+          settings = OPTION_TEST_SETTINGS[option]
+          boundary = parse_and_cast(@options[option])
+          
+          method = settings[:method]
+
+          valid_value, invalid_value = if settings[:modify_on] == :valid
+            [ boundary.send(method, 1), boundary ]
+          else
+            [ boundary, boundary.send(method, 1) ]
+          end
+          
+          error_matching(invalid_value, option) && 
+            no_error_matching(valid_value, option)
+        end
+
+        def test_before
+          before = parse_and_cast(@options[:before])
+
+          error_matching(before - 1, :before) && 
+            no_error_matching(before, :before)
+        end
+
+        def test_between
+          between = parse_and_cast(@options[:between]) 
+          
+          error_matching(between.first - 1, :between) && 
+            error_matching(between.last + 1, :between) && 
+            no_error_matching(between.first, :between) &&
+            no_error_matching(between.last, :between)
+        end
+       
+        def parse_and_cast(value)
+          value = @validator.class.send(:evaluate_option_value, value, @type, @record)
+          @validator.class.send(:type_cast_value, value, @type)
+        end
+
+        def error_matching(value, option)
+          match = error_message_for(option)
+          @record.send("#{@expected}=", value)
+          @record.valid?
+          errors = @record.errors.on(@expected)
+          pass = [ errors ].flatten.any? {|error| /#{match}/ === error }
+          @last_failure = "error matching '#{match}' when value is #{format_value(value)}" unless pass
+          pass
+        end
+        
+        def no_error_matching(value, option)
+          pass = !error_matching(value, option)
+          unless pass
+            error = error_message_for(option)
+            @last_failure = "no error matching '#{error}' when value is #{format_value(value)}"
+          end
+          pass
+        end
+
+        def error_message_for(option)
+          msg = @validator.send(:error_messages)[option]
+          restriction = @validator.class.send(:evaluate_option_value, @validator.configuration[option], @type, @record)
+
+          if restriction 
+            restriction = [restriction] unless restriction.is_a?(Array)
+            restriction.map! {|r| @validator.class.send(:type_cast_value, r, @type) }
+            interpolate = @validator.send(:interpolation_values, option, restriction )
+            # get I18n message if defined and has interpolation keys in msg
+            if defined?(I18n) && !@validator.send(:custom_error_messages).include?(option)
+              msg = @record.errors.generate_message(@expected, option, interpolate)
+            else
+              msg = msg % interpolate
+            end
+          end 
+          msg
+        end
+        
+        def format_value(value)
+          return value if value.is_a?(String)
+          value.strftime(ValidatesTimeliness::Validator.error_value_formats[@type])
+        end
+      end
+
+      def validate_date(attribute, options={})
+        options[:type] = :date
+        ValidateTimeliness.new(attribute, options)
+      end
+
+      def validate_time(attribute, options={})
+        options[:type] = :time
+        ValidateTimeliness.new(attribute, options)
+      end
+
+      def validate_datetime(attribute, options={})
+        options[:type] = :datetime
+        ValidateTimeliness.new(attribute, options)
+      end
+    end
+  end
+end

lib/validates_timeliness/validate_timeliness_matcher.rb

@@ -1,119 +0,0 @@
-module Spec
-  module Rails
-    module Matchers
-      class ValidateTimeliness        
-   
-        def initialize(attribute, options)
-          @expected, @options = attribute, options
-          @options.reverse_merge!(error_messages)
-        end
-        
-        def matches?(record)
-          @record = record
-          type = options[:type]
-          
-          test_values = {
-            :date     => {:pass => '2000-01-01', :fail => '2000-01-32'},
-            :time     => {:pass => '12:00',      :fail => '25:00'},
-            :datetime => {:pass => '2000-01-01 00:00:00', :fail => '2000-01-32 00:00:00'}
-          }
-          
-          invalid_value = test_values[type][:fail]
-          valid_value   = parse_and_cast(test_values[type][:pass])
-          valid = error_matching(invalid_value, /#{options["invalid_#{type}_message".to_sym]}/) &&
-              no_error_matching(valid_value, /#{options["invalid_#{type}_message".to_sym]}/)
-
-          valid = test_option(:before, :-) if options[:before] && valid
-          valid = test_option(:after, :+) if options[:after] && valid
-          
-          valid = test_option(:on_or_before, :+, :modify_on => :invalid) if options[:on_or_before] && valid
-          valid = test_option(:on_or_after, :-, :modify_on => :invalid) if options[:on_or_after] && valid
-
-          return valid
-        end
-      
-        def failure_message
-          "expected model to validate #{options[:type]} attribute #{expected.inspect} with #{last_failure}"
-        end
-        
-        def negative_failure_message
-          "expected not to validate #{options[:type]} attribute #{expected.inspect}"
-        end
-        
-        def description
-          "have validated #{options[:type]} attribute #{expected.inspect}"
-        end
-        
-       private
-        attr_reader :actual, :expected, :record, :options, :last_failure
-        
-        def test_option(option, modifier, settings={})
-          settings.reverse_merge!(:modify_on => :valid)
-          boundary = parse_and_cast(options[option])
-          
-          valid_value, invalid_value = if settings[:modify_on] == :valid
-            [ boundary.send(modifier, 1), boundary ]
-          else
-            [ boundary, boundary.send(modifier, 1) ]
-          end
-          
-          message = options["#{option}_message".to_sym]
-          error_matching(invalid_value, /#{message}/) && 
-            no_error_matching(valid_value, /#{message}/)
-        end
-       
-        def parse_and_cast(value)          
-          value = ActiveRecord::Base.send(:timeliness_restriction_value, value, record, options[:type])
-          cast_method = ActiveRecord::Base.send(:restriction_type_cast_method, options[:type])
-          value.send(cast_method) rescue nil
-        end
-
-        def error_messages
-          messages = ActiveRecord::Base.send(:timeliness_default_error_messages)
-          messages = messages.inject({}) {|h, (k, v)| h[k] = v.sub(' %s', ''); h } 
-          @options.reverse_merge!(messages)
-        end
-        
-        def error_matching(value, match)
-          record.send("#{expected}=", value)
-          record.valid?
-          errors = record.errors.on(expected)
-          pass = [ errors ].flatten.any? {|error| match === error }
-          @last_failure = "error matching #{match.inspect} when value is #{format_value(value)}" unless pass
-          pass
-        end
-        
-        def no_error_matching(value, match)        
-          pass = !error_matching(value, match)
-          @last_failure = "no error matching #{match.inspect} when value is #{format_value(value)}" unless pass
-          pass
-        end
-        
-        def format_value(value)
-          return value if value.is_a?(String)
-          value.strftime(ActiveRecord::Errors.date_time_error_value_formats[options[:type]])
-        end
-      end
-
-      def validate_date(attribute, options={})
-        options[:type] = :date
-        validate_timeliness_of(attribute, options)
-      end
-
-      def validate_time(attribute, options={})
-        options[:type] = :time
-        validate_timeliness_of(attribute, options)
-      end
-
-      def validate_datetime(attribute, options={})
-        options[:type] = :datetime
-        validate_timeliness_of(attribute, options)
-      end
-
-      private      
-        def validate_timeliness_of(attribute, options={})
-          ValidateTimeliness.new(attribute, options)
-        end        
-    end
-  end  
-end

lib/validates_timeliness/validation_methods.rb

@@ -0,0 +1,82 @@
+module ValidatesTimeliness
+  module ValidationMethods
+
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+
+      def parse_date_time(raw_value, type, strict=true)
+        return nil if raw_value.blank?
+        return raw_value if raw_value.acts_like?(:time) || raw_value.is_a?(Date)
+        
+        time_array = ValidatesTimeliness::Formats.parse(raw_value, type, strict)
+        raise if time_array.nil?
+        
+        # Rails dummy time date part is defined as 2000-01-01
+        time_array[0..2] = 2000, 1, 1 if type == :time
+  
+        # Date.new enforces days per month, unlike Time
+        date = Date.new(*time_array[0..2]) unless type == :time
+        
+        return date if type == :date
+        
+        # Create time object which checks time part, and return time object
+        make_time(time_array)
+      rescue
+        nil
+      end
+
+      def validates_time(*attr_names)
+        configuration = attr_names.extract_options!
+        configuration[:type] = :time
+        validates_timeliness_of(attr_names, configuration)
+      end
+      
+      def validates_date(*attr_names)
+        configuration = attr_names.extract_options!
+        configuration[:type] = :date
+        validates_timeliness_of(attr_names, configuration)
+      end
+      
+      def validates_datetime(*attr_names)
+        configuration = attr_names.extract_options!
+        configuration[:type] = :datetime
+        validates_timeliness_of(attr_names, configuration)
+      end
+
+      private
+
+      def validates_timeliness_of(attr_names, configuration)
+        validator = ValidatesTimeliness::Validator.new(configuration.symbolize_keys)
+        
+        # bypass handling of allow_nil and allow_blank to validate raw value
+        configuration.delete(:allow_nil)
+        configuration.delete(:allow_blank)
+        validates_each(attr_names, configuration) do |record, attr_name, value|
+          validator.call(record, attr_name, value)
+        end
+      end
+
+      # Time.zone. Rails 2.0 should be default_timezone.
+      def make_time(time_array)
+        if Time.respond_to?(:zone) && time_zone_aware_attributes
+          Time.zone.local(*time_array)
+        else
+          begin
+            Time.send(::ActiveRecord::Base.default_timezone, *time_array)
+          rescue ArgumentError, TypeError
+            zone_offset = ::ActiveRecord::Base.default_timezone == :local ? DateTime.local_offset : 0
+            time_array.pop # remove microseconds
+            DateTime.civil(*(time_array << zone_offset))
+          end
+        end
+      end
+
+    end
+
+  end
+end
+
+ActiveRecord::Base.send(:include, ValidatesTimeliness::ValidationMethods)

lib/validates_timeliness/validations.rb

@@ -1,189 +0,0 @@
-module ValidatesTimeliness
-  # Adds ActiveRecord validation methods for date, time and datetime validation.
-  # The validity of values can be restricted to be before or after certain dates
-  # or times.
-  module Validations    
-        
-    # Error messages and error value formats added to AR defaults to allow 
-    # global override.  
-    def self.included(base)
-      base.extend ClassMethods
-      
-      base.class_inheritable_accessor :ignore_datetime_restriction_errors
-      base.ignore_datetime_restriction_errors = false
-      
-      ActiveRecord::Errors.class_inheritable_accessor :date_time_error_value_formats
-      ActiveRecord::Errors.date_time_error_value_formats = {
-        :time     => '%H:%M:%S',
-        :date     => '%Y-%m-%d',
-        :datetime => '%Y-%m-%d %H:%M:%S'
-      }      
-      
-      ActiveRecord::Errors.default_error_messages.update(
-        :invalid_date     => "is not a valid date",
-        :invalid_time     => "is not a valid time",
-        :invalid_datetime => "is not a valid datetime",
-        :before           => "must be before %s",
-        :on_or_before     => "must be on or before %s",
-        :after            => "must be after %s",
-        :on_or_after      => "must be on or after %s"
-      )
-    end
-    
-    module ClassMethods
-      
-      def parse_date_time(raw_value, type, strict=true)
-        return nil if raw_value.blank?
-        return raw_value if raw_value.acts_like?(:time) || raw_value.is_a?(Date)
-        
-        time_array = ValidatesTimeliness::Formats.parse(raw_value, type, strict)
-        raise if time_array.nil?
-        
-        # Rails dummy time date part is defined as 2000-01-01
-        time_array[0..2] = 2000, 1, 1 if type == :time
-  
-        # Date.new enforces days per month, unlike Time
-        date = Date.new(*time_array[0..2]) unless type == :time
-        
-        return date if type == :date
-        
-        # Create time object which checks time part, and return time object
-        make_time(time_array)
-      rescue
-        nil
-      end
-      
-      # The main validation method which can be used directly or called through
-      # the other specific type validation methods.      
-      def validates_timeliness_of(*attr_names)
-        configuration = { :on => :save, :type => :datetime, :allow_nil => false, :allow_blank => false }
-        configuration.update(timeliness_default_error_messages)
-        configuration.update(attr_names.extract_options!)
-        
-        # we need to check raw value for blank or nil
-        allow_nil   = configuration.delete(:allow_nil)
-        allow_blank = configuration.delete(:allow_blank)
-        
-        validates_each(attr_names, configuration) do |record, attr_name, value|          
-          raw_value = record.send("#{attr_name}_before_type_cast")
-
-          next if (raw_value.nil? && allow_nil) || (raw_value.blank? && allow_blank)
-
-          record.errors.add(attr_name, configuration[:blank_message]) and next if raw_value.blank?
-          
-          column = record.column_for_attribute(attr_name)
-          begin
-            unless time = parse_date_time(raw_value, configuration[:type])
-              record.errors.add(attr_name, configuration["invalid_#{configuration[:type]}_message".to_sym])
-              next
-            end
-           
-            validate_timeliness_restrictions(record, attr_name, time, configuration)
-          rescue Exception => e
-            record.errors.add(attr_name, configuration["invalid_#{configuration[:type]}_message".to_sym])
-          end          
-        end
-      end   
-      
-      # Use this validation to force validation of values and restrictions 
-      # as dummy time
-      def validates_time(*attr_names)
-        configuration = attr_names.extract_options!
-        configuration[:type] = :time
-        validates_timeliness_of(attr_names, configuration)
-      end
-      
-      # Use this validation to force validation of values and restrictions 
-      # as Date
-      def validates_date(*attr_names)
-        configuration = attr_names.extract_options!
-        configuration[:type] = :date
-        validates_timeliness_of(attr_names, configuration)
-      end
-      
-      # Use this validation to force validation of values and restrictions
-      # as Time/DateTime
-      def validates_datetime(*attr_names)
-        configuration = attr_names.extract_options!
-        configuration[:type] = :datetime
-        validates_timeliness_of(attr_names, configuration)
-      end
-      
-     private
-     
-      def timeliness_restriction_value(restriction, record, type)
-        case restriction
-          when Time, Date, DateTime
-            restriction
-          when Symbol
-            timeliness_restriction_value(record.send(restriction), record, type)
-          when Proc
-            timeliness_restriction_value(restriction.call(record), record, type)
-          else
-            parse_date_time(restriction, type, false)
-        end
-      end
-      
-      def restriction_type_cast_method(type)
-        case type
-          when :time     then :to_dummy_time
-          when :date     then :to_date
-          when :datetime then :to_time
-        end
-      end
-      
-      # Validate value against the temporal restrictions. Restriction values 
-      # maybe of mixed type, so they are evaluated as a common type, which may
-      # require conversion. The type used is defined by validation type.
-      def validate_timeliness_restrictions(record, attr_name, value, configuration)
-        restriction_methods = {:before => '<', :after => '>', :on_or_before => '<=', :on_or_after => '>='}
-        
-        type_cast_method = restriction_type_cast_method(configuration[:type])
-        
-        display = ActiveRecord::Errors.date_time_error_value_formats[configuration[:type]]
-        
-        value = value.send(type_cast_method)
-        
-        restriction_methods.each do |option, method|
-          next unless restriction = configuration[option]
-          begin
-            compare = timeliness_restriction_value(restriction, record, configuration[:type])
-            
-            next if compare.nil?
-            
-            compare = compare.send(type_cast_method)
-            record.errors.add(attr_name, configuration["#{option}_message".to_sym] % compare.strftime(display)) unless value.send(method, compare)
-          rescue
-            record.errors.add(attr_name, "restriction '#{option}' value was invalid") unless self.ignore_datetime_restriction_errors
-          end
-        end
-      end
-      
-      # Map error message keys to *_message to merge with validation options
-      def timeliness_default_error_messages
-        defaults = ActiveRecord::Errors.default_error_messages.slice(
-          :blank, :invalid_date, :invalid_time, :invalid_datetime, :before, :on_or_before, :after, :on_or_after)
-        returning({}) do |messages|
-          defaults.each {|k, v| messages["#{k}_message".to_sym] = v }
-        end
-      end
-      
-      # Create time in correct timezone. For Rails 2.1 that is value in 
-      # Time.zone. Rails 2.0 should be default_timezone.
-      def make_time(time_array)
-        if Time.respond_to?(:zone) && time_zone_aware_attributes
-          Time.zone.local(*time_array)
-        else
-          begin
-            Time.send(ActiveRecord::Base.default_timezone, *time_array)
-          rescue ArgumentError, TypeError
-            zone_offset = ActiveRecord::Base.default_timezone == :local ? DateTime.local_offset : 0
-            time_array.pop # remove microseconds
-            DateTime.civil(*(time_array << zone_offset))
-          end
-        end
-      end
-                        
-    end
-  end
-end

lib/validates_timeliness/validator.rb

@@ -0,0 +1,205 @@
+module ValidatesTimeliness
+
+  class Validator
+    cattr_accessor :ignore_restriction_errors
+    cattr_accessor :error_value_formats
+
+    self.ignore_restriction_errors = false
+    self.error_value_formats = {
+      :time     => '%H:%M:%S',
+      :date     => '%Y-%m-%d',
+      :datetime => '%Y-%m-%d %H:%M:%S'
+    }
+
+    RESTRICTION_METHODS = {
+      :equal_to     => :==,
+      :before       => :<, 
+      :after        => :>, 
+      :on_or_before => :<=,
+      :on_or_after  => :>=,
+      :between      => lambda {|v, r| (r.first..r.last).include?(v) } 
+    }
+
+    VALID_OPTIONS = [
+      :on, :if, :unless, :allow_nil, :empty, :allow_blank, :blank,
+      :with_time, :with_date, :ignore_usec,
+      :invalid_time_message, :invalid_date_message, :invalid_datetime_message
+    ] + RESTRICTION_METHODS.keys.map {|option| [option, "#{option}_message".to_sym] }.flatten
+
+    attr_reader :configuration, :type
+
+    def initialize(configuration)
+      defaults = { :on => :save, :type => :datetime, :allow_nil => false, :allow_blank => false, :ignore_usec => false }
+      @configuration = defaults.merge(configuration)
+      @type = @configuration.delete(:type)
+      validate_options(@configuration)
+    end
+      
+    def call(record, attr_name, value)
+      value     = record.class.parse_date_time(value, type, false) if value.is_a?(String)
+      raw_value = raw_value(record, attr_name) || value
+
+      return if (raw_value.nil? && configuration[:allow_nil]) || (raw_value.blank? && configuration[:allow_blank])
+
+      add_error(record, attr_name, :blank) and return if raw_value.blank?
+       
+      add_error(record, attr_name, "invalid_#{type}".to_sym) and return unless value
+
+      validate_restrictions(record, attr_name, value)
+    end
+    
+   private
+
+    def raw_value(record, attr_name)
+      record.send("#{attr_name}_before_type_cast") rescue nil
+    end
+   
+    def validate_restrictions(record, attr_name, value)
+      value = if @configuration[:with_time] || @configuration[:with_date]
+        restriction_type = :datetime
+        combine_date_and_time(value, record)
+      else
+        restriction_type = type
+        self.class.type_cast_value(value, type, @configuration[:ignore_usec])
+      end
+      return if value.nil?
+
+      RESTRICTION_METHODS.each do |option, method|
+        next unless restriction = configuration[option]
+        begin
+          restriction = self.class.evaluate_option_value(restriction, restriction_type, record)
+          next if restriction.nil?
+          restriction = self.class.type_cast_value(restriction, restriction_type, @configuration[:ignore_usec])
+
+          unless evaluate_restriction(restriction, value, method)
+            add_error(record, attr_name, option, interpolation_values(option, restriction))
+          end
+        rescue
+          unless self.class.ignore_restriction_errors
+            add_error(record, attr_name, "restriction '#{option}' value was invalid")
+          end
+        end
+      end
+    end
+
+    def interpolation_values(option, restriction)
+      format = self.class.error_value_formats[type]
+      restriction = [restriction] unless restriction.is_a?(Array)
+
+      if defined?(I18n)
+        message = custom_error_messages[option] || I18n.translate('activerecord.errors.messages')[option]
+        subs = message.scan(/\{\{([^\}]*)\}\}/)
+        interpolations = {}
+        subs.each_with_index {|s, i| interpolations[s[0].to_sym] = restriction[i].strftime(format) }
+        interpolations
+      else
+        restriction.map {|r| r.strftime(format) }
+      end
+    end
+
+    def evaluate_restriction(restriction, value, comparator)
+      return true if restriction.nil?
+
+      case comparator
+      when Symbol
+        value.send(comparator, restriction)
+      when Proc
+        comparator.call(value, restriction)
+      end
+    end
+    
+    def add_error(record, attr_name, message, interpolate=nil)
+      if defined?(I18n)
+        # use i18n support in AR for message or use custom message passed to validation method
+        custom = custom_error_messages[message]
+        record.errors.add(attr_name, custom || message, interpolate || {})
+      else
+        message = error_messages[message] if message.is_a?(Symbol)
+        message = message % interpolate
+        record.errors.add(attr_name, message)
+      end
+    end
+
+    def error_messages
+      @error_messages ||= ValidatesTimeliness.default_error_messages.merge(custom_error_messages)
+    end
+    
+    def custom_error_messages
+      @custom_error_messages ||= configuration.inject({}) {|msgs, (k, v)|
+        if md = /(.*)_message$/.match(k.to_s) 
+          msgs[md[1].to_sym] = v
+        end
+        msgs
+      }
+    end
+    
+    def combine_date_and_time(value, record)
+      if type == :date
+        date = value
+        time = @configuration[:with_time]
+      else
+        date = @configuration[:with_date]
+        time = value
+      end
+      date, time = self.class.evaluate_option_value(date, :date, record), self.class.evaluate_option_value(time, :time, record)
+      return if date.nil? || time.nil?
+      record.class.send(:make_time, [date.year, date.month, date.day, time.hour, time.min, time.sec, time.usec]) 
+    end
+
+    def validate_options(options)
+      invalid_for_type = ([:time, :date, :datetime] - [@type]).map {|k| "invalid_#{k}_message".to_sym }
+      invalid_for_type << :with_date unless @type == :time
+      invalid_for_type << :with_time unless @type == :date
+      options.assert_valid_keys(VALID_OPTIONS - invalid_for_type)
+    end
+
+    # class methods
+    class << self
+
+      def evaluate_option_value(value, type, record)
+        case value
+        when Time, Date, DateTime
+          value
+        when Symbol
+          evaluate_option_value(record.send(value), type, record)
+        when Proc
+          evaluate_option_value(value.call(record), type, record)
+        when Array
+          value.map {|r| evaluate_option_value(r, type, record) }.sort
+        when Range
+          evaluate_option_value([value.first, value.last], type, record)
+        else
+          record.class.parse_date_time(value, type, false)
+        end
+      end
+
+      def type_cast_value(value, type, ignore_usec=false)
+        if value.is_a?(Array)
+          value.map {|v| type_cast_value(v, type, ignore_usec) }
+        else
+          value = case type
+          when :time
+            value.to_dummy_time
+          when :date
+            value.to_date
+          when :datetime
+            if value.is_a?(DateTime) || value.is_a?(Time)
+              value.to_time
+            else
+              value.to_time(ValidatesTimeliness.default_timezone)
+            end
+          else
+            nil
+          end
+          if ignore_usec && value.is_a?(Time)
+            ::ActiveRecord::Base.send(:make_time, Array(value).reverse[4..9])
+          else
+            value
+          end
+        end
+      end
+
+    end
+
+  end
+end

spec/action_view/instance_tag_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe ValidatesTimeliness::InstanceTag, :type => :helper do
+describe ValidatesTimeliness::ActionView::InstanceTag, :type => :helper do
   
   before do
     @person = Person.new

spec/active_record/attribute_methods_spec.rb

@@ -1,13 +1,43 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe ValidatesTimeliness::AttributeMethods do
+describe ValidatesTimeliness::ActiveRecord::AttributeMethods do
-  include ValidatesTimeliness::AttributeMethods
-  include ValidatesTimeliness::Validations
-  
   before do
     @person = Person.new
   end
 
+  it "should call write_date_time_attribute when date attribute assigned value" do
+    @person.should_receive(:write_date_time_attribute)
+    @person.birth_date = "2000-01-01"
+  end
+
+  it "should call write_date_time_attribute when time attribute assigned value" do
+    @person.should_receive(:write_date_time_attribute)
+    @person.birth_time = "12:00"
+  end
+
+  it "should call write_date_time_attribute when datetime attribute assigned value" do
+    @person.should_receive(:write_date_time_attribute)
+    @person.birth_date_and_time = "2000-01-01 12:00"
+  end
+
+  it "should call read_date_time_attribute when date attribute is retrieved" do
+    @person.should_receive(:read_date_time_attribute)
+    @person.birth_date = "2000-01-01"
+    @person.birth_date
+  end
+
+  it "should call read_date_time_attribute when time attribute is retrieved" do
+    @person.should_receive(:read_date_time_attribute)
+    @person.birth_time = "12:00"
+    @person.birth_time
+  end
+
+  it "should call read_date_time_attribute when datetime attribute is retrieved" do
+    @person.should_receive(:read_date_time_attribute)
+    @person.birth_date_and_time = "2000-01-01 12:00"
+    @person.birth_date_and_time
+  end
+
   it "should call parser on write for datetime attribute" do
     @person.class.should_receive(:parse_date_time).once
     @person.birth_date_and_time = "2000-01-01 02:03:04"
@@ -39,6 +69,11 @@ describe ValidatesTimeliness::AttributeMethods do
     @person.birth_date_and_time.should be_kind_of(Time)
   end
 
+  it "should return Time object for datetime attribute read method when assigned Date object" do
+    @person.birth_date_and_time = Date.today
+    @person.birth_date_and_time.should be_kind_of(Time)
+  end
+
   it "should return Time object for datetime attribute read method when assigned string" do
     @person.birth_date_and_time = "2000-01-01 02:03:04"
     @person.birth_date_and_time.should be_kind_of(Time)

spec/active_record/multiparameter_attributes_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe ValidatesTimeliness::MultiparameterAttributes do
+describe ValidatesTimeliness::ActiveRecord::MultiparameterAttributes do
   def obj
     @obj ||= Person.new
   end
@@ -39,11 +39,9 @@ describe ValidatesTimeliness::MultiparameterAttributes do
       obj.send(:execute_callstack_for_multiparameter_attributes, @callstack)
     end
    
-    unless RAILS_VER < '2.1' # sqlite doesn't support :time attribute in rails 2.0.x
+    it "should store time string for a time column" do
-      it "should store time string for a time column" do
+      obj.should_receive(:birth_time=).once.with("09:10:11")
-        obj.should_receive(:birth_time=).once.with("09:10:11")
+      obj.send(:execute_callstack_for_multiparameter_attributes, @callstack)
-        obj.send(:execute_callstack_for_multiparameter_attributes, @callstack)
-      end
     end
   end
   

spec/core_ext/dummy_time_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe ValidatesTimeliness::CoreExtensions::Date do  
+  before do
+    @a_date = Date.new(2008, 7, 1)
+  end
+  
+  it "should make a date value into a dummy time value" do
+    @a_date.to_dummy_time.should == Time.utc(2000,1,1,0,0,0)
+  end
+end
+
+describe ValidatesTimeliness::CoreExtensions::Time do
+  before do
+    @a_time = Time.mktime(2008, 7, 1, 2, 3, 4)
+  end
+  
+  it "should make a time value into a dummy time value" do
+    @a_time.to_dummy_time.should == Time.utc(2000,1,1,2,3,4)
+  end
+end
+
+describe ValidatesTimeliness::CoreExtensions::DateTime do
+  before do
+    @a_datetime = DateTime.new(2008, 7, 1, 2, 3, 4)
+  end
+  
+  it "should make a datetime value into a dummy time value" do
+    @a_datetime.to_dummy_time.should == Time.utc(2000,1,1,2,3,4)
+  end
+end

spec/dummy_time_spec.rb

@@ -1,31 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe ValidatesTimeliness::CoreExtensions::Date do  
-  before do
-    @a_date = Date.new(2008, 7, 1)
-  end
-  
-  it "should " do
-    @a_date.to_dummy_time.should == Time.mktime(2000,1,1,0,0,0)
-  end
-end
-
-describe ValidatesTimeliness::CoreExtensions::Time do
-  before do
-    @a_time = Time.mktime(2008, 7, 1, 2, 3, 4)
-  end
-  
-  it "should " do
-    @a_time.to_dummy_time.should == Time.mktime(2000,1,1,2,3,4)
-  end
-end
-
-describe ValidatesTimeliness::CoreExtensions::DateTime do
-  before do
-    @a_datetime = DateTime.new(2008, 7, 1, 2, 3, 4)
-  end
-  
-  it "should " do
-    @a_datetime.to_dummy_time.should == Time.mktime(2000,1,1,2,3,4)
-  end
-end

spec/formats_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe ValidatesTimeliness::Formats do
   attr_reader :formats
@@ -157,11 +157,16 @@ describe ValidatesTimeliness::Formats do
       time_array = formats.parse('2000-02-01', :datetime, false)
       time_array.should == [2000,2,1,0,0,0,0]
     end
-    
+
     it "should ignore time when extracting date and strict is false" do
       time_array = formats.parse('2000-02-01 12:12', :date, false)
       time_array.should == [2000,2,1,0,0,0,0]
     end
+
+    it "should ignore time when extracting date from format with trailing year and strict is false" do
+      time_array = formats.parse('01-02-2000 12:12', :date, false)
+      time_array.should == [2000,2,1,0,0,0,0]
+    end
     
     it "should ignore date when extracting time and strict is false" do
       time_array = formats.parse('2000-02-01 12:12', :time, false)

spec/ginger_scenarios.rb

@@ -9,7 +9,7 @@
 #   ginger spec
 #
 Ginger.configure do |config|
-  rails_versions = ['2.0.2', '2.1.2', '2.2.2']
+  rails_versions = ['2.0.2', '2.1.2', '2.2.2', '2.3.2']
 
   rails_versions.each do |v|
     g = Ginger::Scenario.new

spec/resources/sqlite_patch.rb

@@ -0,0 +1,19 @@
+# patches adapter in rails 2.0 which mistakenly made time attributes map to datetime column type
+ActiveRecord::ConnectionAdapters::SQLiteAdapter.class_eval do
+  def native_database_types #:nodoc:
+    {
+      :primary_key => default_primary_key_type,
+      :string      => { :name => "varchar", :limit => 255 },
+      :text        => { :name => "text" },
+      :integer     => { :name => "integer" },
+      :float       => { :name => "float" },
+      :decimal     => { :name => "decimal" },
+      :datetime    => { :name => "datetime" },
+      :timestamp   => { :name => "datetime" },
+      :time        => { :name => "time" },
+      :date        => { :name => "date" },
+      :binary      => { :name => "blob" },
+      :boolean     => { :name => "boolean" }
+    }
+  end
+end

spec/spec/rails/matchers/validate_timeliness_spec.rb

@@ -1,39 +1,63 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
+class NoValidation < Person
+end
+
+class WithValidation < Person
+  validates_date :birth_date, 
+    :before       => '2000-01-10',
+    :after        => '2000-01-01',
+    :on_or_before => '2000-01-09',
+    :on_or_after  => '2000-01-02',
+    :between      => ['2000-01-01', '2000-01-03']
+
+  validates_time :birth_time, 
+    :before       => '23:00',
+    :after        => '09:00',
+    :on_or_before => '22:00',
+    :on_or_after  => '10:00',
+    :between      => ['09:00', '17:00']
+
+  validates_datetime :birth_date_and_time, 
+    :before       => '2000-01-10 23:00',
+    :after        => '2000-01-01 09:00',
+    :on_or_before => '2000-01-09 23:00',
+    :on_or_after  => '2000-01-02 09:00',
+    :between      => ['2000-01-01 09:00', '2000-01-01 17:00']
+
+end
+
+class CustomMessages < Person
+  validates_date :birth_date,
+    :invalid_date_message => 'is not really a date',
+    :before               => '2000-01-10',
+    :before_message       => 'is too late',
+    :after                => '2000-01-01',
+    :after_message        => 'is too early',
+    :on_or_before         => '2000-01-09',
+    :on_or_before_message => 'is just too late',
+    :on_or_after          => '2000-01-02',
+    :on_or_after_message  => 'is just too early'
+end
 
 describe "ValidateTimeliness matcher" do
   attr_accessor :no_validation, :with_validation
   
+  @@attribute_for_type = { :date => :birth_date, :time => :birth_time, :datetime => :birth_date_and_time }
+  
   before do
-    class NoValidation < Person
-      alias_attribute :birth_datetime, :birth_date_and_time
-    end
-    
-    class WithValidation < Person
-      validates_date :birth_date, 
-        :before       => '2000-01-10', :after       => '2000-01-01',
-        :on_or_before => '2000-01-09', :on_or_after => '2000-01-02'
-      validates_time :birth_time, 
-        :before       => '23:00', :after       => '09:00',
-        :on_or_before => '22:00', :on_or_after => '10:00'
-      validates_datetime :birth_date_and_time, 
-        :before       => '2000-01-10 23:00', :after       => '2000-01-01 09:00',
-        :on_or_before => '2000-01-09 23:00', :on_or_after => '2000-01-02 09:00'
-      
-      alias_attribute :birth_datetime, :birth_date_and_time
-    end
     @no_validation = NoValidation.new
     @with_validation = WithValidation.new
   end
 
   [:date, :time, :datetime].each do |type|
-    attribute = type == :datetime ? :date_and_time : type
     
     it "should report that #{type} is validated" do
-      with_validation.should self.send("validate_#{type}", "birth_#{attribute}".to_sym)
+      with_validation.should self.send("validate_#{type}", attribute_for_type(type))
     end
     
     it "should report that #{type} is not validated" do
-      no_validation.should_not self.send("validate_#{type}", "birth_#{attribute}".to_sym)
+      no_validation.should_not self.send("validate_#{type}", attribute_for_type(type))
     end    
   end
    
@@ -45,18 +69,17 @@ describe "ValidateTimeliness matcher" do
     }
     
     [:date, :time, :datetime].each do |type|
-      attribute = type == :datetime ? :date_and_time : type
 
       it "should report that #{type} is validated" do
-        with_validation.should self.send("validate_#{type}", "birth_#{attribute}", :before => test_values[type][0])
+        with_validation.should self.send("validate_#{type}", attribute_for_type(type), :before => test_values[type][0])
       end
       
       it "should report that #{type} is not validated when option value is incorrect" do
-        with_validation.should_not self.send("validate_#{type}", "birth_#{attribute}", :before => test_values[type][1])
+        with_validation.should_not self.send("validate_#{type}", attribute_for_type(type), :before => test_values[type][1])
       end
       
       it "should report that #{type} is not validated with option" do
-        no_validation.should_not self.send("validate_#{type}", "birth_#{attribute}", :before => test_values[type][0])
+        no_validation.should_not self.send("validate_#{type}", attribute_for_type(type), :before => test_values[type][0])
       end
     end
   end
@@ -69,18 +92,17 @@ describe "ValidateTimeliness matcher" do
     }
     
     [:date, :time, :datetime].each do |type|
-      attribute = type == :datetime ? :date_and_time : type
 
       it "should report that #{type} is validated" do
-        with_validation.should self.send("validate_#{type}", "birth_#{attribute}", :after => test_values[type][0])
+        with_validation.should self.send("validate_#{type}", attribute_for_type(type), :after => test_values[type][0])
       end
       
       it "should report that #{type} is not validated when option value is incorrect" do
-        with_validation.should_not self.send("validate_#{type}", "birth_#{attribute}", :after => test_values[type][1])
+        with_validation.should_not self.send("validate_#{type}", attribute_for_type(type), :after => test_values[type][1])
       end
       
       it "should report that #{type} is not validated with option" do
-        no_validation.should_not self.send("validate_#{type}", "birth_#{attribute}", :after => test_values[type][0])
+        no_validation.should_not self.send("validate_#{type}", attribute_for_type(type), :after => test_values[type][0])
       end
     end
   end
@@ -93,18 +115,17 @@ describe "ValidateTimeliness matcher" do
     }
     
     [:date, :time, :datetime].each do |type|
-      attribute = type == :datetime ? :date_and_time : type
 
       it "should report that #{type} is validated" do
-        with_validation.should self.send("validate_#{type}", "birth_#{attribute}", :on_or_before => test_values[type][0])
+        with_validation.should self.send("validate_#{type}", attribute_for_type(type), :on_or_before => test_values[type][0])
       end
       
       it "should report that #{type} is not validated when option value is incorrect" do
-        with_validation.should_not self.send("validate_#{type}", "birth_#{attribute}", :on_or_before => test_values[type][1])
+        with_validation.should_not self.send("validate_#{type}", attribute_for_type(type), :on_or_before => test_values[type][1])
       end
       
       it "should report that #{type} is not validated with option" do
-        no_validation.should_not self.send("validate_#{type}", "birth_#{attribute}", :on_or_before => test_values[type][0])
+        no_validation.should_not self.send("validate_#{type}", attribute_for_type(type), :on_or_before => test_values[type][0])
       end
     end
   end
@@ -117,31 +138,47 @@ describe "ValidateTimeliness matcher" do
     }
     
     [:date, :time, :datetime].each do |type|
-      attribute = type == :datetime ? :date_and_time : type
 
       it "should report that #{type} is validated" do
-        with_validation.should self.send("validate_#{type}", "birth_#{attribute}", :on_or_after => test_values[type][0])
+        with_validation.should self.send("validate_#{type}", attribute_for_type(type), :on_or_after => test_values[type][0])
       end
       
       it "should report that #{type} is not validated when option value is incorrect" do
-        with_validation.should_not self.send("validate_#{type}", "birth_#{attribute}", :on_or_after => test_values[type][1])
+        with_validation.should_not self.send("validate_#{type}", attribute_for_type(type), :on_or_after => test_values[type][1])
       end
       
       it "should report that #{type} is not validated with option" do
-        no_validation.should_not self.send("validate_#{type}", "birth_#{attribute}", :on_or_after => test_values[type][0])
+        no_validation.should_not self.send("validate_#{type}", attribute_for_type(type), :on_or_after => test_values[type][0])
       end
     end
   end
   
-  describe "custom messages" do
+  describe "between option" do
-    before do
+    test_values = {
-      class CustomMessages < Person
+      :date     => [ ['2000-01-01', '2000-01-03'], ['2000-01-01', '2000-01-04'] ],
-        validates_date :birth_date, :invalid_date_message => 'is not really a date',
+      :time     => [ ['09:00', '17:00'], ['09:00', '17:01'] ], 
-          :before      => '2000-01-10', :before_message => 'is too late',
+      :datetime => [ ['2000-01-01 09:00', '2000-01-01 17:00'], ['2000-01-01 09:00', '2000-01-01 17:01'] ] 
-          :after       => '2000-01-01', :after_message => 'is too early',
+    }
-          :on_or_before=> '2000-01-09', :on_or_before_message => 'is just too late',
+    
-          :on_or_after => '2000-01-02', :on_or_after_message => 'is just too early'
+    [:date, :time, :datetime].each do |type|
+
+      it "should report that #{type} is validated" do
+        with_validation.should self.send("validate_#{type}", attribute_for_type(type), :between => test_values[type][0])
       end
+      
+      it "should report that #{type} is not validated when option value is incorrect" do
+        with_validation.should_not self.send("validate_#{type}", attribute_for_type(type), :between => test_values[type][1])
+      end
+      
+      it "should report that #{type} is not validated with option" do
+        no_validation.should_not self.send("validate_#{type}", attribute_for_type(type), :between => test_values[type][0])
+      end
+    end
+  end
+
+  describe "custom messages" do
+
+    before do
       @person = CustomMessages.new
     end
     
@@ -174,4 +211,8 @@ describe "ValidateTimeliness matcher" do
     end
     
   end
+
+  def attribute_for_type(type)
+    @@attribute_for_type[type.to_sym]
+  end
 end

spec/spec_helper.rb

@@ -16,7 +16,11 @@ else
    require 'ginger' 
   rescue LoadError
   end
-  gem 'rails'
+  if ENV['VERSION']
+    gem 'rails', ENV['VERSION']
+  else
+    gem 'rails'
+  end
 end
 
 RAILS_ROOT = File.dirname(__FILE__)
@@ -27,17 +31,14 @@ require 'active_record/version'
 require 'action_controller'
 require 'action_view'
 
-ActiveSupport::Deprecation.silenced = true
-
 require 'spec/rails'
 require 'time_travel/time_travel'
-require 'validates_timeliness'
-
-RAILS_VER = Rails::VERSION::STRING
-
-puts "Using #{vendored ? 'vendored' : 'gem'} Rails version #{RAILS_VER} (ActiveRecord version #{ActiveRecord::VERSION::STRING})"
 
 ActiveRecord::Base.default_timezone = :utc
+RAILS_VER = Rails::VERSION::STRING
+puts "Using #{vendored ? 'vendored' : 'gem'} Rails version #{RAILS_VER} (ActiveRecord version #{ActiveRecord::VERSION::STRING})"
+
+require 'validates_timeliness'
 
 if RAILS_VER >= '2.1'
   Time.zone_default = ActiveSupport::TimeZone['UTC']
@@ -47,5 +48,7 @@ end
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:'})
 
+require 'sqlite_patch' if RAILS_VER < '2.1'
+
 require 'schema'
 require 'person'

spec/validation_methods_spec.rb

@@ -0,0 +1,61 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ValidatesTimeliness::ValidationMethods do
+  attr_accessor :person
+
+  describe "parse_date_time" do
+    it "should return time object for valid time string" do
+      parse_method("2000-01-01 12:13:14", :datetime).should be_kind_of(Time)
+    end
+    
+    it "should return nil for time string with invalid date part" do
+      parse_method("2000-02-30 12:13:14", :datetime).should be_nil
+    end
+    
+    it "should return nil for time string with invalid time part" do
+      parse_method("2000-02-01 25:13:14", :datetime).should be_nil      
+    end
+    
+    it "should return Time object when passed a Time object" do
+      parse_method(Time.now, :datetime).should be_kind_of(Time)
+    end
+        
+    if RAILS_VER >= '2.1'
+      it "should convert time string into current timezone" do
+        Time.zone = 'Melbourne'
+        time = parse_method("2000-01-01 12:13:14", :datetime)
+        Time.zone.utc_offset.should == 10.hours
+      end
+    end
+
+    it "should return nil for invalid date string" do
+      parse_method("2000-02-30", :date).should be_nil      
+    end
+        
+    def parse_method(*args)
+      ActiveRecord::Base.parse_date_time(*args)
+    end
+  end
+
+  describe "make_time" do
+
+    if RAILS_VER >= '2.1'
+
+      it "should create time using current timezone" do
+        Time.zone = 'Melbourne'
+        time = ActiveRecord::Base.send(:make_time, [2000,1,1,12,0,0])
+        time.zone.should == "EST"
+      end
+
+    else
+
+      it "should create time using default timezone" do
+        time = ActiveRecord::Base.send(:make_time, [2000,1,1,12,0,0])
+        time.zone.should == "UTC"
+      end
+
+    end
+
+  end
+
+end

spec/validations_spec.rb

@@ -1,507 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe ValidatesTimeliness::Validations do
-  attr_accessor :person
-
-  before :all do
-    # freezes time using time_travel plugin
-    Time.now = Time.utc(2000, 1, 1, 0, 0, 0)
-  end
-  
-  after :all do
-    Time.now = nil
-  end
-  
-  describe "parse_date_time" do
-    it "should return time object for valid time string" do
-      parse_method("2000-01-01 12:13:14", :datetime).should be_kind_of(Time)
-    end
-    
-    it "should return nil for time string with invalid date part" do
-      parse_method("2000-02-30 12:13:14", :datetime).should be_nil
-    end
-    
-    it "should return nil for time string with invalid time part" do
-      parse_method("2000-02-01 25:13:14", :datetime).should be_nil      
-    end
-    
-    it "should return Time object when passed a Time object" do
-      parse_method(Time.now, :datetime).should be_kind_of(Time)
-    end
-        
-    if RAILS_VER >= '2.1'
-      it "should convert time string into current timezone" do
-        Time.zone = 'Melbourne'
-        time = parse_method("2000-01-01 12:13:14", :datetime)
-        Time.zone.utc_offset.should == 10.hours
-      end
-    end
-
-    it "should return nil for invalid date string" do
-      parse_method("2000-02-30", :date).should be_nil      
-    end
-        
-    def parse_method(*args)
-      ActiveRecord::Base.parse_date_time(*args)
-    end
-  end
-  
-  describe "timeliness_restriction_value" do
-    it "should return Time object when restriction is Time object" do
-      restriction_value(Time.now, person, :datetime).should be_kind_of(Time)
-    end
-    
-    it "should return Time object when restriction is string" do
-      restriction_value("2007-01-01 12:00", person, :datetime).should be_kind_of(Time)
-    end
-    
-    it "should return Time object when restriction is method symbol which returns Time object" do
-      person.stub!(:datetime_attr).and_return(Time.now)
-      restriction_value(:datetime_attr, person, :datetime).should be_kind_of(Time)
-    end
-    
-    it "should return Time object when restriction is method symbol which returns string" do
-      person.stub!(:datetime_attr).and_return("2007-01-01 12:00")
-      restriction_value(:datetime_attr, person, :datetime).should be_kind_of(Time)
-    end
-    
-    it "should return Time object when restriction is proc which returns Time object" do
-      restriction_value(lambda { Time.now }, person, :datetime).should be_kind_of(Time)
-    end
-    
-    it "should return Time object when restriction is proc which returns string" do
-      restriction_value(lambda {"2007-01-01 12:00"}, person, :datetime).should be_kind_of(Time)
-    end
-    
-    def restriction_value(*args)
-      ActiveRecord::Base.send(:timeliness_restriction_value, *args)
-    end
-  end
-   
-  describe "with no restrictions" do
-    before :all do
-      class BasicValidation < Person
-        validates_datetime :birth_date_and_time, :allow_blank => true
-        validates_date :birth_date, :allow_blank => true
-        validates_time :birth_time, :allow_blank => true
-      end
-    end
-
-    before :each do
-      @person = BasicValidation.new
-    end
-
-    it "should have error for invalid date component for datetime column" do
-      person.birth_date_and_time = "2000-01-32 01:02:03"
-      person.should_not be_valid
-      person.errors.on(:birth_date_and_time).should == "is not a valid datetime"
-    end
-
-    it "should have error for invalid time component for datetime column" do
-      person.birth_date_and_time = "2000-01-01 25:02:03"
-      person.should_not be_valid 
-      person.errors.on(:birth_date_and_time).should == "is not a valid datetime"
-    end
-
-    it "should have error for invalid date value for date column" do
-      person.birth_date = "2000-01-32"
-      person.should_not be_valid
-      person.errors.on(:birth_date).should == "is not a valid date"
-    end
-
-    it "should have error for invalid time value for time column" do
-      person.birth_time = "25:00"
-      person.should_not be_valid
-      person.errors.on(:birth_time).should == "is not a valid time"
-    end
-
-    it "should have same value for before_type_cast after failed validation" do
-      person.birth_date_and_time = "2000-01-01 25:02:03"
-      person.should_not be_valid
-      person.birth_date_and_time_before_type_cast.should == "2000-01-01 25:02:03"
-    end
-    
-    it "should be valid with valid values" do
-      person.birth_date_and_time = "2000-01-01 12:12:12"
-      person.birth_date = "2000-01-31"
-      person.should be_valid
-    end
-    
-    it "should be valid with value out of range for Time class" do
-      person.birth_date_and_time = "1890-01-01 12:12:12"
-      person.should be_valid
-    end
-    
-    it "should be valid with nil values when allow_blank is true" do
-      person.birth_date_and_time = nil
-      person.birth_date = nil
-      person.birth_time = nil      
-      person.should be_valid
-    end
-  end
-  
-  describe "for datetime type" do
-    
-    describe "with before and after restrictions" do
-      before :all do
-        class DateTimeBeforeAfter < Person
-          validates_datetime :birth_date_and_time,
-            :before => lambda { Time.now }, :after => lambda { 1.day.ago}
-        end
-      end
-
-      before :each do
-        @person = DateTimeBeforeAfter.new
-      end
-      
-      it "should have error when past :before restriction" do
-        person.birth_date_and_time = 1.minute.from_now
-        person.should_not be_valid
-        person.errors.on(:birth_date_and_time).should match(/must be before/)
-      end
-
-      it "should have error when before :after restriction" do
-        person.birth_date_and_time = 2.days.ago
-        person.should_not be_valid
-        person.errors.on(:birth_date_and_time).should match(/must be after/)
-      end
-      
-      it "should have error when on boundary of :before restriction" do
-        person.birth_date_and_time = Time.now
-        person.should_not be_valid
-        person.errors.on(:birth_date_and_time).should match(/must be before/)
-      end
-
-      it "should have error when on boundary of :after restriction" do
-        person.birth_date_and_time = 1.day.ago
-        person.should_not be_valid
-        person.errors.on(:birth_date_and_time).should match(/must be after/)
-      end
-    end
-
-    describe "with on_or_before and on_or_after restrictions" do
-      before :all do
-        class DateTimeOnOrBeforeAndAfter < Person
-          validates_datetime :birth_date_and_time, :type => :datetime,
-            :on_or_before => lambda { Time.now.at_midnight },
-            :on_or_after => lambda { 1.day.ago }
-        end
-      end
-      
-      before do  
-        @person = DateTimeOnOrBeforeAndAfter.new
-      end
-        
-      it "should have error when past :on_or_before restriction" do
-        person.birth_date_and_time = Time.now.at_midnight + 1
-        person.should_not be_valid
-        person.errors.on(:birth_date_and_time).should match(/must be on or before/)
-      end
-
-      it "should have error when before :on_or_after restriction" do
-        person.birth_date_and_time = 1.days.ago - 1
-        person.should_not be_valid
-        person.errors.on(:birth_date_and_time).should match(/must be on or after/)
-      end
-      
-      it "should be valid when value equal to :on_or_before restriction" do
-        person.birth_date_and_time = Time.now.at_midnight
-        person.should be_valid
-      end
-
-      it "should be valid when value equal to :on_or_after restriction" do
-        person.birth_date_and_time = 1.day.ago
-        person.should be_valid        
-      end 
-    end
-
-  end
-  
-  describe "for date type" do
-    
-    describe "with before and after restrictions" do
-      before :all do
-        class DateBeforeAfter < Person
-          validates_date :birth_date,
-            :before => 1.day.from_now, 
-            :after => 1.day.ago
-        end        
-      end
-
-      before :each do
-        @person = DateBeforeAfter.new
-      end
-      
-      it "should have error when past :before restriction" do
-        person.birth_date = 2.days.from_now
-        person.should_not be_valid
-        person.errors.on(:birth_date).should match(/must be before/)
-      end
-
-      it "should have error when before :after restriction" do
-        person.birth_date = 2.days.ago
-        person.should_not be_valid
-        person.errors.on(:birth_date).should match(/must be after/)
-      end
-    end
-
-    describe "with on_or_before and on_or_after restrictions" do
-      before :all do
-        class DateOnOrBeforeAndAfter < Person
-          validates_date :birth_date,
-            :on_or_before => 1.day.from_now,
-            :on_or_after => 1.day.ago
-        end
-      end
-      
-      before :each do
-        @person = DateOnOrBeforeAndAfter.new
-      end
-        
-      it "should have error when past :on_or_before restriction" do
-        person.birth_date = 2.days.from_now
-        person.should_not be_valid
-        person.errors.on(:birth_date).should match(/must be on or before/)
-      end
-
-      it "should have error when before :on_or_after restriction" do
-        person.birth_date = 2.days.ago
-        person.should_not be_valid
-        person.errors.on(:birth_date).should match(/must be on or after/)
-      end
-      
-      it "should be valid when value equal to :on_or_before restriction" do
-        person.birth_date = 1.day.from_now
-        person.should be_valid
-      end
-
-      it "should be valid when value equal to :on_or_after restriction" do
-        person.birth_date = 1.day.ago
-        person.should be_valid        
-      end      
-    end 
-  end
-  
-  describe "for time type" do
-  
-    describe "with before and after restrictions" do
-      before :all do
-        class TimeBeforeAfter < Person
-          validates_time :birth_time,
-            :before => "23:00", 
-            :after => "06:00"
-        end        
-      end
-
-      before :each do
-        @person = TimeBeforeAfter.new
-      end
-      
-      it "should have error when on boundary of :before restriction" do
-        person.birth_time = "23:00"
-        person.should_not be_valid
-        person.errors.on(:birth_time).should match(/must be before/)
-      end
-
-      it "should have error when on boundary of :after restriction" do
-        person.birth_time = "06:00am"
-        person.should_not be_valid
-        person.errors.on(:birth_time).should match(/must be after/)
-      end
-      
-      it "should have error when past :before restriction" do
-        person.birth_time = "23:01"
-        person.should_not be_valid
-        person.errors.on(:birth_time).should match(/must be before/)
-      end
-
-      it "should have error when before :after restriction" do
-        person.birth_time = "05:59"
-        person.should_not be_valid
-        person.errors.on(:birth_time).should match(/must be after/)
-      end
-      
-      it "should not have error when before :before restriction" do
-        person.birth_time = "22:59"
-        person.should be_valid
-      end
-
-      it "should have error when before :after restriction" do
-        person.birth_time = "06:01"
-        person.should be_valid
-      end
-    end
-
-    describe "with on_or_before and on_or_after restrictions" do
-      before :all do
-        class TimeOnOrBeforeAndAfter < Person
-          validates_time :birth_time,
-            :on_or_before => "23:00",
-            :on_or_after => "06:00"
-        end
-      end
-      
-      before :each do
-        @person = TimeOnOrBeforeAndAfter.new
-      end
-        
-      it "should have error when past :on_or_before restriction" do
-        person.birth_time = "23:01"
-        person.should_not be_valid
-        person.errors.on(:birth_time).should match(/must be on or before/)
-      end
-
-      it "should have error when before :on_or_after restriction" do
-        person.birth_time = "05:59"
-        person.should_not be_valid
-        person.errors.on(:birth_time).should match(/must be on or after/)
-      end
-      
-      it "should be valid when on boundary of :on_or_before restriction" do
-        person.birth_time = "23:00"
-        person.should be_valid
-      end
-
-      it "should be valid when on boundary of :on_or_after restriction" do
-        person.birth_time = "06:00"
-        person.should be_valid        
-      end      
-    end 
-  end
-  
-  describe "with mixed value and restriction types" do
-    before :all do
-      
-      class MixedBeforeAndAfter < Person
-        validates_datetime :birth_date_and_time, 
-                            :before => Date.new(2000,1,2), 
-                            :after => lambda { "2000-01-01" }
-        validates_date :birth_date,
-                            :on_or_before => lambda { "2000-01-01" }, 
-                            :on_or_after => :birth_date_and_time
-      end
-    end
-    
-    before :each do
-      @person = MixedBeforeAndAfter.new
-    end
-    
-    it "should correctly validate time attribute with Date restriction" do
-      person.birth_date_and_time = "2000-01-03 00:00:00"
-      person.should_not be_valid
-      person.errors.on(:birth_date_and_time).should match(/must be before/)
-    end
-    
-    it "should correctly validate with proc restriction" do
-      person.birth_date_and_time = "2000-01-01 00:00:00"
-      person.should_not be_valid
-      person.errors.on(:birth_date_and_time).should match(/must be after/)
-    end
-
-    it "should correctly validate date attribute with DateTime restriction" do
-      person.birth_date = "2000-01-03"
-      person.birth_date_and_time = "1890-01-01 00:00:00"
-      person.should_not be_valid
-      person.errors.on(:birth_date).should match(/must be on or before/)
-    end
-
-    it "should correctly validate date attribute with symbol restriction" do
-      person.birth_date = "2000-01-01"
-      person.birth_date_and_time = "2000-01-02 12:00:00"
-      person.should_not be_valid
-      person.errors.on(:birth_date).should match(/must be on or after/)
-    end
-
-  end
-  
-  describe "ignoring restriction errors" do
-    before :all do
-      class BadRestriction < Person        
-        validates_date :birth_date, :before => Proc.new { raise }
-        self.ignore_datetime_restriction_errors = true
-      end
-    end
-    
-    before :each do
-      @person = BadRestriction.new
-    end
-    
-    it "should have no errors when restriction is invalid" do
-      person.birth_date = '2000-01-01'
-      person.should be_valid
-    end
-  end
-  
-  describe "restriction value error message" do
-    describe "default formats" do
-      before :all do
-        class DefaultFormats < Person
-          validates_datetime :birth_date_and_time, :allow_blank => true, :after => 1.day.from_now
-          validates_date :birth_date, :allow_blank => true, :after => 1.day.from_now
-          validates_time :birth_time, :allow_blank => true, :after => '23:59:59'
-        end
-      end
-
-      before :each do
-        @person = DefaultFormats.new
-      end
-      
-      it "should format datetime value of restriction" do
-        person.birth_date_and_time = Time.now
-        person.save
-        person.errors.on(:birth_date_and_time).should match(/after \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\Z/)
-      end
-      
-      it "should format date value of restriction" do
-        person.birth_date = Time.now
-        person.save
-        person.errors.on(:birth_date).should match(/after \d{4}-\d{2}-\d{2}\Z/)
-      end
-      
-      it "should format time value of restriction" do
-        person.birth_time = '12:00:00'
-        person.save
-        person.errors.on(:birth_time).should match(/after \d{2}:\d{2}:\d{2}\Z/)
-      end
-    end
-    
-    describe "custom formats" do
-      before :all do
-        class CustomFormats < Person
-          validates_datetime :birth_date_and_time, :allow_blank => true, :after => 1.day.from_now
-          validates_date :birth_date, :allow_blank => true, :after => 1.day.from_now
-          validates_time :birth_time, :allow_blank => true, :after => '23:59:59'
-        end
-
-        ActiveRecord::Errors.date_time_error_value_formats = {
-          :time => '%H:%M %p',
-          :date => '%d-%m-%Y',
-          :datetime => '%d-%m-%Y %H:%M %p'
-        }
-      end
-
-      before :each do
-        @person = CustomFormats.new
-      end
-      
-      it "should format datetime value of restriction" do
-        person.birth_date_and_time = Time.now
-        person.save
-        person.errors.on(:birth_date_and_time).should match(/after \d{2}-\d{2}-\d{4} \d{2}:\d{2} (AM|PM)\Z/)
-      end
-      
-      it "should format date value of restriction" do
-        person.birth_date = Time.now
-        person.save
-        person.errors.on(:birth_date).should match(/after \d{2}-\d{2}-\d{4}\Z/)
-      end
-      
-      it "should format time value of restriction" do
-        person.birth_time = '12:00:00'
-        person.save
-        person.errors.on(:birth_time).should match(/after \d{2}:\d{2} (AM|PM)\Z/)
-      end
-    end
-    
-  end
-end

spec/validator_spec.rb

@@ -0,0 +1,619 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ValidatesTimeliness::Validator do
+  attr_accessor :person, :validator
+
+  before :all do
+    # freezes time using time_travel plugin
+    Time.now = Time.utc(2000, 1, 1, 0, 0, 0)
+  end
+
+  after :all do
+    Time.now = nil
+  end
+
+  before :each do
+    @person = Person.new
+  end
+
+  describe "option keys validation" do
+    before do
+      keys = ValidatesTimeliness::Validator::VALID_OPTIONS - [:invalid_date_message, :invalid_time_message, :with_date, :with_time]
+      @valid_options = keys.inject({}) {|hash, opt| hash[opt] = nil; hash }
+    end
+
+    it "should raise error if invalid option key passed" do
+      @valid_options.update(:invalid_key => 'will not open lock')
+      lambda { Person.validates_datetime(@valid_options) }.should raise_error(ArgumentError)
+    end
+
+    it "should not raise error if option keys are valid" do
+      lambda { Person.validates_datetime(@valid_options) }.should_not raise_error(ArgumentError)
+    end
+  end
+
+  describe "evaluate_option_value" do
+    it "should return Time object when restriction is Time object" do
+      evaluate_option_value(Time.now, :datetime).should be_kind_of(Time)
+    end
+
+    it "should return Time object when restriction is string" do
+      evaluate_option_value("2007-01-01 12:00", :datetime).should be_kind_of(Time)
+    end
+
+    it "should return Time object when restriction is method and method returns Time object" do
+      person.stub!(:datetime_attr).and_return(Time.now)
+      evaluate_option_value(:datetime_attr, :datetime).should be_kind_of(Time)
+    end
+
+    it "should return Time object when restriction is method and method returns string" do
+      person.stub!(:datetime_attr).and_return("2007-01-01 12:00")
+      evaluate_option_value(:datetime_attr, :datetime).should be_kind_of(Time)
+    end
+
+    it "should return Time object when restriction is proc which returns Time object" do
+      evaluate_option_value(lambda { Time.now }, :datetime).should be_kind_of(Time)
+    end
+
+    it "should return Time object when restriction is proc which returns string" do
+      evaluate_option_value(lambda {"2007-01-01 12:00"}, :datetime).should be_kind_of(Time)
+    end
+
+    it "should return array of Time objects when restriction is array of Time objects" do
+      time1, time2 = Time.now, 1.day.ago
+      evaluate_option_value([time1, time2], :datetime).should == [time2, time1]
+    end
+
+    it "should return array of Time objects when restriction is array of strings" do
+      time1, time2 = "2000-01-02", "2000-01-01"
+      evaluate_option_value([time1, time2], :datetime).should == [Person.parse_date_time(time2, :datetime), Person.parse_date_time(time1, :datetime)]
+    end
+
+    it "should return array of Time objects when restriction is Range of Time objects" do
+      time1, time2 = Time.now, 1.day.ago
+      evaluate_option_value(time1..time2, :datetime).should == [time2, time1]
+    end
+
+    it "should return array of Time objects when restriction is Range of time strings" do
+      time1, time2 = "2000-01-02", "2000-01-01"
+      evaluate_option_value(time1..time2, :datetime).should == [Person.parse_date_time(time2, :datetime), Person.parse_date_time(time1, :datetime)]
+    end
+    def evaluate_option_value(restriction, type)
+      configure_validator(:type => type)
+      validator.class.send(:evaluate_option_value, restriction, type, person)
+    end
+  end
+
+  describe "instance with defaults" do
+
+    describe "for datetime type" do
+      before do
+        configure_validator(:type => :datetime)
+      end
+
+      it "should have invalid error when date component is invalid" do
+        validate_with(:birth_date_and_time, "2000-01-32 01:02:03")
+        should_have_error(:birth_date_and_time, :invalid_datetime)
+      end
+
+      it "should have invalid error when time component is invalid" do
+        validate_with(:birth_date_and_time, "2000-01-01 25:02:03")
+        should_have_error(:birth_date_and_time, :invalid_datetime)
+      end
+
+      it "should have blank error when value is nil" do
+        validate_with(:birth_date_and_time, nil)
+        should_have_error(:birth_date_and_time, :blank)
+      end
+
+      it "should have no errors when value is valid" do
+        validate_with(:birth_date_and_time, "2000-01-01 12:00:00")
+        should_have_no_error(:birth_date_and_time, :invalid_datetime)
+      end
+    end
+
+    describe "for date type" do
+      before do
+        configure_validator(:type => :date)
+      end
+
+      it "should have invalid error when value is invalid" do
+        validate_with(:birth_date, "2000-01-32")
+        should_have_error(:birth_date, :invalid_date)
+      end
+
+      it "should have blank error when value is nil" do
+        validate_with(:birth_date, nil)
+        should_have_error(:birth_date, :blank)
+      end
+
+      it "should have no error when value is valid" do
+        validate_with(:birth_date, "2000-01-31")
+        should_have_no_error(:birth_date, :invalid_date)
+      end
+    end
+
+    describe "for time type" do
+      before do
+        configure_validator(:type => :time)
+      end
+
+      it "should have invalid error when value is invalid" do
+        validate_with(:birth_time, "25:00")
+        should_have_error(:birth_time, :invalid_time)
+      end
+
+      it "should have blank error when value is nil" do
+        validate_with(:birth_time, nil)
+        should_have_error(:birth_time, :blank)
+      end
+
+      it "should have no errors when value is valid" do
+        validate_with(:birth_date_and_time, "12:00")
+        should_have_no_error(:birth_time, :invalid_time)
+      end
+    end
+
+  end
+
+  describe "instance with before and after restrictions" do
+
+    describe "for datetime type" do
+      before :each do
+        configure_validator(:before => lambda { Time.now }, :after => lambda { 1.day.ago})
+      end
+
+      it "should have before error when value is past :before restriction" do
+        validate_with(:birth_date_and_time, 1.minute.from_now)
+        should_have_error(:birth_date_and_time, :before)
+      end
+
+      it "should have before error when value is on boundary of :before restriction" do
+        validate_with(:birth_date_and_time, Time.now)
+        should_have_error(:birth_date_and_time, :before)
+      end
+
+      it "should have after error when value is before :after restriction" do
+        validate_with(:birth_date_and_time, 2.days.ago)
+        should_have_error(:birth_date_and_time, :after)
+      end
+
+      it "should have after error when value is on boundary of :after restriction" do
+        validate_with(:birth_date_and_time, 1.day.ago)
+        should_have_error(:birth_date_and_time, :after)
+      end
+    end
+
+    describe "for date type" do
+      before :each do
+        configure_validator(:before => 1.day.from_now, :after => 1.day.ago, :type => :date)
+      end
+
+      it "should have error when value is past :before restriction" do
+        validate_with(:birth_date, 2.days.from_now)
+        should_have_error(:birth_date, :before)
+      end
+
+      it "should have error when value is before :after restriction" do
+        validate_with(:birth_date, 2.days.ago)
+        should_have_error(:birth_date, :after)
+      end
+
+      it "should have no error when value is before :before restriction" do
+        validate_with(:birth_date, Time.now)
+        should_have_no_error(:birth_date, :before)
+      end
+
+      it "should have no error when value is after :after restriction" do
+        validate_with(:birth_date, Time.now)
+        should_have_no_error(:birth_date, :after)
+      end
+    end
+
+    describe "for time type" do
+      before :each do
+        configure_validator(:before => "23:00", :after => "06:00", :type => :time)
+      end
+
+      it "should have error when value is on boundary of :before restriction" do
+        validate_with(:birth_time, "23:00")
+        should_have_error(:birth_time, :before)
+      end
+
+      it "should have error when value is on boundary of :after restriction" do
+        validate_with(:birth_time, "06:00")
+        should_have_error(:birth_time, :after)
+      end
+
+      it "should have error when value is past :before restriction" do
+        validate_with(:birth_time, "23:01")
+        should_have_error(:birth_time, :before)
+      end
+
+      it "should have error when value is before :after restriction" do
+        validate_with(:birth_time, "05:59")
+        should_have_error(:birth_time, :after)
+      end
+
+      it "should not have error when value is before :before restriction" do
+        validate_with(:birth_time, "22:59")
+        should_have_no_error(:birth_time, :before)
+      end
+
+      it "should have error when value is before :after restriction" do
+        validate_with(:birth_time, "06:01")
+        should_have_no_error(:birth_time, :before)
+      end
+    end
+  end
+
+  describe "instance with between restriction" do
+
+    describe "for datetime type" do
+      before do
+        configure_validator(:between => [1.day.ago.at_midnight, 1.day.from_now.at_midnight])
+      end
+
+      it "should have error when value is before earlist :between restriction" do
+        validate_with(:birth_date_and_time, 2.days.ago)
+        should_have_error(:birth_date_and_time, :between)
+      end
+
+      it "should have error when value is after latest :between restriction" do
+        validate_with(:birth_date_and_time, 2.days.from_now)
+        should_have_error(:birth_date_and_time, :between)
+      end
+
+      it "should be valid when value is equal to earliest :between restriction" do
+        validate_with(:birth_date_and_time, 1.day.ago.at_midnight)
+        should_have_no_error(:birth_date_and_time, :between)
+      end
+
+      it "should be valid when value is equal to latest :between restriction" do
+        validate_with(:birth_date_and_time, 1.day.from_now.at_midnight)
+        should_have_no_error(:birth_date_and_time, :between)
+      end
+
+      it "should allow a range for between restriction" do
+        configure_validator(:type => :datetime, :between => (1.day.ago.at_midnight)..(1.day.from_now.at_midnight))
+        validate_with(:birth_date_and_time, 1.day.from_now.at_midnight)
+        should_have_no_error(:birth_date_and_time, :between)
+      end
+    end
+
+    describe "for date type" do
+      before do
+        configure_validator(:type => :date, :between => [1.day.ago.to_date, 1.day.from_now.to_date])
+      end
+
+      it "should have error when value is before earlist :between restriction" do
+        validate_with(:birth_date, 2.days.ago.to_date)
+        should_have_error(:birth_date, :between)
+      end
+
+      it "should have error when value is after latest :between restriction" do
+        validate_with(:birth_date, 2.days.from_now.to_date)
+        should_have_error(:birth_date, :between)
+      end
+
+      it "should be valid when value is equal to earliest :between restriction" do
+        validate_with(:birth_date, 1.day.ago.to_date)
+        should_have_no_error(:birth_date, :between)
+      end
+
+      it "should be valid when value is equal to latest :between restriction" do
+        validate_with(:birth_date, 1.day.from_now.to_date)
+        should_have_no_error(:birth_date, :between)
+      end
+      
+      it "should allow a range for between restriction" do
+        configure_validator(:type => :date, :between => (1.day.ago.to_date)..(1.day.from_now.to_date))
+        validate_with(:birth_date, 1.day.from_now.to_date)
+        should_have_no_error(:birth_date, :between)
+      end
+    end
+
+    describe "for time type" do
+      before do
+        configure_validator(:type => :time, :between => ["09:00", "17:00"])
+      end
+
+      it "should have error when value is before earlist :between restriction" do
+        validate_with(:birth_time, "08:59")
+        should_have_error(:birth_time, :between)
+      end
+
+      it "should have error when value is after latest :between restriction" do
+        validate_with(:birth_time, "17:01")
+        should_have_error(:birth_time, :between)
+      end
+
+      it "should be valid when value is equal to earliest :between restriction" do
+        validate_with(:birth_time, "09:00")
+        should_have_no_error(:birth_time, :between)
+      end
+
+      it "should be valid when value is equal to latest :between restriction" do
+        validate_with(:birth_time, "17:00")
+        should_have_no_error(:birth_time, :between)
+      end
+
+      it "should allow a range for between restriction" do
+        configure_validator(:type => :time, :between => "09:00".."17:00")
+        validate_with(:birth_time, "17:00")
+        should_have_no_error(:birth_time, :between)
+      end
+    end
+  end
+
+  describe "instance with :equal_to restriction" do
+
+    describe "for datetime type" do
+      before do
+        configure_validator(:equal_to => Time.now)
+      end
+
+      it "should have error when value not equal to :equal_to restriction" do
+        validate_with(:birth_date_and_time, Time.now + 1)
+        should_have_error(:birth_date_and_time, :equal_to)
+      end
+
+      it "should have error when value is equal to :equal_to restriction for all values except microscond, and microsecond is not ignored" do
+        configure_validator(:equal_to => Time.utc(2000, 1, 1, 0, 0, 0, 0), :ignore_usec => false)
+        validate_with(:birth_date_and_time, Time.utc(2000, 1, 1, 0, 0, 0, 500))
+        should_have_error(:birth_date_and_time, :equal_to)
+      end
+
+      it "should be valid when value is equal to :equal_to restriction for all values except microscond, and microsecond is ignored" do
+        configure_validator(:equal_to => Time.utc(2000, 1, 1, 0, 0, 0, 0), :ignore_usec => true)
+        validate_with(:birth_date_and_time, Time.utc(2000, 1, 1, 0, 0, 0, 500))
+        should_have_no_error(:birth_date_and_time, :equal_to)
+      end
+
+      it "should be valid when value is equal to :equal_to restriction" do
+        validate_with(:birth_date_and_time, Time.now)
+        should_have_no_error(:birth_date_and_time, :equal_to)
+      end
+    end
+
+    describe "for date type" do
+      before do
+        configure_validator(:type => :date, :equal_to => Date.today)
+      end
+
+      it "should have error when value is not equal to :equal_to restriction" do
+        validate_with(:birth_date, Date.today + 1)
+        should_have_error(:birth_date, :equal_to)
+      end
+
+      it "should be valid when value is equal to :equal_to restriction" do
+        validate_with(:birth_date, Date.today)
+        should_have_no_error(:birth_date, :equal_to)
+      end
+    end
+
+    describe "for time type" do
+      before do
+        configure_validator(:type => :time, :equal_to => "09:00:00")
+      end
+
+      it "should have error when value is not equal to :equal_to restriction" do
+        validate_with(:birth_time, "09:00:01")
+        should_have_error(:birth_time, :equal_to)
+      end
+
+      it "should be valid when value is equal to :equal_to restriction" do
+        validate_with(:birth_time, "09:00:00")
+        should_have_no_error(:birth_time, :equal_to)
+      end
+    end
+  end
+
+  describe "instance with :with_time option" do
+
+    it "should validate date attribute as datetime combining value of :with_time against restrictions " do
+      configure_validator(:type => :date, :with_time => '12:31', :on_or_before => Time.mktime(2000,1,1,12,30))
+      validate_with(:birth_date, "2000-01-01")
+      should_have_error(:birth_date, :on_or_before)
+    end
+
+    it "should skip restriction validation if :with_time value is nil" do
+      configure_validator(:type => :date, :with_time => nil, :on_or_before => Time.mktime(2000,1,1,12,30))
+      validate_with(:birth_date, "2000-01-01")
+      should_have_no_error(:birth_date, :on_or_before)
+    end
+
+  end
+
+  describe "instance with :with_date option" do
+
+    it "should validate time attribute as datetime combining value of :with_date against restrictions " do
+      configure_validator(:type => :time, :with_date => '2009-01-01', :on_or_before => Time.mktime(2000,1,1,12,30))
+      validate_with(:birth_date, "12:30")
+      should_have_error(:birth_date, :on_or_before)
+    end
+
+    it "should skip restriction validation if :with_date value is nil" do
+      configure_validator(:type => :time, :with_date => nil, :on_or_before => Time.mktime(2000,1,1,12,30))
+      validate_with(:birth_date, "12:30")
+      should_have_no_error(:birth_date, :on_or_before)
+    end
+  end
+
+  describe "instance with mixed value and restriction types" do
+
+    it "should validate datetime attribute with Date restriction" do
+      configure_validator(:type => :datetime, :on_or_before => Date.new(2000,1,1))
+      validate_with(:birth_date_and_time, "2000-01-01 00:00:00")
+      should_have_no_error(:birth_date_and_time, :on_or_before)
+    end
+
+    it "should validate date attribute with DateTime restriction value" do
+      configure_validator(:type => :date, :on_or_before => DateTime.new(2000, 1, 1, 0,0,0))
+      validate_with(:birth_date, "2000-01-01")
+      should_have_no_error(:birth_date, :on_or_before)
+    end
+
+    it "should validate date attribute with Time restriction value" do
+      configure_validator(:type => :date, :on_or_before => Time.utc(2000, 1, 1, 0,0,0))
+      validate_with(:birth_date, "2000-01-01")
+      should_have_no_error(:birth_date, :on_or_before)
+    end
+
+    it "should validate time attribute with DateTime restriction value" do
+      configure_validator(:type => :time, :on_or_before => DateTime.new(2000, 1, 1, 12,0,0))
+      validate_with(:birth_time, "12:00")
+      should_have_no_error(:birth_time, :on_or_before)
+    end
+
+    it "should validate time attribute with Time restriction value" do
+      configure_validator(:type => :time, :on_or_before => Time.utc(2000, 1, 1, 12,0,0))
+      validate_with(:birth_time, "12:00")
+      should_have_no_error(:birth_time, :on_or_before)
+    end
+  end
+
+  describe "custom_error_messages" do
+    it "should return hash of custom error messages from configuration with _message truncated from keys" do
+      configure_validator(:type => :date, :invalid_date_message => 'thats no date')
+      validator.send(:custom_error_messages)[:invalid_date].should == 'thats no date'
+    end
+
+    it "should return empty hash if no custom error messages in configuration" do
+      configure_validator(:type => :date)
+      validator.send(:custom_error_messages).should be_empty
+    end
+  end
+
+  describe "interpolation_values" do
+    if defined?(I18n)
+      it "should return hash of interpolation keys with restriction values" do
+        before = '1900-01-01'
+        configure_validator(:type => :date, :before => before)
+        validator.send(:interpolation_values, :before, before.to_date).should == {:restriction => before}
+      end
+
+      it "should return empty hash if no interpolation keys are in message" do
+        before = '1900-01-01'
+        configure_validator(:type => :date, :before => before, :before_message => 'too late')
+        validator.send(:interpolation_values, :before, before.to_date).should be_empty
+      end
+    else
+      it "should return array of interpolation values" do
+        before = '1900-01-01'
+        configure_validator(:type => :date, :before => before)
+        validator.send(:interpolation_values, :before, before.to_date).should == [before]
+      end
+    end
+  end
+
+  describe "restriction errors" do
+    before :each do
+      configure_validator(:type => :date, :before => lambda { raise })
+    end
+
+    it "should be added by default for invalid restriction" do
+      ValidatesTimeliness::Validator.ignore_restriction_errors = false
+      validate_with(:birth_date, Date.today)
+      person.errors.on(:birth_date).should match(/restriction 'before' value was invalid/)
+    end
+
+    it "should not be added when ignore switch is true and restriction is invalid" do
+      ValidatesTimeliness::Validator.ignore_restriction_errors = true
+      person.should be_valid
+    end
+
+    after :all do
+      ValidatesTimeliness::Validator.ignore_restriction_errors = false
+    end
+  end
+
+  describe "restriction value error message" do
+
+    describe "default formats" do
+
+      it "should format datetime value of restriction" do
+        configure_validator(:type => :datetime, :after => 1.day.from_now)
+        validate_with(:birth_date_and_time, Time.now)
+        person.errors.on(:birth_date_and_time).should match(/after \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\Z/)
+      end
+
+      it "should format date value of restriction" do
+        configure_validator(:type => :date, :after => 1.day.from_now)
+        validate_with(:birth_date, Time.now)
+        person.errors.on(:birth_date).should match(/after \d{4}-\d{2}-\d{2}\Z/)
+      end
+
+      it "should format time value of restriction" do
+        configure_validator(:type => :time, :after => '12:00')
+        validate_with(:birth_time, '11:59')
+        person.errors.on(:birth_time).should match(/after \d{2}:\d{2}:\d{2}\Z/)
+      end
+    end
+
+    describe "custom formats" do
+
+      before :all do
+        @@formats = ValidatesTimeliness::Validator.error_value_formats
+        ValidatesTimeliness::Validator.error_value_formats = {
+          :time     => '%H:%M %p',
+          :date     => '%d-%m-%Y',
+          :datetime => '%d-%m-%Y %H:%M %p'
+        }
+      end
+
+      it "should format datetime value of restriction" do
+        configure_validator(:type => :datetime, :after => 1.day.from_now)
+        validate_with(:birth_date_and_time, Time.now)
+        person.errors.on(:birth_date_and_time).should match(/after \d{2}-\d{2}-\d{4} \d{2}:\d{2} (AM|PM)\Z/)
+      end
+
+      it "should format date value of restriction" do
+        configure_validator(:type => :date, :after => 1.day.from_now)
+        validate_with(:birth_date, Time.now)
+        person.errors.on(:birth_date).should match(/after \d{2}-\d{2}-\d{4}\Z/)
+      end
+
+      it "should format time value of restriction" do
+        configure_validator(:type => :time, :after => '12:00')
+        validate_with(:birth_time, '11:59')
+        person.errors.on(:birth_time).should match(/after \d{2}:\d{2} (AM|PM)\Z/)
+      end
+
+      after :all do
+        ValidatesTimeliness::Validator.error_value_formats = @@formats
+      end
+    end
+
+  end
+
+  def configure_validator(options={})
+    @validator = ValidatesTimeliness::Validator.new(options)
+  end
+
+  def validate_with(attr_name, value)
+    person.send("#{attr_name}=", value)
+    validator.call(person, attr_name, value)
+  end
+
+  def should_have_error(attr_name, error)
+    message = error_messages[error]
+    person.errors.on(attr_name).should match(/#{message}/)
+  end
+
+  def should_have_no_error(attr_name, error)
+    message = error_messages[error]
+    errors = person.errors.on(attr_name)
+    if errors
+      errors.should_not match(/#{message}/)
+    else
+      errors.should be_nil
+    end
+  end
+
+  def error_messages
+    return @error_messages if defined?(@error_messages)
+    messages = validator.send(:error_messages)
+    @error_messages = messages.inject({}) {|h, (k, v)| h[k] = v.sub(/ (\%s|\{\{\w*\}\}).*/, ''); h }
+  end
+end

validates_timeliness.gemspec

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{validates_timeliness}
+  s.version = "1.1.7"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Adam Meehan"]
+  s.autorequire = %q{validates_timeliness}
+  s.date = %q{2009-03-26}
+  s.description = %q{Date and time validation plugin for Rails 2.x which allows custom formats}
+  s.email = %q{adam.meehan@gmail.com}
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE", "TODO", "CHANGELOG"]
+  s.files = ["LICENSE", "README.rdoc", "Rakefile", "TODO", "CHANGELOG", "lib/validates_timeliness", "lib/validates_timeliness/core_ext", "lib/validates_timeliness/core_ext/date.rb", "lib/validates_timeliness/core_ext/date_time.rb", "lib/validates_timeliness/core_ext/time.rb", "lib/validates_timeliness/action_view", "lib/validates_timeliness/action_view/instance_tag.rb", "lib/validates_timeliness/locale", "lib/validates_timeliness/locale/en.yml", "lib/validates_timeliness/validation_methods.rb", "lib/validates_timeliness/active_record", "lib/validates_timeliness/active_record/attribute_methods.rb", "lib/validates_timeliness/active_record/multiparameter_attributes.rb", "lib/validates_timeliness/formats.rb", "lib/validates_timeliness/validator.rb", "lib/validates_timeliness/spec", "lib/validates_timeliness/spec/rails", "lib/validates_timeliness/spec/rails/matchers", "lib/validates_timeliness/spec/rails/matchers/validate_timeliness.rb", "lib/validates_timeliness.rb", "spec/core_ext", "spec/core_ext/dummy_time_spec.rb", "spec/validator_spec.rb", "spec/action_view", "spec/action_view/instance_tag_spec.rb", "spec/ginger_scenarios.rb", "spec/validation_methods_spec.rb", "spec/spec_helper.rb", "spec/formats_spec.rb", "spec/active_record", "spec/active_record/attribute_methods_spec.rb", "spec/active_record/multiparameter_attributes_spec.rb", "spec/time_travel", "spec/time_travel/time_travel.rb", "spec/time_travel/time_extensions.rb", "spec/time_travel/MIT-LICENSE", "spec/spec", "spec/spec/rails", "spec/spec/rails/matchers", "spec/spec/rails/matchers/validate_timeliness_spec.rb", "spec/resources", "spec/resources/person.rb", "spec/resources/sqlite_patch.rb", "spec/resources/schema.rb", "spec/resources/application.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/adzap/validates_timeliness}
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{validatestime}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Date and time validation plugin for Rails 2.x which allows custom formats}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end