Merge branch 'release/1.17.0'

CanCanCommunity · Mar 26, 2017 · e633592 · e633592
2 parents 17805b1 + 4336d28
commit e633592
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -2,6 +2,10 @@ Develop
 
 Unreleased
 
+1.17.0 (March 26th, 2017)
+
+* Improve performance for the Mongoid Adapter
+
 1.16.0 (February 2nd, 2017)
 
 * Introduce rubocop and fixes most of the issues

diff --git a/lib/cancan/model_adapters/mongoid_adapter.rb b/lib/cancan/model_adapters/mongoid_adapter.rb
@@ -62,7 +62,7 @@ def simplify_relations(model_class, conditions)
             if (relation = model_relations[k])
               relation_class_name = relation[:class_name].blank? ? k.to_s.classify : relation[:class_name]
               v = simplify_relations(relation_class_name.constantize, v)
-              relation_ids = relation_class_name.constantize.where(v).only(:id).map(&:id)
+              relation_ids = relation_class_name.constantize.where(v).distinct(:_id)
               k = "#{k}_id"
               v = { '$in' => relation_ids }
             end

diff --git a/lib/cancan/version.rb b/lib/cancan/version.rb
@@ -1,3 +1,3 @@
 module CanCan
-  VERSION = '1.16.0'.freeze
+  VERSION = '1.17.0'.freeze
 end