version 3.0.5

CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+= 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)
+
 = 3.0.4 [2011-01-22]
 * Fix :between option which was being ignored (ebeigarts)
 * Use class_attribute to remove deprecated class_inheritable_accessor

Gemfile

@@ -3,14 +3,14 @@ source 'http://rubygems.org'
 gemspec
 
 gem 'ZenTest'
-gem 'rails', '3.0.3'
+gem 'rails', '3.0.7'
 gem 'rspec', '~> 2.4'
 gem 'rspec-rails', '~> 2.4'
 gem 'timecop'
 gem 'rspec_tag_matchers'
 
 group :mongoid do
-  gem 'mongoid', '2.0.0.rc.6'
+  gem 'mongoid', '2.0.0.rc.8'
 end
 
 group :active_record do

Gemfile.lock

@@ -1,94 +1,94 @@
 PATH
   remote: .
   specs:
-    validates_timeliness (3.0.4)
+    validates_timeliness (3.0.6)
-      timeliness (~> 0.3.2)
+      timeliness (~> 0.3.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.4.2)
+    ZenTest (4.5.0)
     abstract (1.0.0)
-    actionmailer (3.0.3)
+    actionmailer (3.0.7)
-      actionpack (= 3.0.3)
+      actionpack (= 3.0.7)
-      mail (~> 2.2.9)
+      mail (~> 2.2.15)
-    actionpack (3.0.3)
+    actionpack (3.0.7)
-      activemodel (= 3.0.3)
+      activemodel (= 3.0.7)
-      activesupport (= 3.0.3)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
+      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.6)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
+    activemodel (3.0.7)
-      activesupport (= 3.0.3)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
-    activerecord (3.0.3)
+    activerecord (3.0.7)
-      activemodel (= 3.0.3)
+      activemodel (= 3.0.7)
-      activesupport (= 3.0.3)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
+    activeresource (3.0.7)
-      activemodel (= 3.0.3)
+      activemodel (= 3.0.7)
-      activesupport (= 3.0.3)
+      activesupport (= 3.0.7)
-    activesupport (3.0.3)
+    activesupport (3.0.7)
-    arel (2.0.7)
+    arel (2.0.9)
-    bson (1.2.0)
+    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.14)
+    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.2.0)
+    mongo (1.3.0)
-      bson (>= 1.2.0)
+      bson (>= 1.3.0)
-    mongoid (2.0.0.rc.6)
+    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.1)
+    rack (1.2.2)
-    rack-mount (0.6.13)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
+    rails (3.0.7)
-      actionmailer (= 3.0.3)
+      actionmailer (= 3.0.7)
-      actionpack (= 3.0.3)
+      actionpack (= 3.0.7)
-      activerecord (= 3.0.3)
+      activerecord (= 3.0.7)
-      activeresource (= 3.0.3)
+      activeresource (= 3.0.7)
-      activesupport (= 3.0.3)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.3)
+      railties (= 3.0.7)
-    railties (3.0.3)
+    railties (3.0.7)
-      actionpack (= 3.0.3)
+      actionpack (= 3.0.7)
-      activesupport (= 3.0.3)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.4.0)
+    rspec (2.5.0)
-      rspec-core (~> 2.4.0)
+      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.4.0)
+      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.4.0)
+      rspec-mocks (~> 2.5.0)
-    rspec-core (2.4.0)
+    rspec-core (2.5.1)
-    rspec-expectations (2.4.0)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    rspec-mocks (2.5.0)
-    rspec-rails (2.4.1)
+    rspec-rails (2.5.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.4.0)
+      rspec (~> 2.5.0)
     rspec_tag_matchers (1.0.0)
       nokogiri (>= 1.4.0)
       rspec-rails (>= 1.2.6)
@@ -100,7 +100,7 @@ GEM
     timeliness (0.3.3)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
+    tzinfo (0.3.27)
     will_paginate (3.0.pre2)
 
 PLATFORMS
@@ -108,12 +108,11 @@ PLATFORMS
 
 DEPENDENCIES
   ZenTest
