Add mongoid2 support and add mongoid2 to travis test matrix.

Joseph Chen
1 parent 9a9707d4
Showing 4 changed files with 37 additions and 3 deletions Show diff stats
.travis.yml
gemfiles/mongoid2.gemfile
lib/searchkick/results.rb
test/test_helper.rb
@@ -14,5 +14,6 @@ notifications:
     on_failure: change
 gemfile:
   - Gemfile
+  - gemfiles/mongoid2.gemfile
   - gemfiles/mongoid3.gemfile
 -  - gemfiles/mongoid4.gemfile
+  - gemfiles/mongoid4.gemfile
 \ No newline at end of file
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in searchkick.gemspec
+gemspec path: "../"
+
+gem "mongoid", "~> 2"
+gem "bson_ext"
@@ -27,8 +27,11 @@ module Searchkick
               records = records.includes(options[:includes])
             end
             results[type] =
-              if records.respond_to?(:primary_key)
+              if records.respond_to?(:primary_key) && records.primary_key
                 records.where(records.primary_key => grouped_hits.map{|hit| hit["_id"] }).to_a
+              elsif records.respond_to?(:all) && records.all && records.all.respond_to?(:for_ids)
+                # Mongoid 2
+                records.all.for_ids(grouped_hits.map{|hit| hit["_id"] }).to_a
               else
                 records.queryable.for_ids(grouped_hits.map{|hit| hit["_id"] }).to_a
               end
@@ -10,8 +10,31 @@ File.delete(&quot;elasticsearch.log&quot;) if File.exists?(&quot;elasticsearch.log&quot;)
 Searchkick.client.transport.logger = Logger.new("elasticsearch.log")
 if defined?(Mongoid)
+
+  # Helpers to determine version of mongoid.
+  module Mongoid
+    def self.mongoid2?
+      ::Mongoid.const_defined? :Contexts # deprecated in Mongoid 3.x
+    end
+  end
+
+  # Mongoid2 uses BSON gem. We need to re-define <=> in order for TestSql.test_order_id to pass.
+  if defined?(BSON) && defined?(BSON::ObjectId)
+    module BSON
+      class ObjectId
+        def <=>(other)
+          self.eql?(other) ? 0 : self.generation_time <=> other.generation_time
+        end
+      end
+    end
+  end
+
   Mongoid.configure do |config|
-    config.connect_to "searchkick_test"
+    if Mongoid.mongoid2?
+      config.master = Mongo::Connection.new.db("searchkick_test")
+    else
+      config.connect_to "searchkick_test"
+    end
   end
   class Product
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+source 'https://rubygems.org'
	2	+
	3	+# Specify your gem's dependencies in searchkick.gemspec
	4	+gemspec path: "../"
	5	+
	6	+gem "mongoid", "~> 2"
	7	+gem "bson_ext"
	@@ -10,8 +10,31 @@ File.delete("elasticsearch.log") if File.exists?("elasticsearch.log")		@@ -10,8 +10,31 @@ File.delete("elasticsearch.log") if File.exists?("elasticsearch.log")
10	Searchkick.client.transport.logger = Logger.new("elasticsearch.log")	10	Searchkick.client.transport.logger = Logger.new("elasticsearch.log")
11		11
12	if defined?(Mongoid)	12	if defined?(Mongoid)
		13	+
		14	+ # Helpers to determine version of mongoid.
		15	+ module Mongoid
		16	+ def self.mongoid2?
		17	+ ::Mongoid.const_defined? :Contexts # deprecated in Mongoid 3.x
		18	+ end
		19	+ end
		20	+
		21	+ # Mongoid2 uses BSON gem. We need to re-define <=> in order for TestSql.test_order_id to pass.
		22	+ if defined?(BSON) && defined?(BSON::ObjectId)
		23	+ module BSON
		24	+ class ObjectId
		25	+ def <=>(other)
		26	+ self.eql?(other) ? 0 : self.generation_time <=> other.generation_time
		27	+ end
		28	+ end
		29	+ end
		30	+ end
		31	+
13	Mongoid.configure do \|config\|	32	Mongoid.configure do \|config\|
14	- config.connect_to "searchkick_test"	33	+ if Mongoid.mongoid2?
		34	+ config.master = Mongo::Connection.new.db("searchkick_test")
		35	+ else
		36	+ config.connect_to "searchkick_test"
		37	+ end
15	end	38	end
16		39
17	class Product	40	class Product