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

Use Mongoid::Matchers#matches? instead of a database query in MongoidAdapter#matches_conditions_hash?

Browse Source
This commit is contained in:
Mani Tadayon 2011-01-05 23:12:59 -08:00
parent bc9ecb226d
commit 12b0bff0b6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,9 @@ module CanCan
end end
def self.matches_conditions_hash?(subject, conditions) def self.matches_conditions_hash?(subject, conditions)
subject.class.where(conditions).include?(subject) # TODO don't use a database query here for performance and other instances # To avoid hitting the db, retrieve the raw Mongo selector from
# the Mongoid Criteria and use Mongoid::Matchers#matches?
subject.matches?( subject.class.where(conditions).selector )
end end
def database_records def database_records

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

@ -84,7 +84,7 @@ if ENV["MODEL_ADAPTER"] == "mongoid"
it "Calls where on the model class when there are criteria" do it "Calls where on the model class when there are criteria" do
obj = MongoidProject.create(:title => 'Bird') obj = MongoidProject.create(:title => 'Bird')
@conditions = {:title.nin => ["Fork", "Spoon"]} @conditions = {:title.nin => ["Fork", "Spoon"]}
mock(MongoidProject).where(@conditions) {[obj]}
@ability.can :read, MongoidProject, @conditions @ability.can :read, MongoidProject, @conditions
@ability.should be_able_to(:read, obj) @ability.should be_able_to(:read, obj)
end end