-  mongoid (= 2.0.0.rc.6)
+  mongoid (= 2.0.0.rc.8)
-  rails (= 3.0.3)
+  rails (= 3.0.7)
   rspec (~> 2.4)
   rspec-rails (~> 2.4)
   rspec_tag_matchers
   sqlite3-ruby
   timecop
-  timeliness (~> 0.3.2)
   validates_timeliness!

README.rdoc

@@ -54,7 +54,7 @@ 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

Rakefile

@@ -1,37 +1,11 @@
-require 'rubygems'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rubygems/specification'
 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.rubyforge_project = "validates_timeliness"
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "LICENSE"]
-  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.files = %w(validates_timeliness.gemspec LICENSE CHANGELOG.rdoc README.rdoc Rakefile) + Dir.glob("{lib,spec}/**/*")
-  s.add_runtime_dependency 'timeliness', '~> 0.3.2'
-end
-
-desc 'Default: run specs.'
-task :default => :spec
 
 desc "Run specs"
-RSpec::Core::RakeTask.new do |t|
+RSpec::Core::RakeTask.new(:spec)
-  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
-end
 
 desc "Generate code coverage"
 RSpec::Core::RakeTask.new(:coverage) do |t|
@@ -48,18 +22,5 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
+desc 'Default: run specs.'
-  pkg.gem_spec = spec
+task :default => :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

lib/validates_timeliness/attribute_methods.rb

@@ -31,14 +31,12 @@ module ValidatesTimeliness
       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 }
+
+            #{ "if value.is_a?(String)\n#{timeliness_type_cast_code(attr_name, 'value')}\nend" if ValidatesTimeliness.use_plugin_parser }
             super
           end
         EOV
@@ -54,6 +52,14 @@ module ValidatesTimeliness
         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)
+        timezone_aware = timeliness_attribute_timezone_aware?(attr_name)
+        timezone = :current if timezone_aware
+
+        "#{var_name} = Timeliness::Parser.parse(#{var_name}, :#{type}, :zone => #{timezone.inspect})"
+      end
+
       def generated_timeliness_methods
         @generated_timeliness_methods ||= Module.new.tap { |m| include(m) }
       end

lib/validates_timeliness/conversion.rb

@@ -56,6 +56,7 @@ module ValidatesTimeliness
     end
 
     def parse(value)
+      return nil if value.nil?
       if ValidatesTimeliness.use_plugin_parser
         Timeliness::Parser.parse(value, @type, :zone => (:current if @timezone_aware), :format => options[:format], :strict => false)
       else

lib/validates_timeliness/helper_methods.rb

@@ -20,7 +20,7 @@ module ActiveModel
           self.timeliness_validated_attributes ||= []
           self.timeliness_validated_attributes += (attr_names - self.timeliness_validated_attributes)
         end
-        validates_with ValidatesTimeliness::Validator, options
+        validates_with TimelinessValidator, options
       end
     end
 

lib/validates_timeliness/orm/active_record.rb

@@ -18,6 +18,15 @@ module ValidatesTimeliness
         def timeliness_attribute_type(attr_name)
           columns_hash[attr_name.to_s].type
         end
+
+        def timeliness_type_cast_code(attr_name, var_name)
+          type = timeliness_attribute_type(attr_name)
+
+          <<-END
+            #{super}
+            #{var_name} = #{var_name}.to_date if #{var_name} && :#{type} == :date
+          END
+        end
       end
 
       module InstanceMethods

lib/validates_timeliness/orm/mongoid.rb

@@ -16,17 +16,10 @@ module ValidatesTimeliness
           attr_names.each { |attr_name| define_timeliness_write_method(attr_name) }
         end
 
-        def define_timeliness_write_method(attr_name)
+        def timeliness_type_cast_code(attr_name, var_name)
           type = timeliness_attribute_type(attr_name)
-          method_body, line = <<-EOV, __LINE__ + 1
+
-            def #{attr_name}=(value)
+          "#{var_name} = Timeliness::Parser.parse(value, :#{type})"
-              @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)

lib/validates_timeliness/validator.rb

