role_authorization 0.5.8 → 0.5.9

data/lib/role_authorization/user.rb

@@ -82,24 +82,23 @@ module RoleAuthorization
         enroll(value)
       end
 
-      # mass enroll based on scope
-      def roles=(role_names, scope = nil)
-        # first get rid of all scoped roles
-        scope_key, scope_id = scope_with(scope)
+      def global_roles
+        roles(:global)
+      end
+
+      # mass enroll, global only
+      def global_roles=(role_names)
+        # first get rid of all global roles
+        removed_roles = []
+
         self.serialized_roles ||= Hash.new
 
-        if scope_key.nil?
-          self.serialized_roles[:global] = Array.new
-        else
-          if scope_id.nil?
-            self.serialized_roles[scope_key] = Array.new
-          else
-            self.serialized_roles[scope_key] ||= Hash.new
-            self.serialized_roles[scope_key][scope_id] = Array.new
-          end
+        (self.serialized_roles[:global] || []).map do |role_name|
+          RoleAuthorization::Roles.manager.klass.find_by_name(role_name).remove_user(self.id)
         end
+        self.serialized_roles[:global] = Array.new
 
-        role_names.map {|role_name| enroll(role_name, scope)}
+        role_names.map {|role_name| enroll(role_name.to_s)}
       end
 
       # adds a role to the user

data/lib/role_authorization/version.rb

@@ -1,3 +1,3 @@
 module RoleAuthorization
-  VERSION = "0.5.8"
+  VERSION = "0.5.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: role_authorization
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22356720 !ruby/object:Gem::Requirement
+  requirement: &23450000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22356720
+  version_requirements: *23450000
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &22356300 !ruby/object:Gem::Requirement
+  requirement: &23449580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22356300
+  version_requirements: *23449580
 description: A gem for handling authorization in rails using roles
 email:
 - machinist@asceth.com