v3.0.8

Remove deprecated InstanceMethods module when using AS::Concern

.gitignore

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

CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+= 3.0.8 [2011-12-24]
+* Remove deprecated InstanceMethods module when using AS::Concern
+* 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.1.0'
-gem 'rails', '3.0.7'
+gem 'rspec', '~> 2.6'
-gem 'rspec', '~> 2.4'
+gem 'rspec-rails', '~> 2.6'
-gem 'rspec-rails', '~> 2.4'
 gem 'timecop'
 gem 'rspec_tag_matchers'
+gem 'ruby-debug', :platforms => [:ruby_18, :jruby]
+gem 'ruby-debug19', :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!

lib/validates_timeliness/attribute_methods.rb

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

lib/validates_timeliness/orm/active_record.rb

@@ -7,7 +7,8 @@ module ValidatesTimeliness
         def define_attribute_methods
           super
           # Define write method and before_type_cast method
-          define_timeliness_methods(true)
+          use_before_type_cast = ::ActiveRecord::VERSION::STRING < '3.1.0'
+          define_timeliness_methods(use_before_type_cast)
         end
 
         def timeliness_attribute_timezone_aware?(attr_name)
@@ -29,14 +30,11 @@ module ValidatesTimeliness
         end
       end
 
-      module InstanceMethods
       def reload(*args)
         _clear_timeliness_cache
         super
       end
     end
-
-    end
   end
 end
 

lib/validates_timeliness/orm/mongoid.rb

@@ -31,27 +31,24 @@ module ValidatesTimeliness
         end
       end
 
+      def reload
+        _clear_timeliness_cache
+        super
+      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
 
+  # Pre-2.3 reload
+  if instance_methods.include?('reload')
     def reload_with_timeliness
       _clear_timeliness_cache
       reload_without_timeliness
     end
     alias_method_chain :reload, :timeliness
+  end
 end

lib/validates_timeliness/version.rb

@@ -1,3 +1,3 @@
 module ValidatesTimeliness
-  VERSION = '3.0.6'
+  VERSION = '3.0.8'
 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,7 +82,7 @@ class Employee < ActiveRecord::Base
   end
 end
 
-Rspec.configure do |c|
+RSpec.configure do |c|
   c.mock_with :rspec
   c.include(RspecTagMatchers)
   c.include(ModelHelpers)
@@ -95,8 +91,5 @@ Rspec.configure do |c|
     Person.reset_callbacks(:validate)
     PersonWithShim.timeliness_validated_attributes = []
     Person._validators.clear
-    Employee.reset_callbacks(:validate)
-    Employee.timeliness_validated_attributes = []
-    Employee._validators.clear
   end
 end

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/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/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

@@ -82,6 +82,7 @@ describe ValidatesTimeliness, 'ActiveRecord' do
       r = Employee.create!
       r.birth_date = '2010-01-01'
       r.reload
+
       r._timeliness_raw_value_for(:birth_date).should be_nil
     end
   end
@@ -94,7 +95,16 @@ 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
   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
@@ -52,7 +52,7 @@ describe ValidatesTimeliness, 'Mongoid' do
     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 +60,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 +79,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
@@ -100,6 +108,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

@@ -138,7 +138,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.4"])
 end