@@ -20,9 +20,7 @@ module ValidatesTimeliness
       :datetime => '%Y-%m-%d %H:%M:%S'
     }.freeze
 
-    def self.kind
+    RESTRICTION_ERROR_MESSAGE = "Error occurred validating %s for %s restriction:\n%s"
-      :timeliness
-    end
 
     def initialize(options)
       @type = options.delete(:type) || :datetime
@@ -45,17 +43,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

lib/validates_timeliness/version.rb

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

spec/spec_helper.rb

@@ -6,10 +6,12 @@ require 'active_record'
 require 'action_view'
 require 'timecop'
 require 'rspec_tag_matchers'
-require 'model_helpers'
 
 require 'validates_timeliness'
-require 'test_model'
+
+require 'support/test_model'
+require 'support/model_helpers'
+require 'support/config_helper'
 
 ValidatesTimeliness.setup do |c|
   c.extend_orms = [ :active_record ]
@@ -87,6 +89,8 @@ end
 Rspec.configure do |c|
   c.mock_with :rspec
   c.include(RspecTagMatchers)
+  c.include(ModelHelpers)
+  c.include(ConfigHelper)
   c.before do
     Person.reset_callbacks(:validate)
     PersonWithShim.timeliness_validated_attributes = []

spec/support/config_helper.rb

@@ -0,0 +1,26 @@
+module ConfigHelper
+  extend ActiveSupport::Concern
+
+  # Justin French tip
+  def with_config(preference_name, temporary_value)
+    old_value = ValidatesTimeliness.send(preference_name)
+    ValidatesTimeliness.send(:"#{preference_name}=", temporary_value)
+    yield
+  ensure
+    ValidatesTimeliness.send(:"#{preference_name}=", old_value)
+  end
+
+  module ClassMethods
+    def with_config(preference_name, temporary_value)
+      original_config_value = ValidatesTimeliness.send(preference_name)
+
+      before(:all) do
+        ValidatesTimeliness.send(:"#{preference_name}=", temporary_value)
+      end
+
+      after(:all) do
+        ValidatesTimeliness.send(:"#{preference_name}=", original_config_value)
+      end
+    end
+  end
+end

spec/validates_timeliness/attribute_methods_spec.rb

@@ -41,6 +41,8 @@ describe ValidatesTimeliness::AttributeMethods do
     end
 
     context "with plugin parser" do
+      with_config(:use_plugin_parser, true)
+
       class PersonWithParser
         include TestModel
         include TestModelShim
@@ -52,25 +54,12 @@ describe ValidatesTimeliness::AttributeMethods do
         validates_datetime :birth_datetime
       end
 
-      before :all do
-        ValidatesTimeliness.use_plugin_parser = true
-      end
-
       it 'should parse a string value' do
         Timeliness::Parser.should_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
-
-      after :all do
-        ValidatesTimeliness.use_plugin_parser = false
-      end
     end
   end
 

spec/validates_timeliness/conversion_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe ValidatesTimeliness::Conversion do
   include ValidatesTimeliness::Conversion
 
+  let(:options) { Hash.new }
+
   before do
     Timecop.freeze(Time.mktime(2010, 1, 1, 0, 0, 0))
   end
 
   describe "#type_cast_value" do
-    let(:options) { Hash.new }
-
     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)
@@ -114,17 +114,10 @@ describe ValidatesTimeliness::Conversion do
     end
 
     describe "with custom dummy date" do
-      before do
-        @original_dummy_date = ValidatesTimeliness.dummy_date_for_time_type
-        ValidatesTimeliness.dummy_date_for_time_type = [2010, 1, 1] 
-      end
-
       it 'should return dummy time with custom dummy date' do
-        dummy_time(Time.utc(1999, 11, 22, 12, 34, 56)).should == Time.utc(2010, 1, 1, 12, 34, 56)
+        with_config(:dummy_date_for_time_type, [2010, 1, 1] ) do
-      end
+          dummy_time(Time.utc(1999, 11, 22, 12, 34, 56)).should == Time.utc(2010, 1, 1, 12, 34, 56)
-
+        end
-      after do
-        ValidatesTimeliness.dummy_date_for_time_type = @original_dummy_date
       end
     end
   end
