diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-06-08 20:48:14 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-06-08 20:48:14 -0500 |
commit | 0b694a4ff41dbb7f64b6ea4cb088c2c2ba26b569 (patch) | |
tree | bfbaa2c0b2d6ff0b9e4eda0684f9c7bd2d48d89d /activeresource/lib/active_resource.rb | |
parent | 28f36279cd484dc66b8b0ca2f0c3d75fd9ac631c (diff) | |
download | rails-0b694a4ff41dbb7f64b6ea4cb088c2c2ba26b569.tar.gz rails-0b694a4ff41dbb7f64b6ea4cb088c2c2ba26b569.tar.bz2 rails-0b694a4ff41dbb7f64b6ea4cb088c2c2ba26b569.zip |
Setup ActiveResource autoloads
Diffstat (limited to 'activeresource/lib/active_resource.rb')
-rw-r--r-- | activeresource/lib/active_resource.rb | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb index b46801affc..1dcb795a7d 100644 --- a/activeresource/lib/active_resource.rb +++ b/activeresource/lib/active_resource.rb @@ -25,18 +25,15 @@ activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" $:.unshift(activesupport_path) if File.directory?(activesupport_path) require 'active_support' -begin - require 'active_model' -rescue LoadError - $:.unshift "#{File.dirname(__FILE__)}/../../activemodel/lib" - require 'active_model' -end - -require 'active_resource/formats' -require 'active_resource/base' -require 'active_resource/validations' -require 'active_resource/custom_methods' +activemodel_path = "#{File.dirname(__FILE__)}/../../activemodel/lib" +$:.unshift(activemodel_path) if File.directory?(activemodel_path) +require 'active_model' module ActiveResource autoload :Base, 'active_resource/base' + autoload :Connection, 'active_resource/connection' + autoload :CustomMethods, 'active_resource/custom_methods' + autoload :Formats, 'active_resource/formats' + autoload :Validations, 'active_resource/validations' + autoload :HttpMock, 'active_resource/http_mock' end |