Added basic support for multiple models - #38

Andrew Kane
1 parent 6f9fb3c5
Showing 5 changed files with 43 additions and 7 deletions Show diff stats
CHANGELOG.md
README.md
lib/searchkick.rb
lib/searchkick/query.rb
test/model_test.rb
@@ -4,6 +4,7 @@
 - Added `analyzed_only` option for large text fields
 - Added `encoder` option to highlight
 - Fixed issue in `similar` method with `per_page` option
+- Added basic support for multiple models
 ## 1.1.2
@@ -1246,6 +1246,12 @@ class Product &lt; ActiveRecord::Base
 end
 ```
+Search multiple models [master]
+
+```ruby
+Searchkick.search "milk", index_name: [Product, Category]
+```
+
 Reindex all models - Rails only
 ```sh
@@ -128,6 +128,16 @@ module Searchkick
   def self.callbacks_value=(value)
     Thread.current[:searchkick_callbacks_enabled] = value
   end
+
+  def self.search(term = nil, options = {}, &block)
+    query = Searchkick::Query.new(nil, term, options)
+    block.call(query.body) if block
+    if options[:execute] == false
+      query
+    else
+      query.execute
+    end
+  end
 end
 # TODO find better ActiveModel hook
@@ -28,20 +28,29 @@ module Searchkick
     end
     def searchkick_index
-      klass.searchkick_index
+      klass ? klass.searchkick_index : nil
     end
     def searchkick_options
-      klass.searchkick_options
+      klass ? klass.searchkick_options : {}
     end
     def searchkick_klass
-      klass.searchkick_klass
+      klass ? klass.searchkick_klass : nil
     end
     def params
+      index =
+        if options[:index_name]
+          Array(options[:index_name]).map { |v| v.respond_to?(:searchkick_index) ? v.searchkick_index.name : v }.join(",")
+        elsif searchkick_index
+          searchkick_index.name
+        else
+          "_all"
+        end
+
       params = {
-        index: options[:index_name] || searchkick_index.name,
+        index: index,
         body: body
       }
       params.merge!(type: @type) if @type
@@ -60,7 +69,7 @@ module Searchkick
         rescue => e # TODO rescue type
           status_code = e.message[1..3].to_i
           if status_code == 404
-            raise MissingIndexError, "Index missing - run #{searchkick_klass.name}.reindex"
+            raise MissingIndexError, "Index missing - run #{reindex_command}"
           elsif status_code == 500 && (
               e.message.include?("IllegalArgumentException[minimumSimilarity >= 1]") ||
               e.message.include?("No query registered for [multi_match]") ||
@@ -71,7 +80,7 @@ module Searchkick
             raise UnsupportedVersionError, "This version of Searchkick requires Elasticsearch 1.0 or greater"
           elsif status_code == 400
             if e.message.include?("[multi_match] analyzer [searchkick_search] not found")
-              raise InvalidQueryError, "Bad mapping - run #{searchkick_klass.name}.reindex"
+              raise InvalidQueryError, "Bad mapping - run #{reindex_command}"
             else
               raise InvalidQueryError, e.message
             end
@@ -116,6 +125,10 @@ module Searchkick
     private
+    def reindex_command
+      searchkick_klass ? "#{searchkick_klass.name}.reindex" : "reindex"
+    end
+
     def execute_search
       Searchkick.client.search(params)
     end
@@ -561,7 +574,7 @@ module Searchkick
           payload[:fields] = []
         end
-        if options[:type] || klass != searchkick_klass
+        if options[:type] || (klass != searchkick_klass && searchkick_index)
           @type = [options[:type] || klass].flatten.map { |v| searchkick_index.klass_document_type(v) }
         end
@@ -33,4 +33,10 @@ class ModelTest &lt; Minitest::Test
     assert_search "product", ["product a", "product b"]
   end
+
+  def test_multiple_models
+    store_names ["Product A"]
+    store_names ["Product B"], Store
+    assert_equal Product.all + Store.all, Searchkick.search("product", index_name: [Product, Store], order: "name").to_a
+  end
 end
	@@ -4,6 +4,7 @@		@@ -4,6 +4,7 @@
4	- Added `analyzed_only` option for large text fields	4	- Added `analyzed_only` option for large text fields
5	- Added `encoder` option to highlight	5	- Added `encoder` option to highlight
6	- Fixed issue in `similar` method with `per_page` option	6	- Fixed issue in `similar` method with `per_page` option
		7	+- Added basic support for multiple models
7		8
8	## 1.1.2	9	## 1.1.2
9		10
	@@ -1246,6 +1246,12 @@ class Product < ActiveRecord::Base		@@ -1246,6 +1246,12 @@ class Product < ActiveRecord::Base
1246	end	1246	end
1247	```	1247	```
1248		1248
		1249	+Search multiple models [master]
		1250	+
		1251	+```ruby
		1252	+Searchkick.search "milk", index_name: [Product, Category]
		1253	+```
		1254	+
1249	Reindex all models - Rails only	1255	Reindex all models - Rails only
1250		1256
1251	```sh	1257	```sh
	@@ -128,6 +128,16 @@ module Searchkick		@@ -128,6 +128,16 @@ module Searchkick
128	def self.callbacks_value=(value)	128	def self.callbacks_value=(value)
129	Thread.current[:searchkick_callbacks_enabled] = value	129	Thread.current[:searchkick_callbacks_enabled] = value
130	end	130	end
		131	+
		132	+ def self.search(term = nil, options = {}, &block)
		133	+ query = Searchkick::Query.new(nil, term, options)
		134	+ block.call(query.body) if block
		135	+ if options[:execute] == false
		136	+ query
		137	+ else
		138	+ query.execute
		139	+ end
		140	+ end
131	end	141	end
132		142
133	# TODO find better ActiveModel hook	143	# TODO find better ActiveModel hook
	@@ -33,4 +33,10 @@ class ModelTest < Minitest::Test		@@ -33,4 +33,10 @@ class ModelTest < Minitest::Test
33		33
34	assert_search "product", ["product a", "product b"]	34	assert_search "product", ["product a", "product b"]
35	end	35	end
		36	+
		37	+ def test_multiple_models
		38	+ store_names ["Product A"]
		39	+ store_names ["Product B"], Store
		40	+ assert_equal Product.all + Store.all, Searchkick.search("product", index_name: [Product, Store], order: "name").to_a
		41	+ end
36	end	42	end