v3.0.12

Add basic validation specs to each ORM shim

.gitignore

@@ -1,3 +1,4 @@
 pkg/
 .bundle/
 .rvmrc
+Gemfile.lock

CHANGELOG.rdoc

@@ -1,3 +1,27 @@
+= 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.

Gemfile

@@ -2,15 +2,18 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'ZenTest'
+gem 'rails', '~> 3.2.6'
-gem 'rails', '3.0.7'
+gem 'rspec', '~> 2.8'
-gem 'rspec', '~> 2.4'
+gem 'rspec-rails', '~> 2.8'
-gem 'rspec-rails', '~> 2.4'
 gem 'timecop'
 gem 'rspec_tag_matchers'
+gem 'ruby-debug', :platforms => [:ruby_18, :jruby]
+gem 'debugger', :platforms => [:ruby_19]
 
 group :mongoid do
-  gem 'mongoid', '2.0.0.rc.8'
+  gem 'mongoid', '~> 2.3.0'
+  gem 'bson_ext'
+  gem 'system_timer', :platforms => [:ruby_18]
 end
 
 group :active_record do

Gemfile.lock

@@ -1,118 +0,0 @@
-PATH
-  remote: .
-  specs:
-    validates_timeliness (3.0.6)
-      timeliness (~> 0.3.3)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    ZenTest (4.5.0)
-    abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    arel (2.0.9)
-    bson (1.3.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.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    mongo (1.3.0)
-      bson (>= 1.3.0)
-    mongoid (2.0.0.rc.8)
-      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.2)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
-      bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.5.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.27)
-    will_paginate (3.0.pre2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ZenTest
-  mongoid (= 2.0.0.rc.8)
-  rails (= 3.0.7)
-  rspec (~> 2.4)
-  rspec-rails (~> 2.4)
-  rspec_tag_matchers
-  sqlite3-ruby
-  timecop
-  validates_timeliness!

Rakefile

@@ -1,6 +1,8 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
+Bundler.setup
+
 require 'rake/rdoctask'
 require 'rspec/core/rake_task'
 

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/validates_timeliness.rb

@@ -58,6 +58,10 @@ module ValidatesTimeliness
   # 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
 end

lib/validates_timeliness/attribute_methods.rb

@@ -20,24 +20,34 @@ module ValidatesTimeliness
         :datetime
       end
 
+      def undefine_attribute_methods
+        super
+        undefine_timeliness_attribute_methods
+      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_attribute_timeliness_methods(attr_name, before_type_cast)
-          define_timeliness_before_type_cast_method(attr_name) if before_type_cast
         end
       end
 
+      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)
         method_body, line = <<-EOV, __LINE__ + 1
           def #{attr_name}=(value)
+            original_value = value
             @timeliness_cache ||= {}
-            @timeliness_cache["#{attr_name}"] = value
+            @timeliness_cache["#{attr_name}"] = original_value
-
             #{ "if value.is_a?(String)\n#{timeliness_type_cast_code(attr_name, 'value')}\nend" if ValidatesTimeliness.use_plugin_parser }
-            super
+            
+            super(value)
           end
         EOV
         generated_timeliness_methods.module_eval(method_body, __FILE__, line)
@@ -46,7 +56,7 @@ module ValidatesTimeliness
       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}')
+            _timeliness_raw_value_for('#{attr_name}') || @attributes['#{attr_name}']
           end
         EOV
         generated_timeliness_methods.module_eval(method_body, __FILE__, line)
@@ -63,17 +73,20 @@ module ValidatesTimeliness
       def generated_timeliness_methods
         @generated_timeliness_methods ||= Module.new.tap { |m| include(m) }
       end
-    end
 
-    module InstanceMethods
+      def undefine_timeliness_attribute_methods
-      def _timeliness_raw_value_for(attr_name)
+        generated_timeliness_methods.module_eval do
-        @timeliness_cache && @timeliness_cache[attr_name.to_s]
+          instance_methods.each { |m| undef_method(m) }
-      end
+        end
-
-      def _clear_timeliness_cache
-        @timeliness_cache = {}
       end
     end
 
