Permalink
Browse files

Merge pull request #363 from rahearn/mongoid-conditions-empty

Fixes bug in mongoid_adapter with empty conditions hash
  • Loading branch information...
2 parents 4e4c5a9 + 0882450 commit 74c9d582b2cbd0bdce5025e5c402713c69fc88d1 @ryanb committed May 17, 2011
Showing with 20 additions and 7 deletions.
  1. +11 −7 lib/cancan/model_adapters/mongoid_adapter.rb
  2. +9 −0 spec/cancan/model_adapters/mongoid_adapter_spec.rb
View
18 lib/cancan/model_adapters/mongoid_adapter.rb
@@ -23,18 +23,22 @@ def self.matches_conditions_hash?(subject, conditions)
end
def database_records
- if @rules.size == 0
+ if @rules.size == 0
@model_class.where(:_id => {'$exists' => false, '$type' => 7}) # return no records in Mongoid
elsif @rules.size == 1 && @rules[0].conditions.is_a?(Mongoid::Criteria)
@rules[0].conditions
else
- @rules.inject(@model_class.all) do |records, rule|
- if rule.conditions.empty?
- records
- elsif rule.base_behavior
- records.or(rule.conditions)
+ # we only need to process can rules if
+ # there are no rules with empty conditions
+ rules = @rules.reject { |rule| rule.conditions.empty? }
+ 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
+ elsif !rule.base_behavior
+ records.excludes rule.conditions
else
- records.excludes(rule.conditions)
+ records
end
end
end
View
9 spec/cancan/model_adapters/mongoid_adapter_spec.rb
@@ -68,6 +68,15 @@ class MongoidProject
MongoidProject.accessible_by(@ability, :read).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'
+ sir = MongoidProject.create(:title => 'Sir')
+ lord = MongoidProject.create(:title => 'Lord')
+
+ MongoidProject.accessible_by(@ability, :read).count.should == 2
+ end
+
it "should return everything when the defined ability is manage all" do
@ability.can :manage, :all
sir = MongoidProject.create(:title => 'Sir')

0 comments on commit 74c9d58

Please sign in to comment.