added Searchkick.search_method_name to allow for changing the search method when…

… it conflicts with other gems

added Searchkick.search_method_name to allow for changing the search method when…
… it conflicts with other gems
Cory O'Daniel
1 parent 95672b1c
Showing 4 changed files with 16 additions and 17 deletions Show diff stats
lib/searchkick.rb
lib/searchkick/model.rb
lib/searchkick/search.rb
lib/searchkick/similar.rb
@@ -6,14 +6,20 @@ require &quot;searchkick/index&quot;
 require "searchkick/reindex"
 require "searchkick/results"
 require "searchkick/query"
-require "searchkick/search"
 require "searchkick/similar"
 require "searchkick/model"
 require "searchkick/tasks"
 require "searchkick/logging" if defined?(Rails)
 module Searchkick
+  def self.search_method_name=(_search_method_name)
+    @search_method_name ||= _search_method_name
+  end
+  def self.search_method_name
+    @search_method_name || :search
+  end
+  
   def self.client
     @client ||= Elasticsearch::Client.new(url: ENV["ELASTICSEARCH_URL"])
   end
@@ -19,7 +19,14 @@ module Searchkick
           Searchkick::Index.new(index)
         end
-        extend Searchkick::Search
+        define_singleton_method(Searchkick.search_method_name) do |term, options={}|
+          query = Searchkick::Query.new(self, term, options)
+          if options[:execute] == false
+            query
+          else
+            query.execute
+          end
+        end
         extend Searchkick::Reindex
         include Searchkick::Similar
@@ -1,14 +0,0 @@
-module Searchkick
-  module Search
-
-    def search(term, options = {})
-      query = Searchkick::Query.new(self, term, options)
-      if options[:execute] == false
-        query
-      else
-        query.execute
-      end
-    end
-
-  end
-end
@@ -12,7 +12,7 @@ module Searchkick
       options[:where][:_id][:not] = id.to_s
       options[:limit] ||= 10
       options[:similar] = true
-      self.class.search(like_text, options)
+      self.class.send(Searchkick.search_method_name, like_text, options)
     end
   end
	@@ -19,7 +19,14 @@ module Searchkick		@@ -19,7 +19,14 @@ module Searchkick
19	Searchkick::Index.new(index)	19	Searchkick::Index.new(index)
20	end	20	end
21		21
22	- extend Searchkick::Search	22	+ define_singleton_method(Searchkick.search_method_name) do \|term, options={}\|
		23	+ query = Searchkick::Query.new(self, term, options)
		24	+ if options[:execute] == false
		25	+ query
		26	+ else
		27	+ query.execute
		28	+ end
		29	+ end
23	extend Searchkick::Reindex	30	extend Searchkick::Reindex
24	include Searchkick::Similar	31	include Searchkick::Similar
25		32
	@@ -1,14 +0,0 @@	@@ -1,14 +0,0 @@
1	-module Searchkick
2	- module Search
3	-
4	- def search(term, options = {})
5	- query = Searchkick::Query.new(self, term, options)
6	- if options[:execute] == false
7	- query
8	- else
9	- query.execute
10	- end
11	- end
12	-
13	- end
14	-end
	@@ -12,7 +12,7 @@ module Searchkick		@@ -12,7 +12,7 @@ module Searchkick
12	options[:where][:_id][:not] = id.to_s	12	options[:where][:_id][:not] = id.to_s
13	options[:limit] \|\|= 10	13	options[:limit] \|\|= 10
14	options[:similar] = true	14	options[:similar] = true
15	- self.class.search(like_text, options)	15	+ self.class.send(Searchkick.search_method_name, like_text, options)
16	end	16	end
17		17
18	end	18	end