role_authorization 0.3.6 → 0.3.7

data/lib/role_authorization/roles/role.rb

@@ -12,33 +12,29 @@ module RoleAuthorization
 
       module InstanceMethods
         def scope_with(scope)
-          if scope.is_a?(Symbol) || scope.is_a?(String) || scope.is_a?(Integer)
-            scope
+          if scope.blank? || scope.is_a?(Symbol) || scope.is_a?(String) || scope.is_a?(Integer)
+            scope || :all
           else
             scope.id
           end
         end
 
         def users(scope = nil)
-          if user_ids.is_a?(Hash)
-            RoleAuthorization::Roles::Manager.user_klass.where(:id => user_ids[scope_with(scope)]).all
-          else
-            RoleAuthorization::Roles::Manager.user_klass.where(:id => user_ids).all
-          end
+          RoleAuthorization::Roles::Manager.user_klass.where(:id => user_ids[scope_with(scope)]).all
         end
 
         def add_user(user_id, scope = nil)
           unserialized_user_ids = self.user_ids
+          unserialized_user_ids ||= Hash.new
 
           if scope.nil? || scope.is_a?(Symbol) || scope.is_a?(String) || scope.is_a?(Class)
-            unserialized_user_ids ||= Array.new
-            unserialized_user_ids << user_id
-            unserialized_user_ids.uniq!
+            unserialized_user_ids[scope_with(scope)] ||= Array.new
+            unserialized_user_ids[scope_with(scope)] << user_id
+            unserialized_user_ids[scope_with(scope)].uniq!
           else
-            unserialized_user_ids ||= Hash.new
-            unserialized_user_ids[scope.id] ||= Array.new
-            unserialized_user_ids[scope.id] << user_id
-            unserialized_user_ids[scope.id].uniq!
+            unserialized_user_ids[scope_with(scope)] ||= Array.new
+            unserialized_user_ids[scope_with(scope)] << user_id
+            unserialized_user_ids[scope_with(scope)].uniq!
           end
 
           self.user_ids = unserialized_user_ids
@@ -48,14 +44,14 @@ module RoleAuthorization
 
         def remove_user(user_id, scope = nil)
           unserialized_user_ids = self.user_ids
+          unserialized_user_ids ||= Hash.new
 
           if scope.nil? || scope.is_a?(Symbol) || scope.is_a?(String) || scope.is_a?(Class)
-            unserialized_user_ids ||= Array.new
-            unserialized_user_ids.delete(user_id)
+            unserialized_user_ids[scope_with(scope)] ||= Array.new
+            unserialized_user_ids[scope_with(scope)].delete(user_id)
           else
-            unserialized_user_ids ||= Hash.new
-            unserialized_user_ids[scope.id] ||= Array.new
-            unserialized_user_ids[scope.id].delete(user_id)
+            unserialized_user_ids[scope_with(scope)] ||= Array.new
+            unserialized_user_ids[scope_with(scope)].delete(user_id)
           end
 
           self.user_ids = unserialized_user_ids

data/lib/role_authorization/user.rb

@@ -82,20 +82,20 @@ module RoleAuthorization
       def enroll(role_name, scope = nil)
         return true if has_role?(role_name.to_sym, scope)
 
-        scope, scope_id = scope_with(scope)
+        scope_key, scope_id = scope_with(scope)
         self.serialized_roles ||= Hash.new
 
-        if scope.nil?
+        if scope_key.nil?
           self.serialized_roles[:global] ||= Array.new
           self.serialized_roles[:global] << role_name.to_sym
         else
           if scope_id.nil?
-            self.serialized_roles[scope] ||= Array.new
-            self.serialized_roles[scope] << role_name.to_sym
+            self.serialized_roles[scope_key] ||= Array.new
+            self.serialized_roles[scope_key] << role_name.to_sym
           else
-            self.serialized_roles[scope] ||= Hash.new
-            self.serialized_roles[scope][scope_id] ||= Array.new
-            self.serialized_roles[scope][scope_id] << role_name.to_sym
+            self.serialized_roles[scope_key] ||= Hash.new
+            self.serialized_roles[scope_key][scope_id] ||= Array.new
+            self.serialized_roles[scope_key][scope_id] << role_name.to_sym
           end
         end
 
@@ -110,20 +110,20 @@ module RoleAuthorization
       def withdraw(role_name, scope = nil)
         return true unless has_role?(role_name.to_sym, scope)
 
-        scope, scope_id = scope_with(scope)
+        scope_key, scope_id = scope_with(scope)
         serialized_roles ||= Hash.new
 
-        if scope.nil?
+        if scope_key.nil?
           self.serialized_roles[:global] ||= Array.new
           self.serialized_roles[:global].delete(role_name.to_sym)
         else
-          if scope_id.nil?
-            self.serialized_roles[scope] ||= Array.new
-            self.serialized_roles[scope].delete(role_name.to_sym)
+          if scope_key_id.nil?
+            self.serialized_roles[scope_key] ||= Array.new
+            self.serialized_roles[scope_key].delete(role_name.to_sym)
           else
-            self.serialized_roles[scope] ||= Hash.new
-            self.serialized_roles[scope][scope_id] ||= Array.new
-            self.serialized_roles[scope][scope_id].delete(role_name.to_sym)
+            self.serialized_roles[scope_key] ||= Hash.new
+            self.serialized_roles[scope_key][scope_key_id] ||= Array.new
+            self.serialized_roles[scope_key][scope_key_id].delete(role_name.to_sym)
           end
         end
 

data/lib/role_authorization/version.rb

@@ -1,3 +1,3 @@
 module RoleAuthorization
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -2,7 +2,7 @@
 name: role_authorization
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - John 'asceth' Long
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -04:00
+date: 2011-03-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency