role_authorization 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d1c4328441ef2d5ecee3d451c844d4068b99d79
-  data.tar.gz: 880716b15c5e0a370c83b85e3b9e9c579e2c3634
+  metadata.gz: 2b82cc6cf70a1dae2b60c08fbbebe3b7eddd8f91
+  data.tar.gz: 76e2bcfe4b15319db70d96923de9f5572a90b6d8
 SHA512:
-  metadata.gz: 49207b05f38eca3c7011fbd92378ecda1ff575245962a469d2087e070e7327a0b40c1bc855d08f843dbe18b501f3c1010b19637ed3d488867bfecd597773c032
-  data.tar.gz: 4f62169cc3790715c4a22193acfd70e57086f9f6045b8ff2710706cf73c84e0561fd94fafe3ad62aa91ef68afc75770f4d85409a0bc8ce94694d4d3a009b563b
+  metadata.gz: 346377c85cd0992b85de06973c5835012e9180e7e185b37c1f6b83d7a1d26a8bda10ee70b5f0133be72a0e2525dc8c400e0a9c6a8ce40595dba7ef0fedae6a8a
+  data.tar.gz: 7f018b62080f8eb3b0d85eb3dfb1fbdd5ca742479fb46a7658fb41a6e5dbfd9aa8d02efe602d1ee9d17e4ed023acc788c8533d8bcdd960a860b70ba2be654bca

data/lib/role_authorization/roles/role.rb

@@ -16,6 +16,20 @@ module RoleAuthorization
       end
 
       module InstanceMethods
+        def unserialized_user_ids
+          result = if Rails::VERSION::MAJOR >= 4
+                     self.user_ids.unserialized_value
+                   else
+                     self.user_ids
+                   end
+
+          if result.is_a?(Hash)
+            result
+          else
+            Hash.new
+          end
+        end
+
         def scope_with(scope)
           if scope.blank? || scope.is_a?(Symbol) || scope.is_a?(String) || scope.is_a?(Integer)
             scope || :all
@@ -30,45 +44,45 @@ module RoleAuthorization
                               []
                             else
                               if scope.nil?
-                                RoleAuthorization::Roles::Manager.user_klass.where(:id => user_ids.values.flatten.uniq).all
+                                RoleAuthorization::Roles::Manager.user_klass.where(:id => unserialized_user_ids.values.flatten.uniq).all
                               else
-                                RoleAuthorization::Roles::Manager.user_klass.where(:id => user_ids[scope_with(scope)]).all
+                                RoleAuthorization::Roles::Manager.user_klass.where(:id => unserialized_user_ids[scope_with(scope)]).all
                               end
                             end
         end
 
         def add_user(user_id, scope = nil)
-          unserialized_user_ids = self.user_ids
-          unserialized_user_ids ||= Hash.new
+          hash = unserialized_user_ids
+          hash ||= Hash.new
 
           if scope.nil? || scope.is_a?(Symbol) || scope.is_a?(String) || scope.is_a?(Class)
-            unserialized_user_ids[scope_with(scope)] ||= Array.new
-            unserialized_user_ids[scope_with(scope)] << user_id
-            unserialized_user_ids[scope_with(scope)].uniq!
+            hash[scope_with(scope)] ||= Array.new
+            hash[scope_with(scope)] << user_id
+            hash[scope_with(scope)].uniq!
           else
-            unserialized_user_ids[scope_with(scope)] ||= Array.new
-            unserialized_user_ids[scope_with(scope)] << user_id
-            unserialized_user_ids[scope_with(scope)].uniq!
+            hash[scope_with(scope)] ||= Array.new
+            hash[scope_with(scope)] << user_id
+            hash[scope_with(scope)].uniq!
           end
 
-          self.user_ids = unserialized_user_ids
+          self.user_ids = hash
 
           save
         end
 
         def remove_user(user_id, scope = nil)
-          unserialized_user_ids = self.user_ids
-          unserialized_user_ids ||= Hash.new
+          hash = unserialized_user_ids
+          hash ||= Hash.new
 
           if scope.nil? || scope.is_a?(Symbol) || scope.is_a?(String) || scope.is_a?(Class)
-            unserialized_user_ids[scope_with(scope)] ||= Array.new
-            unserialized_user_ids[scope_with(scope)].delete(user_id)
+            hash[scope_with(scope)] ||= Array.new
+            hash[scope_with(scope)].delete(user_id)
           else
-            unserialized_user_ids[scope_with(scope)] ||= Array.new
-            unserialized_user_ids[scope_with(scope)].delete(user_id)
+            hash[scope_with(scope)] ||= Array.new
+            hash[scope_with(scope)].delete(user_id)
           end
 
-          self.user_ids = unserialized_user_ids
+          self.user_ids = hash
 
           save
         end

data/lib/role_authorization/version.rb

@@ -1,3 +1,3 @@
 module RoleAuthorization
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: role_authorization
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - John 'asceth' Long