Removed use of Array[*roles].

This commit is contained in:
James McCarthy 2011-09-05 19:20:49 +01:00 committed by Martin Rehfeld
parent 25be3587cd
commit f3d56f1ccf

View file

@ -19,12 +19,12 @@ module RoleModel
end
def mask_for(*roles)
(Array[*roles].map { |r|
r.respond_to?(:each) ? r.to_a : r
}.flatten.map { |r|
r.to_sym
} & valid_roles).map { |r|
2**valid_roles.index(r)
(roles.map { |role|
role.respond_to?(:each) ? role.to_a : role
}.flatten.map { |role|
role.to_sym
} & valid_roles).map { |role|
2**valid_roles.index(role)
}.inject { |sum, bitvalue|
sum + bitvalue
} || 0
@ -40,7 +40,7 @@ module RoleModel
#
# declare valid roles
def roles(*roles)
self.valid_roles = Array[*roles].flatten.map { |r| r.to_sym }
self.valid_roles = roles.flatten.map { |r| r.to_sym }
end
end
end