+    def _timeliness_raw_value_for(attr_name)
+      @timeliness_cache && @timeliness_cache[attr_name]
+    end
+
+    def _clear_timeliness_cache
+      @timeliness_cache = {}
+    end
   end
 end

lib/validates_timeliness/extensions/date_time_select.rb

@@ -10,35 +10,52 @@ module ValidatesTimeliness
 
       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 initialize(year, month, day, hour, min, sec)
-
+          @year, @month, @day, @hour, @min, @sec = year, month, day, hour, min, sec
-        def datetime_selector_with_timeliness(*args)
-          @timeliness_date_or_time_tag = true
-          datetime_selector_without_timeliness(*args)
         end
 
-        def value(object)
+        # adapted from activesupport/lib/active_support/core_ext/date_time/calculations.rb, line 36 (3.0.7)
-          unless @timeliness_date_or_time_tag && @template_object.params[@object_name]
+        def change(options)
-            return super
+          TimelinessDateTime.new(
-          end
+            options[:year]  || year,
-
+            options[:month] || month,
-          pairs = @template_object.params[@object_name].select {|k,v| k =~ /^#{@method_name}\(/ }
+            options[:day]   || day,
-          return super if pairs.empty?
+            options[:hour]  || hour,
-
+            options[:min]   || (options[:hour] ? 0 : min),
-          values = [nil] * 6
+            options[:sec]   || ((options[:hour] || options[:min]) ? 0 : sec)
-          pairs.map do |(param, value)|
+          )
-            position = param.scan(/\(([0-9]*).*\)/).first.first
-            values[position.to_i-1] = value
-          end
-
-          TimelinessDateTime.new(*values)
         end
       end
 
+      def datetime_selector_with_timeliness(*args)
+        @timeliness_date_or_time_tag = true
+        datetime_selector_without_timeliness(*args)
+      end
+
+      def value_with_timeliness(object)
+        unless @timeliness_date_or_time_tag && @template_object.params[@object_name]
+          return value_without_timeliness(object)
+        end
+
+        @template_object.params[@object_name]
+
+        pairs = @template_object.params[@object_name].select {|k,v| k =~ /^#{@method_name}\(/ }
+        return value_without_timeliness(object) if pairs.empty?
+
+        values = [nil] * 6
+        pairs.map do |(param, 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

@@ -8,7 +8,8 @@ module ValidatesTimeliness
 
       included do
         alias_method_chain :instantiate_time_object, :timeliness
-        alias_method_chain :execute_callstack_for_multiparameter_attributes, :timeliness
+        alias_method :execute_callstack_for_multiparameter_attributes, :execute_callstack_for_multiparameter_attributes_with_timeliness
+        alias_method :read_value_from_parameter, :read_value_from_parameter_with_timeliness
       end
 
       private
@@ -20,42 +21,52 @@ module ValidatesTimeliness
       end
 
       def instantiate_time_object_with_timeliness(name, values)
-        if Date.valid_civil?(*values[0..2])
+        validate_multiparameter_date_values(values) {
           instantiate_time_object_without_timeliness(name, values)
+        }
+      end
+
+      def instantiate_date_object(name, values)
+        validate_multiparameter_date_values(values) {
+          Date.new(*values)
+        }
+      end
+
+      # Yield if date values are valid
+      def validate_multiparameter_date_values(values)
+        if values[0..2].all?{ |v| v.present? } && Date.valid_civil?(*values[0..2])
+          yield
         else
           invalid_multiparameter_date_or_time_as_string(values)
         end
       end
 
-      def instantiate_date_object(name, values)
+      def read_value_from_parameter_with_timeliness(name, values_from_param)
-        values = values.map { |v| v.nil? ? 1 : v }
+        klass = (self.class.reflect_on_aggregation(name.to_sym) || column_for_attribute(name)).klass
-        Date.new(*values)
+        values = values_from_param.is_a?(Hash) ? values_from_param.to_a.sort_by(&:first).map(&:last) : values_from_param
-      rescue ArgumentError => ex
+
-        invalid_multiparameter_date_or_time_as_string(values)
+        if values.empty? || values.all?{ |v| v.nil? }
+          nil
+        elsif klass == Time
+          instantiate_time_object(name, values)
+        elsif klass == Date
+          instantiate_date_object(name, values)
+        else
+          if respond_to?(:read_other_parameter_value)
+            read_date_parameter_value(name, values_from_param)
+          else
+            klass.new(*values)
+          end
+        end
       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
+            send(name + "=", read_value_from_parameter(name, values_with_empty_parameters))
-            values = values_with_empty_parameters.reject { |v| v.nil? }
-
-            if values.empty?
-              send(name + "=", nil)
-            else
-
-              value = if Time == klass
-                instantiate_time_object(name, values)
-              elsif Date == klass
-                instantiate_date_object(name, values_with_empty_parameters)
-              else
-                klass.new(*values)
-              end
-
-              send(name + "=", value)
-            end
           rescue => ex
+            values = values_with_empty_parameters.is_a?(Hash) ? values_with_empty_parameters.values : values_with_empty_parameters 
             errors << ActiveRecord::AttributeAssignmentError.new("error on assignment #{values.inspect} to #{name}", ex, name)
           end
         end

lib/validates_timeliness/orm/active_record.rb

@@ -3,12 +3,21 @@ module ValidatesTimeliness
     module ActiveRecord
       extend ActiveSupport::Concern
 
-      module ClassMethods
+      def self.use_plugin_cache?
-        def define_attribute_methods
+        ::ActiveRecord::VERSION::STRING < '3.1.0'
-          super
+      end
-          # Define write method and before_type_cast method
+
-          define_timeliness_methods(true)
+      included do
+        if ValidatesTimeliness::ORM::ActiveRecord.use_plugin_cache? 
+          include Reload
+        else
+          # Just use the built-in before_type_cast retrieval
+          alias_method :_timeliness_raw_value_for, :read_attribute_before_type_cast
         end
+      end
+
+      module ClassMethods
+        public
 
         def timeliness_attribute_timezone_aware?(attr_name)
           attr_name = attr_name.to_s
@@ -19,17 +28,46 @@ module ValidatesTimeliness
           columns_hash[attr_name.to_s].type
         end
 
+        def define_attribute_methods
+          super.tap do |attribute_methods_generated|
+            use_before_type_cast = ValidatesTimeliness::ORM::ActiveRecord.use_plugin_cache?
+            define_timeliness_methods use_before_type_cast
+          end
+        end
+
+        protected
+
+        def define_attribute_timeliness_methods(attr_name, before_type_cast=false)
+          if before_type_cast
+            define_timeliness_write_method(attr_name)
+            define_timeliness_before_type_cast_method(attr_name)
+          elsif ValidatesTimeliness.use_plugin_parser
+            define_timeliness_write_method_without_cache(attr_name)
+          end
+        end
+
+        def define_timeliness_write_method_without_cache(attr_name)
+          method_body, line = <<-EOV, __LINE__ + 1
+            def #{attr_name}=(value)
+              original_value = value
+              if value.is_a?(String)\n#{timeliness_type_cast_code(attr_name, 'value')}\nend
+              super(value)
+              @attributes['#{attr_name}'] = original_value
+            end
+          EOV
+          generated_timeliness_methods.module_eval(method_body, __FILE__, line)
+        end
+
         def timeliness_type_cast_code(attr_name, var_name)
           type = timeliness_attribute_type(attr_name)
 
-          <<-END
+          method_body = super
-            #{super}
+          method_body << "\n#{var_name} = #{var_name}.to_date if #{var_name}" if type == :date
-            #{var_name} = #{var_name}.to_date if #{var_name} && :#{type} == :date
+          method_body
-          END
         end
       end
 
-      module InstanceMethods
+      module Reload
         def reload(*args)
           _clear_timeliness_cache
           super

lib/validates_timeliness/orm/mongoid.rb

@@ -7,6 +7,8 @@ module ValidatesTimeliness
       # field value in Mongoid. Parser will return nil rather than error.
 
       module ClassMethods 
+        public
+
         # 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.
@@ -16,12 +18,6 @@ module ValidatesTimeliness
           attr_names.each { |attr_name| define_timeliness_write_method(attr_name) }
         end
 
-        def timeliness_type_cast_code(attr_name, var_name)
-          type = timeliness_attribute_type(attr_name)
-
-          "#{var_name} = Timeliness::Parser.parse(value, :#{type})"
-        end
-
         def timeliness_attribute_type(attr_name)
           {
             Date => :date,
@@ -29,29 +25,39 @@ module ValidatesTimeliness
             DateTime => :datetime
           }[fields[attr_name.to_s].type] || :datetime
         end
+
+        protected
+
+        def timeliness_type_cast_code(attr_name, var_name)
+          type = timeliness_attribute_type(attr_name)
+
+          "#{var_name} = Timeliness::Parser.parse(value, :#{type})"
+        end
+
       end
 
+      module Reload
+        def reload(*args)
+          _clear_timeliness_cache
+          super
+        end
+      end
     end
   end
 end
  
 module Mongoid::Document
-  # Due to how Mongoid misuses ActiveSupport::Concern,
+  include ValidatesTimeliness::AttributeMethods
-  # the only way to override a core component method is 
+  include ValidatesTimeliness::ORM::Mongoid
-  # 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
+  # Pre-2.3 reload
-    _clear_timeliness_cache
+  if (instance_methods & ['reload', :reload]).present?
-    reload_without_timeliness
+    def reload_with_timeliness
+      _clear_timeliness_cache
+      reload_without_timeliness
+    end
+    alias_method_chain :reload, :timeliness
+  else
+    include ValidatesTimeliness::ORM::Mongoid::Reload
   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

@@ -77,7 +77,7 @@ module ValidatesTimeliness
 
     def attribute_raw_value(record, attr_name)
       record.respond_to?(:_timeliness_raw_value_for) &&
-        record._timeliness_raw_value_for(attr_name)
+        record._timeliness_raw_value_for(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.6'
+  VERSION = '3.0.12'
 end

spec/spec_helper.rb

@@ -49,9 +49,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
 
@@ -73,12 +71,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_date :birth_time, :allow_nil => true
+  validates_date :birth_datetime, :allow_nil => true
 
   def birth_date=(value)
     self.redefined_birth_date_called = true
@@ -86,17 +82,20 @@ class Employee < ActiveRecord::Base
   end
 end
 
-Rspec.configure do |c|
+RSpec.configure do |c|
   c.mock_with :rspec
   c.include(RspecTagMatchers)
   c.include(ModelHelpers)
   c.include(ConfigHelper)
   c.before do
-    Person.reset_callbacks(:validate)
+    reset_validation_setup_for(Person)
-    PersonWithShim.timeliness_validated_attributes = []
+    reset_validation_setup_for(PersonWithShim)
-    Person._validators.clear
-    Employee.reset_callbacks(:validate)
-    Employee.timeliness_validated_attributes = []
-    Employee._validators.clear
   end
+
+  RSpec.configure do |c|
+    c.filter_run_excluding :active_record => lambda {|version|
+      !(::ActiveRecord::VERSION::STRING.to_s =~ /^#{version.to_s}/)
+    }
+  end
+  
 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/test_model.rb

@@ -31,7 +31,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 +39,7 @@ module TestModel
   end
 
   def attributes
-    @attributes.keys
+    @attributes
   end
 
   def attributes=(new_attributes={})
@@ -49,14 +49,12 @@ module TestModel
   end
 
   def method_missing(method_id, *args, &block)
-    if !self.class.attribute_methods_generated?
+    if match_attribute_method?(method_id.to_s)
-      self.class.define_attribute_methods self.class.model_attributes.keys.map(&:to_s)
+      self.class.define_attribute_methods self.class.model_attributes.keys
-      method_name = method_id.to_s
       send(method_id, *args, &block)
     else
       super
     end
   end
-
 end
 

spec/validates_timeliness/attribute_methods_spec.rb

@@ -31,7 +31,7 @@ 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
+      r._timeliness_raw_value_for('birth_datetime').should == date_string
     end
 
     it 'should not overwrite user defined methods' do
@@ -40,6 +40,21 @@ describe ValidatesTimeliness::AttributeMethods do
       e.redefined_birth_date_called.should be_true
     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 = RUBY_VERSION < '1.9' ? 'birth_date=' : :birth_date=
+
+      PersonWithShim.send(:generated_timeliness_methods).instance_methods.should include(write_method)
+
+      PersonWithShim.undefine_attribute_methods 
+
+      PersonWithShim.send(:generated_timeliness_methods).instance_methods.should_not include(write_method)
+    end
+
     context "with plugin parser" do
       with_config(:use_plugin_parser, true)
 

spec/validates_timeliness/extensions/date_time_select_spec.rb

@@ -14,12 +14,12 @@ 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(1i)" => '2009',
-        "birth_datetime(2i)" => 2,
+        "birth_datetime(2i)" => '2',
-        "birth_datetime(3i)" => 29,
+        "birth_datetime(3i)" => '29',
-        "birth_datetime(4i)" => 12,
+        "birth_datetime(4i)" => '12',
-        "birth_datetime(5i)" => 13,
+        "birth_datetime(5i)" => '13',
-        "birth_datetime(6i)" => 14,
+        "birth_datetime(6i)" => '14',
       }
       person.birth_datetime = nil
       @output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
@@ -28,12 +28,12 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
 
     it "should override object values and use params if present" do
       @params["person"] = {
-        "birth_datetime(1i)" => 2009,
+        "birth_datetime(1i)" => '2009',
-        "birth_datetime(2i)" => 2,
+        "birth_datetime(2i)" => '2',
-        "birth_datetime(3i)" => 29,
+        "birth_datetime(3i)" => '29',
-        "birth_datetime(4i)" => 12,
+        "birth_datetime(4i)" => '12',
-        "birth_datetime(5i)" => 13,
+        "birth_datetime(5i)" => '13',
-        "birth_datetime(6i)" => 14,
+        "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)
@@ -63,44 +63,56 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
   describe "date_select" do
     it "should use param values when attribute is nil" do
       @params["person"] = {
-        "birth_date(1i)" => 2009,
+        "birth_date(1i)" => '2009',
-        "birth_date(2i)" => 2,
+        "birth_date(2i)" => '2',
-        "birth_date(3i)" => 29,
+        "birth_date(3i)" => '29',
       }
       person.birth_date = nil
-      @output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
+      @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(1i)" => '2009',
-        "birth_date(2i)" => 2,
+        "birth_date(2i)" => '2',
-        "birth_date(3i)" => 29,
+        "birth_date(3i)" => '29',
       }
       person.birth_date = "2009-03-01"
-      @output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
+      @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 = 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 = 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 = 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)
+      @output.should have_tag("input[id=person_birth_date_3i][type=hidden][value='1']")
+    end
   end
 
   describe "time_select" do
@@ -110,12 +122,12 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
 
     it "should use param values when attribute is nil" do
       @params["person"] = {
-        "birth_time(1i)" => 2000,
+        "birth_time(1i)" => '2000',
-        "birth_time(2i)" => 1,
+        "birth_time(2i)" => '1',
-        "birth_time(3i)" => 1,
+        "birth_time(3i)" => '1',
-        "birth_time(4i)" => 12,
+        "birth_time(4i)" => '12',
-        "birth_time(5i)" => 13,
+        "birth_time(5i)" => '13',
-        "birth_time(6i)" => 14,
+        "birth_time(6i)" => '14',
       }
       person.birth_time = nil
       @output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)

spec/validates_timeliness/extensions/multiparameter_handler_spec.rb

@@ -1,33 +1,44 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness::Extensions::MultiparameterHandler do
-  let(:employee) { Employee.new }
 
   context "time column" do
-    it 'should return string value for invalid date portion' do
+    it 'should assign a string value for invalid date portion' do
-      multiparameter_attribute(:birth_datetime, [2000, 2, 31, 12, 0, 0])
+      employee = record_with_multiparameter_attribute(:birth_datetime, [2000, 2, 31, 12, 0, 0])
-      employee.birth_datetime_before_type_cast.should == '2000-02-31 12:00:00'
+      employee.birth_datetime_before_type_cast.should eq '2000-02-31 12:00:00'
     end
      
-    it 'should return Time value for valid datetimes' do
+    it 'should assign a Time value for valid datetimes' do
-      multiparameter_attribute(:birth_datetime, [2000, 2, 28, 12, 0, 0])
+      employee = record_with_multiparameter_attribute(:birth_datetime, [2000, 2, 28, 12, 0, 0])
-      employee.birth_datetime_before_type_cast.should be_kind_of(Time)
+      employee.birth_datetime_before_type_cast.should eq Time.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])
+      employee.birth_datetime_before_type_cast.should eq '2000-00-00'
     end
   end
 
   context "date column" do
