validates_timeliness 3.0.0.beta.2 → 3.0.0.beta.3

data/README.rdoc

@@ -32,7 +32,7 @@ As plugin (from master)
 As gem (in beta)
 
   # in Gemfile
-  gem 'validates_timeliness', '3.0.0.beta'
+  gem 'validates_timeliness', '>= 3.0.0.beta'
 
   # Run bundler
   $ bundle install

data/Rakefile

@@ -20,9 +20,7 @@ spec = Gem::Specification.new do |s|
   s.author = "Adam Meehan"
   s.email = "adam.meehan@gmail.com"
   s.homepage = "http://github.com/adzap/validates_timeliness"
-
   s.require_path = 'lib'
-  s.autorequire = GEM_NAME
   s.files = %w(validates_timeliness.gemspec LICENSE CHANGELOG README.rdoc Rakefile) + Dir.glob("{lib,spec}/**/*")
 end
 

data/lib/generators/validates_timeliness/templates/validates_timeliness.rb

@@ -2,6 +2,9 @@ ValidatesTimeliness.setup do |config|
   # Add plugin to supported ORMs (only :active_record for now)
   # config.extend_orms = [ :active_record ]
   #
+  # User the plugin date/time parser which is stricter and extendable
+  # config.use_plugin_parser = false
+  #
   # Set the dummy date part for a time type values.
   # config.dummy_date_for_time_type = [ 2000, 1, 1 ]
   #

data/lib/validates_timeliness.rb

@@ -42,7 +42,7 @@ module ValidatesTimeliness
   # Setup method for plugin configuration
   def self.setup
     yield self
-    extend_orms.each {|orm| require "validates_timeliness/orms/#{orm}" }
+    extend_orms.each {|orm| require "validates_timeliness/orm/#{orm}" }
   end
 end
 

data/lib/validates_timeliness/attribute_methods.rb

@@ -5,6 +5,7 @@ module ValidatesTimeliness
     module ClassMethods
 
       def define_timeliness_methods(before_type_cast=false)
+        return if timeliness_validated_attributes.blank?
         timeliness_validated_attributes.each do |attr_name, type|
           define_timeliness_write_method(attr_name, type, timeliness_attribute_timezone_aware?(attr_name))
           define_timeliness_before_type_cast_method(attr_name) if before_type_cast
@@ -18,7 +19,7 @@ module ValidatesTimeliness
           def #{attr_name}=(value)
             @attributes_cache ||= {}
             @attributes_cache["_#{attr_name}_before_type_cast"] = value
-            #{ "value = ValidatesTimeliness::Parser.parse(value, :#{type}) if value.is_a?(String)" if ValidatesTimeliness.use_plugin_parser }
+            #{ "value = ValidatesTimeliness::Parser.parse(value, :#{type}, :timezone_aware => #{timezone_aware}) if value.is_a?(String)" if ValidatesTimeliness.use_plugin_parser }
             super
           end
         EOV
@@ -34,6 +35,8 @@ module ValidatesTimeliness
         class_eval(method_body, __FILE__, line)
       end
 
+      public
+
       def timeliness_attribute_timezone_aware?(attr_name)
         false
       end

data/lib/validates_timeliness/orm/mongoid.rb

@@ -0,0 +1,35 @@
+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 
+        def timeliness_validation_for(attr_names, type)
+          super
+          attr_names.each { |attr_name| define_timeliness_write_method(attr_name, type, false) }
+        end
+
+        def define_timeliness_write_method(attr_name, type, timezone_aware)
+          method_body, line = <<-EOV, __LINE__ + 1
+            def #{attr_name}=(value)
+              @attributes_cache ||= {}
+              @attributes_cache["_#{attr_name}_before_type_cast"] = value
+              #{ "value = ValidatesTimeliness::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
+      end
+    end
+  end
+end
+ 
+module Mongoid::Document
+  include ValidatesTimeliness::HelperMethods
+  include ValidatesTimeliness::AttributeMethods
+  include ValidatesTimeliness::ORM::Mongoid
+end

data/lib/validates_timeliness/validator.rb

@@ -35,7 +35,7 @@ module ValidatesTimeliness
       return if (@allow_nil && raw_value.nil?) || (@allow_blank && raw_value.blank?)
 
       @timezone_aware = record.class.timeliness_attribute_timezone_aware?(attr_name)
