role_authorization 0.2.1 → 0.2.2

data/lib/role_authorization/roles/role.rb

@@ -11,9 +11,17 @@ module RoleAuthorization
       end
 
       module InstanceMethods
+        def scope_with(scope)
+          if scope.is_a?(Symbol) || scope.is_a?(String) || scope.is_a?(Integer)
+            scope
+          else
+            scope.id
+          end
+        end
+
         def users(scope = nil)
           if user_ids.is_a?(Hash)
-            User.where(:id => user_ids[scope])
+            User.where(:id => user_ids[scope_with(scope)])
           else
             User.where(:id => user_ids)
           end

data/lib/role_authorization/roles/role_group.rb

@@ -8,8 +8,8 @@ module RoleAuthorization
         @roles = roles
       end
 
-      def users
-        klass.find_all_by_name(roles).map(&:users)
+      def users(scope = nil)
+        klass.find_all_by_name(roles).map {|role| role.users(scope) }
       end
     end
   end

data/lib/role_authorization/user.rb

@@ -93,7 +93,7 @@ module RoleAuthorization
           end
         end
 
-        if save
+        if save(:validate => false)
           RoleAuthorization::Roles.manager.klass.find_by_name(role_name).add_user(self.id, scope)
           true
         else
@@ -121,7 +121,7 @@ module RoleAuthorization
           end
         end
 
-        if save
+        if save(:validate => false)
           RoleAuthorization::Roles.manager.klass.find_by_name(role_name).remove_user(self.id, scope)
           true
         else

data/lib/role_authorization/version.rb

@@ -1,3 +1,3 @@
 module RoleAuthorization
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: role_authorization
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - John 'asceth' Long
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -05:00
+date: 2011-03-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency