Merge pull request #109 from DisruptionCorporation/observers-railtie-…

…and-load-hooks Instantiate observers via Railtie, and run load hooks
rails · Jan 29, 2014 · c4eb476 · c4eb476
2 parents 16fe0c9 + dc15b1c
commit c4eb476
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
+end
+