aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib
diff options
context:
space:
mode:
authorŁukasz Strzałkowski <lukasz.strzalkowski@gmail.com>2010-08-11 21:56:22 +0200
committerJosé Valim <jose.valim@gmail.com>2010-09-02 11:54:04 +0200
commit38a421b34d0b414564e919f67d339fac067a56e6 (patch)
tree049be1f37edf18d380b9e8716e2a3165b67be71e /activeresource/lib
parentc5c839f75f332b02f85fc74f5d1b1347cba411ff (diff)
downloadrails-38a421b34d0b414564e919f67d339fac067a56e6.tar.gz
rails-38a421b34d0b414564e919f67d339fac067a56e6.tar.bz2
rails-38a421b34d0b414564e919f67d339fac067a56e6.zip
Setup explicit requires for files with exceptions. Removed them from autoloading.
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activeresource/lib')
-rw-r--r--activeresource/lib/active_resource/connection.rb3
-rw-r--r--activeresource/lib/active_resource/exceptions.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/connection.rb b/activeresource/lib/active_resource/connection.rb
index b7befe110d..dd0be4775d 100644
--- a/activeresource/lib/active_resource/connection.rb
+++ b/activeresource/lib/active_resource/connection.rb
@@ -1,8 +1,9 @@
-require 'active_support/core_ext/benchmark'
require 'net/https'
require 'date'
require 'time'
require 'uri'
+require 'active_support/core_ext/benchmark'
+require 'action_controller/metal/exceptions'
module ActiveResource
# Class to handle connections to remote web services.
diff --git a/activeresource/lib/active_resource/exceptions.rb b/activeresource/lib/active_resource/exceptions.rb
index 0f4549fd73..56f8a71702 100644
--- a/activeresource/lib/active_resource/exceptions.rb
+++ b/activeresource/lib/active_resource/exceptions.rb
@@ -1,3 +1,5 @@
+require 'action_controller/metal/exceptions'
+
module ActiveResource
class ConnectionError < StandardError # :nodoc:
attr_reader :response