diff --git a/lib/active_resource.rb b/lib/active_resource.rb index b8c77a56e5..ef3490e009 100644 --- a/lib/active_resource.rb +++ b/lib/active_resource.rb @@ -41,3 +41,6 @@ module ActiveResource autoload :Validations autoload :Collection end + +require 'active_resource/railtie' if defined? Rails + diff --git a/lib/active_resource/base.rb b/lib/active_resource/base.rb index f9a66bd7f9..dcac3ae8f2 100644 --- a/lib/active_resource/base.rb +++ b/lib/active_resource/base.rb @@ -1560,4 +1560,7 @@ class Base include ActiveModel::Serializers::Xml include ActiveResource::Reflection end + + ActiveSupport.run_load_hooks(:active_resource, Base) end + diff --git a/lib/active_resource/railtie.rb b/lib/active_resource/railtie.rb index 60f6f88311..6b0a433e97 100644 --- a/lib/active_resource/railtie.rb +++ b/lib/active_resource/railtie.rb @@ -10,5 +10,16 @@ class Railtie < Rails::Railtie ActiveResource::Base.send "#{k}=", v end end + + config.after_initialize do |app| + ActiveSupport.on_load(:active_resource) do + ActiveResource::Base.instantiate_observers + + ActionDispatch::Reloader.to_prepare do + ActiveResource::Base.instantiate_observers + end + end + end end -end \ No newline at end of file +end +