@@ -206,4 +199,36 @@ describe ValidatesTimeliness::Conversion do
       end
     end
   end
+
+  describe "#parse" do
+    context "use_plugin_parser setting is true" do
+      with_config(:use_plugin_parser, true)
+
+      it 'should use timeliness' do
+        Timeliness::Parser.should_receive(:parse)
+        parse('2000-01-01')
+      end
+    end
+
+    context "use_plugin_parser setting is false" do
+      with_config(:use_plugin_parser, false)
+
+      it 'should use Time.zone.parse attribute is timezone aware' do
+        @timezone_aware = true
+        Time.zone.should_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)
+        parse(value)
+      end
+    end
+
+    it 'should return nil if value is nil' do
+      parse(nil).should be_nil
+    end
+  end
 end

spec/validates_timeliness/extensions/date_time_select_spec.rb

@@ -4,9 +4,7 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
   include ActionView::Helpers::DateHelper
   attr_reader :person, :params
 
-  before :all do
+  with_config(:use_plugin_parser, true)
-    ValidatesTimeliness.use_plugin_parser = true
-  end
 
   before do
     @person = Person.new
@@ -15,7 +13,7 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
 
   describe "datetime_select" do
     it "should use param values when attribute is nil" do
-      params["person"] = {
+      @params["person"] = {
         "birth_datetime(1i)" => 2009,
         "birth_datetime(2i)" => 2,
         "birth_datetime(3i)" => 29,
@@ -24,17 +22,12 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
         "birth_datetime(6i)" => 14,
       }
       person.birth_datetime = nil
-      output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
+      @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')
+      should_have_datetime_selected(:birth_datetime, :year => 2009, :month => 'February', :day => 29, :hour => 12, :min => 13, :sec => 14)
-      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["person"] = {
+      @params["person"] = {
         "birth_datetime(1i)" => 2009,
         "birth_datetime(2i)" => 2,
         "birth_datetime(3i)" => 29,
@@ -43,100 +36,70 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
         "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 = 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')
+      should_have_datetime_selected(:birth_datetime, :year => 2009, :month => 'February', :day => 29, :hour => 12, :min => 13, :sec => 14)
-      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
       person.birth_datetime = "2009-01-02 12:13:14"
-      output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
+      @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')
+      should_have_datetime_selected(:birth_datetime, :year => 2009, :month => 'January', :day => 2, :hour => 12, :min => 13, :sec => 14)
-      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
       person.birth_datetime = "2009-01-02 12:13:14"
-      params["person"] = { }
+      @params["person"] = { }
-      output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
+      @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')
+      should_have_datetime_selected(:birth_datetime, :year => 2009, :month => 'January', :day => 2, :hour => 12, :min => 13, :sec => 14)
-      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
       person.birth_datetime = nil
-      output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
+      @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]')
+      should_not_have_datetime_selected(:birth_datetime, :year, :month, :day, :hour, :min, :sec)
-      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["person"] = {
+      @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 = 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')
+      should_have_datetime_selected(:birth_date, :year => 2009, :month => 'February', :day => 29)
-      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["person"] = {
+      @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 = 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')
+      should_have_datetime_selected(:birth_date, :year => 2009, :month => 'February', :day => 29)
-      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
       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, :include_seconds => true)
-      output.should have_tag('select[id=person_birth_date_1i] option[selected=selected]', '2009')
+      should_have_datetime_selected(:birth_date, :year => 2009, :month => 'January', :day => 2)
-      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
       person.birth_date = "2009-01-02"
-      params["person"] = { }
+      @params["person"] = { }
-      output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
+      @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')
+      should_have_datetime_selected(:birth_date, :year => 2009, :month => 'January', :day => 2)
-      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
       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, :include_seconds => true)
-      output.should_not have_tag('select[id=person_birth_date_1i] option[selected=selected]')
+      should_not_have_datetime_selected(:birth_time, :year, :month, :day)
-      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
 
@@ -146,7 +109,7 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
     end
 
     it "should use param values when attribute is nil" do
-      params["person"] = {
+      @params["person"] = {
         "birth_time(1i)" => 2000,
         "birth_time(2i)" => 1,
         "birth_time(3i)" => 1,
@@ -155,30 +118,34 @@ describe ValidatesTimeliness::Extensions::DateTimeSelect do
         "birth_time(6i)" => 14,
       }
       person.birth_time = nil
-      output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)
+      @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')
+      should_have_datetime_selected(:birth_time, :hour => 12, :min => 13, :sec => 14)
-      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
       person.birth_time = "2000-01-01 12:13:14"
-      output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)
+      @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')
+      should_have_datetime_selected(:birth_time, :hour => 12, :min => 13, :sec => 14)
-      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
       person.birth_time = nil
-      output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)
+      @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]')
+      should_not_have_datetime_selected(:birth_time, :hour, :min, :sec)
-      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
+  def should_have_datetime_selected(field, datetime_hash)
-    ValidatesTimeliness.use_plugin_parser = false
+    datetime_hash.each do |key, value|
+      index = {:year => 1, :month => 2, :day => 3, :hour => 4, :min => 5, :sec => 6}[key]
+      @output.should 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]
+      @output.should_not have_tag("select[id=person_#{attribute}_#{index}i] option[selected=selected]")
+    end
   end
 end

