Skip to content

Support arrays of actions in can statements #64

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
CyborgMaster wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support arrays of actions in can statements #64

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57e577f
Support arrays of actions in can statements
CyborgMaster May 1, 2015
318eed9
Enabled arrays of actions for `cannot`, just like we already did for …
CyborgMaster Mar 1, 2016
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
66 changes: 38 additions & 28 deletions lib/protector/dsl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,23 +102,28 @@ def eval_scope_procs(instance)
# # Can create f1 field with value equal to 'olo'
# can :create, f1: lambda{|x| x == 'olo'}
# end
def can(action, *fields)
action = deprecate_actions(action)
def can(actions, *fields)
Array.wrap(actions).each do |action|
action = deprecate_actions(action)

return @destroyable = true if action == :destroy
if action == :destroy
@destroyable = true
next
end

@access[action] = {} unless @access[action]
@access[action] = {} unless @access[action]

if fields.length == 0
@fields.each { |f| @access[action][f.to_s] = nil }
else
fields.each do |a|
if a.is_a?(Array)
a.each { |f| @access[action][f.to_s] = nil }
elsif a.is_a?(Hash)
@access[action].merge!(a.stringify_keys)
else
@access[action][a.to_s] = nil
if fields.length == 0
@fields.each { |f| @access[action][f.to_s] = nil }
else
fields.each do |a|
if a.is_a?(Array)
a.each { |f| @access[action][f.to_s] = nil }
elsif a.is_a?(Hash)
@access[action].merge!(a.stringify_keys)
else
@access[action][a.to_s] = nil
end
end
end
end
Expand All @@ -133,25 +138,30 @@ def can(action, *fields)
#
# @see #can
# @see #can?
def cannot(action, *fields)
action = deprecate_actions(action)
def cannot(actions, *fields)
Array.wrap(actions).each do |action|
action = deprecate_actions(action)

return @destroyable = false if action == :destroy
if action == :destroy
@destroyable = false
next
end

return unless @access[action]
next unless @access[action]

if fields.length == 0
@access.delete(action)
else
fields.each do |a|
if a.is_a?(Array)
a.each { |f| @access[action].delete(f.to_s) }
else
@access[action].delete(a.to_s)
if fields.length == 0
@access.delete(action)
else
fields.each do |a|
if a.is_a?(Array)
a.each { |f| @access[action].delete(f.to_s) }
else
@access[action].delete(a.to_s)
end
end
end

@access.delete(action) if @access[action].empty?
@access.delete(action) if @access[action].empty?
end
end
end

Expand Down