update: updating authorized plugin via piston update

kete · Oct 5, 2008 · c728930 · c728930
1 parent 2885937
commit c728930
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/vendor/plugins/authorization/.gitignore b/vendor/plugins/authorization/.gitignore
@@ -0,0 +1,2 @@
+.DS_STORE
+.DS_Store
diff --git a/vendor/plugins/authorization/.piston.yml b/vendor/plugins/authorization/.piston.yml
@@ -1,8 +1,8 @@
 --- 
 format: 1
 handler: 
-  commit: f78438e627582ec424c74b7999c89cdd3f5350a0
+  commit: d4e6c7ca6a21b2b8c501f618e201b35128f949f8
   branch: HEAD
-lock: 
+lock: false
 repository_url: git://github.com/DocSavage/rails-authorization-plugin.git
 repository_class: Piston::Git::Repository
diff --git a/vendor/plugins/authorization/lib/publishare/identity.rb b/vendor/plugins/authorization/lib/publishare/identity.rb
@@ -101,11 +101,13 @@ module InstanceMethods
         def method_missing( method_sym, *args )
           method_name = method_sym.to_s
           if method_name =~ /^has_(\w+)\?$/
-            role_name = $1.singularize
-            self.accepted_roles.find_all_by_name(role_name).any? { |role| role.users.compact.any? }
+            roles = $1.split('_or_').collect { |role| role.singularize }
+            roles = roles.flatten.compact
+            self.accepted_roles.find_all_by_name(roles, :include => :users).any? { |role| role.users.compact.any? }
           elsif method_name =~ /^has_(\w+)$/
-            role_name = $1.singularize
-            users = self.accepted_roles.find_all_by_name(role_name).collect { |role| role.users }
+            roles = $1.split('_or_').collect { |role| role.singularize }
+            roles = roles.flatten.compact
+            users = self.accepted_roles.find_all_by_name(roles, :include => :users).collect { |role| role.users }
             users.flatten.compact.uniq if users
           else
             super