mirror of
https://github.com/ditkrg/validates_timeliness.git
synced 2026-01-22 22:06:45 +00:00
switched to using Rails::VERSION constant instead of AR which doesn't
seem to be available on rails boot
This commit is contained in:
parent
d3e278069e
commit
4ee24faad4
@ -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?
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user