spec/validates_timeliness/orm/active_record_spec.rb

@@ -33,31 +33,46 @@ describe ValidatesTimeliness, 'ActiveRecord' do
     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
 
-      before :all do
-        ValidatesTimeliness.use_plugin_parser = true
-      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
+      context "for a date column" do
-        r = EmployeeWithParser.new
+        it 'should store a date value after parsing string' do
-        r.birth_datetime = '2010-06-01 12:00'
+          r = EmployeeWithParser.new
-        r.birth_datetime.utc_offset.should == 10.hours
+          r.birth_date = '2010-01-01'
+
+          r.birth_date.should be_kind_of(Date)
+          r.birth_date.should == Date.new(2010, 1, 1)
+        end
       end
 
-      after :all do
+      context "for a datetime column" do
-        Time.zone = 'Australia/Melbourne'
+        with_config(:default_timezone, 'Australia/Melbourne')
-        ValidatesTimeliness.use_plugin_parser = false
+
+        it 'should parse string into Time value' do
+          r = EmployeeWithParser.new
+          r.birth_datetime = '2010-01-01 12:00'
+
+          r.birth_datetime.should be_kind_of(Time)
+        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 == Time.zone.utc_offset
+        end
       end
     end
   end

spec/validates_timeliness/orm/mongoid_spec.rb

@@ -12,20 +12,20 @@ Mongoid.configure do |config|
   config.persist_in_safe_mode = false
 end
 
-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
-
 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)
@@ -52,9 +52,7 @@ describe ValidatesTimeliness, 'Mongoid' do
     end
 
     context "with plugin parser" do
-      before :all do
+      with_config(:use_plugin_parser, false)
-        ValidatesTimeliness.use_plugin_parser = true
-      end
 
       it 'should parse a string value' do
         Timeliness::Parser.should_receive(:parse)
@@ -62,14 +60,24 @@ describe ValidatesTimeliness, 'Mongoid' do
         r.publish_date = '2010-01-01'
       end
 
-      it 'should parse string into Time value' do
+      context "for a date column" do
-        r = Article.new
+        it 'should store a date value after parsing string' do
-        r.publish_datetime = '2010-01-01 12:00'
+          r = Article.new
-        r.publish_datetime.should == Time.utc(2010,1,1,12,0)
+          r.publish_date = '2010-01-01'
+
+          r.publish_date.should be_kind_of(Date)
+          r.publish_date.should == Date.new(2010, 1, 1)
+        end
       end
 
-      after :all do
+      context "for a datetime column" do
-        ValidatesTimeliness.use_plugin_parser = false
+        it 'should parse string into Time 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 == Time.utc(2010,1,1,12,0)
+        end
       end
     end
   end