-      value = parse(value) if value.is_a?(String)
+      value = parse(raw_value) if value.is_a?(String) || options[:format]
       value = type_cast_value(value, @type)
 
       return record.errors.add(attr_name, :"invalid_#{@type}") if value.blank?

data/lib/validates_timeliness/version.rb

@@ -1,3 +1,3 @@
 module ValidatesTimeliness
-  VERSION = '3.0.0.beta.2'
+  VERSION = '3.0.0.beta.3'
 end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rspec'
-require 'rspec/autorun'
 
 require 'active_model'
 require 'active_model/validations'

data/spec/test_model.rb

@@ -14,12 +14,17 @@ module TestModel
 
   module ClassMethods
     def define_method_attribute=(attr_name)
-      generated_attribute_methods.module_eval("def #{attr_name}=(new_value); @attributes['#{attr_name}']=new_value ; end", __FILE__, __LINE__)
+      generated_attribute_methods.module_eval("def #{attr_name}=(new_value); @attributes['#{attr_name}']=self.class.type_cast(new_value); end", __FILE__, __LINE__)
     end
 
     def define_method_attribute(attr_name)
       generated_attribute_methods.module_eval("def #{attr_name}; @attributes['#{attr_name}']; end", __FILE__, __LINE__)
     end
+
+    def type_cast(value)
+      return value unless value.is_a?(String)
+      value.to_time rescue nil
+    end
   end
 
   module DynamicMethods

data/spec/validates_timeliness/attribute_methods_spec.rb

@@ -6,21 +6,27 @@ describe ValidatesTimeliness::AttributeMethods do
   end
   
   context "attribute write method" do
-    class EmployeeWithCache < ActiveRecord::Base
-      set_table_name 'employees'
+    class PersonWithCache
+      include TestModel
+      self.model_attributes = :birth_date, :birth_time, :birth_datetime
+      validates_date :birth_date
+      validates_time :birth_time
       validates_datetime :birth_datetime
     end
 
     it 'should cache attribute raw value' do
-      r = EmployeeWithCache.new
+      r = PersonWithCache.new
       r.birth_datetime = date_string = '2010-01-01'
       r._timeliness_raw_value_for(:birth_datetime).should == date_string
     end
 
     context "with plugin parser" do
-      class EmployeeWithParser < ActiveRecord::Base
-        set_table_name 'employees'
-        validates_datetime :birth_date
+      class PersonWithParser
+        include TestModel
+        self.model_attributes = :birth_date, :birth_time, :birth_datetime
+        validates_date :birth_date
+        validates_time :birth_time
+        validates_datetime :birth_datetime
       end
 
       before :all do
@@ -29,14 +35,14 @@ describe ValidatesTimeliness::AttributeMethods do
 
       it 'should parse a string value' do
         ValidatesTimeliness::Parser.should_receive(:parse) 
-        r = EmployeeWithParser.new
+        r = PersonWithParser.new
         r.birth_date = '2010-01-01'
       end
 
-      it 'should be strict on day values' do
-        r = EmployeeWithParser.new
-        r.birth_date = '2010-02-31'
-        r.birth_date.should be_nil
+      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
 
       after :all do
@@ -46,18 +52,8 @@ describe ValidatesTimeliness::AttributeMethods do
   end
 
   context "before_type_cast method" do
-    it 'should be defined on class if ORM supports it' do
-      Employee.instance_methods(false).should include("birth_datetime_before_type_cast")
-    end
-
     it 'should not be defined if ORM does not support it' do
       Person.instance_methods(false).should_not include("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
-    end
   end
 end

data/spec/validates_timeliness/conversion_spec.rb

@@ -168,19 +168,12 @@ describe ValidatesTimeliness::Conversion do
       evaluate_option_value(lambda { value }, person).should == Time.utc(2010,1,1,12,0,0)
     end
 
-    it 'should return Time value in default zone for attribute method symbol which returns string time value' do
+    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)
     end
 
-    it 'should return Time value in current zone attribute method symbol which returns string time value if timezone aware' do
-      @timezone_aware = true
-      value = '2010-01-01 12:00:00'
-      person.birth_time = value
-      evaluate_option_value(:birth_time, person).should == Time.zone.local(2010,1,1,12,0,0)
-    end
-
     context "restriction shorthand" do
       before do
         Timecop.freeze(Time.mktime(2010, 1, 1, 0, 0, 0))

