automatically include modules

jasherai · Jul 23, 2007 · 1449451 · 1449451
1 parent 531844e
commit 1449451
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/init.rb b/init.rb
@@ -4,4 +4,8 @@
 if RAILS_ENV=="test"
   require "role_requirement_test_helper.rb"
   require "hijacker.rb"
-end
+  Test::Unit::TestCase.send :include, RoleRequirementTestHelper
+end
+
+ActionController::Base.send :include, AuthenticatedSystem
+ActionController::Base.send :include, RoleRequirement
diff --git a/lib/role_requirement_system.rb b/lib/role_requirement_system.rb
@@ -82,9 +82,10 @@ def user_authorized_for?(user, params = {}, binding = self.binding)
 
         # check to see if they have one of the required roles
         passed = false
-        roles.each{|role|
-          passed = true if user && user.has_role?(role)
-        }
+        roles.each { |role|
+          passed = true if user.has_role?(role)
+        } unless (user==:false || user==false)
+
         return false unless passed
       }