@@ -85,7 +93,7 @@ describe ValidatesTimeliness, 'Mongoid' do
 
   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)
+      Article.new.should_not respond_to(:publish_datetime_before_type_cast)
     end
   end
 end

spec/validates_timeliness/validator/after_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness::Validator, ":after option" do
-  include ModelHelpers 
-
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :after => Date.new(2010, 1, 1)

spec/validates_timeliness/validator/before_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness::Validator, ":before option" do
-  include ModelHelpers 
-
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :before => Date.new(2010, 1, 1)

spec/validates_timeliness/validator/is_at_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness::Validator, ":is_at option" do
-  include ModelHelpers 
-
   before do
     Timecop.freeze(Time.local_time(2010, 1, 1, 0, 0, 0))
   end

spec/validates_timeliness/validator/on_or_after_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness::Validator, ":on_or_after option" do
-  include ModelHelpers 
-
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :on_or_after => Date.new(2010, 1, 1)

spec/validates_timeliness/validator/on_or_before_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness::Validator, ":on_or_before option" do
-  include ModelHelpers 
-
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :on_or_before => Date.new(2010, 1, 1)

spec/validates_timeliness/validator_spec.rb

@@ -1,17 +1,12 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness::Validator do
-  include ModelHelpers
   NIL = [nil]
 
   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 
-  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}
@@ -118,9 +113,7 @@ describe ValidatesTimeliness::Validator do
 
     let(:person) { PersonWithFormatOption.new }
 
-    before(:all) do
+    with_config(:use_plugin_parser, true)
-      ValidatesTimeliness.use_plugin_parser = true
-    end
 
     it "should be valid when value matches format" do
       person.birth_date = '11-12-1913'
@@ -133,33 +126,34 @@ describe ValidatesTimeliness::Validator do
       person.valid?
       person.errors[:birth_date].should include('is not a valid date')
     end
-
-    after(:all) do
-      ValidatesTimeliness.use_plugin_parser = false
-    end
   end
 
   describe "restriction value errors" 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
-      ValidatesTimeliness.ignore_restriction_errors = false
+      with_config(:ignore_restriction_errors, false) do
-      person.valid?
+        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 for :is_at restriction")
+      end
     end
 
     it "should not be added when ignore_restriction_errors is true" do
-      ValidatesTimeliness.ignore_restriction_errors = true
+      with_config(:ignore_restriction_errors, true) do
-      person.valid?
+        person.valid?
-      person.errors[:birth_date].should be_empty
+        person.errors[:birth_date].should be_empty
+      end
     end
 
-    after :all do
+    it 'should exit on first error' do
-      ValidatesTimeliness.ignore_restriction_errors = false
+      with_config(:ignore_restriction_errors, false) do
+        person.valid?
+        person.errors[:birth_date].should have(1).items
+      end
     end
   end
 

validates_timeliness.gemspec

@@ -1,32 +1,20 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "validates_timeliness/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{validates_timeliness}
+  s.name        = "validates_timeliness"
-  s.version = "3.0.4"
+  s.version     = ValidatesTimeliness::VERSION
+  s.authors     = ["Adam Meehan"]
+  s.summary     = %q{Date and time validation plugin for Rails which allows custom formats}
+  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.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths    = ["lib"]
-  s.authors = ["Adam Meehan"]
+  s.files            = `git ls-files`.split("\n") - %w{ .gitignore .rspec Gemfile Gemfile.lock autotest/discover.rb }
-  s.date = %q{2011-01-22}
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
-  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 = ["validates_timeliness.gemspec", "LICENSE", "CHANGELOG.rdoc", "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/railtie.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/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", "spec/validates_timeliness_spec.rb"]
-  s.homepage = %q{http://github.com/adzap/validates_timeliness}
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{validates_timeliness}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Date and time validation plugin for Rails which allows custom formats}
 
-  if s.respond_to? :specification_version then
+  s.add_runtime_dependency(%q<timeliness>, ["~> 0.3.3"])
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    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
 end