Merge branch 'joe1chen-mongoid2-support'

Andrew Kane
2 parents 084f7dce d9fa7eea
Showing 4 changed files with 35 additions and 2 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
@@ -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,9 +27,14 @@ module Searchkick
               records = records.includes(options[:includes])
             end
             results[type] =
-              if records.respond_to?(:primary_key)
+              if records.respond_to?(:primary_key) and records.primary_key
+                # ActiveRecord
                 records.where(records.primary_key => grouped_hits.map{|hit| hit["_id"] }).to_a
+              elsif records.respond_to?(:all) and records.all.respond_to?(:for_ids)
+                # Mongoid 2
+                records.all.for_ids(grouped_hits.map{|hit| hit["_id"] }).to_a
               else
+                # Mongoid 3+
                 records.queryable.for_ids(grouped_hits.map{|hit| hit["_id"] }).to_a
               end
           end
@@ -10,8 +10,28 @@ File.delete(&quot;elasticsearch.log&quot;) if File.exists?(&quot;elasticsearch.log&quot;)
 Searchkick.client.transport.logger = Logger.new("elasticsearch.log")
  
 if defined?(Mongoid)
+
+  def mongoid2?
+    Mongoid::VERSION.starts_with?("2.")
+  end
+
+  if mongoid2?
+    # enable comparison of BSON::ObjectIds
+    module BSON
+      class ObjectId
+        def <=>(other)
+          self.data <=> other.data
+        end
+      end
+    end
+  end
+
   Mongoid.configure do |config|
-    config.connect_to "searchkick_test"
+    if mongoid2?
+      config.master = Mongo::Connection.new.db("searchkick_test")
+    else
+      config.connect_to "searchkick_test"
+    end
   end
  
   class Product
...	...	@@ -14,5 +14,6 @@ notifications:
14	14	on_failure: change
15	15	gemfile:
16	16	- Gemfile
	17	+ - gemfiles/mongoid2.gemfile
17	18	- gemfiles/mongoid3.gemfile
18	19	- gemfiles/mongoid4.gemfile
...	...
...	...	@@ -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"
...	...
...	...	@@ -27,9 +27,14 @@ module Searchkick
27	27	records = records.includes(options[:includes])
28	28	end
29	29	results[type] =
30		- if records.respond_to?(:primary_key)
	30	+ if records.respond_to?(:primary_key) and records.primary_key
	31	+ # ActiveRecord
31	32	records.where(records.primary_key => grouped_hits.map{\|hit\| hit["_id"] }).to_a
	33	+ elsif records.respond_to?(:all) and records.all.respond_to?(:for_ids)
	34	+ # Mongoid 2
	35	+ records.all.for_ids(grouped_hits.map{\|hit\| hit["_id"] }).to_a
32	36	else
	37	+ # Mongoid 3+
33	38	records.queryable.for_ids(grouped_hits.map{\|hit\| hit["_id"] }).to_a
34	39	end
35	40	end
...	...
...	...	@@ -10,8 +10,28 @@ File.delete("elasticsearch.log") if File.exists?("elasticsearch.log")
10	10	Searchkick.client.transport.logger = Logger.new("elasticsearch.log")
11	11
12	12	if defined?(Mongoid)
	13	+
	14	+ def mongoid2?
	15	+ Mongoid::VERSION.starts_with?("2.")
	16	+ end
	17	+
	18	+ if mongoid2?
	19	+ # enable comparison of BSON::ObjectIds
	20	+ module BSON
	21	+ class ObjectId
	22	+ def <=>(other)
	23	+ self.data <=> other.data
	24	+ end
	25	+ end
	26	+ end
	27	+ end
	28	+
13	29	Mongoid.configure do \|config\|
14		- config.connect_to "searchkick_test"
	30	+ if mongoid2?
	31	+ config.master = Mongo::Connection.new.db("searchkick_test")
	32	+ else
	33	+ config.connect_to "searchkick_test"
	34	+ end
15	35	end
16	36
17	37	class Product
...	...