-    it 'should return string value for invalid date' do
+    it 'should assign a string value for invalid date' do
-      multiparameter_attribute(:birth_date, [2000, 2, 31])
+      employee = record_with_multiparameter_attribute(:birth_date, [2000, 2, 31])
-      employee.birth_date_before_type_cast.should == '2000-02-31'
+      employee.birth_date_before_type_cast.should eq '2000-02-31'
     end
 
-    it 'should return Date value for valid date' do
+    it 'should assign a Date value for valid date' do
-      multiparameter_attribute(:birth_date, [2000, 2, 28])
+      employee = record_with_multiparameter_attribute(:birth_date, [2000, 2, 28])
-      employee.birth_date_before_type_cast.should be_kind_of(Date)
+      employee.birth_date_before_type_cast.should 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])
+      employee.birth_date_before_type_cast.should eq '2000-00-00'
     end
   end
 
-  def multiparameter_attribute(name, values)
+  def record_with_multiparameter_attribute(name, values)
-    employee.send(:execute_callstack_for_multiparameter_attributes, name.to_s => 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

@@ -13,9 +13,18 @@ describe ValidatesTimeliness, 'HelperMethods' do
     Person.new.should respond_to(:validates_datetime)
   end
 
-  it 'should validate instance when validation method called' do
+  it 'should validate instance using class validation defined' do
+    Person.validates_date :birth_date
+    r = Person.new
+    r.valid?
+
+    r.errors[:birth_date].should_not be_empty
+  end
+
+  it 'should validate instance using instance valiation method' do
     r = Person.new
     r.validates_date :birth_date
+
     r.errors[:birth_date].should_not be_empty
   end
 end

spec/validates_timeliness/orm/active_record_spec.rb

@@ -14,6 +14,30 @@ describe ValidatesTimeliness, 'ActiveRecord' do
       Employee.new.should respond_to(:validates_time)
       Employee.new.should respond_to(:validates_datetime)
     end
+
+    it "should validate a valid value string" do
+      r = Employee.new
+      r.birth_date = '2012-01-01'
+
+      r.valid?
+      r.errors[:birth_date].should be_empty
+    end
+
+    it "should validate a invalid value string" do
+      r = Employee.new
+      r.birth_date = 'not a date'
+
+      r.valid?
+      r.errors[:birth_date].should_not be_empty
+    end
+
+    it "should validate a nil value" do
+      r = Employee.new
+      r.birth_date = nil
+
+      r.valid?
+      r.errors[:birth_date].should be_empty
+    end
   end
 
   it 'should determine type for attribute' do
@@ -23,13 +47,26 @@ describe ValidatesTimeliness, 'ActiveRecord' do
   context "attribute write method" do
     class EmployeeWithCache < ActiveRecord::Base
       set_table_name 'employees'
-      validates_datetime :birth_datetime
+      validates_date :birth_date, :allow_blank => true
+      validates_datetime :birth_datetime, :allow_blank => true
     end
 
-    it 'should cache attribute raw value' do
+    context 'value cache' do
-      r = EmployeeWithCache.new
+      context 'for datetime column' do
-      r.birth_datetime = date_string = '2010-01-01'
+        it 'should store raw value' do
-      r._timeliness_raw_value_for(:birth_datetime).should == date_string
+          r = EmployeeWithCache.new
+          r.birth_datetime = date_string = '2010-01-01'
+          r._timeliness_raw_value_for('birth_datetime').should == date_string
+        end
+      end
+
+      context 'for date column' do
+        it 'should store raw value' do
+          r = EmployeeWithCache.new
+          r.birth_date = date_string = '2010-01-01'
+          r._timeliness_raw_value_for('birth_date').should == date_string
+        end
+      end
     end
 
     context "with plugin parser" do
@@ -37,8 +74,8 @@ describe ValidatesTimeliness, 'ActiveRecord' do
 
       class EmployeeWithParser < ActiveRecord::Base
         set_table_name 'employees'
-        validates_date :birth_date
+        validates_date :birth_date, :allow_blank => true
-        validates_datetime :birth_datetime
+        validates_datetime :birth_datetime, :allow_blank => true
       end
 
       it 'should parse a string value' do
@@ -47,6 +84,12 @@ describe ValidatesTimeliness, 'ActiveRecord' do
         r.birth_date = '2010-01-01'
       end
 
+      it 'should parse a invalid string value as nil' do
+        Timeliness::Parser.should_receive(:parse)
+        r = EmployeeWithParser.new
+        r.birth_date = 'not a date'
+      end
+
       context "for a date column" do
         it 'should store a date value after parsing string' do
           r = EmployeeWithParser.new
@@ -77,12 +120,14 @@ describe ValidatesTimeliness, 'ActiveRecord' do
     end
   end
 
-  context "cached value" do
+  context "reload" do
-    it 'should be cleared on reload' do
+    it 'should clear cache value' do
       r = Employee.create!
       r.birth_date = '2010-01-01'
+      
       r.reload
-      r._timeliness_raw_value_for(:birth_date).should be_nil
+
+      r._timeliness_raw_value_for('birth_date').should be_nil
     end
   end
 
@@ -94,7 +139,34 @@ describe ValidatesTimeliness, 'ActiveRecord' do
     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
     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)
