role_authorization 0.2.7 → 0.2.8

data/lib/role_authorization/user.rb

@@ -52,17 +52,17 @@ module RoleAuthorization
         scope, scope_id = scope_with(scope)
 
         (serialized_roles || {}).inject([]) do |array, (key, value)|
-          if key == :global
-            array << value if scope.nil?
+          if key == :global && scope.nil?
+            array << value
           else
             if scope.nil? || (key == scope.to_sym && scope_id.nil?)
               if value.is_a?(Hash)
                 array << value.values
               else
-                array << value
+                array << value unless value.nil?
               end
             else
-              array << value[scope_id]
+              array << value[scope_id] unless scope_id.nil?
             end
           end
 

data/lib/role_authorization/version.rb

@@ -1,3 +1,3 @@
 module RoleAuthorization
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

metadata

@@ -2,7 +2,7 @@
 name: role_authorization
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - John 'asceth' Long