Fixes for Mongoid 3.1.4

Andrew Kane
1 parent c2c48a84
Showing 6 changed files with 22 additions and 7 deletions Show diff stats
Gemfile
lib/searchkick.rb
lib/searchkick/reindex.rb
lib/searchkick/search.rb
test/index_test.rb
test/test_helper.rb
@@ -2,3 +2,6 @@ source &#39;https://rubygems.org&#39;
 # Specify your gem's dependencies in searchkick.gemspec
 gemspec
+
+# gem "mongoid", github: "mongoid/mongoid"
+# gem "mongoid", "~> 3.1.0"
@@ -9,5 +9,5 @@ require &quot;searchkick/tasks&quot;
 require "searchkick/logger" if defined?(Rails)
 # TODO find better ActiveModel hook
-ActiveModel::AttributeMethods::ClassMethods.send(:include, Searchkick::Model)
+ActiveModel::Callbacks.send(:include, Searchkick::Model)
 ActiveRecord::Base.send(:extend, Searchkick::Model) if defined?(ActiveRecord)
@@ -14,8 +14,12 @@ module Searchkick
       # use scope for import
       scope = respond_to?(:search_import) ? search_import : self
-      scope.find_in_batches do |batch|
-        index.import batch
+      if scope.respond_to?(:find_in_batches)
+        scope.find_in_batches do |batch|
+          index.import batch
+        end
+      else
+        index.import scope.all
       end
       if a = Tire::Alias.find(alias_name)
@@ -28,7 +28,7 @@ module Searchkick
       page = [options[:page].to_i, 1].max
       per_page = options[:limit] || options[:per_page] || 100000
       offset = options[:offset] || (page - 1) * per_page
-      index_name = options[:index_name] || index.name
+      index_name = options[:index_name] || tire.index.name
       conversions_field = @searchkick_options[:conversions]
       personalize_field = @searchkick_options[:personalize]
@@ -12,7 +12,7 @@ class TestIndex &lt; Minitest::Unit::TestCase
     Product.clean_indices
-    assert Product.index.exists?
+    assert Product.tire.index.exists?
     assert different_index.exists?
     assert !old_index.exists?
   end
@@ -35,7 +35,14 @@ Tire.configure do
   pretty true
 end
+# Mongoid.configure do |config|
+#   config.connect_to "searchkick_test"
+# end
+
 class Product < ActiveRecord::Base
+  # include Mongoid::Document
+  # include Mongoid::Attributes::Dynamic
+
   belongs_to :store
   searchkick \
@@ -64,9 +71,10 @@ class Product &lt; ActiveRecord::Base
 end
 class Store < ActiveRecord::Base
+  # include Mongoid::Document
 end
-Product.index.delete if Product.index.exists?
+Product.tire.index.delete if Product.tire.index.exists?
 Product.reindex
 Product.reindex # run twice for both index paths
@@ -82,7 +90,7 @@ class MiniTest::Unit::TestCase
     documents.shuffle.each do |document|
       Product.create!(document)
     end
-    Product.index.refresh
+    Product.tire.index.refresh
   end
   def store_names(names)
	@@ -2,3 +2,6 @@ source 'https://rubygems.org'		@@ -2,3 +2,6 @@ source 'https://rubygems.org'
2		2
3	# Specify your gem's dependencies in searchkick.gemspec	3	# Specify your gem's dependencies in searchkick.gemspec
4	gemspec	4	gemspec
		5	+
		6	+# gem "mongoid", github: "mongoid/mongoid"
		7	+# gem "mongoid", "~> 3.1.0"
	@@ -9,5 +9,5 @@ require "searchkick/tasks"		@@ -9,5 +9,5 @@ require "searchkick/tasks"
9	require "searchkick/logger" if defined?(Rails)	9	require "searchkick/logger" if defined?(Rails)
10		10
11	# TODO find better ActiveModel hook	11	# TODO find better ActiveModel hook
12	-ActiveModel::AttributeMethods::ClassMethods.send(:include, Searchkick::Model)	12	+ActiveModel::Callbacks.send(:include, Searchkick::Model)
13	ActiveRecord::Base.send(:extend, Searchkick::Model) if defined?(ActiveRecord)	13	ActiveRecord::Base.send(:extend, Searchkick::Model) if defined?(ActiveRecord)
	@@ -28,7 +28,7 @@ module Searchkick		@@ -28,7 +28,7 @@ module Searchkick
28	page = [options[:page].to_i, 1].max	28	page = [options[:page].to_i, 1].max
29	per_page = options[:limit] \|\| options[:per_page] \|\| 100000	29	per_page = options[:limit] \|\| options[:per_page] \|\| 100000
30	offset = options[:offset] \|\| (page - 1) * per_page	30	offset = options[:offset] \|\| (page - 1) * per_page
31	- index_name = options[:index_name] \|\| index.name	31	+ index_name = options[:index_name] \|\| tire.index.name
32		32
33	conversions_field = @searchkick_options[:conversions]	33	conversions_field = @searchkick_options[:conversions]
34	personalize_field = @searchkick_options[:personalize]	34	personalize_field = @searchkick_options[:personalize]
	@@ -12,7 +12,7 @@ class TestIndex < Minitest::Unit::TestCase		@@ -12,7 +12,7 @@ class TestIndex < Minitest::Unit::TestCase
12		12
13	Product.clean_indices	13	Product.clean_indices
14		14
15	- assert Product.index.exists?	15	+ assert Product.tire.index.exists?
16	assert different_index.exists?	16	assert different_index.exists?
17	assert !old_index.exists?	17	assert !old_index.exists?
18	end	18	end