authorization-san 2.0.0 → 2.0.1

data/lib/authorization/block_access.rb

@@ -24,9 +24,10 @@ module Authorization
       die_if_undefined
       unless @authenticated.nil?
         if @authenticated.respond_to?(:role)
+          checked = @authenticated.role.to_s
           return true if _access_allowed?(params, @authenticated.role, @authenticated)
         end
-        access_allowed_for.keys.each do |role|
+        (access_allowed_for.keys-[checked]).each do |role|
           if @authenticated.respond_to?("#{role}?") and @authenticated.send("#{role}?")
             return true if _access_allowed?(params, role, @authenticated)
           end
@@ -84,14 +85,14 @@ module Authorization
       if rules = access_allowed_for[role]
         rules.each do |rule|
           if _access_allowed_with_rule?(rule, params, role, authenticated)
-            logger.debug("  \e[32mAccess GRANTED by RULE #{rule.inspect} FOR `#{role}'\e[0m")
+            logger.debug("  \e[32mAccess granted by rule #{rule.inspect} for #{role}\e[0m")
             return true
           else
-            logger.debug("  \e[31mAccess DENIED by RULE #{rule.inspect} FOR `#{role}'\e[0m")
+            logger.debug("  \e[31mAccess denied by rule #{rule.inspect} for #{role}\e[0m")
           end
         end
       else
-        logger.debug("  \e[31mCan't find rules for `#{role}'\e[0m")
+        logger.debug("  \e[31mCan't find rules for #{role}\e[0m")
       end
       false
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authorization-san
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Manfred Stienstra