diff options
Diffstat (limited to 'activeresource/lib/active_resource.rb')
| -rw-r--r-- | activeresource/lib/active_resource.rb | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb index f0d30b1624..b46801affc 100644 --- a/activeresource/lib/active_resource.rb +++ b/activeresource/lib/active_resource.rb @@ -21,15 +21,9 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -begin - require 'active_support' -rescue LoadError - activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" - if File.directory?(activesupport_path) - $:.unshift activesupport_path - require 'active_support' - end -end +activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" +$:.unshift(activesupport_path) if File.directory?(activesupport_path) +require 'active_support' begin require 'active_model' @@ -44,8 +38,5 @@ require 'active_resource/validations' require 'active_resource/custom_methods' module ActiveResource - Base.class_eval do - include Validations - include CustomMethods - end + autoload :Base, 'active_resource/base' end |