will/cancan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #645 from andhapp/issue-644

Browse Source 
Allow users to specify a mix of can and cannot rule for mongoid
This commit is contained in:
Ryan Bates 2012-06-11 09:52:38 -07:00
commit 7bf683d8f4
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cancan/model_adapters/mongoid_adapter.rb
View File

@ -30,8 +30,9 @@ module CanCan
else else
# we only need to process can rules if # we only need to process can rules if
# there are no rules with empty conditions # there are no rules with empty conditions
rules = @rules.reject { |rule| rule.conditions.empty? } rules = @rules.reject { |rule| rule.conditions.empty? && rule.base_behavior }
process_can_rules = @rules.count == rules.count process_can_rules = @rules.count == rules.count
rules.inject(@model_class.all) do |records, rule| rules.inject(@model_class.all) do |records, rule|
if process_can_rules && rule.base_behavior if process_can_rules && rule.base_behavior
records.or rule.conditions records.or rule.conditions

15
spec/cancan/model_adapters/mongoid_adapter_spec.rb
View File

@ -73,6 +73,17 @@ if ENV["MODEL_ADAPTER"] == "mongoid"
MongoidProject.accessible_by(@ability, :read).entries.should == [sir] MongoidProject.accessible_by(@ability, :read).entries.should == [sir]
end end
it "should return the correct records when a mix of can and cannot rules in defined ability" do
@ability.can :manage, MongoidProject, :title => 'Sir'
@ability.cannot :destroy, MongoidProject
sir = MongoidProject.create(:title => 'Sir')
lord = MongoidProject.create(:title => 'Lord')
dude = MongoidProject.create(:title => 'Dude')
MongoidProject.accessible_by(@ability, :destroy).entries.should == [sir]
end
it "should be able to mix empty conditions and hashes" do it "should be able to mix empty conditions and hashes" do
@ability.can :read, MongoidProject @ability.can :read, MongoidProject
@ability.can :read, MongoidProject, :title => 'Sir' @ability.can :read, MongoidProject, :title => 'Sir'
@ -185,7 +196,7 @@ if ENV["MODEL_ADAPTER"] == "mongoid"
@ability.can :read, MongoidProject, :foo => {:bar => 1} @ability.can :read, MongoidProject, :foo => {:bar => 1}
MongoidProject.accessible_by(@ability, :read).entries.first.should == obj MongoidProject.accessible_by(@ability, :read).entries.first.should == obj
end end
it "should exclude from the result if set to cannot" do it "should exclude from the result if set to cannot" do
obj = MongoidProject.create(:bar => 1) obj = MongoidProject.create(:bar => 1)
obj2 = MongoidProject.create(:bar => 2) obj2 = MongoidProject.create(:bar => 2)
@ -202,7 +213,7 @@ if ENV["MODEL_ADAPTER"] == "mongoid"
@ability.can :read, MongoidProject, :bar => 2 @ability.can :read, MongoidProject, :bar => 2
MongoidProject.accessible_by(@ability, :read).entries.should =~ [obj, obj2] MongoidProject.accessible_by(@ability, :read).entries.should =~ [obj, obj2]
end end
it "should not allow to fetch records when ability with just block present" do it "should not allow to fetch records when ability with just block present" do
@ability.can :read, MongoidProject do @ability.can :read, MongoidProject do
false false