+
+      r = Employee.last
+      r.birth_datetime_before_type_cast.should match(/2010-01-01 00:00:00/)
+    end
+
+    context "with plugin parser" do
+      with_config(:use_plugin_parser, true)
+
+      it 'should return original value' do
+        r = Employee.new
+        r.birth_datetime = date_string = '2010-01-31'
+
+        r.birth_datetime_before_type_cast.should == date_string
+      end
+    end
+
+  end
+
+  context "define_attribute_methods" do
+    it "returns a falsy value if the attribute methods have already been generated" do
+      Employee.define_attribute_methods.should be_false
+    end
   end
 end

spec/validates_timeliness/orm/mongoid_spec.rb

@@ -15,15 +15,15 @@ end
 describe ValidatesTimeliness, 'Mongoid' do
 
   class Article
-    ::ValidatesTimeliness.use_plugin_parser = true
     include Mongoid::Document
+    ValidatesTimeliness.use_plugin_parser = true
     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
+    ValidatesTimeliness.use_plugin_parser = false
   end
 
   context "validation methods" do
@@ -38,6 +38,30 @@ describe ValidatesTimeliness, 'Mongoid' do
       Article.new.should respond_to(:validates_time)
       Article.new.should respond_to(:validates_datetime)
     end
+
+    it "should validate a valid value string" do
+      r = Article.new
+      r.publish_date = '2012-01-01'
+
+      r.valid?
+      r.errors[:publish_date].should be_empty
+    end
+
+    it "should validate a invalid value string" do
+      r = Article.new
+      r.publish_date = 'not a date'
+
+      r.valid?
+      r.errors[:publish_date].should_not be_empty
+    end
+
+    it "should validate a nil value" do
+      r = Article.new
+      r.publish_date = nil
+
+      r.valid?
+      r.errors[:publish_date].should be_empty
+    end
   end
 
   it 'should determine type for attribute' do
