Skip to content

Commit

Permalink
always use base class when saving roles on resources
Browse files Browse the repository at this point in the history
  • Loading branch information
@doits
doits committed Jun 5, 2019
1 parent e196d70 commit 4a43f60
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 15 deletions.
3 changes: 3 additions & 0 deletions lib/rolify.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,7 @@ def self.resource_types
@@resource_types
end

def self.base_class_for(klass)
klass.respond_to?(:base_class) ? klass.base_class : klass
end
end
14 changes: 7 additions & 7 deletions lib/rolify/adapters/active_record/role_adapter.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ def where(relation, *args)
def where_strict(relation, args)
return relation.where(:name => args[:name]) if args[:resource].blank?
resource = if args[:resource].is_a?(Class)
{class: args[:resource].to_s, id: nil}
{class: Rolify.base_class_for(args[:resource]).to_s, id: nil}
else
{class: args[:resource].class.name, id: args[:resource].id}
{class: Rolify.base_class_for(args[:resource].class).name, id: args[:resource].id}
end

relation.where(:name => args[:name], :resource_type => resource[:class], :resource_id => resource[:id])
end

def find_cached(relation, args)
resource_id = (args[:resource].nil? || args[:resource].is_a?(Class) || args[:resource] == :any) ? nil : args[:resource].id
resource_type = args[:resource].is_a?(Class) ? args[:resource].to_s : args[:resource].class.name
resource_type = args[:resource].is_a?(Class) ? Rolify.base_class_for(args[:resource]).to_s : Rolify.base_class_for(args[:resource].class).name

return relation.find_all { |role| role.name == args[:name].to_s } if args[:resource] == :any

Expand All @@ -34,7 +34,7 @@ def find_cached(relation, args)

def find_cached_strict(relation, args)
resource_id = (args[:resource].nil? || args[:resource].is_a?(Class)) ? nil : args[:resource].id
resource_type = args[:resource].is_a?(Class) ? args[:resource].to_s : args[:resource].class.name
resource_type = args[:resource].is_a?(Class) ? Rolify.base_class_for(args[:resource]).to_s : Rolify.base_class_for(args[:resource].class).name

relation.find_all do |role|
role.resource_id == resource_id && role.resource_type == resource_type && role.name == args[:name].to_s
Expand All @@ -51,7 +51,7 @@ def add(relation, role)

def remove(relation, role_name, resource = nil)
cond = { :name => role_name }
cond[:resource_type] = (resource.is_a?(Class) ? resource.to_s : resource.class.name) if resource
cond[:resource_type] = (resource.is_a?(Class) ? Rolify.base_class_for(resource).to_s : Rolify.base_class_for(resource.class).name) if resource
cond[:resource_id] = resource.id if resource && !resource.is_a?(Class)
roles = relation.roles.where(cond)
if roles
Expand Down Expand Up @@ -104,10 +104,10 @@ def build_query(role, resource = nil)
if resource
query.insert(0, "(")
query += " OR ((#{role_table}.name = ?) AND (#{role_table}.resource_type = ?) AND (#{role_table}.resource_id IS NULL))"
values << role << (resource.is_a?(Class) ? resource.to_s : resource.class.name)
values << role << (resource.is_a?(Class) ? Rolify.base_class_for(resource).to_s : Rolify.base_class_for(resource.class).name)
if !resource.is_a? Class
query += " OR ((#{role_table}.name = ?) AND (#{role_table}.resource_type = ?) AND (#{role_table}.resource_id = ?))"
values << role << resource.class.name << resource.id
values << role << Rolify.base_class_for(resource.class).name << resource.id
end
query += ")"
end
Expand Down
14 changes: 7 additions & 7 deletions lib/rolify/adapters/mongoid/role_adapter.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ def where(relation, *args)
def where_strict(relation, args)
return relation.where(:name => args[:name]) if args[:resource].blank?
resource = if args[:resource].is_a?(Class)
{class: args[:resource].to_s, id: nil}
{class: Rolify.base_class_for(args[:resource]).to_s, id: nil}
else
{class: args[:resource].class.name, id: args[:resource].id}
{class: Rolify.base_class_for(args[:resource].class).name, id: args[:resource].id}
end

relation.where(:name => args[:name], :resource_type => resource[:class], :resource_id => resource[:id])
end

def find_cached(relation, args)
resource_id = (args[:resource].nil? || args[:resource].is_a?(Class) || args[:resource] == :any) ? nil : args[:resource].id
resource_type = args[:resource].is_a?(Class) ? args[:resource].to_s : args[:resource].class.name
resource_type = args[:resource].is_a?(Class) ? Rolify.base_class_for(args[:resource]).to_s : Rolify.base_class_for(args[:resource].class).name

return relation.find_all { |role| role.name == args[:name].to_s } if args[:resource] == :any

Expand All @@ -34,7 +34,7 @@ def find_cached(relation, args)

def find_cached_strict(relation, args)
resource_id = (args[:resource].nil? || args[:resource].is_a?(Class)) ? nil : args[:resource].id
resource_type = args[:resource].is_a?(Class) ? args[:resource].to_s : args[:resource].class.name
resource_type = args[:resource].is_a?(Class) ? Rolify.base_class_for(args[:resource]).to_s : Rolify.base_class_for(args[:resource].class).name

relation.find_all do |role|
role.resource_id == resource_id && role.resource_type == resource_type && role.name == args[:name].to_s
Expand Down Expand Up @@ -67,7 +67,7 @@ def remove(relation, role_name, resource = nil)
# role.destroy if role.send(user_class.to_s.tableize.to_sym).empty?
#end
cond = { :name => role_name }
cond[:resource_type] = (resource.is_a?(Class) ? resource.to_s : resource.class.name) if resource
cond[:resource_type] = (resource.is_a?(Class) ? Rolify.base_class_for(resource).to_s : Rolify.base_class_for(resource.class).name) if resource
cond[:resource_id] = resource.id if resource && !resource.is_a?(Class)
roles = relation.roles.where(cond)
roles.each do |role|
Expand Down Expand Up @@ -116,9 +116,9 @@ def build_query(role, resource = nil)
return [{ :name => role }] if resource == :any
query = [{ :name => role, :resource_type => nil, :resource_id => nil }]
if resource
query << { :name => role, :resource_type => (resource.is_a?(Class) ? resource.to_s : resource.class.name), :resource_id => nil }
query << { :name => role, :resource_type => (resource.is_a?(Class) ? Rolify.base_class_for(resource).to_s : Rolify.base_class_for(resource.class).name), :resource_id => nil }
if !resource.is_a? Class
query << { :name => role, :resource_type => resource.class.name, :resource_id => resource.id }
query << { :name => role, :resource_type => Rolify.base_class_for(resource.class).name, :resource_id => resource.id }
end
end
query
Expand Down
2 changes: 1 addition & 1 deletion lib/rolify/role.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def self.included(base)

def add_role(role_name, resource = nil)
role = self.class.adapter.find_or_create_by(role_name.to_s,
(resource.is_a?(Class) ? resource.to_s : resource.class.name if resource),
(resource.is_a?(Class) ? Rolify.base_class_for(resource).to_s : Rolify.base_class_for(resource.class).name if resource),
(resource.id if resource && !resource.is_a?(Class)))

if !roles.include?(role)
Expand Down

0 comments on commit 4a43f60

Please sign in to comment.