v4.1.0

This reverts commit a05f091a42.

.gitignore

@@ -1,3 +1,6 @@
 pkg/
 .bundle/
 .rvmrc
+Gemfile.lock
+gemfiles/*.lock
+.byebug_history

.rspec

@@ -1,2 +1,4 @@
---format nested
+--format documentation
 --color
+--require spec_helper
+--require byebug

.travis.yml

@@ -0,0 +1,30 @@
+language: ruby
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
+before_script:
+  - bundle install
+cache: bundler
+bundler_args: --verbose
+
+matrix:
+  include:
+    - rvm: "2.3.7"
+      gemfile: gemfiles/rails_4_0.gemfile
+    - rvm: "2.3.7"
+      gemfile: gemfiles/rails_4_1.gemfile
+    - rvm: "2.3.7"
+      gemfile: gemfiles/rails_4_2.gemfile
+    - rvm: "2.4.6"
+      gemfile: gemfiles/rails_4_2.gemfile
+    - rvm: "2.5.5"
+      gemfile: gemfiles/rails_4_2.gemfile
+
+script: 'bundle exec rspec'
+
+notifications:
+  email:
+    recipients:
+      - adam.meehan@gmail.com
+    on_failure: change
+    on_success: never

Appraisals

@@ -0,0 +1,11 @@
+appraise "rails_4_0" do
+  gem "rails", "~> 4.0.13"
+end
+
+appraise "rails_4_1" do
+  gem "rails", "~> 4.1.14"
+end
+
+appraise "rails_4_2" do
+  gem "rails", "~> 4.2.11"
+end

CHANGELOG.rdoc

@@ -1,3 +1,62 @@
+= 4.1.0 [2019-06-11]
+* Relaxed Timeliness dependency version to >= 0.3.10 and < 1, which allows
+  version 0.4 with threadsafety fix for use_us_formats and use_euro_formats
+  hot switching in a request.
+
+= 4.0.2 [2016-01-07]
+* Fix undefine_generated_methods ivar guard setting to false
+
+= 4.0.1 [2016-01-06]
+* Fix undefine_generated_methods thread locking bug
+* Created an ActiveModel ORM, for manual require if using without any full blown ORM
+
+= 4.0.0 [2015-12-29]
+* Extracted mongoid support into https://github.com/adzap/validates_timeliness-mongoid which is broken (not supported anymore).
+* Fixed Rails 4.0, 4.1 and 4.2 compatability issues
+* Upgrade specs to RSpec 3
+* Added travis config
+* Huge thanks to @johncarney for keeping it alive with his fork (https://github.com/johncarney/validates_timeliness)
+
+= 3.0.15 [2015-12-29]
+* Fixes mongoid 3 support and removes mongoid 2 support(johnnyshields)
+* Some documentation/comments tidying
+* Some general tidying up
+
+= 3.0.14 [2012-08-23]
+* Fix for using validates :timeliness => {} form to correctly add attributes to timeliness validated attributes.
+
+= 3.0.13 [2012-08-21]
+* Fix ActiveRecord issues with using plugin parser by using old way of caching values.
+* Allow any ActiveRecord non-column attribute to be validated
+
+= 3.0.12 [2012-06-23]
+* Fix load order issue when relying on Railtie to load ActiveRecord extension
+
+= 3.0.11 [2012-04-01]
+* Change dependency on Timeliness version due to a broken release
+
+= 3.0.10 [2012-03-26]
+* Fix for ActiveRecord shim and validation with :allow_blank => true in AR 3.1+. Fixes issue#52.
+
+= 3.0.9 [2012-03-26]
+* ActiveRecord 3.1+ suport
+* Fixes for multiparameter extension with empty date values (thanks @mogox, @Sharagoz)
+
+= 3.0.8 [2011-12-24]
+* Remove deprecated InstanceMethods module when using AS::Concern (carlosantoniodasilva)
+* Update Mongoid shim for v2.3 compatability.
+
+= 3.0.7 [2011-09-21]
+* Fix ActiveRecord before_type_cast extension for non-dirty attributes.
+* Don't override AR before_type_cast for >= 3.1.0 which now has it's own implementation for date/time attributes.
+* Fix DateTimeSelect extension to convert params to integers (#45)
+* Add #change method to DateTimeSelect extension (@trusche, #45)
+* Cleanup Mongoid shim.
+
+= 3.0.6 [2011-05-09]
+* Fix for AR type conversion for date columns when using plugin parser.
+* Add timeliness_type_cast_code for ORM specific type casting after parsing.
+
 = 3.0.5 [2011-01-29]
 * Fix for Conversion#parse when given nil value (closes issue #34)
 

Gemfile

@@ -1,18 +1,13 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
-gem 'ZenTest'
-gem 'rails', '3.0.3'
-gem 'rspec', '~> 2.4'
-gem 'rspec-rails', '~> 2.4'
+gem 'rake'
+gem 'rails', '~> 4.2.11.1'
+gem 'rspec'
+gem 'rspec-rails', '~> 3.7'
 gem 'timecop'
-gem 'rspec_tag_matchers'
-
-group :mongoid do
-  gem 'mongoid', '2.0.0.rc.6'
-end
-
-group :active_record do
-  gem 'sqlite3-ruby', :require => 'sqlite3'
-end
+gem 'byebug'
+gem 'appraisal'
+gem 'sqlite3'
+gem 'nokogiri', '~> 1.8'

Gemfile.lock

@@ -1,119 +0,0 @@
-PATH
-  remote: .
-  specs:
-    validates_timeliness (3.0.4)
-      timeliness (~> 0.3.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    ZenTest (4.4.2)
-    abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.7)
-    bson (1.2.0)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    mail (2.2.14)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    mongo (1.2.0)
-      bson (>= 1.2.0)
-    mongoid (2.0.0.rc.6)
-      activemodel (~> 3.0)
-      mongo (~> 1.2)
-      tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
-    nokogiri (1.4.4)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
-      bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-    rspec-rails (2.4.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.4.0)
-    rspec_tag_matchers (1.0.0)
-      nokogiri (>= 1.4.0)
-      rspec-rails (>= 1.2.6)
-    sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    thor (0.14.6)
-    timecop (0.3.5)
-    timeliness (0.3.3)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
-    will_paginate (3.0.pre2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ZenTest
-  mongoid (= 2.0.0.rc.6)
-  rails (= 3.0.3)
-  rspec (~> 2.4)
-  rspec-rails (~> 2.4)
-  rspec_tag_matchers
-  sqlite3-ruby
-  timecop
-  timeliness (~> 0.3.2)
-  validates_timeliness!

README.rdoc

@@ -1,13 +1,13 @@
 = ValidatesTimeliness
 
 * Source:  http://github.com/adzap/validates_timeliness
-* Bugs:    http://github.com/adzap/validates_timeliness/issues
+* Issues:  http://github.com/adzap/validates_timeliness/issues
 
 == Description
 
-Complete validation of dates, times and datetimes for Rails 3.x and ActiveModel.
+Complete validation of dates, times and datetimes for Rails 4.x and ActiveModel.
 
-If you a looking for the old version for Rails 2.x go here[http://github.com/adzap/validates_timeliness/tree/v2.3].
+If you a looking for the old version for Rails 3.x go here[http://github.com/adzap/validates_timeliness/tree/v3.x].
 
 
 == Features
@@ -18,24 +18,19 @@ If you a looking for the old version for Rails 2.x go here[http://github.com/adz
 
 * Only Rails date/time validation plugin offering complete validation (See ORM/ODM support)
 
-* Adds extensions to fix Rails date/time select issues (See Extensions)
-
 * Uses extensible date/time parser (Using {timeliness gem}[http://github.com/adzap/timeliness]. See Plugin Parser)
 
-* Supports I18n for the error messages
+* Adds extensions to fix Rails date/time select issues (See Extensions)
+
+* Supports I18n for the error messages. For multi-language support try {timeliness-i18n gem}[https://github.com/pedrofurtado/timeliness-i18n].
+
+* Supports all the Rubies (that any sane person would be using in production).
 
-* Supports Ruby 1.8.x, 1.9.x and Rubinius.
 
 == Installation
 
-As plugin (from master)
-
-  rails plugin install git://github.com/adzap/validates_timeliness.git
-
-As gem
-
   # in Gemfile
-  gem 'validates_timeliness', '~> 3.0.2'
+  gem 'validates_timeliness', '~> 4.0'
 
   # Run bundler
   $ bundle install
@@ -44,7 +39,7 @@ Then run
   
   $ rails generate validates_timeliness:install
 
-This creates configuration initializer and locale files. In the initializer, you there are a number of config
+This creates configuration initializer and locale files. In the initializer, there are a number of config
 options to customize the plugin.
 
 NOTE: You may wish to enable the plugin parser and the extensions to start. Please read those sections first.
@@ -54,13 +49,16 @@ NOTE: You may wish to enable the plugin parser and the extensions to start. Plea
 
   validates_datetime :occurred_at
 
-  validates_date :date_of_birth :before => lambda { 18.years.ago },
+  validates_date :date_of_birth, :before => lambda { 18.years.ago },
                                  :before_message => "must be at least 18 years old"
 
   validates_datetime :finish_time, :after => :start_time # Method symbol
 
   validates_date :booked_at, :on => :create, :on_or_after => :today # See Restriction Shorthand.
-  validates_time :booked_at, :between => ['9.00am', '5:00pm']
+
+  validates_time :booked_at, :between => ['9:00am', '5:00pm'] # On or after 9:00AM and on or before 5:00PM
+  validates_time :booked_at, :between => '9:00am'..'5:00pm' # The same as previous example
+  validates_time :booked_at, :between => '9:00am'...'5:00pm' # On or after 9:00AM and strictly before 5:00PM
 
   validates_time :breakfast_time, :on_or_after => '6:00am',
                                   :on_or_after_message => 'must be after opening time',
@@ -79,7 +77,7 @@ validation method
     validates :date_of_birth, :timeliness => {:on_or_before => lambda { Date.current }, :type => :date}
   end
 
-  # or even on a specific record, per ActiveModel API.
+or even on a specific record, per ActiveModel API.
 
   @person.validates_date :date_of_birth, :on_or_before => lambda { Date.current }
 
@@ -139,8 +137,8 @@ like so
 
   ValidatesTimeliness.setup do |config|
 
-    # Extend ORM/ODMs for full support (:active_record, :mongoid).
-    config.extend_orms = [ :mongoid ]
+    # Extend ORM/ODMs for full support (:active_record).
+    config.extend_orms = [ :active_record ]
 
   end
 
@@ -178,8 +176,8 @@ You can also use validation options for custom error messages. The following opt
     :after_message
     :on_or_after_message
 
-Note: There is no :between_message option. The between error message should be defined using the 
-:on_or_before and :on_or_after messages.
+Note: There is no :between_message option. The between error message should be defined using the :on_or_after and :on_or_before
+(:before in case when :between argument is a Range with excluded high value, see Examples) messages.
 
 It is highly recommended you use the I18n system for error messages.
 
@@ -298,4 +296,4 @@ To see the generous people who have contributed code, take a look at the {contri
 
 == License
 
-Copyright (c) 2008-2010 Adam Meehan, released under the MIT license
+Copyright (c) 2008 Adam Meehan, released under the MIT license

Rakefile

@@ -1,36 +1,12 @@
-require 'rubygems'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rubygems/specification'
+require 'bundler'
+require 'bundler/setup'
+
+require 'appraisal'
+
+Bundler::GemHelper.install_tasks
+
+require 'rdoc/task'
 require 'rspec/core/rake_task'
-require 'lib/validates_timeliness/version'
-
-GEM_NAME = "validates_timeliness"
-GEM_VERSION = ValidatesTimeliness::VERSION
-
-spec = Gem::Specification.new do |s|
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.summary = %q{Date and time validation plugin for Rails which allows custom formats}
-  s.description = s.summary
-  s.author = "Adam Meehan"
-  s.email = "adam.meehan@gmail.com"
-  s.homepage = "http://github.com/adzap/validates_timeliness"
-  s.require_path = 'lib'
-
-  s.add_runtime_dependency 'timeliness', '~> 0.3.2'
-
-  s.files       = `git ls-files`.split("\n") - %w{ .rspec .gitignore autotest/discover.rb Gemfile Gemfile.lock }
-  s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "LICENSE"]
-end
-
-desc 'Default: run specs.'
-task :default => :spec
 
 desc "Run specs"
 RSpec::Core::RakeTask.new(:spec)
@@ -50,18 +26,5 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Install the gem locally"
-task :install => [:package] do
-  sh %{gem install pkg/#{GEM_NAME}-#{GEM_VERSION}}
-end
-
-desc "Create a gemspec file"
-task :make_spec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
-end
+desc 'Default: run specs.'
+task :default => :spec

autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }

gemfiles/rails_4_0.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0.13"
+gem "rspec", "~> 3.6.0"
+gem "rspec-rails", "~> 3.6.0"
+gem "timecop"
+gem "byebug"
+gem "appraisal"
+gem "sqlite3", "~> 1.3.0"
+gem "nokogiri", "1.6.7"
+
+gemspec path: "../"

gemfiles/rails_4_1.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.14"
+gem "rspec", "~> 3.6.0"
+gem "rspec-rails", "~> 3.6.0"
+gem "timecop"
+gem "byebug"
+gem "appraisal"
+gem "sqlite3", "~> 1.3.0"
+gem "nokogiri", "1.6.7"
+
+gemspec path: "../"

gemfiles/rails_4_2.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.8"
+gem "rspec", "~> 3.6.0"
+gem "rspec-rails", "~> 3.6.0"
+gem "timecop"
+gem "byebug"
+gem "appraisal"
+gem "sqlite3", "~> 1.3.0"
+gem "nokogiri", "1.6.7"
+
+gemspec path: "../"

lib/generators/validates_timeliness/install_generator.rb

@@ -3,7 +3,6 @@ module ValidatesTimeliness
     class InstallGenerator < Rails::Generators::Base
       desc "Copy ValidatesTimeliness default files"
       source_root File.expand_path('../templates', __FILE__)
-      class_option :template_engine
 
       def copy_initializers
         copy_file 'validates_timeliness.rb', 'config/initializers/validates_timeliness.rb'

lib/generators/validates_timeliness/templates/validates_timeliness.rb

@@ -1,6 +1,6 @@
 ValidatesTimeliness.setup do |config|
-  # Extend ORM/ODMs for full support (:active_record, :mongoid).
-  # config.extend_orms = [ :active_record ]
+  # Extend ORM/ODMs for full support (:active_record included).
+  config.extend_orms = [ :active_record ]
   #
   # Default timezone
   # config.default_timezone = :utc
@@ -32,7 +32,7 @@ ValidatesTimeliness.setup do |config|
   # Remove one or more formats making them invalid. e.g. remove_formats(:date, 'dd/mm/yyy')
   # config.parser.remove_formats()
   #
-  # Change the amiguous year threshold when parsing a 2 digit year
+  # Change the ambiguous year threshold when parsing a 2 digit year
   # config.parser.ambiguous_year_threshold =  30
   #
   # Treat ambiguous dates, such as 01/02/1950, as a Non-US date.

lib/validates_timeliness.rb

@@ -24,26 +24,24 @@ module ValidatesTimeliness
 
   class << self
     delegate :default_timezone, :default_timezone=, :dummy_date_for_time_type, :dummy_date_for_time_type=, :to => Timeliness
+
+    attr_accessor :extend_orms, :ignore_restriction_errors, :restriction_shorthand_symbols, :use_plugin_parser
   end
 
-  # Extend ORM/ODMs for full support (:active_record, :mongoid).
-  mattr_accessor :extend_orms
-  @@extend_orms = []
+  # Extend ORM/ODMs for full support (:active_record).
+  self.extend_orms = []
 
   # Ignore errors when restriction options are evaluated
-  mattr_accessor :ignore_restriction_errors
-  @@ignore_restriction_errors = false
+  self.ignore_restriction_errors = false
 
   # Shorthand time and date symbols for restrictions
-  mattr_accessor :restriction_shorthand_symbols
-  @@restriction_shorthand_symbols = {
+  self.restriction_shorthand_symbols = {
     :now   => lambda { Time.current },
     :today => lambda { Date.current }
   }
 
   # Use the plugin date/time parser which is stricter and extensible
-  mattr_accessor :use_plugin_parser
-  @@use_plugin_parser = false
+  self.use_plugin_parser = false
 
   # Default timezone
   self.default_timezone = :utc
@@ -51,15 +49,17 @@ module ValidatesTimeliness
   # Set the dummy date part for a time type values.
   self.dummy_date_for_time_type = [ 2000, 1, 1 ]
 
-  def self.parser
-    Timeliness
-  end
-
   # Setup method for plugin configuration
   def self.setup
     yield self
+    load_orms
+  end
+
+  def self.load_orms
     extend_orms.each {|orm| require "validates_timeliness/orm/#{orm}" }
   end
+
+  def self.parser; Timeliness end
 end
 
 require 'validates_timeliness/conversion'

lib/validates_timeliness/attribute_methods.rb

@@ -20,54 +20,69 @@ module ValidatesTimeliness
         :datetime
       end
 
-      protected
-
       def define_timeliness_methods(before_type_cast=false)
         return if timeliness_validated_attributes.blank?
         timeliness_validated_attributes.each do |attr_name|
-          define_timeliness_write_method(attr_name)
-          define_timeliness_before_type_cast_method(attr_name) if before_type_cast
+          define_attribute_timeliness_methods(attr_name, before_type_cast)
         end
       end
 
-      def define_timeliness_write_method(attr_name)
-        type = timeliness_attribute_type(attr_name)
-        timezone_aware = timeliness_attribute_timezone_aware?(attr_name)
-
-        method_body, line = <<-EOV, __LINE__ + 1
-          def #{attr_name}=(value)
-            @timeliness_cache ||= {}
-            @timeliness_cache["#{attr_name}"] = value
-            #{ "value = Timeliness::Parser.parse(value, :#{type}, :zone => (:current if #{timezone_aware})) if value.is_a?(String)" if ValidatesTimeliness.use_plugin_parser }
-            super
-          end
-        EOV
-        generated_timeliness_methods.module_eval(method_body, __FILE__, line)
-      end
-
-      def define_timeliness_before_type_cast_method(attr_name)
-        method_body, line = <<-EOV, __LINE__ + 1
-          def #{attr_name}_before_type_cast
-            _timeliness_raw_value_for('#{attr_name}')
-          end
-        EOV
-        generated_timeliness_methods.module_eval(method_body, __FILE__, line)
-      end
-
       def generated_timeliness_methods
-        @generated_timeliness_methods ||= Module.new.tap { |m| include(m) }
+        @generated_timeliness_methods ||= Module.new { |m| 
+          extend Mutex_m
+        }.tap { |mod| include mod }
+      end
+
+      def undefine_timeliness_attribute_methods
+        generated_timeliness_methods.module_eval do
+          instance_methods.each { |m| undef_method(m) } 
         end
       end
 
-    module InstanceMethods
-      def _timeliness_raw_value_for(attr_name)
-        @timeliness_cache && @timeliness_cache[attr_name.to_s]
+      protected
+
+      def define_attribute_timeliness_methods(attr_name, before_type_cast=false)
+        define_timeliness_write_method(attr_name)
+        define_timeliness_before_type_cast_method(attr_name) if before_type_cast
+      end
+
+      def define_timeliness_write_method(attr_name)
+        generated_timeliness_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
+          def #{attr_name}=(value)
+            write_timeliness_attribute('#{attr_name}', value)
+          end
+        STR
+      end
+
+      def define_timeliness_before_type_cast_method(attr_name)
+        generated_timeliness_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
+          def #{attr_name}_before_type_cast
+            read_timeliness_attribute_before_type_cast('#{attr_name}')
+          end
+        STR
+      end
+    end
+
+    def write_timeliness_attribute(attr_name, value)
+      @timeliness_cache ||= {}
+      @timeliness_cache[attr_name] = value
+
+      if ValidatesTimeliness.use_plugin_parser
+        type = self.class.timeliness_attribute_type(attr_name)
+        timezone = :current if self.class.timeliness_attribute_timezone_aware?(attr_name)
+        value = Timeliness::Parser.parse(value, type, :zone => timezone)
+        value = value.to_date if value && type == :date
+      end
+
+      @attributes[attr_name] = value
+    end
+
+    def read_timeliness_attribute_before_type_cast(attr_name)
+      @timeliness_cache && @timeliness_cache[attr_name] || @attributes[attr_name]
     end
 
     def _clear_timeliness_cache
       @timeliness_cache = {}
     end
   end
-
-  end
 end

lib/validates_timeliness/conversion.rb

@@ -12,6 +12,8 @@ module ValidatesTimeliness
         value.to_date
       when :datetime
         value.is_a?(Time) ? value : value.to_time
+      else
+        value
       end
       if options[:ignore_usec] && value.is_a?(Time)
         Timeliness::Parser.make_time(Array(value).reverse[4..9], (:current if @timezone_aware))

lib/validates_timeliness/extensions.rb

@@ -1,14 +1,13 @@
 module ValidatesTimeliness
   module Extensions
     autoload :DateTimeSelect, 'validates_timeliness/extensions/date_time_select'
-    autoload :MultiparameterHandler, 'validates_timeliness/extensions/multiparameter_handler'
   end
 
   def self.enable_date_time_select_extension!
-    ::ActionView::Helpers::InstanceTag.send(:include, ValidatesTimeliness::Extensions::DateTimeSelect)
+    ::ActionView::Helpers::Tags::DateSelect.send(:include, ValidatesTimeliness::Extensions::DateTimeSelect)
   end
 
   def self.enable_multiparameter_extension!
-    ::ActiveRecord::Base.send(:include, ValidatesTimeliness::Extensions::MultiparameterHandler)
+    require 'validates_timeliness/extensions/multiparameter_handler'
   end
 end

lib/validates_timeliness/extensions/date_time_select.rb

@@ -9,35 +9,45 @@ module ValidatesTimeliness
       # It's a minor usability improvement which is rarely an issue for the user.
 
       included do
-        alias_method_chain :datetime_selector, :timeliness
+        alias_method_chain :value, :timeliness
       end
 
-      module InstanceMethods
+      class TimelinessDateTime
+        attr_accessor :year, :month, :day, :hour, :min, :sec
 
-        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)
+        def initialize(year, month, day, hour, min, sec)
+          @year, @month, @day, @hour, @min, @sec = year, month, day, hour, min, sec
         end
 
-        def value(object)
-          unless @timeliness_date_or_time_tag && @template_object.params[@object_name]
-            return super
+        # adapted from activesupport/lib/active_support/core_ext/date_time/calculations.rb, line 36 (3.0.7)
+        def change(options)
+          TimelinessDateTime.new(
+            options[:year]  || year,
+            options[:month] || month,
+            options[:day]   || day,
+            options[:hour]  || hour,
+            options[:min]   || (options[:hour] ? 0 : min),
+            options[:sec]   || ((options[:hour] || options[:min]) ? 0 : sec)
+          )
         end
+      end
+
+      def value_with_timeliness(object)
+        return value_without_timeliness(object) unless @template_object.params[@object_name]
+
+        @template_object.params[@object_name]
 
         pairs = @template_object.params[@object_name].select {|k,v| k =~ /^#{@method_name}\(/ }
-          return super if pairs.empty?
+        return value_without_timeliness(object) if pairs.empty?
 
         values = [nil] * 6
         pairs.map do |(param, value)|
-            position = param.scan(/\(([0-9]*).*\)/).first.first
-            values[position.to_i-1] = value
+          position = param.scan(/\((\d+)\w+\)/).first.first
+          values[position.to_i-1] = value.to_i
         end
 
         TimelinessDateTime.new(*values)
       end
-      end
 
     end
   end

lib/validates_timeliness/extensions/multiparameter_handler.rb

@@ -1,69 +1,74 @@
-module ValidatesTimeliness
-  module Extensions
-    module MultiparameterHandler
-      extend ActiveSupport::Concern
-
-      # Stricter handling of date and time values from multiparameter 
-      # assignment from the date/time select view helpers
-
-      included do
-        alias_method_chain :instantiate_time_object, :timeliness
-        alias_method_chain :execute_callstack_for_multiparameter_attributes, :timeliness
-      end
-
+ActiveRecord::AttributeAssignment::MultiparameterAttribute.class_eval do
   private
 
+  # Yield if date values are valid
+  def validate_multiparameter_date_values(set_values)
+    if set_values[0..2].all?{ |v| v.present? } && Date.valid_civil?(*set_values[0..2])
+      yield
+    else
+      invalid_multiparameter_date_or_time_as_string(set_values)
+    end
+  end
+
   def invalid_multiparameter_date_or_time_as_string(values)
     value =  [values[0], *values[1..2].map {|s| s.to_s.rjust(2,"0")} ].join("-")
     value += ' ' + values[3..5].map {|s| s.to_s.rjust(2, "0") }.join(":") unless values[3..5].empty?
     value
   end
 
-      def instantiate_time_object_with_timeliness(name, values)
-        if Date.valid_civil?(*values[0..2])
-          instantiate_time_object_without_timeliness(name, values)
+  def instantiate_time_object(set_values)
+    raise if set_values.any?(&:nil?)
+
+    validate_multiparameter_date_values(set_values) {
+      set_values = set_values.map {|v| v.is_a?(String) ? v.strip : v }
+
+      if object.class.send(:create_time_zone_conversion_attribute?, name, cast_type_or_column)
+        Time.zone.local(*set_values)
       else
-          invalid_multiparameter_date_or_time_as_string(values)
+        Time.send(object.class.default_timezone, *set_values)
+      end
+    }
+  rescue
+    invalid_multiparameter_date_or_time_as_string(set_values)
+  end
+
+  def read_time
+    # If column is a :time (and not :date or :timestamp) there is no need to validate if
+    # there are year/month/day fields
+    if cast_type_or_column.type == :time
+      # if the column is a time set the values to their defaults as January 1, 1970, but only if they're nil
+      { 1 => 1970, 2 => 1, 3 => 1 }.each do |key,value|
+        values[key] ||= value
       end
     end
 
-      def instantiate_date_object(name, values)
-        values = values.map { |v| v.nil? ? 1 : v }
-        Date.new(*values)
-      rescue ArgumentError => ex
-        invalid_multiparameter_date_or_time_as_string(values)
+    max_position = extract_max_param(6)
+    set_values   = values.values_at(*(1..max_position))
+
+    instantiate_time_object(set_values)
   end
 
-      def execute_callstack_for_multiparameter_attributes_with_timeliness(callstack)
-        errors = []
-        callstack.each do |name, values_with_empty_parameters|
-          begin
-            klass = (self.class.reflect_on_aggregation(name.to_sym) || column_for_attribute(name)).klass
-            values = values_with_empty_parameters.reject { |v| v.nil? }
+  def read_date
+    set_values = values.values_at(1,2,3).map {|v| v.is_a?(String) ? v.strip : v }
     
-            if values.empty?
-              send(name + "=", nil)
+    if set_values.any? { |v| v.is_a?(String) }
+      Timeliness.parse(set_values.join('-'), :date).try(:to_date) or raise TypeError
     else
-
-              value = if Time == klass
-                instantiate_time_object(name, values)
-              elsif Date == klass
-                instantiate_date_object(name, values_with_empty_parameters)
-              else
-                klass.new(*values)
+      Date.new(*set_values)
+    end
+  rescue TypeError, ArgumentError, NoMethodError => ex # if Date.new raises an exception on an invalid date
+    # Date.new with nil values throws NoMethodError
+    raise ex if ex.is_a?(NoMethodError) && ex.message !~ /undefined method `div' for/
+    invalid_multiparameter_date_or_time_as_string(set_values)
   end
 
-              send(name + "=", value)
-            end
-          rescue => ex
-            errors << ActiveRecord::AttributeAssignmentError.new("error on assignment #{values.inspect} to #{name}", ex, name)
-          end
-        end
-        unless errors.empty?
-          raise ActiveRecord::MultiparameterAssignmentErrors.new(errors), "#{errors.size} error(s) on assignment of multiparameter attributes"
-        end
+  # Cast type is v4.2 and column before
+  def cast_type_or_column
+    @cast_type || @column
   end
 
+  def timezone_conversion_attribute?
+    object.class.send(:create_time_zone_conversion_attribute?, name, column)
   end
-  end
+
 end

lib/validates_timeliness/helper_methods.rb

@@ -14,13 +14,14 @@ module ActiveModel
         timeliness_validation_for attr_names, :datetime
       end
 
-      def timeliness_validation_for(attr_names, type)
-        options = _merge_attributes(attr_names).merge(:type => type)
-        if respond_to?(:timeliness_validated_attributes)
-          self.timeliness_validated_attributes ||= []
-          self.timeliness_validated_attributes += (attr_names - self.timeliness_validated_attributes)
+      def validates_timeliness_of(*attr_names)
+        timeliness_validation_for attr_names
       end
-        validates_with ValidatesTimeliness::Validator, options
+
+      def timeliness_validation_for(attr_names, type=nil)
+        options = _merge_attributes(attr_names)
+        options.update(:type => type) if type
+        validates_with TimelinessValidator, options
       end
     end
 

lib/validates_timeliness/orm/active_model.rb

@@ -0,0 +1,20 @@
+module ValidatesTimeliness
+  module ORM
+    module ActiveModel
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        public
+
+        def define_attribute_methods(*attr_names)
+          super.tap { define_timeliness_methods}
+        end
+
+        def undefine_attribute_methods
+          super.tap { undefine_timeliness_attribute_methods }
+        end
+      end
+      
+    end
+  end
+end

lib/validates_timeliness/orm/active_record.rb

@@ -4,28 +4,90 @@ module ValidatesTimeliness
       extend ActiveSupport::Concern
 
       module ClassMethods
-        def define_attribute_methods
-          super
-          # Define write method and before_type_cast method
-          define_timeliness_methods(true)
-        end
+        public
 
         def timeliness_attribute_timezone_aware?(attr_name)
-          attr_name = attr_name.to_s
-          create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name])
+          create_time_zone_conversion_attribute?(attr_name, timeliness_column_for_attribute(attr_name))
         end
 
         def timeliness_attribute_type(attr_name)
-          columns_hash[attr_name.to_s].type
+          timeliness_column_for_attribute(attr_name).type
+        end
+
+        if ::ActiveModel.version >= Gem::Version.new('4.2')
+          def timeliness_column_for_attribute(attr_name)
+            columns_hash.fetch(attr_name.to_s) do |key|
+              validation_type = _validators[key.to_sym].find {|v| v.kind == :timeliness }.type.to_s
+              ::ActiveRecord::ConnectionAdapters::Column.new(key, nil, lookup_cast_type(validation_type), validation_type)
             end
           end
           
-      module InstanceMethods
+          def lookup_cast_type(sql_type)
+            case sql_type
+            when 'datetime' then ::ActiveRecord::Type::DateTime.new
+            when 'date' then ::ActiveRecord::Type::Date.new
+            when 'time' then ::ActiveRecord::Type::Time.new
+            end
+          end
+        else
+          def timeliness_column_for_attribute(attr_name)
+            columns_hash.fetch(attr_name.to_s) do |key|
+              validation_type = _validators[key.to_sym].find {|v| v.kind == :timeliness }.type.to_s
+              ::ActiveRecord::ConnectionAdapters::Column.new(key, nil, validation_type)
+            end
+          end
+        end
+
+        def define_attribute_methods
+          super.tap { 
+            generated_timeliness_methods.synchronize do
+              return if @timeliness_methods_generated
+              define_timeliness_methods true
+              @timeliness_methods_generated = true
+            end
+          }
+        end
+
+        def undefine_attribute_methods
+          super.tap { 
+            generated_timeliness_methods.synchronize do
+              return unless @timeliness_methods_generated
+              undefine_timeliness_attribute_methods 
+              @timeliness_methods_generated = false
+            end
+          }
+        end
+        # Override to overwrite methods in ActiveRecord attribute method module because in AR 4+
+        # there is curious code which calls the method directly from the generated methods module
+        # via bind inside method_missing. This means our method in the formerly custom timeliness
+        # methods module was never reached.
+        def generated_timeliness_methods
+          generated_attribute_methods
+        end
+      end
+
+      def write_timeliness_attribute(attr_name, value)
+        @timeliness_cache ||= {}
+        @timeliness_cache[attr_name] = value
+
+        if ValidatesTimeliness.use_plugin_parser
+          type = self.class.timeliness_attribute_type(attr_name)
+          timezone = :current if self.class.timeliness_attribute_timezone_aware?(attr_name)
+          value = Timeliness::Parser.parse(value, type, :zone => timezone)
+          value = value.to_date if value && type == :date
+        end
+
+        write_attribute(attr_name, value)
+      end
+      
+      def read_timeliness_attribute_before_type_cast(attr_name)
+        @timeliness_cache && @timeliness_cache[attr_name] || read_attribute_before_type_cast(attr_name)
+      end
+
       def reload(*args)
         _clear_timeliness_cache
         super
       end
-      end
 
     end
   end

lib/validates_timeliness/orm/mongoid.rb

@@ -1,64 +0,0 @@
-module ValidatesTimeliness
-  module ORM
-    module Mongoid
-      extend ActiveSupport::Concern
-      # You need define the fields before you define the validations.
-      # It is best to use the plugin parser to avoid errors on a bad
-      # field value in Mongoid. Parser will return nil rather than error.
-
-      module ClassMethods 
-        # Mongoid has no bulk attribute method definition hook. It defines
-        # them with each field definition. So we likewise define them after
-        # each validation is defined.
-        #
-        def timeliness_validation_for(attr_names, type)
-          super
-          attr_names.each { |attr_name| define_timeliness_write_method(attr_name) }
-        end
-
-        def define_timeliness_write_method(attr_name)
-          type = timeliness_attribute_type(attr_name)
-          method_body, line = <<-EOV, __LINE__ + 1
-            def #{attr_name}=(value)
-              @timeliness_cache ||= {}
-              @timeliness_cache["#{attr_name}"] = value
-              #{ "value = Timeliness::Parser.parse(value, :#{type}) if value.is_a?(String)" if ValidatesTimeliness.use_plugin_parser }
-              write_attribute(:#{attr_name}, value)
-            end
-          EOV
-          class_eval(method_body, __FILE__, line)
-        end
-
-        def timeliness_attribute_type(attr_name)
-          {
-            Date => :date,
-            Time => :datetime,
-            DateTime => :datetime
-          }[fields[attr_name.to_s].type] || :datetime
-        end
-      end
-
-    end
-  end
-end
- 
-module Mongoid::Document
-  # Due to how Mongoid misuses ActiveSupport::Concern,
-  # the only way to override a core component method is 
-  # using an append_features hook.
-  #
-  module TimelinessConcern
-    def append_features(base)
-      super
-      base.send :include, ValidatesTimeliness::AttributeMethods
-      base.send :include, ValidatesTimeliness::ORM::Mongoid
-    end
-  end
-  extend TimelinessConcern
-
-  def reload_with_timeliness
-    _clear_timeliness_cache
-    reload_without_timeliness
-  end
-  alias_method_chain :reload, :timeliness
-end

lib/validates_timeliness/railtie.rb

@@ -3,7 +3,8 @@ module ValidatesTimeliness
     initializer "validates_timeliness.initialize_active_record", :after => 'active_record.initialize_timezone' do
       ActiveSupport.on_load(:active_record) do
         ValidatesTimeliness.default_timezone = ActiveRecord::Base.default_timezone
-        ValidatesTimeliness.extend_orms = [ :active_record ]
+        ValidatesTimeliness.extend_orms << :active_record
+        ValidatesTimeliness.load_orms
       end
     end
 

lib/validates_timeliness/validator.rb

@@ -1,10 +1,11 @@
+require 'active_model'
 require 'active_model/validator'
 
 module ValidatesTimeliness
   class Validator < ActiveModel::EachValidator
     include Conversion
 
-    attr_reader :type
+    attr_reader :type, :attributes
 
     RESTRICTIONS = {
       :is_at        => :==,
@@ -20,6 +21,8 @@ module ValidatesTimeliness
       :datetime => '%Y-%m-%d %H:%M:%S'
     }.freeze
 
+    RESTRICTION_ERROR_MESSAGE = "Error occurred validating %s for %s restriction:\n%s"
+
     def self.kind
       :timeliness
     end
@@ -30,11 +33,31 @@ module ValidatesTimeliness
 
       if range = options.delete(:between)
         raise ArgumentError, ":between must be a Range or an Array" unless range.is_a?(Range) || range.is_a?(Array)
-        options[:on_or_after], options[:on_or_before] = range.first, range.last
+        options[:on_or_after] = range.first
+        if range.is_a?(Range) && range.exclude_end?
+          options[:before] = range.last
+        else
+          options[:on_or_before] = range.last
+        end
       end
 
       @restrictions_to_check = RESTRICTIONS.keys & options.keys
+
       super
+
+      setup_timeliness_validated_attributes(options[:class]) if options[:class]
+    end
+
+    def setup_timeliness_validated_attributes(model)
+      if model.respond_to?(:timeliness_validated_attributes)
+        model.timeliness_validated_attributes ||= []
+        model.timeliness_validated_attributes |= attributes
+      end
+    end
+
+    # Rails 4.0 compatibility for old #setup method with class as arg
+    if Gem::Version.new(ActiveModel::VERSION::STRING) <= Gem::Version.new('4.1')
+      alias_method(:setup, :setup_timeliness_validated_attributes) 
     end
 
     def validate_each(record, attr_name, value)
@@ -45,17 +68,22 @@ module ValidatesTimeliness
       value = parse(raw_value) if value.is_a?(String) || options[:format]
       value = type_cast_value(value, @type)
 
-      return add_error(record, attr_name, :"invalid_#{@type}") if value.blank?
+      add_error(record, attr_name, :"invalid_#{@type}") and return if value.blank?
 
+      validate_restrictions(record, attr_name, value)
+    end
+
+    def validate_restrictions(record, attr_name, value)
       @restrictions_to_check.each do |restriction|
         begin
           restriction_value = type_cast_value(evaluate_option_value(options[restriction], record), @type)
           unless value.send(RESTRICTIONS[restriction], restriction_value)
-            return add_error(record, attr_name, restriction, restriction_value)
+            add_error(record, attr_name, restriction, restriction_value) and break
           end
         rescue => e
           unless ValidatesTimeliness.ignore_restriction_errors
-            add_error(record, attr_name, "Error occurred validating #{attr_name} for #{restriction.inspect} restriction:\n#{e.message}")
+            message = RESTRICTION_ERROR_MESSAGE % [ attr_name, restriction.inspect, e.message ]
+            add_error(record, attr_name, message) and break
           end
         end
       end
@@ -63,7 +91,7 @@ module ValidatesTimeliness
 
     def add_error(record, attr_name, message, value=nil)
       value = format_error_value(value) if value
-      message_options = { :message => options[:"#{message}_message"], :restriction => value }
+      message_options = { :message => options.fetch(:"#{message}_message", options[:message]), :restriction => value }
       record.errors.add(attr_name, message, message_options)
     end
 
@@ -73,8 +101,8 @@ module ValidatesTimeliness
     end
 
     def attribute_raw_value(record, attr_name)
-      record.respond_to?(:_timeliness_raw_value_for) &&
-        record._timeliness_raw_value_for(attr_name)
+      record.respond_to?(:read_timeliness_attribute_before_type_cast) &&
+        record.read_timeliness_attribute_before_type_cast(attr_name.to_s)
     end
 
     def timezone_aware?(record, attr_name)

lib/validates_timeliness/version.rb

@@ -1,3 +1,3 @@
 module ValidatesTimeliness
-  VERSION = '3.0.5'
+  VERSION = '4.1.0'
 end

spec/spec_helper.rb

@@ -5,13 +5,14 @@ require 'active_model/validations'
 require 'active_record'
 require 'action_view'
 require 'timecop'
-require 'rspec_tag_matchers'
 
 require 'validates_timeliness'
+require 'validates_timeliness/orm/active_model'
 
 require 'support/test_model'
 require 'support/model_helpers'
 require 'support/config_helper'
+require 'support/tag_matcher'
 
 ValidatesTimeliness.setup do |c|
   c.extend_orms = [ :active_record ]
@@ -24,19 +25,15 @@ Time.zone = 'Australia/Melbourne'
 
 LOCALE_PATH = File.expand_path(File.dirname(__FILE__) + '/../lib/generators/validates_timeliness/templates/en.yml')
 I18n.load_path.unshift(LOCALE_PATH)
+I18n.available_locales = ['en', 'es']
 
 # Extend TestModel as you would another ORM/ODM module
 module TestModelShim
   extend ActiveSupport::Concern
   include ValidatesTimeliness::AttributeMethods
+  include ValidatesTimeliness::ORM::ActiveModel
 
   module ClassMethods
-    # Hook method for attribute method generation
-    def define_attribute_methods(attr_names)
-      super
-      define_timeliness_methods
-    end
-
     # Hook into native time zone handling check, if any
     def timeliness_attribute_timezone_aware?(attr_name)
       false
@@ -49,9 +46,7 @@ class Person
   attribute :birth_date, :date
   attribute :birth_time, :time
   attribute :birth_datetime, :datetime
-  validates_date :birth_date
-  validates_time :birth_time
-  validates_datetime :birth_datetime
+
   define_attribute_methods model_attributes.keys
 end
 
@@ -59,6 +54,7 @@ class PersonWithShim < Person
   include TestModelShim
 end
 
+ActiveRecord::Base.default_timezone = :utc
 ActiveRecord::Base.time_zone_aware_attributes = true
 ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:'})
 ActiveRecord::Migration.verbose = false
@@ -73,12 +69,10 @@ ActiveRecord::Schema.define(:version => 1) do
 end
 
 class Employee < ActiveRecord::Base
-  validates_date :birth_date
-  validates_time :birth_time
-  validates_datetime :birth_datetime
-  define_attribute_methods
-
   attr_accessor :redefined_birth_date_called
+  validates_date :birth_date, :allow_nil => true
+  validates_time :birth_time, :allow_nil => true
+  validates_datetime :birth_datetime, :allow_nil => true
 
   def birth_date=(value)
     self.redefined_birth_date_called = true
@@ -86,17 +80,17 @@ class Employee < ActiveRecord::Base
   end
 end
 
-Rspec.configure do |c|
+RSpec.configure do |c|
   c.mock_with :rspec
-  c.include(RspecTagMatchers)
+  c.include(TagMatcher)
   c.include(ModelHelpers)
   c.include(ConfigHelper)
   c.before do
-    Person.reset_callbacks(:validate)
-    PersonWithShim.timeliness_validated_attributes = []
-    Person._validators.clear
-    Employee.reset_callbacks(:validate)
-    Employee.timeliness_validated_attributes = []
-    Employee._validators.clear
+    reset_validation_setup_for(Person)
+    reset_validation_setup_for(PersonWithShim)
   end
+
+  c.filter_run_excluding :active_record => lambda {|version|
+    !(::ActiveRecord::VERSION::STRING.to_s =~ /^#{version.to_s}/)
+  }
 end

spec/support/config_helper.rb

@@ -10,6 +10,16 @@ module ConfigHelper
     ValidatesTimeliness.send(:"#{preference_name}=", old_value)
   end
 
+  def reset_validation_setup_for(model_class)
+    model_class.reset_callbacks(:validate)
+    model_class._validators.clear
+    model_class.timeliness_validated_attributes = [] if model_class.respond_to?(:timeliness_validated_attributes)
+    model_class.undefine_attribute_methods
+    # This is a hack to avoid a disabled super method error message after an undef
+    model_class.instance_variable_set(:@generated_attribute_methods, nil)
+    model_class.instance_variable_set(:@generated_timeliness_methods, nil)
+  end
+
   module ClassMethods
     def with_config(preference_name, temporary_value)
       original_config_value = ValidatesTimeliness.send(preference_name)

spec/support/model_helpers.rb

@@ -3,15 +3,15 @@ module ModelHelpers
   # Some test helpers from Rails source 
   def invalid!(attr_name, values, error = nil)
     with_each_person_value(attr_name, values) do |record, value|
-      record.should be_invalid
-      record.errors[attr_name].size.should >= 1
-      record.errors[attr_name].first.should == error if error
+      expect(record).to be_invalid
+      expect(record.errors[attr_name].size).to be >= 1
+      expect(record.errors[attr_name].first).to eq(error) if error
     end
   end
 
   def valid!(attr_name, values)
     with_each_person_value(attr_name, values) do |record, value|
-      record.should be_valid
+      expect(record).to be_valid
     end
   end
 

spec/support/tag_matcher.rb

@@ -0,0 +1,35 @@
+require 'nokogiri'
+
+module TagMatcher
+  extend RSpec::Matchers::DSL
+
+  matcher :have_tag do |selector|
+    match do |subject|
+      matches = doc(subject).search(selector)
+
+      if @inner_text
+        matches = matches.select { |element| element.inner_text == @inner_text }
+      end
+
+      matches.any?
+    end
+
+    chain :with_inner_text do |inner_text|
+      @inner_text = inner_text
+    end
+
+    private
+
+    def body(subject)
+      if subject.respond_to?(:body)
+        subject.body
+      else
+        subject.to_s
+      end
+    end
+
+    def doc(subject)
+      @doc ||= Nokogiri::HTML(body(subject))
+    end
+  end
+end

spec/support/test_model.rb

@@ -5,7 +5,6 @@ module TestModel
   include ActiveModel::AttributeMethods
 
   included do
-    attribute_method_suffix ""
     attribute_method_suffix "="
     cattr_accessor :model_attributes
   end
@@ -31,7 +30,7 @@ module TestModel
   end
 
   def initialize(attributes = nil)
-    @attributes = self.class.model_attributes.inject({}) do |hash, column|
+    @attributes = self.class.model_attributes.keys.inject({}) do |hash, column|
       hash[column.to_s] = nil
       hash
     end
@@ -39,7 +38,7 @@ module TestModel
   end
 
   def attributes
-    @attributes.keys
+    @attributes
   end
 
   def attributes=(new_attributes={})
@@ -49,14 +48,12 @@ module TestModel
   end
 
   def method_missing(method_id, *args, &block)
-    if !self.class.attribute_methods_generated?
-      self.class.define_attribute_methods self.class.model_attributes.keys.map(&:to_s)
-      method_name = method_id.to_s
+    if match_attribute_method?(method_id.to_s)
+      self.class.define_attribute_methods self.class.model_attributes.keys
       send(method_id, *args, &block)
     else
       super
     end
   end
-
 end
 

spec/validates_timeliness/attribute_methods_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::AttributeMethods do
-  it 'should define _timeliness_raw_value_for instance method' do
-    PersonWithShim.new.should respond_to(:_timeliness_raw_value_for)
+RSpec.describe ValidatesTimeliness::AttributeMethods do
+  it 'should define read_timeliness_attribute_before_type_cast instance method' do
+    expect(PersonWithShim.new).to respond_to(:read_timeliness_attribute_before_type_cast)
   end
 
   describe ".timeliness_validated_attributes" do
@@ -12,7 +10,7 @@ describe ValidatesTimeliness::AttributeMethods do
       PersonWithShim.validates_time :birth_time
       PersonWithShim.validates_datetime :birth_datetime
 
-      PersonWithShim.timeliness_validated_attributes.should == [ :birth_date, :birth_time, :birth_datetime ]
+      expect(PersonWithShim.timeliness_validated_attributes).to eq([ :birth_date, :birth_time, :birth_datetime ])
     end
   end
   
@@ -31,13 +29,28 @@ describe ValidatesTimeliness::AttributeMethods do
     it 'should cache attribute raw value' do
       r = PersonWithCache.new
       r.birth_datetime = date_string = '2010-01-01'
-      r._timeliness_raw_value_for(:birth_datetime).should == date_string
+      expect(r.read_timeliness_attribute_before_type_cast('birth_datetime')).to eq(date_string)
     end
 
     it 'should not overwrite user defined methods' do
       e = Employee.new
       e.birth_date = '2010-01-01'
-      e.redefined_birth_date_called.should be_true
+      expect(e.redefined_birth_date_called).to be_truthy
+    end
+
+    it 'should be undefined if model class has dynamic attribute methods reset' do
+      # Force method definitions
+      PersonWithShim.validates_date :birth_date
+      r = PersonWithShim.new
+      r.birth_date = Time.now
+
+      write_method = :birth_date=
+
+      expect(PersonWithShim.send(:generated_timeliness_methods).instance_methods).to include(write_method)
+
+      PersonWithShim.undefine_attribute_methods 
+
+      expect(PersonWithShim.send(:generated_timeliness_methods).instance_methods).not_to include(write_method)
     end
 
     context "with plugin parser" do
@@ -55,22 +68,17 @@ describe ValidatesTimeliness::AttributeMethods do
       end
 
       it 'should parse a string value' do
-        Timeliness::Parser.should_receive(:parse)
+        expect(Timeliness::Parser).to receive(:parse)
         r = PersonWithParser.new
         r.birth_date = '2010-01-01'
       end
 
-      it 'should parse string as current timezone' do
-        r = PersonWithParser.new
-        r.birth_datetime = '2010-01-01 12:00'
-        r.birth_datetime.zone == Time.zone.name
-      end
     end
   end
 
   context "before_type_cast method" do
     it 'should not be defined if ORM does not support it' do
-      PersonWithShim.new.should_not respond_to(:birth_datetime_before_type_cast)
+      expect(PersonWithShim.new).not_to respond_to(:birth_datetime_before_type_cast)
     end
   end
 end

spec/validates_timeliness/conversion_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Conversion do
+RSpec.describe ValidatesTimeliness::Conversion do
   include ValidatesTimeliness::Conversion
 
   let(:options) { Hash.new }
@@ -12,68 +10,68 @@ describe ValidatesTimeliness::Conversion do
   describe "#type_cast_value" do
     describe "for date type" do
       it "should return same value for date value" do
-        type_cast_value(Date.new(2010, 1, 1), :date).should == Date.new(2010, 1, 1)
+        expect(type_cast_value(Date.new(2010, 1, 1), :date)).to eq(Date.new(2010, 1, 1))
       end
 
       it "should return date part of time value" do
-        type_cast_value(Time.mktime(2010, 1, 1, 0, 0, 0), :date).should == Date.new(2010, 1, 1)
+        expect(type_cast_value(Time.mktime(2010, 1, 1, 0, 0, 0), :date)).to eq(Date.new(2010, 1, 1))
       end
 
       it "should return date part of datetime value" do
-        type_cast_value(DateTime.new(2010, 1, 1, 0, 0, 0), :date).should == Date.new(2010, 1, 1)
+        expect(type_cast_value(DateTime.new(2010, 1, 1, 0, 0, 0), :date)).to eq(Date.new(2010, 1, 1))
       end
 
       it 'should return nil for invalid value types' do
-        type_cast_value(12, :date).should == nil
+        expect(type_cast_value(12, :date)).to eq(nil)
       end
     end
 
     describe "for time type" do
       it "should return same value for time value matching dummy date part" do
-        type_cast_value(Time.utc(2000, 1, 1, 0, 0, 0), :time).should == Time.utc(2000, 1, 1, 0, 0, 0)
+        expect(type_cast_value(Time.utc(2000, 1, 1, 0, 0, 0), :time)).to eq(Time.utc(2000, 1, 1, 0, 0, 0))
       end
 
       it "should return dummy time value with same time part for time value with different date" do
-        type_cast_value(Time.utc(2010, 1, 1, 0, 0, 0), :time).should == Time.utc(2000, 1, 1, 0, 0, 0)
+        expect(type_cast_value(Time.utc(2010, 1, 1, 0, 0, 0), :time)).to eq(Time.utc(2000, 1, 1, 0, 0, 0))
       end
 
       it "should return dummy time only for date value" do
-        type_cast_value(Date.new(2010, 1, 1), :time).should == Time.utc(2000, 1, 1, 0, 0, 0)
+        expect(type_cast_value(Date.new(2010, 1, 1), :time)).to eq(Time.utc(2000, 1, 1, 0, 0, 0))
       end
 
       it "should return dummy date with time part for datetime value" do
-        type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56), :time).should == Time.utc(2000, 1, 1, 12, 34, 56)
+        expect(type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56), :time)).to eq(Time.utc(2000, 1, 1, 12, 34, 56))
       end
 
       it 'should return nil for invalid value types' do
-        type_cast_value(12, :time).should == nil
+        expect(type_cast_value(12, :time)).to eq(nil)
       end
     end
 
     describe "for datetime type" do
       it "should return Date as Time value" do
-        type_cast_value(Date.new(2010, 1, 1), :datetime).should == Time.local_time(2010, 1, 1, 0, 0, 0)
+        expect(type_cast_value(Date.new(2010, 1, 1), :datetime)).to eq(Time.local(2010, 1, 1, 0, 0, 0))
       end
 
       it "should return same Time value" do
         value = Time.utc(2010, 1, 1, 12, 34, 56)
-        type_cast_value(Time.utc(2010, 1, 1, 12, 34, 56), :datetime).should == value
+        expect(type_cast_value(Time.utc(2010, 1, 1, 12, 34, 56), :datetime)).to eq(value)
       end
 
       it "should return as Time with same component values" do
-        type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56), :datetime).should == Time.utc(2010, 1, 1, 12, 34, 56)
+        expect(type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56), :datetime)).to eq(Time.utc(2010, 1, 1, 12, 34, 56))
       end
 
       it "should return same Time in correct zone if timezone aware" do
         @timezone_aware = true
         value = Time.utc(2010, 1, 1, 12, 34, 56)
         result = type_cast_value(value, :datetime)
-        result.should == Time.zone.local(2010, 1, 1, 23, 34, 56)
-        result.zone.should == 'EST'
+        expect(result).to eq(Time.zone.local(2010, 1, 1, 23, 34, 56))
+        expect(result.zone).to eq('AEDT')
       end
 
       it 'should return nil for invalid value types' do
-        type_cast_value(12, :datetime).should == nil
+        expect(type_cast_value(12, :datetime)).to eq(nil)
       end
     end
 
@@ -82,41 +80,41 @@ describe ValidatesTimeliness::Conversion do
 
       it "should ignore usec on time values when evaluated" do
         value = Time.utc(2010, 1, 1, 12, 34, 56, 10000)
-        type_cast_value(value, :datetime).should == Time.utc(2010, 1, 1, 12, 34, 56)
+        expect(type_cast_value(value, :datetime)).to eq(Time.utc(2010, 1, 1, 12, 34, 56))
       end
 
       it "should ignore usec and return time in correct zone if timezone aware" do
         @timezone_aware = true
         value = Time.utc(2010, 1, 1, 12, 34, 56, 10000)
         result = type_cast_value(value, :datetime)
-        result.should == Time.zone.local(2010, 1, 1, 23, 34, 56)
-        result.zone.should == 'EST'
+        expect(result).to eq(Time.zone.local(2010, 1, 1, 23, 34, 56))
+        expect(result.zone).to eq('AEDT')
       end
     end
   end
 
   describe "#dummy_time" do
     it 'should return Time with dummy date values but same time components' do
-      dummy_time(Time.utc(2010, 11, 22, 12, 34, 56)).should == Time.utc(2000, 1, 1, 12, 34, 56)
+      expect(dummy_time(Time.utc(2010, 11, 22, 12, 34, 56))).to eq(Time.utc(2000, 1, 1, 12, 34, 56))
     end
 
     it 'should return same value for Time which already has dummy date values' do
-      dummy_time(Time.utc(2000, 1, 1, 12, 34, 56)).should == Time.utc(2000, 1, 1, 12, 34, 56)
+      expect(dummy_time(Time.utc(2000, 1, 1, 12, 34, 56))).to eq(Time.utc(2000, 1, 1, 12, 34, 56))
     end
 
     it 'should return time component values shifted to current zone if timezone aware' do
       @timezone_aware = true
-      dummy_time(Time.utc(2000, 1, 1, 12, 34, 56)).should == Time.zone.local(2000, 1, 1, 23, 34, 56)
+      expect(dummy_time(Time.utc(2000, 1, 1, 12, 34, 56))).to eq(Time.zone.local(2000, 1, 1, 23, 34, 56))
     end
 
     it 'should return base dummy time value for Date value' do
-      dummy_time(Date.new(2010, 11, 22)).should == Time.utc(2000, 1, 1, 0, 0, 0)
+      expect(dummy_time(Date.new(2010, 11, 22))).to eq(Time.utc(2000, 1, 1, 0, 0, 0))
     end
 
     describe "with custom dummy date" do
       it 'should return dummy time with custom dummy date' do
         with_config(:dummy_date_for_time_type, [2010, 1, 1] ) do
-          dummy_time(Time.utc(1999, 11, 22, 12, 34, 56)).should == Time.utc(2010, 1, 1, 12, 34, 56)
+          expect(dummy_time(Time.utc(1999, 11, 22, 12, 34, 56))).to eq(Time.utc(2010, 1, 1, 12, 34, 56))
         end
       end
     end
@@ -127,56 +125,56 @@ describe ValidatesTimeliness::Conversion do
 
     it 'should return Date object as is' do
       value = Date.new(2010,1,1)
-      evaluate_option_value(value, person).should == value
+      expect(evaluate_option_value(value, person)).to eq(value)
     end
 
     it 'should return Time object as is' do
       value = Time.mktime(2010,1,1)
-      evaluate_option_value(value, person).should == value
+      expect(evaluate_option_value(value, person)).to eq(value)
     end
 
     it 'should return DateTime object as is' do
       value = DateTime.new(2010,1,1,0,0,0)
-      evaluate_option_value(value, person).should == value
+      expect(evaluate_option_value(value, person)).to eq(value)
     end
 
     it 'should return Time value returned from proc with 0 arity' do
       value = Time.mktime(2010,1,1)
-      evaluate_option_value(lambda { value }, person).should == value
+      expect(evaluate_option_value(lambda { value }, person)).to eq(value)
     end
 
     it 'should return Time value returned by record attribute call in proc arity of 1' do
       value = Time.mktime(2010,1,1)
       person.birth_time = value
-      evaluate_option_value(lambda {|r| r.birth_time }, person).should == value
+      expect(evaluate_option_value(lambda {|r| r.birth_time }, person)).to eq(value)
     end
 
     it 'should return Time value for attribute method symbol which returns Time' do
       value = Time.mktime(2010,1,1)
       person.birth_time = value
-      evaluate_option_value(:birth_time, person).should == value
+      expect(evaluate_option_value(:birth_time, person)).to eq(value)
     end
 
     it 'should return Time value is default zone from string time value' do
       value = '2010-01-01 12:00:00'
-      evaluate_option_value(value, person).should == Time.utc(2010,1,1,12,0,0)
+      expect(evaluate_option_value(value, person)).to eq(Time.utc(2010,1,1,12,0,0))
     end
 
     it 'should return Time value is current zone from string time value if timezone aware' do
       @timezone_aware = true
       value = '2010-01-01 12:00:00'
-      evaluate_option_value(value, person).should == Time.zone.local(2010,1,1,12,0,0)
+      expect(evaluate_option_value(value, person)).to eq(Time.zone.local(2010,1,1,12,0,0))
     end
 
     it 'should return Time value in default zone from proc which returns string time' do
       value = '2010-01-01 12:00:00'
-      evaluate_option_value(lambda { value }, person).should == Time.utc(2010,1,1,12,0,0)
+      expect(evaluate_option_value(lambda { value }, person)).to eq(Time.utc(2010,1,1,12,0,0))
     end
 
     it 'should return Time value for attribute method symbol which returns string time value' do
       value = '2010-01-01 12:00:00'
       person.birth_time = value
-      evaluate_option_value(:birth_time, person).should == Time.utc(2010,1,1,12,0,0)
+      expect(evaluate_option_value(:birth_time, person)).to eq(Time.local(2010,1,1,12,0,0))
     end
 
     context "restriction shorthand" do
@@ -185,17 +183,17 @@ describe ValidatesTimeliness::Conversion do
       end
 
       it 'should evaluate :now as current time' do
-        evaluate_option_value(:now, person).should == Time.now
+        expect(evaluate_option_value(:now, person)).to eq(Time.now)
       end
 
       it 'should evaluate :today as current time' do
-        evaluate_option_value(:today, person).should == Date.today
+        expect(evaluate_option_value(:today, person)).to eq(Date.today)
       end
 
       it 'should not use shorthand if symbol if is record method' do
         time = 1.day.from_now
-        person.stub!(:now).and_return(time)
-        evaluate_option_value(:now, person).should == time
+        allow(person).to receive(:now).and_return(time)
+        expect(evaluate_option_value(:now, person)).to eq(time)
       end
     end
   end
@@ -205,7 +203,7 @@ describe ValidatesTimeliness::Conversion do
       with_config(:use_plugin_parser, true)
 
       it 'should use timeliness' do
-        Timeliness::Parser.should_receive(:parse)
+        expect(Timeliness::Parser).to receive(:parse)
         parse('2000-01-01')
       end
     end
@@ -215,20 +213,20 @@ describe ValidatesTimeliness::Conversion do
 
       it 'should use Time.zone.parse attribute is timezone aware' do
         @timezone_aware = true
-        Time.zone.should_receive(:parse)
+        expect(Time.zone).to receive(:parse)
         parse('2000-01-01')
       end
 
       it 'should use value#to_time if use_plugin_parser setting is false and attribute is not timezone aware' do
         @timezone_aware = false
         value = '2000-01-01'
-        value.should_receive(:to_time)
+        expect(value).to receive(:to_time)
         parse(value)
       end
     end
 
     it 'should return nil if value is nil' do
-      parse(nil).should be_nil
+      expect(parse(nil)).to be_nil
     end
   end
 end

spec/validates_timeliness/extensions/date_time_select_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Extensions::DateTimeSelect do
+RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do
   include ActionView::Helpers::DateHelper
   attr_reader :person, :params
 
@@ -13,128 +11,105 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
 
   describe "datetime_select" do
     it "should use param values when attribute is nil" do
-      params["person"] = {
-        "birth_datetime(1i)" => 2009,
-        "birth_datetime(2i)" => 2,
-        "birth_datetime(3i)" => 29,
-        "birth_datetime(4i)" => 12,
-        "birth_datetime(5i)" => 13,
-        "birth_datetime(6i)" => 14,
+      @params["person"] = {
+        "birth_datetime(1i)" => '2009',
+        "birth_datetime(2i)" => '2',
+        "birth_datetime(3i)" => '29',
+        "birth_datetime(4i)" => '12',
+        "birth_datetime(5i)" => '13',
+        "birth_datetime(6i)" => '14',
       }
       person.birth_datetime = nil
-      output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=person_birth_datetime_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=person_birth_datetime_2i] option[selected=selected]', 'February')
-      output.should have_tag('select[id=person_birth_datetime_3i] option[selected=selected]', '29')
-      output.should have_tag('select[id=person_birth_datetime_4i] option[selected=selected]', '12')
-      output.should have_tag('select[id=person_birth_datetime_5i] option[selected=selected]', '13')
-      output.should have_tag('select[id=person_birth_datetime_6i] option[selected=selected]', '14')
+      @output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
+      should_have_datetime_selected(:birth_datetime, :year => 2009, :month => 'February', :day => 29, :hour => 12, :min => 13, :sec => 14)
     end
 
     it "should override object values and use params if present" do
-      params["person"] = {
-        "birth_datetime(1i)" => 2009,
-        "birth_datetime(2i)" => 2,
-        "birth_datetime(3i)" => 29,
-        "birth_datetime(4i)" => 12,
-        "birth_datetime(5i)" => 13,
-        "birth_datetime(6i)" => 14,
+      @params["person"] = {
+        "birth_datetime(1i)" => '2009',
+        "birth_datetime(2i)" => '2',
+        "birth_datetime(3i)" => '29',
+        "birth_datetime(4i)" => '12',
+        "birth_datetime(5i)" => '13',
+        "birth_datetime(6i)" => '14',
       }
       person.birth_datetime = "2010-01-01 15:16:17"
-      output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=person_birth_datetime_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=person_birth_datetime_2i] option[selected=selected]', 'February')
-      output.should have_tag('select[id=person_birth_datetime_3i] option[selected=selected]', '29')
-      output.should have_tag('select[id=person_birth_datetime_4i] option[selected=selected]', '12')
-      output.should have_tag('select[id=person_birth_datetime_5i] option[selected=selected]', '13')
-      output.should have_tag('select[id=person_birth_datetime_6i] option[selected=selected]', '14')
+      @output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
+      should_have_datetime_selected(:birth_datetime, :year => 2009, :month => 'February', :day => 29, :hour => 12, :min => 13, :sec => 14)
     end
 
     it "should use attribute values from object if no params" do
       person.birth_datetime = "2009-01-02 12:13:14"
-      output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=person_birth_datetime_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=person_birth_datetime_2i] option[selected=selected]', 'January')
-      output.should have_tag('select[id=person_birth_datetime_3i] option[selected=selected]', '2')
-      output.should have_tag('select[id=person_birth_datetime_4i] option[selected=selected]', '12')
-      output.should have_tag('select[id=person_birth_datetime_5i] option[selected=selected]', '13')
-      output.should have_tag('select[id=person_birth_datetime_6i] option[selected=selected]', '14')
+      @output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
+      should_have_datetime_selected(:birth_datetime, :year => 2009, :month => 'January', :day => 2, :hour => 12, :min => 13, :sec => 14)
     end
 
     it "should use attribute values if params does not contain attribute params" do
       person.birth_datetime = "2009-01-02 12:13:14"
-      params["person"] = { }
-      output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=person_birth_datetime_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=person_birth_datetime_2i] option[selected=selected]', 'January')
-      output.should have_tag('select[id=person_birth_datetime_3i] option[selected=selected]', '2')
-      output.should have_tag('select[id=person_birth_datetime_4i] option[selected=selected]', '12')
-      output.should have_tag('select[id=person_birth_datetime_5i] option[selected=selected]', '13')
-      output.should have_tag('select[id=person_birth_datetime_6i] option[selected=selected]', '14')
+      @params["person"] = { }
+      @output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
+      should_have_datetime_selected(:birth_datetime, :year => 2009, :month => 'January', :day => 2, :hour => 12, :min => 13, :sec => 14)
     end
 
     it "should not select values when attribute value is nil and has no param values" do
       person.birth_datetime = nil
-      output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
-      output.should_not have_tag('select[id=person_birth_datetime_1i] option[selected=selected]')
-      output.should_not have_tag('select[id=person_birth_datetime_2i] option[selected=selected]')
-      output.should_not have_tag('select[id=person_birth_datetime_3i] option[selected=selected]')
-      output.should_not have_tag('select[id=person_birth_datetime_4i] option[selected=selected]')
-      output.should_not have_tag('select[id=person_birth_datetime_5i] option[selected=selected]')
-      output.should_not have_tag('select[id=person_birth_datetime_6i] option[selected=selected]')
+      @output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
+      should_not_have_datetime_selected(:birth_datetime, :year, :month, :day, :hour, :min, :sec)
     end
   end
 
   describe "date_select" do
     it "should use param values when attribute is nil" do
-      params["person"] = {
-        "birth_date(1i)" => 2009,
-        "birth_date(2i)" => 2,
-        "birth_date(3i)" => 29,
+      @params["person"] = {
+        "birth_date(1i)" => '2009',
+        "birth_date(2i)" => '2',
+        "birth_date(3i)" => '29',
       }
       person.birth_date = nil
-      output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=person_birth_date_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=person_birth_date_2i] option[selected=selected]', 'February')
-      output.should have_tag('select[id=person_birth_date_3i] option[selected=selected]', '29')
+      @output = date_select(:person, :birth_date, :include_blank => true)
+      should_have_datetime_selected(:birth_date, :year => 2009, :month => 'February', :day => 29)
     end
 
     it "should override object values and use params if present" do
-      params["person"] = {
-        "birth_date(1i)" => 2009,
-        "birth_date(2i)" => 2,
-        "birth_date(3i)" => 29,
+      @params["person"] = {
+        "birth_date(1i)" => '2009',
+        "birth_date(2i)" => '2',
+        "birth_date(3i)" => '29',
       }
       person.birth_date = "2009-03-01"
-      output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=person_birth_date_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=person_birth_date_2i] option[selected=selected]', 'February')
-      output.should have_tag('select[id=person_birth_date_3i] option[selected=selected]', '29')
+      @output = date_select(:person, :birth_date, :include_blank => true)
+      should_have_datetime_selected(:birth_date, :year => 2009, :month => 'February', :day => 29)
     end
 
     it "should select attribute values from object if no params" do
       person.birth_date = "2009-01-02"
-      output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=person_birth_date_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=person_birth_date_2i] option[selected=selected]', 'January')
-      output.should have_tag('select[id=person_birth_date_3i] option[selected=selected]', '2')
+      @output = date_select(:person, :birth_date, :include_blank => true)
+      should_have_datetime_selected(:birth_date, :year => 2009, :month => 'January', :day => 2)
     end
 
     it "should select attribute values if params does not contain attribute params" do
       person.birth_date = "2009-01-02"
-      params["person"] = { }
-      output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=person_birth_date_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=person_birth_date_2i] option[selected=selected]', 'January')
-      output.should have_tag('select[id=person_birth_date_3i] option[selected=selected]', '2')
+      @params["person"] = { }
+      @output = date_select(:person, :birth_date, :include_blank => true)
+      should_have_datetime_selected(:birth_date, :year => 2009, :month => 'January', :day => 2)
     end
 
     it "should not select values when attribute value is nil and has no param values" do
       person.birth_date = nil
-      output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
-      output.should_not have_tag('select[id=person_birth_date_1i] option[selected=selected]')
-      output.should_not have_tag('select[id=person_birth_date_2i] option[selected=selected]')
-      output.should_not have_tag('select[id=person_birth_date_3i] option[selected=selected]')
+      @output = date_select(:person, :birth_date, :include_blank => true)
+      should_not_have_datetime_selected(:birth_time, :year, :month, :day)
+    end
+
+    it "should allow the day part to be discarded" do
+      @params["person"] = {
+        "birth_date(1i)" => '2009',
+        "birth_date(2i)" => '2',
+      }
+
+      @output = date_select(:person, :birth_date, :include_blank => true, :discard_day => true)
+      should_have_datetime_selected(:birth_date, :year => 2009, :month => 'February')
+      should_not_have_datetime_selected(:birth_time, :day)
+      expect(@output).to have_tag("input[id=person_birth_date_3i][type=hidden][value='1']")
     end
   end
 
@@ -144,35 +119,44 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
     end
 
     it "should use param values when attribute is nil" do
-      params["person"] = {
-        "birth_time(1i)" => 2000,
-        "birth_time(2i)" => 1,
-        "birth_time(3i)" => 1,
-        "birth_time(4i)" => 12,
-        "birth_time(5i)" => 13,
-        "birth_time(6i)" => 14,
+      @params["person"] = {
+        "birth_time(1i)" => '2000',
+        "birth_time(2i)" => '1',
+        "birth_time(3i)" => '1',
+        "birth_time(4i)" => '12',
+        "birth_time(5i)" => '13',
+        "birth_time(6i)" => '14',
       }
       person.birth_time = nil
-      output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=person_birth_time_4i] option[selected=selected]', '12')
-      output.should have_tag('select[id=person_birth_time_5i] option[selected=selected]', '13')
-      output.should have_tag('select[id=person_birth_time_6i] option[selected=selected]', '14')
+      @output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)
+      should_have_datetime_selected(:birth_time, :hour => 12, :min => 13, :sec => 14)
     end
 
     it "should select attribute values from object if no params" do
       person.birth_time = "2000-01-01 12:13:14"
-      output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=person_birth_time_4i] option[selected=selected]', '12')
-      output.should have_tag('select[id=person_birth_time_5i] option[selected=selected]', '13')
-      output.should have_tag('select[id=person_birth_time_6i] option[selected=selected]', '14')
+      @output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)
+      should_have_datetime_selected(:birth_time, :hour => 12, :min => 13, :sec => 14)
     end
 
     it "should not select values when attribute value is nil and has no param values" do
       person.birth_time = nil
-      output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)
-      output.should_not have_tag('select[id=person_birth_time_4i] option[selected=selected]')
-      output.should_not have_tag('select[id=person_birth_time_5i] option[selected=selected]')
-      output.should_not have_tag('select[id=person_birth_time_6i] option[selected=selected]')
+      @output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)
+      should_not_have_datetime_selected(:birth_time, :hour, :min, :sec)
     end
   end
+
+  def should_have_datetime_selected(field, datetime_hash)
+    datetime_hash.each do |key, value|
+      index = {:year => 1, :month => 2, :day => 3, :hour => 4, :min => 5, :sec => 6}[key]
+      expect(@output).to have_tag("select[id=person_#{field}_#{index}i] option[selected=selected]", value.to_s)
+    end
+  end
+
+  def should_not_have_datetime_selected(field, *attributes)
+    attributes.each do |attribute|
+      index = {:year => 1, :month => 2, :day => 3, :hour => 4, :min => 5, :sec => 6}[attribute]
+      expect(@output).not_to have_tag("select[id=person_#{attribute}_#{index}i] option[selected=selected]")
+    end
+  end
+  
 end

spec/validates_timeliness/extensions/multiparameter_handler_spec.rb

@@ -1,33 +1,43 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Extensions::MultiparameterHandler do
-  let(:employee) { Employee.new }
+RSpec.describe 'ValidatesTimeliness::Extensions::MultiparameterHandler' do
 
   context "time column" do
-    it 'should return string value for invalid date portion' do
-      multiparameter_attribute(:birth_datetime, [2000, 2, 31, 12, 0, 0])
-      employee.birth_datetime_before_type_cast.should == '2000-02-31 12:00:00'
+    it 'should assign a string value for invalid date portion' do
+      employee = record_with_multiparameter_attribute(:birth_datetime, [2000, 2, 31, 12, 0, 0])
+      expect(employee.birth_datetime_before_type_cast).to eq '2000-02-31 12:00:00'
     end
      
-    it 'should return Time value for valid datetimes' do
-      multiparameter_attribute(:birth_datetime, [2000, 2, 28, 12, 0, 0])
-      employee.birth_datetime_before_type_cast.should be_kind_of(Time)
+    it 'should assign a Time value for valid datetimes' do
+      employee = record_with_multiparameter_attribute(:birth_datetime, [2000, 2, 28, 12, 0, 0])
+      expect(employee.birth_datetime_before_type_cast).to eq Time.zone.local(2000, 2, 28, 12, 0, 0)
+    end
+
+    it 'should assign a string value for incomplete time' do
+      employee = record_with_multiparameter_attribute(:birth_datetime, [2000, nil, nil])
+      expect(employee.birth_datetime_before_type_cast).to eq '2000-00-00'
     end
   end
 
   context "date column" do
-    it 'should return string value for invalid date' do
-      multiparameter_attribute(:birth_date, [2000, 2, 31])
-      employee.birth_date_before_type_cast.should == '2000-02-31'
+    it 'should assign a string value for invalid date' do
+      employee = record_with_multiparameter_attribute(:birth_date, [2000, 2, 31])
+      expect(employee.birth_date_before_type_cast).to eq '2000-02-31'
     end
 
-    it 'should return Date value for valid date' do
-      multiparameter_attribute(:birth_date, [2000, 2, 28])
-      employee.birth_date_before_type_cast.should be_kind_of(Date)
+    it 'should assign a Date value for valid date' do
+      employee = record_with_multiparameter_attribute(:birth_date, [2000, 2, 28])
+      expect(employee.birth_date_before_type_cast).to eq Date.new(2000, 2, 28)
+    end
+
+    it 'should assign a string value for incomplete date' do
+      employee = record_with_multiparameter_attribute(:birth_date, [2000, nil, nil])
+      expect(employee.birth_date_before_type_cast).to eq '2000-00-00'
     end
   end
 
-  def multiparameter_attribute(name, values)
-    employee.send(:execute_callstack_for_multiparameter_attributes, name.to_s => values)
+  def record_with_multiparameter_attribute(name, values)
+    hash = {}
+    values.each_with_index {|value, index| hash["#{name}(#{index+1}i)"] = value.to_s }
+    Employee.new(hash)
   end
+
 end

spec/validates_timeliness/helper_methods_spec.rb

@@ -1,21 +1,28 @@
-require 'spec_helper'
+RSpec.describe ValidatesTimeliness, 'HelperMethods' do
+  let(:record) { Person.new }
   
-describe ValidatesTimeliness, 'HelperMethods' do
   it 'should define class validation methods' do
-    Person.should respond_to(:validates_date)
-    Person.should respond_to(:validates_time)
-    Person.should respond_to(:validates_datetime)
+    expect(Person).to respond_to(:validates_date)
+    expect(Person).to respond_to(:validates_time)
+    expect(Person).to respond_to(:validates_datetime)
   end
 
   it 'should define instance validation methods' do
-    Person.new.should respond_to(:validates_date)
-    Person.new.should respond_to(:validates_time)
-    Person.new.should respond_to(:validates_datetime)
+    expect(record).to respond_to(:validates_date)
+    expect(record).to respond_to(:validates_time)
+    expect(record).to respond_to(:validates_datetime)
   end
 
-  it 'should validate instance when validation method called' do
-    r = Person.new
-    r.validates_date :birth_date
-    r.errors[:birth_date].should_not be_empty
+  it 'should validate instance using class validation defined' do
+    Person.validates_date :birth_date
+    record.valid?
+
+    expect(record.errors[:birth_date]).not_to be_empty
+  end
+
+  it 'should validate instance using instance valiation method' do
+    record.validates_date :birth_date
+
+    expect(record.errors[:birth_date]).not_to be_empty
   end
 end

spec/validates_timeliness/orm/active_record_spec.rb

@@ -1,78 +1,254 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness, 'ActiveRecord' do
+RSpec.describe ValidatesTimeliness, 'ActiveRecord' do
 
   context "validation methods" do
+    let(:record) { Employee.new }
+
     it 'should be defined for the class' do
-      ActiveRecord::Base.should respond_to(:validates_date)
-      ActiveRecord::Base.should respond_to(:validates_time)
-      ActiveRecord::Base.should respond_to(:validates_datetime)
+      expect(ActiveRecord::Base).to respond_to(:validates_date)
+      expect(ActiveRecord::Base).to respond_to(:validates_time)
+      expect(ActiveRecord::Base).to respond_to(:validates_datetime)
     end
 
     it 'should defines for the instance' do
-      Employee.new.should respond_to(:validates_date)
-      Employee.new.should respond_to(:validates_time)
-      Employee.new.should respond_to(:validates_datetime)
+      expect(record).to respond_to(:validates_date)
+      expect(record).to respond_to(:validates_time)
+      expect(record).to respond_to(:validates_datetime)
+    end
+
+    it "should validate a valid value string" do
+      record.birth_date = '2012-01-01'
+
+      record.valid?
+      expect(record.errors[:birth_date]).to be_empty
+    end
+
+    it "should validate a invalid value string" do
+      record.birth_date = 'not a date'
+
+      record.valid?
+      expect(record.errors[:birth_date]).not_to be_empty
+    end
+
+    it "should validate a nil value" do
+      record.birth_date = nil
+
+      record.valid?
+      expect(record.errors[:birth_date]).to be_empty
     end
   end
 
   it 'should determine type for attribute' do
-    Employee.timeliness_attribute_type(:birth_date).should == :date
+    expect(Employee.timeliness_attribute_type(:birth_date)).to eq :date
+  end
+
+  context 'attribute timezone awareness' do
+    let(:klass) {
+      Class.new(ActiveRecord::Base) do
+        self.table_name = 'employees'
+        attr_accessor :some_date
+        attr_accessor :some_time
+        attr_accessor :some_datetime
+        validates_date :some_date
+        validates_time :some_time
+        validates_datetime :some_datetime
+      end
+    }
+
+    context 'for column attribute' do
+      it 'should be detected from column type' do
+        expect(klass.timeliness_attribute_timezone_aware?(:birth_date)).to be_falsey
+        expect(klass.timeliness_attribute_timezone_aware?(:birth_time)).to be_falsey
+        expect(klass.timeliness_attribute_timezone_aware?(:birth_datetime)).to be_truthy
+      end
+    end
+
+    context 'for non-column attribute' do
+      it 'should be detected from the validation type' do
+        expect(klass.timeliness_attribute_timezone_aware?(:some_date)).to be_falsey
+        expect(klass.timeliness_attribute_timezone_aware?(:some_time)).to be_falsey
+        expect(klass.timeliness_attribute_timezone_aware?(:some_datetime)).to be_truthy
+      end
+    end
   end
   
   context "attribute write method" do
     class EmployeeWithCache < ActiveRecord::Base
-      set_table_name 'employees'
-      validates_datetime :birth_datetime
+      self.table_name = 'employees'
+      validates_date :birth_date, :allow_blank => true
+      validates_time :birth_time, :allow_blank => true
+      validates_datetime :birth_datetime, :allow_blank => true
     end
 
-    it 'should cache attribute raw value' do
-      r = EmployeeWithCache.new
-      r.birth_datetime = date_string = '2010-01-01'
-      r._timeliness_raw_value_for(:birth_datetime).should == date_string
+    context 'value cache' do
+      let(:record) { EmployeeWithCache.new }
+
+      context 'for datetime column' do
+        it 'should store raw value' do
+          record.birth_datetime = datetime_string = '2010-01-01 12:30'
+
+          expect(record.read_timeliness_attribute_before_type_cast('birth_datetime')).to eq datetime_string
+        end
+      end
+
+      context 'for date column' do
+        it 'should store raw value' do
+          record.birth_date = date_string = '2010-01-01'
+
+          expect(record.read_timeliness_attribute_before_type_cast('birth_date')).to eq date_string
+        end
+      end
+
+      context 'for time column' do
+        it 'should store raw value' do
+          record.birth_time = time_string = '12:12'
+
+          expect(record.read_timeliness_attribute_before_type_cast('birth_time')).to eq time_string
+        end
+      end
+    end
+
+    context "with plugin parser" do
+      with_config(:use_plugin_parser, true)
+      let(:record) { EmployeeWithParser.new }
+
+      class EmployeeWithParser < ActiveRecord::Base
+        self.table_name = 'employees'
+        validates_date :birth_date, :allow_blank => true
+        validates_time :birth_time, :allow_blank => true
+        validates_datetime :birth_datetime, :allow_blank => true
+      end
+
+      context "for a date column" do
+        it 'should parse a string value' do
+          expect(Timeliness::Parser).to receive(:parse)
+
+          record.birth_date = '2010-01-01'
+        end
+
+        it 'should parse a invalid string value as nil' do
+          expect(Timeliness::Parser).to receive(:parse)
+
+          record.birth_date = 'not valid'
+        end
+
+        it 'should store a Date value after parsing string' do
+          record.birth_date = '2010-01-01'
+
+          expect(record.birth_date).to be_kind_of(Date)
+          expect(record.birth_date).to eq Date.new(2010, 1, 1)
+        end
+      end
+
+      context "for a time column" do
+        it 'should parse a string value' do
+          expect(Timeliness::Parser).to receive(:parse)
+
+          record.birth_time = '12:30'
+        end
+
+        it 'should parse a invalid string value as nil' do
+          expect(Timeliness::Parser).to receive(:parse)
+
+          record.birth_time = 'not valid'
+        end
+
+        it 'should store a Time value after parsing string' do
+          record.birth_time = '12:30'
+
+          expect(record.birth_time).to be_kind_of(Time)
+          expect(record.birth_time).to eq Time.utc(2000, 1, 1, 12, 30)
+        end
+      end
+
+      context "for a datetime column" do
+        with_config(:default_timezone, 'Australia/Melbourne')
+
+        it 'should parse a string value' do
+          expect(Timeliness::Parser).to receive(:parse)
+
+          record.birth_datetime = '2010-01-01 12:00'
+        end
+
+        it 'should parse a invalid string value as nil' do
+          expect(Timeliness::Parser).to receive(:parse)
+
+          record.birth_datetime = 'not valid'
+        end
+
+        it 'should parse string into Time value' do
+          record.birth_datetime = '2010-01-01 12:00'
+
+          expect(record.birth_datetime).to be_kind_of(Time)
+        end
+
+        it 'should parse string as current timezone' do
+          record.birth_datetime = '2010-06-01 12:00'
+
+          expect(record.birth_datetime.utc_offset).to eq Time.zone.utc_offset
+        end
+      end
+    end
+  end
+
+  context "reload" do
+    it 'should clear cache value' do
+      record = Employee.create!
+      record.birth_date = '2010-01-01'
+      
+      record.reload
+
+      expect(record.read_timeliness_attribute_before_type_cast('birth_date')).to be_nil
+    end
+  end
+
+  context "before_type_cast method" do
+    let(:record) { Employee.new }
+
+    it 'should be defined on class if ORM supports it' do
+      expect(record).to respond_to(:birth_datetime_before_type_cast)
+    end
+
+    it 'should return original value' do
+      record.birth_datetime = date_string = '2010-01-01'
+
+      expect(record.birth_datetime_before_type_cast).to eq date_string
+    end
+
+    it 'should return attribute if no attribute assignment has been made' do
+      datetime = Time.zone.local(2010,01,01)
+      Employee.create(:birth_datetime => datetime)
+
+      record = Employee.last
+      expect(record.birth_datetime_before_type_cast).to match(/#{datetime.utc.to_s[0...-4]}/)
     end
 
     context "with plugin parser" do
       with_config(:use_plugin_parser, true)
 
-      class EmployeeWithParser < ActiveRecord::Base
-        set_table_name 'employees'
-        validates_date :birth_date
-        validates_datetime :birth_datetime
-      end
-
-      it 'should parse a string value' do
-        Timeliness::Parser.should_receive(:parse)
-        r = EmployeeWithParser.new
-        r.birth_date = '2010-01-01'
-      end
-
-      it 'should parse string as current timezone' do
-        r = EmployeeWithParser.new
-        r.birth_datetime = '2010-06-01 12:00'
-        r.birth_datetime.utc_offset.should == 10.hours
-      end
-    end
-  end
-
-  context "cached value" do
-    it 'should be cleared on reload' do
-      r = Employee.create!
-      r.birth_date = '2010-01-01'
-      r.reload
-      r._timeliness_raw_value_for(:birth_date).should be_nil
-    end
-  end
-
-  context "before_type_cast method" do
-    it 'should be defined on class if ORM supports it' do
-      Employee.new.should respond_to(:birth_datetime_before_type_cast)
-    end
-
       it 'should return original value' do
-      r = Employee.new
-      r.birth_datetime = date_string = '2010-01-01'
-      r.birth_datetime_before_type_cast.should == date_string
+        record.birth_datetime = date_string = '2010-01-31'
+
+        expect(record.birth_datetime_before_type_cast).to eq date_string
+      end
+    end
+
+  end
+
+  context "define_attribute_methods" do
+    it "returns a falsy value if the attribute methods have already been generated" do
+      expect(Employee.define_attribute_methods).to be_falsey
+    end
+  end
+
+  context "undefine_attribute_methods" do
+    it "returns remove attribute methods that have already been generated" do
+      Employee.define_attribute_methods
+
+      expect(Employee.instance_methods).to include(:birth_datetime)
+
+      Employee.undefine_attribute_methods
+
+      expect(Employee.instance_methods).to_not include(:birth_datetime)
     end
   end
 end

spec/validates_timeliness/orm/mongoid_spec.rb

@@ -1,91 +0,0 @@
-require 'spec_helper'
-
-# Try loading mongoid and connecting. Otherwise, abort and skip spec.
-begin
-
-require 'mongoid'
-require 'validates_timeliness/orm/mongoid'
-Mongoid.configure do |config|
-  name = "validates_timeliness_test"
-  host = "localhost"
-  config.master = Mongo::Connection.new.db(name)
-  config.persist_in_safe_mode = false
-end
-
-describe ValidatesTimeliness, 'Mongoid' do
-
-  class Article
-    ::ValidatesTimeliness.use_plugin_parser = true
-    include Mongoid::Document
-    field :publish_date, :type => Date
-    field :publish_time, :type => Time
-    field :publish_datetime, :type => DateTime
-    validates_date :publish_date, :allow_nil => true
-    validates_time :publish_time, :allow_nil => true
-    validates_datetime :publish_datetime, :allow_nil => true
-    ::ValidatesTimeliness.use_plugin_parser = false
-  end
-
-  context "validation methods" do
-    it 'should be defined on the class' do
-      Article.should respond_to(:validates_date)
-      Article.should respond_to(:validates_time)
-      Article.should respond_to(:validates_datetime)
-    end
-
-    it 'should be defined on the instance' do
-      Article.new.should respond_to(:validates_date)
-      Article.new.should respond_to(:validates_time)
-      Article.new.should respond_to(:validates_datetime)
-    end
-  end
-
-  it 'should determine type for attribute' do
-    Article.timeliness_attribute_type(:publish_date).should == :date
-  end
-  
-  context "attribute write method" do
-    it 'should cache attribute raw value' do
-      r = Article.new
-      r.publish_datetime = date_string = '2010-01-01'
-      r._timeliness_raw_value_for(:publish_datetime).should == date_string
-    end
-
-    context "with plugin parser" do
-      with_config(:use_plugin_parser, false)
-
-      it 'should parse a string value' do
-        Timeliness::Parser.should_receive(:parse)
-        r = Article.new
-        r.publish_date = '2010-01-01'
-      end
-
-      it 'should parse string into Time value' do
-        r = Article.new
-        r.publish_datetime = '2010-01-01 12:00'
-        r.publish_datetime.should == Time.utc(2010,1,1,12,0)
-      end
-    end
-  end
-
-  context "cached value" do
-    it 'should be cleared on reload' do
-      r = Article.create!
-      r.publish_date = '2010-01-01'
-      r.reload
-      r._timeliness_raw_value_for(:publish_date).should be_nil
-    end
-  end
-
-  context "before_type_cast method" do
-    it 'should not be defined if ORM does not support it' do
-      Article.new.should_not respond_to(:birth_datetime_before_type_cast)
-    end
-  end
-end
-
-rescue LoadError
-  puts "Mongoid specs skipped. Mongoid not installed"
-rescue StandardError
-  puts "Mongoid specs skipped. MongoDB connection failed."
-end

spec/validates_timeliness/validator/after_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Validator, ":after option" do
+RSpec.describe ValidatesTimeliness::Validator, ":after option" do
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :after => Date.new(2010, 1, 1)
@@ -25,15 +23,15 @@ describe ValidatesTimeliness::Validator, ":after option" do
     end
 
     it "should not be valid for same time as restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0), 'must be after 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 12, 0, 0), 'must be after 12:00:00')
     end
 
     it "should not be valid for time before restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59), 'must be after 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59), 'must be after 12:00:00')
     end
 
     it "should be valid for time after restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01))
+      valid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01))
     end
   end
 

spec/validates_timeliness/validator/before_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Validator, ":before option" do
+RSpec.describe ValidatesTimeliness::Validator, ":before option" do
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :before => Date.new(2010, 1, 1)
@@ -25,15 +23,15 @@ describe ValidatesTimeliness::Validator, ":before option" do
     end
 
     it "should not be valid for time after restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01), 'must be before 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01), 'must be before 12:00:00')
     end
 
     it "should not be valid for same time as restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0), 'must be before 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 12, 0, 0), 'must be before 12:00:00')
     end
 
     it "should be valid for time before restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59))
+      valid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59))
     end
   end
 

spec/validates_timeliness/validator/is_at_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Validator, ":is_at option" do
+RSpec.describe ValidatesTimeliness::Validator, ":is_at option" do
   before do
-    Timecop.freeze(Time.local_time(2010, 1, 1, 0, 0, 0))
+    Timecop.freeze(Time.local(2010, 1, 1, 0, 0, 0))
   end
 
   describe "for date type" do
@@ -29,15 +27,15 @@ describe ValidatesTimeliness::Validator, ":is_at option" do
     end
 
     it "should not be valid for time before restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59), 'must be at 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59), 'must be at 12:00:00')
     end
 
     it "should not be valid for time after restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01), 'must be at 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01), 'must be at 12:00:00')
     end
 
     it "should be valid for same time as restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0))
+      valid!(:birth_time, Time.local(2000, 1, 1, 12, 0, 0))
     end
   end
 

spec/validates_timeliness/validator/on_or_after_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Validator, ":on_or_after option" do
+RSpec.describe ValidatesTimeliness::Validator, ":on_or_after option" do
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :on_or_after => Date.new(2010, 1, 1)
@@ -25,15 +23,15 @@ describe ValidatesTimeliness::Validator, ":on_or_after option" do
     end
 
     it "should not be valid for time before restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59), 'must be on or after 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59), 'must be on or after 12:00:00')
     end
 
     it "should be valid for time after restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01))
+      valid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01))
     end
 
     it "should be valid for same time as restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0))
+      valid!(:birth_time, Time.local(2000, 1, 1, 12, 0, 0))
     end
   end
 

spec/validates_timeliness/validator/on_or_before_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Validator, ":on_or_before option" do
+RSpec.describe ValidatesTimeliness::Validator, ":on_or_before option" do
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :on_or_before => Date.new(2010, 1, 1)
@@ -25,15 +23,15 @@ describe ValidatesTimeliness::Validator, ":on_or_before option" do
     end
 
     it "should not be valid for time after restriction" do
-      invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01), 'must be on or before 12:00:00')
+      invalid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01), 'must be on or before 12:00:00')
     end
 
     it "should be valid for time before restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59))
+      valid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59))
     end
 
     it "should be valid for same time as restriction" do
-      valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0))
+      valid!(:birth_time, Time.local(2000, 1, 1, 12, 0, 0))
     end
   end
 

spec/validates_timeliness/validator_spec.rb

@@ -1,27 +1,27 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness::Validator do
-  NIL = [nil]
-
+RSpec.describe ValidatesTimeliness::Validator do
   before do
-    Timecop.freeze(Time.local_time(2010, 1, 1, 0, 0, 0))
-  end
-
-  it 'should return validator kind as :timeliness' do
-    ValidatesTimeliness::Validator.kind.should == :timeliness 
+    Timecop.freeze(Time.local(2010, 1, 1, 0, 0, 0))
   end
 
   describe "Model.validates with :timeliness option" do
     it 'should use plugin validator class' do
       Person.validates :birth_date, :timeliness => {:is_at => Date.new(2010,1,1), :type => :date}
-      Person.validators.should have(1).kind_of(ActiveModel::Validations::TimelinessValidator)
+      expect(Person.validators.select { |v| v.is_a?(ActiveModel::Validations::TimelinessValidator) }.size).to eq(1)
       invalid!(:birth_date, Date.new(2010,1,2))
       valid!(:birth_date, Date.new(2010,1,1))
     end
 
     it 'should use default to :datetime type' do
       Person.validates :birth_datetime, :timeliness => {:is_at => Time.mktime(2010,1,1)}
-      Person.validators.first.type.should == :datetime
+      expect(Person.validators.first.type).to eq(:datetime)
+    end
+
+    it 'should add attribute to timeliness attributes set' do
+      expect(PersonWithShim.timeliness_validated_attributes).not_to include(:birth_time)
+
+      PersonWithShim.validates :birth_time, :timeliness => {:is_at => "12:30"}
+
+      expect(PersonWithShim.timeliness_validated_attributes).to include(:birth_time)
     end
   end
 
@@ -33,22 +33,33 @@ describe ValidatesTimeliness::Validator do
   it 'should not be valid attribute is type cast to nil but raw value is non-nil invalid value' do
     Person.validates_date :birth_date, :allow_nil => true
     record = Person.new
-    record.stub!(:birth_date).and_return(nil)
-    record.stub!(:_timeliness_raw_value_for).and_return("Not a date")
-    record.should_not be_valid
-    record.errors[:birth_date].first.should == 'is not a valid date'
+    allow(record).to receive(:birth_date).and_return(nil)
+    allow(record).to receive(:read_timeliness_attribute_before_type_cast).and_return("Not a date")
+    expect(record).not_to be_valid
+    expect(record.errors[:birth_date].first).to eq('is not a valid date')
   end
 
   describe ":allow_nil option" do
     it 'should not allow nil by default' do
       Person.validates_date :birth_date
-      invalid!(:birth_date, NIL, 'is not a valid date')
+      invalid!(:birth_date, [nil], 'is not a valid date')
       valid!(:birth_date, Date.today)
     end
 
     it 'should allow nil when true' do
       Person.validates_date :birth_date, :allow_nil => true
-      valid!(:birth_date, NIL)
+      valid!(:birth_date, [nil])
+    end
+
+    context "with raw value cache" do
+      it "should not be valid with an invalid format" do
+        PersonWithShim.validates_date :birth_date, :allow_nil => true
+
+        p = PersonWithShim.new
+        p.birth_date = 'bogus'
+
+        expect(p).not_to be_valid
+      end
     end
   end
 
@@ -63,6 +74,31 @@ describe ValidatesTimeliness::Validator do
       Person.validates_date :birth_date, :allow_blank => true
       valid!(:birth_date, '')
     end
+
+    context "with raw value cache" do
+      it "should not be valid with an invalid format" do
+        PersonWithShim.validates_date :birth_date, :allow_blank => true
+
+        p = PersonWithShim.new
+        p.birth_date = 'bogus'
+
+        expect(p).not_to be_valid
+      end
+    end
+  end
+
+  describe ':message options' do
+    it 'should allow message option too' do
+      Person.validates_date :birth_date, on_or_after: :today, message: 'cannot be in past'
+      invalid!(:birth_date, Date.today - 5.days, 'cannot be in past')
+      valid!(:birth_date, Date.today)
+    end
+
+    it 'should first allow the defined message' do
+      Person.validates_date :birth_date, on_or_after: :today, on_or_after_message: 'cannot be in past', message: 'dummy message'
+      invalid!(:birth_date, Date.today - 5.days, 'cannot be in past')
+      valid!(:birth_date, Date.today)
+    end
   end
 
   describe ":between option" do
@@ -70,8 +106,8 @@ describe ValidatesTimeliness::Validator do
       it 'should be split option into :on_or_after and :on_or_before values' do
         on_or_after, on_or_before = Date.new(2010,1,1), Date.new(2010,1,2)
         Person.validates_date :birth_date, :between => [on_or_after, on_or_before]
-        Person.validators.first.options[:on_or_after].should == on_or_after
-        Person.validators.first.options[:on_or_before].should == on_or_before
+        expect(Person.validators.first.options[:on_or_after]).to eq(on_or_after)
+        expect(Person.validators.first.options[:on_or_before]).to eq(on_or_before)
         invalid!(:birth_date, on_or_after - 1, "must be on or after 2010-01-01")
         invalid!(:birth_date, on_or_before + 1, "must be on or before 2010-01-02")
         valid!(:birth_date, on_or_after)
@@ -83,14 +119,27 @@ describe ValidatesTimeliness::Validator do
       it 'should be split option into :on_or_after and :on_or_before values' do
         on_or_after, on_or_before = Date.new(2010,1,1), Date.new(2010,1,2)
         Person.validates_date :birth_date, :between => on_or_after..on_or_before
-        Person.validators.first.options[:on_or_after].should == on_or_after
-        Person.validators.first.options[:on_or_before].should == on_or_before
+        expect(Person.validators.first.options[:on_or_after]).to eq(on_or_after)
+        expect(Person.validators.first.options[:on_or_before]).to eq(on_or_before)
         invalid!(:birth_date, on_or_after - 1, "must be on or after 2010-01-01")
         invalid!(:birth_date, on_or_before + 1, "must be on or before 2010-01-02")
         valid!(:birth_date, on_or_after)
         valid!(:birth_date, on_or_before)
       end
     end
+
+    describe "range with excluded end value" do
+      it 'should be split option into :on_or_after and :before values' do
+        on_or_after, before = Date.new(2010,1,1), Date.new(2010,1,3)
+        Person.validates_date :birth_date, :between => on_or_after...before
+        expect(Person.validators.first.options[:on_or_after]).to eq(on_or_after)
+        expect(Person.validators.first.options[:before]).to eq(before)
+        invalid!(:birth_date, on_or_after - 1, "must be on or after 2010-01-01")
+        invalid!(:birth_date, before, "must be before 2010-01-03")
+        valid!(:birth_date, on_or_after)
+        valid!(:birth_date, before - 1)
+      end
+    end
   end
 
   describe ":ignore_usec option" do
@@ -122,13 +171,13 @@ describe ValidatesTimeliness::Validator do
     it "should be valid when value matches format" do
       person.birth_date = '11-12-1913'
       person.valid?
-      person.errors[:birth_date].should be_empty
+      expect(person.errors[:birth_date]).to be_empty
     end
 
     it "should not be valid when value does not match format" do
       person.birth_date = '1913-12-11'
       person.valid?
-      person.errors[:birth_date].should include('is not a valid date')
+      expect(person.errors[:birth_date]).to include('is not a valid date')
     end
   end
 
@@ -136,20 +185,27 @@ describe ValidatesTimeliness::Validator do
     let(:person) { Person.new(:birth_date => Date.today) }
 
     before do
-      Person.validates_time :birth_date, :is_at => lambda { raise }
+      Person.validates_time :birth_date, :is_at => lambda { raise }, :before => lambda { raise }
     end
 
     it "should be added when ignore_restriction_errors is false" do
       with_config(:ignore_restriction_errors, false) do
         person.valid?
-        person.errors[:birth_date].first.should match("Error occurred validating birth_date for :is_at restriction")
+        expect(person.errors[:birth_date].first).to match("Error occurred validating birth_date")
       end
     end
 
     it "should not be added when ignore_restriction_errors is true" do
       with_config(:ignore_restriction_errors, true) do
         person.valid?
-        person.errors[:birth_date].should be_empty
+        expect(person.errors[:birth_date]).to be_empty
+      end
+    end
+
+    it 'should exit on first error' do
+      with_config(:ignore_restriction_errors, false) do
+        person.valid?
+        expect(person.errors[:birth_date].size).to eq(1)
       end
     end
   end
@@ -158,17 +214,17 @@ describe ValidatesTimeliness::Validator do
     describe "default" do
       it 'should format date error value as yyyy-mm-dd' do
         validator = ValidatesTimeliness::Validator.new(:attributes => [:birth_date], :type => :date)
-        validator.format_error_value(Date.new(2010,1,1)).should == '2010-01-01'
+        expect(validator.format_error_value(Date.new(2010,1,1))).to eq('2010-01-01')
       end
 
       it 'should format time error value as hh:nn:ss' do
         validator = ValidatesTimeliness::Validator.new(:attributes => [:birth_time], :type => :time)
-        validator.format_error_value(Time.mktime(2010,1,1,12,34,56)).should == '12:34:56'
+        expect(validator.format_error_value(Time.mktime(2010,1,1,12,34,56))).to eq('12:34:56')
       end
 
       it 'should format datetime error value as yyyy-mm-dd hh:nn:ss' do
         validator = ValidatesTimeliness::Validator.new(:attributes => [:birth_datetime], :type => :datetime)
-        validator.format_error_value(Time.mktime(2010,1,1,12,34,56)).should == '2010-01-01 12:34:56'
+        expect(validator.format_error_value(Time.mktime(2010,1,1,12,34,56))).to eq('2010-01-01 12:34:56')
       end
     end
 
@@ -179,7 +235,7 @@ describe ValidatesTimeliness::Validator do
 
       it 'should use the default format for the type' do
         validator = ValidatesTimeliness::Validator.new(:attributes => [:birth_date], :type => :date)
-        validator.format_error_value(Date.new(2010,1,1)).should == '2010-01-01'
+        expect(validator.format_error_value(Date.new(2010,1,1))).to eq('2010-01-01')
       end
 
       after :all do

spec/validates_timeliness_spec.rb

@@ -1,41 +1,39 @@
-require 'spec_helper'
-
-describe ValidatesTimeliness do
+RSpec.describe ValidatesTimeliness do
 
   it 'should alias use_euro_formats to remove_us_formats on Timeliness gem' do
-    Timeliness.should respond_to(:remove_us_formats) 
+    expect(Timeliness).to respond_to(:remove_us_formats) 
   end
 
   it 'should alias to date_for_time_type to dummy_date_for_time_type on Timeliness gem' do
-    Timeliness.should respond_to(:dummy_date_for_time_type) 
+    expect(Timeliness).to respond_to(:dummy_date_for_time_type) 
   end
 
   describe "config" do
     it 'should delegate default_timezone to Timeliness gem' do
-      Timeliness.should_receive(:default_timezone=)
+      expect(Timeliness).to receive(:default_timezone=)
       ValidatesTimeliness.default_timezone = :utc
     end
 
     it 'should delegate dummy_date_for_time_type to Timeliness gem' do
-      Timeliness.should_receive(:dummy_date_for_time_type) 
-      Timeliness.should_receive(:dummy_date_for_time_type=) 
+      expect(Timeliness).to receive(:dummy_date_for_time_type) 
+      expect(Timeliness).to receive(:dummy_date_for_time_type=) 
       array = ValidatesTimeliness.dummy_date_for_time_type
       ValidatesTimeliness.dummy_date_for_time_type = array
     end
 
     context "parser" do
       it 'should delegate add_formats to Timeliness gem' do
-        Timeliness.should_receive(:add_formats)
+        expect(Timeliness).to receive(:add_formats)
         ValidatesTimeliness.parser.add_formats
       end
 
       it 'should delegate remove_formats to Timeliness gem' do
-        Timeliness.should_receive(:remove_formats)
+        expect(Timeliness).to receive(:remove_formats)
         ValidatesTimeliness.parser.remove_formats
       end
 
       it 'should delegate remove_us_formats to Timeliness gem' do
-        Timeliness.should_receive(:remove_us_formats)
+        expect(Timeliness).to receive(:remove_us_formats)
         ValidatesTimeliness.parser.remove_us_formats
       end
     end

validates_timeliness.gemspec

@@ -1,32 +1,21 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "validates_timeliness/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{validates_timeliness}
-  s.version = "3.0.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.name        = "validates_timeliness"
+  s.version     = ValidatesTimeliness::VERSION
   s.authors     = ["Adam Meehan"]
-  s.date = %q{2011-01-29}
-  s.description = %q{Date and time validation plugin for Rails which allows custom formats}
-  s.email = %q{adam.meehan@gmail.com}
-  s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "LICENSE"]
-  s.files = ["CHANGELOG.rdoc", "LICENSE", "README.rdoc", "Rakefile", "init.rb", "lib/generators/validates_timeliness/install_generator.rb", "lib/generators/validates_timeliness/templates/en.yml", "lib/generators/validates_timeliness/templates/validates_timeliness.rb", "lib/validates_timeliness.rb", "lib/validates_timeliness/attribute_methods.rb", "lib/validates_timeliness/conversion.rb", "lib/validates_timeliness/extensions.rb", "lib/validates_timeliness/extensions/date_time_select.rb", "lib/validates_timeliness/extensions/multiparameter_handler.rb", "lib/validates_timeliness/helper_methods.rb", "lib/validates_timeliness/orm/active_record.rb", "lib/validates_timeliness/orm/mongoid.rb", "lib/validates_timeliness/railtie.rb", "lib/validates_timeliness/validator.rb", "lib/validates_timeliness/version.rb", "spec/spec_helper.rb", "spec/support/config_helper.rb", "spec/support/model_helpers.rb", "spec/support/test_model.rb", "spec/validates_timeliness/attribute_methods_spec.rb", "spec/validates_timeliness/conversion_spec.rb", "spec/validates_timeliness/extensions/date_time_select_spec.rb", "spec/validates_timeliness/extensions/multiparameter_handler_spec.rb", "spec/validates_timeliness/helper_methods_spec.rb", "spec/validates_timeliness/orm/active_record_spec.rb", "spec/validates_timeliness/orm/mongoid_spec.rb", "spec/validates_timeliness/validator/after_spec.rb", "spec/validates_timeliness/validator/before_spec.rb", "spec/validates_timeliness/validator/is_at_spec.rb", "spec/validates_timeliness/validator/on_or_after_spec.rb", "spec/validates_timeliness/validator/on_or_before_spec.rb", "spec/validates_timeliness/validator_spec.rb", "spec/validates_timeliness_spec.rb", "validates_timeliness.gemspec"]
-  s.homepage = %q{http://github.com/adzap/validates_timeliness}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
   s.summary     = %q{Date and time validation plugin for Rails which allows custom formats}
-  s.test_files = ["spec/spec_helper.rb", "spec/support/config_helper.rb", "spec/support/model_helpers.rb", "spec/support/test_model.rb", "spec/validates_timeliness/attribute_methods_spec.rb", "spec/validates_timeliness/conversion_spec.rb", "spec/validates_timeliness/extensions/date_time_select_spec.rb", "spec/validates_timeliness/extensions/multiparameter_handler_spec.rb", "spec/validates_timeliness/helper_methods_spec.rb", "spec/validates_timeliness/orm/active_record_spec.rb", "spec/validates_timeliness/orm/mongoid_spec.rb", "spec/validates_timeliness/validator/after_spec.rb", "spec/validates_timeliness/validator/before_spec.rb", "spec/validates_timeliness/validator/is_at_spec.rb", "spec/validates_timeliness/validator/on_or_after_spec.rb", "spec/validates_timeliness/validator/on_or_before_spec.rb", "spec/validates_timeliness/validator_spec.rb", "spec/validates_timeliness_spec.rb"]
+  s.description = %q{Adds validation methods to ActiveModel for validating dates and times. Works with multiple ORMS.}
+  s.email       = %q{adam.meehan@gmail.com}
+  s.homepage    = %q{http://github.com/adzap/validates_timeliness}
+  s.license     = "MIT"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.require_paths    = ["lib"]
+  s.files            = `git ls-files`.split("\n") - %w{ .gitignore .rspec Gemfile Gemfile.lock autotest/discover.rb Appraisals Travis.yml } - Dir['gemsfiles/*']
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "LICENSE"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<timeliness>, ["~> 0.3.2"])
-    else
-      s.add_dependency(%q<timeliness>, ["~> 0.3.2"])
-    end
-  else
-    s.add_dependency(%q<timeliness>, ["~> 0.3.2"])
-  end
+  s.add_runtime_dependency(%q<timeliness>, [">= 0.3.10", "< 1"])
 end