data/spec/validates_timeliness/extensions/date_time_select_spec.rb

@@ -2,17 +2,20 @@ require 'spec_helper'
 
 describe ValidatesTimeliness::Extensions::DateTimeSelect do
   include ActionView::Helpers::DateHelper
+  attr_reader :person, :params
 
-  attr_reader :employee, :params
+  before :all do
+    ValidatesTimeliness.use_plugin_parser = true
+  end
 
   before do
-    @employee = Employee.new
+    @person = Person.new
     @params = {}
   end
 
   describe "datetime_select" do
     it "should use param values when attribute is nil" do
-      params["employee"] = {
+      params["person"] = {
         "birth_datetime(1i)" => 2009,
         "birth_datetime(2i)" => 2,
         "birth_datetime(3i)" => 29,
@@ -20,18 +23,18 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
         "birth_datetime(5i)" => 13,
         "birth_datetime(6i)" => 14,
       }
-      employee.birth_datetime = nil
-      output = datetime_select(:employee, :birth_datetime, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=employee_birth_datetime_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=employee_birth_datetime_2i] option[selected=selected]', 'February')
-      output.should have_tag('select[id=employee_birth_datetime_3i] option[selected=selected]', '29')
-      output.should have_tag('select[id=employee_birth_datetime_4i] option[selected=selected]', '12')
-      output.should have_tag('select[id=employee_birth_datetime_5i] option[selected=selected]', '13')
-      output.should have_tag('select[id=employee_birth_datetime_6i] option[selected=selected]', '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')
     end
 
     it "should override object values and use params if present" do
-      params["employee"] = {
+      params["person"] = {
         "birth_datetime(1i)" => 2009,
         "birth_datetime(2i)" => 2,
         "birth_datetime(3i)" => 29,
@@ -39,101 +42,101 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
         "birth_datetime(5i)" => 13,
         "birth_datetime(6i)" => 14,
       }
-      employee.birth_datetime = "2010-01-01 15:16:17"
-      output = datetime_select(:employee, :birth_datetime, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=employee_birth_datetime_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=employee_birth_datetime_2i] option[selected=selected]', 'February')
-      output.should have_tag('select[id=employee_birth_datetime_3i] option[selected=selected]', '29')
-      output.should have_tag('select[id=employee_birth_datetime_4i] option[selected=selected]', '12')
-      output.should have_tag('select[id=employee_birth_datetime_5i] option[selected=selected]', '13')
-      output.should have_tag('select[id=employee_birth_datetime_6i] option[selected=selected]', '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')
     end
 
     it "should use attribute values from object if no params" do
-      employee.birth_datetime = "2009-01-02 12:13:14"
-      output = datetime_select(:employee, :birth_datetime, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=employee_birth_datetime_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=employee_birth_datetime_2i] option[selected=selected]', 'January')
-      output.should have_tag('select[id=employee_birth_datetime_3i] option[selected=selected]', '2')
-      output.should have_tag('select[id=employee_birth_datetime_4i] option[selected=selected]', '12')
-      output.should have_tag('select[id=employee_birth_datetime_5i] option[selected=selected]', '13')
-      output.should have_tag('select[id=employee_birth_datetime_6i] option[selected=selected]', '14')
+      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')
     end
 
     it "should use attribute values if params does not contain attribute params" do
-      employee.birth_datetime = "2009-01-02 12:13:14"
-      params["employee"] = { }
-      output = datetime_select(:employee, :birth_datetime, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=employee_birth_datetime_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=employee_birth_datetime_2i] option[selected=selected]', 'January')
-      output.should have_tag('select[id=employee_birth_datetime_3i] option[selected=selected]', '2')
-      output.should have_tag('select[id=employee_birth_datetime_4i] option[selected=selected]', '12')
-      output.should have_tag('select[id=employee_birth_datetime_5i] option[selected=selected]', '13')
-      output.should have_tag('select[id=employee_birth_datetime_6i] option[selected=selected]', '14')
+      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')
     end
 
     it "should not select values when attribute value is nil and has no param values" do
-      employee.birth_datetime = nil
-      output = datetime_select(:employee, :birth_datetime, :include_blank => true, :include_seconds => true)
-      output.should_not have_tag('select[id=employee_birth_datetime_1i] option[selected=selected]')
-      output.should_not have_tag('select[id=employee_birth_datetime_2i] option[selected=selected]')
-      output.should_not have_tag('select[id=employee_birth_datetime_3i] option[selected=selected]')
-      output.should_not have_tag('select[id=employee_birth_datetime_4i] option[selected=selected]')
-      output.should_not have_tag('select[id=employee_birth_datetime_5i] option[selected=selected]')
-      output.should_not have_tag('select[id=employee_birth_datetime_6i] option[selected=selected]')
+      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]')
     end
   end
 
   describe "date_select" do
     it "should use param values when attribute is nil" do
-      params["employee"] = {
+      params["person"] = {
         "birth_date(1i)" => 2009,
         "birth_date(2i)" => 2,
         "birth_date(3i)" => 29,
       }
-      employee.birth_date = nil
-      output = date_select(:employee, :birth_date, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=employee_birth_date_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=employee_birth_date_2i] option[selected=selected]', 'February')
-      output.should have_tag('select[id=employee_birth_date_3i] option[selected=selected]', '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')
     end
 
     it "should override object values and use params if present" do
-      params["employee"] = {
+      params["person"] = {
         "birth_date(1i)" => 2009,
         "birth_date(2i)" => 2,
         "birth_date(3i)" => 29,
       }
-      employee.birth_date = "2009-03-01"
-      output = date_select(:employee, :birth_date, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=employee_birth_date_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=employee_birth_date_2i] option[selected=selected]', 'February')
-      output.should have_tag('select[id=employee_birth_date_3i] option[selected=selected]', '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')
     end
 
     it "should select attribute values from object if no params" do
-      employee.birth_date = "2009-01-02"
-      output = date_select(:employee, :birth_date, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=employee_birth_date_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=employee_birth_date_2i] option[selected=selected]', 'January')
-      output.should have_tag('select[id=employee_birth_date_3i] option[selected=selected]', '2')
+      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')
     end
 
     it "should select attribute values if params does not contain attribute params" do
-      employee.birth_date = "2009-01-02"
-      params["employee"] = { }
-      output = date_select(:employee, :birth_date, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=employee_birth_date_1i] option[selected=selected]', '2009')
-      output.should have_tag('select[id=employee_birth_date_2i] option[selected=selected]', 'January')
-      output.should have_tag('select[id=employee_birth_date_3i] option[selected=selected]', '2')
+      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')
     end
 
     it "should not select values when attribute value is nil and has no param values" do
-      employee.birth_date = nil
-      output = date_select(:employee, :birth_date, :include_blank => true, :include_seconds => true)
-      output.should_not have_tag('select[id=employee_birth_date_1i] option[selected=selected]')
-      output.should_not have_tag('select[id=employee_birth_date_2i] option[selected=selected]')
-      output.should_not have_tag('select[id=employee_birth_date_3i] option[selected=selected]')
+      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]')
     end
   end
 
@@ -143,7 +146,7 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
     end
 
     it "should use param values when attribute is nil" do
-      params["employee"] = {
+      params["person"] = {
         "birth_time(1i)" => 2000,
         "birth_time(2i)" => 1,
         "birth_time(3i)" => 1,
@@ -151,28 +154,31 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
         "birth_time(5i)" => 13,
         "birth_time(6i)" => 14,
       }
-      employee.birth_time = nil
-      output = time_select(:employee, :birth_time, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=employee_birth_time_4i] option[selected=selected]', '12')
-      output.should have_tag('select[id=employee_birth_time_5i] option[selected=selected]', '13')
-      output.should have_tag('select[id=employee_birth_time_6i] option[selected=selected]', '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')
     end
 
     it "should select attribute values from object if no params" do
-      employee.birth_time = "2000-01-01 12:13:14"
-      output = time_select(:employee, :birth_time, :include_blank => true, :include_seconds => true)
-      output.should have_tag('select[id=employee_birth_time_4i] option[selected=selected]', '12')
-      output.should have_tag('select[id=employee_birth_time_5i] option[selected=selected]', '13')
-      output.should have_tag('select[id=employee_birth_time_6i] option[selected=selected]', '14')
+      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')
     end
 
     it "should not select values when attribute value is nil and has no param values" do
-      employee.birth_time = nil
-      output = time_select(:employee, :birth_time, :include_blank => true, :include_seconds => true)
-      output.should_not have_tag('select[id=employee_birth_time_4i] option[selected=selected]')
-      output.should_not have_tag('select[id=employee_birth_time_5i] option[selected=selected]')
-      output.should_not have_tag('select[id=employee_birth_time_6i] option[selected=selected]')
+      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]')
     end
   end
 
+  after :all do
+    ValidatesTimeliness.use_plugin_parser = false
+  end
 end

data/spec/validates_timeliness/helper_methods_spec.rb

@@ -14,7 +14,7 @@ describe ValidatesTimeliness::HelperMethods do
   end
 
   it 'should validate instance when validation method called' do
-    r = Employee.new
+    r = Person.new
     r.validates_date :birth_date
     r.errors[:birth_date].should_not be_empty
   end

data/spec/validates_timeliness/orm/active_record_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe ValidatesTimeliness, 'ActiveRecord' do
+  it 'should define _timeliness_raw_value_for instance method' do
+    Employee.instance_methods.should include('_timeliness_raw_value_for')
+  end
+  
+  context "attribute write method" do
+    class EmployeeWithCache < ActiveRecord::Base
+      set_table_name 'employees'
+      validates_datetime :birth_datetime
+    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
+    end
+
+    context "with plugin parser" do
+      class EmployeeWithParser < ActiveRecord::Base
+        set_table_name 'employees'
+        validates_date :birth_date
+        validates_datetime :birth_datetime
+      end
+
+      before :all do
+        ValidatesTimeliness.use_plugin_parser = true
+      end
+
+      it 'should parse a string value' do
+        ValidatesTimeliness::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-01-01 12:00'
+        r.birth_datetime.zone == Time.zone.name
+      end
+
+      after :all do
+        ValidatesTimeliness.use_plugin_parser = false
+      end
+    end
+  end
+
+  context "before_type_cast method" do
+    it 'should be defined on class if ORM supports it' do
+      Employee.instance_methods(false).should include("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
+    end
+  end
+end

data/spec/validates_timeliness/orm/mongoid_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+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
+    validates_time :publish_time
+    validates_datetime :publish_datetime
+    ::ValidatesTimeliness.use_plugin_parser = false
+  end
+
+  it 'should define _timeliness_raw_value_for instance method' do
+    Article.instance_methods.should include('_timeliness_raw_value_for')
+  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
+      before :all do
+        ValidatesTimeliness.use_plugin_parser = true
+      end
+
+      it 'should parse a string value' do
+        ValidatesTimeliness::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
+
+      after :all do
+        ValidatesTimeliness.use_plugin_parser = false
+      end
+    end
+  end
+
+  context "before_type_cast method" do
+    it 'should not be defined if ORM does not support it' do
+      Article.instance_methods(false).should_not include("birth_datetime_before_type_cast")
+    end
+  end
+end

data/spec/validates_timeliness/validator_spec.rb

@@ -99,18 +99,28 @@ describe ValidatesTimeliness::Validator do
   end
 
   describe ":format option" do
+    class PersonWithFormatOption
+      include TestModel
+      self.model_attributes = :birth_date, :birth_time, :birth_datetime
+      validates_date :birth_date, :format => 'dd-mm-yyyy'
+    end
+
+    let(:person) { PersonWithFormatOption.new }
+
     before(:all) do
       ValidatesTimeliness.use_plugin_parser = true
     end
 
     it "should be valid when value matches format" do
-      Person.validates_date :birth_date, :format => 'dd-mm-yyyy'
-      valid!(:birth_date, '11-12-1913')
+      person.birth_date = '11-12-1913'
+      person.valid?
+      person.errors[:birth_date].should be_empty
     end
 
     it "should not be valid when value does not match format" do
-      Person.validates_date :birth_date, :format => 'dd/mm/yyyy'
-      invalid!(:birth_date, '1913-12-11', 'is not a valid date')
+      person.birth_date = '1913-12-11'
+      person.valid?
+      person.errors[:birth_date].should include('is not a valid date')
     end
 
     after(:all) do

data/validates_timeliness.gemspec

@@ -2,16 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{validates_timeliness}
-  s.version = "3.0.0.beta.2"
+  s.version = "3.0.0.beta.3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Meehan"]
-  s.autorequire = %q{validates_timeliness}
-  s.date = %q{2010-09-21}
+  s.date = %q{2010-09-22}
   s.description = %q{Date and time validation plugin for Rails which allows custom formats}
   s.email = %q{adam.meehan@gmail.com}
   s.extra_rdoc_files = ["README.rdoc", "LICENSE", "CHANGELOG"]
-  s.files = ["validates_timeliness.gemspec", "LICENSE", "CHANGELOG", "README.rdoc", "Rakefile", "lib/generators", "lib/generators/validates_timeliness", "lib/generators/validates_timeliness/install_generator.rb", "lib/generators/validates_timeliness/templates", "lib/generators/validates_timeliness/templates/en.yml", "lib/generators/validates_timeliness/templates/validates_timeliness.rb", "lib/validates_timeliness", "lib/validates_timeliness/attribute_methods.rb", "lib/validates_timeliness/conversion.rb", "lib/validates_timeliness/extensions", "lib/validates_timeliness/extensions/date_time_select.rb", "lib/validates_timeliness/extensions/multiparameter_handler.rb", "lib/validates_timeliness/extensions.rb", "lib/validates_timeliness/helper_methods.rb", "lib/validates_timeliness/orms", "lib/validates_timeliness/orms/active_record.rb", "lib/validates_timeliness/parser.rb", "lib/validates_timeliness/validator.rb", "lib/validates_timeliness/version.rb", "lib/validates_timeliness.rb", "spec/model_helpers.rb", "spec/spec_helper.rb", "spec/test_model.rb", "spec/validates_timeliness", "spec/validates_timeliness/attribute_methods_spec.rb", "spec/validates_timeliness/conversion_spec.rb", "spec/validates_timeliness/extensions", "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/parser_spec.rb", "spec/validates_timeliness/validator", "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"]
+  s.files = ["validates_timeliness.gemspec", "LICENSE", "CHANGELOG", "README.rdoc", "Rakefile", "lib/generators", "lib/generators/validates_timeliness", "lib/generators/validates_timeliness/install_generator.rb", "lib/generators/validates_timeliness/templates", "lib/generators/validates_timeliness/templates/en.yml", "lib/generators/validates_timeliness/templates/validates_timeliness.rb", "lib/validates_timeliness", "lib/validates_timeliness/attribute_methods.rb", "lib/validates_timeliness/conversion.rb", "lib/validates_timeliness/extensions", "lib/validates_timeliness/extensions/date_time_select.rb", "lib/validates_timeliness/extensions/multiparameter_handler.rb", "lib/validates_timeliness/extensions.rb", "lib/validates_timeliness/helper_methods.rb", "lib/validates_timeliness/orm", "lib/validates_timeliness/orm/active_record.rb", "lib/validates_timeliness/orm/mongoid.rb", "lib/validates_timeliness/parser.rb", "lib/validates_timeliness/validator.rb", "lib/validates_timeliness/version.rb", "lib/validates_timeliness.rb", "spec/model_helpers.rb", "spec/spec_helper.rb", "spec/test_model.rb", "spec/validates_timeliness", "spec/validates_timeliness/attribute_methods_spec.rb", "spec/validates_timeliness/conversion_spec.rb", "spec/validates_timeliness/extensions", "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", "spec/validates_timeliness/orm/active_record_spec.rb", "spec/validates_timeliness/orm/mongoid_spec.rb", "spec/validates_timeliness/parser_spec.rb", "spec/validates_timeliness/validator", "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"]
   s.homepage = %q{http://github.com/adzap/validates_timeliness}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{validates_timeliness}

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: validates_timeliness
 version: !ruby/object:Gem::Version 
-  hash: 62196423
+  hash: 62196421
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
   - beta
-  - 2
-  version: 3.0.0.beta.2
+  - 3
+  version: 3.0.0.beta.3
 platform: ruby
 authors: 
 - Adam Meehan
-autorequire: validates_timeliness
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 +10:00
+date: 2010-09-22 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -46,7 +46,8 @@ files:
 - lib/validates_timeliness/extensions/multiparameter_handler.rb
 - lib/validates_timeliness/extensions.rb
 - lib/validates_timeliness/helper_methods.rb
-- lib/validates_timeliness/orms/active_record.rb
+- lib/validates_timeliness/orm/active_record.rb
+- lib/validates_timeliness/orm/mongoid.rb
 - lib/validates_timeliness/parser.rb
 - lib/validates_timeliness/validator.rb
 - lib/validates_timeliness/version.rb
@@ -59,6 +60,8 @@ files:
 - 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/parser_spec.rb
 - spec/validates_timeliness/validator/after_spec.rb
 - spec/validates_timeliness/validator/before_spec.rb