expect application controller to be called application_controller, an…

…d fallback to application if not
TeaMoe · Feb 20, 2009 · fae8470 · fae8470
1 parent fad211f
commit fae8470
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/resource_controller.rb b/lib/resource_controller.rb
@@ -1,4 +1,8 @@
-require_dependency 'application'
+begin
+  require_dependency 'application_controller'
+rescue LoadError => e
+  require_dependency 'application'
+end
 
 module ResourceController
   ACTIONS           = [:index, :show, :new_action, :create, :edit, :update, :destroy].freeze

diff --git a/test/app/controllers/application.rb → ...app/controllers/application_controller.rb b/test/app/controllers/application.rb → ...app/controllers/application_controller.rb