@@ -48,11 +72,11 @@ describe ValidatesTimeliness, 'Mongoid' 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
+      r._timeliness_raw_value_for('publish_datetime').should == date_string
     end
 
     context "with plugin parser" do
-      with_config(:use_plugin_parser, false)
+      with_config(:use_plugin_parser, true)
 
       it 'should parse a string value' do
         Timeliness::Parser.should_receive(:parse)
@@ -60,8 +84,16 @@ describe ValidatesTimeliness, 'Mongoid' do
         r.publish_date = '2010-01-01'
       end
 
+      it 'should parse an invalid value as nil' do
+        Timeliness::Parser.should_receive(:parse)
+        r = Article.new
+        r.publish_date = 'bad value'
+
+        r.publish_date.should be_nil
+      end
+
       context "for a date column" do
-        it 'should store a date value after parsing string' do
+        it 'should store a Date value after parsing string' do
           r = Article.new
           r.publish_date = '2010-01-01'
 
@@ -71,12 +103,12 @@ describe ValidatesTimeliness, 'Mongoid' do
       end
 
       context "for a datetime column" do
-        it 'should parse string into Time value' do
+        it 'should parse string into DateTime value' do
           r = Article.new
           r.publish_datetime = '2010-01-01 12:00'
 
-          r.publish_datetime.should be_kind_of(Time)
+          r.publish_datetime.should be_kind_of(DateTime)
-          r.publish_datetime.should == Time.utc(2010,1,1,12,0)
+          r.publish_datetime.should == DateTime.new(2010,1,1,12,0)
         end
       end
     end
