Skip to content

Rename filter methods as sanitize #71

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
malomalo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rename filter methods as sanitize #71

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
22 changes: 11 additions & 11 deletions lib/standard_api/access_control_list.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def self.included(application_controller)
end

if mod.instance_methods.include?(:filter)
mod.send :alias_method, "filter_#{prefix}_params".to_sym, :filter
mod.send :alias_method, "sanitize_#{prefix}_params".to_sym, :filter
mod.send :remove_method, :filter
end

Expand All @@ -48,14 +48,14 @@ def model_orders
end

def model_params
if self.respond_to?("filter_#{model_name(model)}_params", true)
self.send("filter_#{model_name(model)}_params", params[model_name(model)], id: params[:id])
if self.respond_to?("sanitize_#{model_name(model)}_params", true)
self.send("sanitize_#{model_name(model)}_params", params[model_name(model)], id: params[:id])
else
filter_model_params(params[model_name(model)], model.base_class)
sanitize_model_params(params[model_name(model)], model.base_class)
end
end

def filter_model_params(model_params, model, id: nil, allow_id: nil)
def sanitize_model_params(model_params, model, id: nil, allow_id: nil)
permitted_params = if model_params && self.respond_to?("#{model_name(model)}_attributes", true)
permits = self.send("#{model_name(model)}_attributes")

Expand All @@ -70,16 +70,16 @@ def filter_model_params(model_params, model, id: nil, allow_id: nil)
attributes_key = "#{relation.name}"

if model_params.has_key?(attributes_key)
filter_method = "filter_#{relation.klass.base_class.model_name.singular}_params"
sanitize_method = "sanitize_#{relation.klass.base_class.model_name.singular}_params"
if model_params[attributes_key].nil?
permitted_params[attributes_key] = nil
elsif model_params[attributes_key].is_a?(Array) && model_params[attributes_key].all? { |a| a.keys.map(&:to_sym) == [:id] }
permitted_params["#{relation.name.to_s.singularize}_ids"] = model_params[attributes_key].map{|a| a['id']}
elsif self.respond_to?(filter_method, true)
elsif self.respond_to?(sanitize_method, true)
permitted_params[attributes_key] = if model_params[attributes_key].is_a?(Array)
models = relation.klass.find(model_params[attributes_key].map { |i| i['id'] }.compact)
model_params[attributes_key].map { |i|
i_params = self.send(filter_method, i, allow_id: true)
i_params = self.send(sanitize_method, i, allow_id: true)
if i_params['id']
r = models.find { |r| r.id == i_params['id'] }
r.assign_attributes(i_params)
Expand All @@ -89,7 +89,7 @@ def filter_model_params(model_params, model, id: nil, allow_id: nil)
end
}
else
i_params = self.send(filter_method, model_params[attributes_key], allow_id: true)
i_params = self.send(sanitize_method, model_params[attributes_key], allow_id: true)
if i_params['id']
r = relation.klass.find(i_params['id'])
r.assign_attributes(i_params)
Expand All @@ -102,7 +102,7 @@ def filter_model_params(model_params, model, id: nil, allow_id: nil)
permitted_params[attributes_key] = if model_params[attributes_key].is_a?(Array)
models = relation.klass.find(model_params[attributes_key].map { |i| i['id'] }.compact)
model_params[attributes_key].map { |i|
i_params = filter_model_params(i, relation.klass.base_class, allow_id: true)
i_params = sanitize_model_params(i, relation.klass.base_class, allow_id: true)
if i_params['id']
r = models.find { |r| r.id == i_params['id'] }
r.assign_attributes(i_params)
Expand All @@ -112,7 +112,7 @@ def filter_model_params(model_params, model, id: nil, allow_id: nil)
end
}
else
i_params = filter_model_params(model_params[attributes_key], relation.klass.base_class, allow_id: true)
i_params = sanitize_model_params(model_params[attributes_key], relation.klass.base_class, allow_id: true)
if i_params['id']
r = relation.klass.find(i_params['id'])
r.assign_attributes(i_params)
Expand Down
8 changes: 4 additions & 4 deletions lib/standard_api/controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,12 @@ def create_resource
resource = resources.find(params[:id])
association = resource.association(params[:relationship])

subresource_params = if self.respond_to?("filter_#{model_name(association.klass)}_params", true)
self.send("filter_#{model_name(association.klass)}_params", params[model_name(association.klass)], id: params[:id])
subresource_params = if self.respond_to?("sanitize_#{model_name(association.klass)}_params", true)
self.send("sanitize_#{model_name(association.klass)}_params", params[model_name(association.klass)], id: params[:id])
elsif self.respond_to?("#{association.klass.model_name.singular}_params", true)
params.require(association.klass.model_name.singular).permit(self.send("#{association.klass.model_name.singular}_params"))
elsif self.respond_to?("filter_model_params", true)
filter_model_params(params[model_name(association.klass)], association.klass.base_class)
elsif self.respond_to?("sanitize_model_params", true)
sanitize_model_params(params[model_name(association.klass)], association.klass.base_class)
else
ActionController::Parameters.new
end
Expand Down