From 4ee24faad4586aa70c494bf9c22dcfa5a2ee379a Mon Sep 17 00:00:00 2001 From: Adam Meehan Date: Mon, 5 May 2008 09:41:16 +1000 Subject: [PATCH] switched to using Rails::VERSION constant instead of AR which doesn't seem to be available on rails boot --- lib/validates_timeliness/attribute_methods.rb | 6 +++--- spec/spec_helper.rb | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/validates_timeliness/attribute_methods.rb b/lib/validates_timeliness/attribute_methods.rb index e6c9940..d68639d 100644 --- a/lib/validates_timeliness/attribute_methods.rb +++ b/lib/validates_timeliness/attribute_methods.rb @@ -15,7 +15,7 @@ module ValidatesTimeliness module AttributeMethods def self.included(base) - if ActiveRecord::VERSION::STRING < '2.1' + if Rails::VERSION::STRING < '2.1' base.extend ClassMethods::Old else base.extend ClassMethods::New @@ -23,7 +23,7 @@ module ValidatesTimeliness end module ClassMethods - # ActiveRecord >= 2.1 + # Rails >= 2.1 module New def define_read_method_for_time_zone_conversion(attr_name) method_body = <<-EOV @@ -57,7 +57,7 @@ module ValidatesTimeliness end end # New - # ActiveRecord < 2.1 + # Rails < 2.1 module Old def define_attribute_methods return if generated_methods? diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 251f6ed..518fe4b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -7,11 +7,14 @@ if File.exists?(File.dirname(__FILE__) + '/../../../../vendor/rails') $: << File.dirname(__FILE__) + '/../../../../vendor/rails' require 'activesupport/lib/active_support' require 'activerecord/lib/active_record' - require 'activerecord/lib/active_record/version' + require 'railties/lib/rails/version' + puts "Using vendored ActiveRecord version #{ActiveRecord::VERSION::STRING}" else require 'active_record' require 'active_record/version' + require 'rails/version' + puts "Using gem ActiveRecord version #{ActiveRecord::VERSION::STRING}" end