@@ -87,7 +119,7 @@ describe ValidatesTimeliness, 'Mongoid' do
       r = Article.create!
       r.publish_date = '2010-01-01'
       r.reload
-      r._timeliness_raw_value_for(:publish_date).should be_nil
+      r._timeliness_raw_value_for('publish_date').should be_nil
     end
   end
 
@@ -100,6 +132,6 @@ end
 
 rescue LoadError
   puts "Mongoid specs skipped. Mongoid not installed"
-rescue StandardError
+rescue StandardError => e
-  puts "Mongoid specs skipped. MongoDB connection failed."
+  puts "Mongoid specs skipped. MongoDB connection failed with error: #{e.message}"
 end

spec/validates_timeliness/validator_spec.rb

@@ -46,6 +46,17 @@ describe ValidatesTimeliness::Validator do
       Person.validates_date :birth_date, :allow_nil => true
       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'
+
+        p.should_not be_valid
+      end
+    end
   end
 
   describe ":allow_blank option" do
@@ -59,6 +70,17 @@ 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'
+
+        p.should_not be_valid
+      end
+    end
   end
 
   describe ":between option" do
@@ -138,7 +160,7 @@ describe ValidatesTimeliness::Validator do
     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")
+        person.errors[:birth_date].first.should match("Error occurred validating birth_date")
       end
     end
 

validates_timeliness.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |s|
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "LICENSE"]
 
-  s.add_runtime_dependency(%q<timeliness>, ["~> 0.3.3"])
+  s.add_runtime_dependency(%q<timeliness>, ["~> 0.3.6"])
 end