optimization for production mode

stffn · Aug 22, 2008 · 292e73f · 292e73f
1 parent 58bbc31
commit 292e73f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/authorization.rb b/lib/authorization.rb
@@ -34,7 +34,7 @@ def self.current_user=(user)
   # For use in test cases only
   def self.ignore_access_control (state = nil) # :nodoc:
     @@ignore_access_control = state unless state.nil?
-    @@ignore_access_control
+    ENV['RAILS_ENV'] == 'test' and @@ignore_access_control
   end
 
   # Authorization::Engine implements the reference monitor.  It may be used
@@ -176,7 +176,7 @@ def obligations (privilege, options = {})
     # yet.  If +dsl_file+ is given, it is passed on to Engine.new and 
     # a new instance is always created.
     def self.instance (dsl_file = nil)
-      if dsl_file
+      if dsl_file or ENV['RAILS_ENV'] == 'development'
         @@instance = new(dsl_file)
       else
         @@instance ||= new

diff --git a/lib/in_controller.rb b/lib/in_controller.rb
@@ -10,7 +10,7 @@ def self.included(base) # :nodoc:
 
     # Returns the Authorization::Engine for the current controller.
     def authorization_engine
-      @authorization_engine ||= Authorization::Engine.new
+      @authorization_engine ||= Authorization::Engine.instance
     end
 
     # If the current user meets the given privilege, permitted_to? returns true