Merge pull request #9 from ryanmccarthypdx/cancan3

edit user model
ryanmccarthypdx · May 2, 2015 · 8694f28 · 8694f28
2 parents a5bf91b + 4ab2229
commit 8694f28
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -6,7 +6,15 @@ class User < ActiveRecord::Base
 
   Roles = [ :admin, :default ]
 
-  def is?( requested_role.to_s )
-    self.role == requested_role.to_s
+  def roles=(roles)
+    self.roles_mask = (roles & ROLES).map { |r| 2**ROLES.index(r) }.sum
+  end
+
+  def roles
+    ROLES.reject { |r| ((roles_mask || 0) & 2**ROLES.index(r)).zero? }
+  end
+
+  def role?(role)
+    roles.include? role.to_s
   end
 end