From 94c306fb075b20ee46b5dafa6eb979a57d4d39b0 Mon Sep 17 00:00:00 2001
From: shaunakpp <shaunak.pagnis@gmail.com>
Date: Tue, 28 Feb 2017 13:37:04 +0530
Subject: [PATCH 1/2] replace only->map by distinct in mongoid_adapter for
 better performance

---
 lib/cancan/model_adapters/mongoid_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cancan/model_adapters/mongoid_adapter.rb b/lib/cancan/model_adapters/mongoid_adapter.rb
index 1771de11..87eff16b 100644
--- 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

From 4336d2869598d34b7fc53860b5a32306b4aeec6c Mon Sep 17 00:00:00 2001
From: Alessandro Rodi <alessandro.rodi@renuo.ch>
Date: Sun, 26 Mar 2017 15:41:45 +0200
Subject: [PATCH 2/2] * add changelog * bump version

---
 CHANGELOG.rdoc        | 4 ++++
 lib/cancan/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 35b3bcd6..a7cdd574 100644
--- 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/version.rb b/lib/cancan/version.rb
index 43042322..79171d34 100644
--- 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