Browse files

Merge pull request #645 from andhapp/issue-644

Allow users to specify a mix of can and cannot rule for mongoid
  • Loading branch information...
2 parents 80a8c39 + da663aa commit 7bf683d8f4e181f5d93d85eac1927b2c96b53529 @ryanb committed Jun 11, 2012
Showing with 15 additions and 3 deletions.
  1. +2 −1 lib/cancan/model_adapters/mongoid_adapter.rb
  2. +13 −2 spec/cancan/model_adapters/mongoid_adapter_spec.rb
View
3 lib/cancan/model_adapters/mongoid_adapter.rb
@@ -30,8 +30,9 @@ def database_records
else
# we only need to process can rules if
# 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
+
rules.inject(@model_class.all) do |records, rule|
if process_can_rules && rule.base_behavior
records.or rule.conditions
View
15 spec/cancan/model_adapters/mongoid_adapter_spec.rb
@@ -73,6 +73,17 @@ class MongoidProject
MongoidProject.accessible_by(@ability, :read).entries.should == [sir]
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
@ability.can :read, MongoidProject
@ability.can :read, MongoidProject, :title => 'Sir'
@@ -185,7 +196,7 @@ class MongoidProject
@ability.can :read, MongoidProject, :foo => {:bar => 1}
MongoidProject.accessible_by(@ability, :read).entries.first.should == obj
end
-
+
it "should exclude from the result if set to cannot" do
obj = MongoidProject.create(:bar => 1)
obj2 = MongoidProject.create(:bar => 2)
@@ -202,7 +213,7 @@ class MongoidProject
@ability.can :read, MongoidProject, :bar => 2
MongoidProject.accessible_by(@ability, :read).entries.should =~ [obj, obj2]
end
-
+
it "should not allow to fetch records when ability with just block present" do
@ability.can :read, MongoidProject do
false

0 comments on commit 7bf683d

Please sign in to comment.