Skip to content

Feedback requested: Pass through options to scope block #75

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

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

Feedback requested: Pass through options to scope block #75

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
12 changes: 6 additions & 6 deletions lib/search_cop.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,26 @@ def search_scope(name, &block)
search_scopes[name] = SearchScope.new(name, self)
search_scopes[name].instance_exec(&block)

send(:define_singleton_method, name) { |query, query_options = {}| search_cop(query, name, query_options) }
send(:define_singleton_method, "unsafe_#{name}") { |query, query_options = {}| unsafe_search_cop(query, name, query_options) }
send(:define_singleton_method, name) { |query, query_options = {}, scope_options = {}| search_cop(query, name, query_options, scope_options) }
Copy link
Author

@bmulholland bmulholland Aug 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The syntax would be cleaner with keyword arguments. Is that possible to do without a breaking change?

send(:define_singleton_method, "unsafe_#{name}") { |query, query_options = {}, scope_options = {}| unsafe_search_cop(query, name, query_options, scope_options) }
end

def search_reflection(scope_name)
search_scopes[scope_name].reflection
end

def search_cop(query, scope_name, query_options)
unsafe_search_cop(query, scope_name, query_options)
def search_cop(query, scope_name, query_options, scope_options)
unsafe_search_cop(query, scope_name, query_options, scope_options)
rescue SearchCop::RuntimeError
respond_to?(:none) ? none : where("1 = 0")
end

def unsafe_search_cop(query, scope_name, query_options)
def unsafe_search_cop(query, scope_name, query_options, scope_options)
return respond_to?(:scoped) ? scoped : all if query.blank?

query_builder = QueryBuilder.new(self, query, search_scopes[scope_name], query_options)

scope = instance_exec(&search_scopes[scope_name].reflection.scope) if search_scopes[scope_name].reflection.scope
scope = instance_exec(scope_options, &search_scopes[scope_name].reflection.scope) if search_scopes[scope_name].reflection.scope
Copy link
Author

@bmulholland bmulholland Aug 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the whole point here. I also considered doing **scope_options, which might be nicer?

scope ||= eager_load(query_builder.associations) if query_builder.associations.any?

(scope || self).where(query_builder.sql)
Expand Down