Skip to content

STI on resources: always use base class when saving roles on resources #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

STI on resources: always use base class when saving roles on resources #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions lib/rolify/adapters/active_record/role_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ def where_strict(relation, args)
wrap_conditions = relation.name != role_class.name

conditions = if args[:resource].is_a?(Class)
{:resource_type => args[:resource].to_s, :resource_id => nil }
{:resource_type => args[:resource].polymorphic_name, :resource_id => nil }
elsif args[:resource].present?
{:resource_type => args[:resource].class.name, :resource_id => args[:resource].id}
{:resource_type => args[:resource].class.polymorphic_name, :resource_id => args[:resource].id}
else
{}
end
Expand All @@ -27,7 +27,7 @@ def where_strict(relation, args)

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) ? args[:resource] : args[:resource].class).polymorphic_name

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

Expand All @@ -40,7 +40,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) ? args[:resource] : args[:resource].class).polymorphic_name

relation.find_all do |role|
role.resource_id == resource_id && role.resource_type == resource_type && role.name == args[:name].to_s
Expand All @@ -57,7 +57,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) ? resource : resource.class).polymorphic_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 @@ -110,10 +110,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) ? resource : resource.class).polymorphic_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 << resource.class.polymorphic_name << resource.id
end
query += ")"
end
Expand Down
14 changes: 7 additions & 7 deletions lib/rolify/adapters/mongoid/role_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ def where_strict(relation, args)
wrap_conditions = relation.name != role_class.name

conditions = if args[:resource].is_a?(Class)
{:resource_type => args[:resource].to_s, :resource_id => nil }
{:resource_type => args[:resource].polymorphic_name, :resource_id => nil }
elsif args[:resource].present?
{:resource_type => args[:resource].class.name, :resource_id => args[:resource].id}
{:resource_type => args[:resource].class.polymorphic_name, :resource_id => args[:resource].id}
else
{}
end
Expand All @@ -27,7 +27,7 @@ def where_strict(relation, args)

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) ? args[:resource] : args[:resource].class).polymorphic_name

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

Expand All @@ -40,7 +40,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) ? args[:resource] : args[:resource].class).polymorphic_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 @@ -73,7 +73,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) ? resource : resource.class).polymorphic_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 @@ -123,9 +123,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) ? resource : resource.class).polymorphic_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 => resource.class.polymorphic_name, :resource_id => resource.id }
end
end
query
Expand Down
2 changes: 1 addition & 1 deletion lib/rolify/role.rb
View file
Open in desktop
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) ? resource : resource.class).polymorphic_name if resource),
(resource.id if resource && !resource.is_a?(Class)))

if !roles.include?(role)
Expand Down