Skip to content
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

Allow using callable objects as scopes #261 #263

Merged
merged 4 commits into from
May 22, 2024
Merged

Allow using callable objects as scopes #261 #263

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
670f557
Allow using callable objects as scopes #261
killondark May 7, 2024
900afb0
Cleaning
killondark May 7, 2024
5c2d113
Update docs, writed tests, fixed logic
killondark May 22, 2024
8799fa4
Merge remote-tracking branch 'origin/master' into add-callable-object…
killondark May 22, 2024
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
13 changes: 12 additions & 1 deletion lib/action_policy/policy/scoping.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,11 @@ def lookup_type_from_target(target)

module ClassMethods # :nodoc:
# Register a new scoping method for the `type`
def scope_for(type, name = :default, &block)
def scope_for(type, name = :default, callable = nil, &block)
name, callable = prepare_args(name, callable)

mid = :"__scoping__#{type}__#{name}"
block = ->(target) { callable.call(target) } if callable

define_method(mid, &block)

Expand Down Expand Up @@ -154,6 +157,14 @@ def scope_matchers
[]
end
end

private

def prepare_args(name, callable)
return [name, callable] if name && callable
return [name, nil] if name.is_a?(Symbol) || name.is_a?(String)
[:default, name]
end
end
end
end
Expand Down
Loading