Much better organization

Andrew Kane
1 parent df81e3c3
Showing 6 changed files with 82 additions and 83 deletions Show diff stats
lib/searchkick.rb
lib/searchkick/index.rb
lib/searchkick/model.rb
lib/searchkick/reindex.rb
lib/searchkick/similar.rb
lib/searchkick/tasks.rb
@@ -3,10 +3,8 @@ require &quot;elasticsearch&quot;
 require "hashie"
 require "searchkick/version"
 require "searchkick/index"
-require "searchkick/reindex"
 require "searchkick/results"
 require "searchkick/query"
-require "searchkick/similar"
 require "searchkick/reindex_job"
 require "searchkick/model"
 require "searchkick/tasks"
@@ -30,11 +28,13 @@ module Searchkick
     attr_accessor :search_method_name
     attr_accessor :wordnet_path
     attr_accessor :timeout
+    attr_accessor :models
   end
   self.callbacks = true
   self.search_method_name = :search
   self.wordnet_path = "/var/lib/wn_s.pl"
   self.timeout = 10
+  self.models = []
   def self.client
     @client ||=
@@ -27,6 +27,34 @@ module Searchkick
       client.indices.exists_alias name: name
     end
+    def search_model(searchkick_klass, term = nil, options = {}, &block)
+      query = Searchkick::Query.new(searchkick_klass, term, options)
+      if block
+        block.call(query.body)
+      end
+      if options[:execute] == false
+        query
+      else
+        query.execute
+      end
+    end
+
+    def similar_record(record, options = {})
+      like_text = retrieve(record).to_hash
+        .keep_if{|k,v| !options[:fields] || options[:fields].map(&:to_s).include?(k) }
+        .values.compact.join(" ")
+
+      # TODO deep merge method
+      options[:where] ||= {}
+      options[:where][:_id] ||= {}
+      options[:where][:_id][:not] = record.id.to_s
+      options[:limit] ||= 10
+      options[:similar] = true
+
+      # TODO use index class instead of record class
+      search_model(record.class, like_text, options)
+    end
+
     def swap(new_name)
       old_indices =
         begin
@@ -4,6 +4,8 @@ module Searchkick
     def searchkick(options = {})
       raise "Only call searchkick once per model" if respond_to?(:searchkick_index)
+      Searchkick.models << self
+
       class_eval do
         cattr_reader :searchkick_options, :searchkick_klass
@@ -14,28 +16,50 @@ module Searchkick
         class_variable_set :@@searchkick_callbacks, callbacks
         class_variable_set :@@searchkick_index, options[:index_name] || [options[:index_prefix], model_name.plural, Searchkick.env].compact.join("_")
-        def self.searchkick_index
-          index = class_variable_get :@@searchkick_index
-          index = index.call if index.respond_to? :call
-          Searchkick::Index.new(index, class_variable_get(:@@searchkick_options))
+        define_singleton_method(Searchkick.search_method_name) do |term = nil, options={}, &block|
+          searchkick_index.search_model(self, term, options, &block)
         end
-        define_singleton_method(Searchkick.search_method_name) do |term = nil, options={}, &block|
-          query = Searchkick::Query.new(self, term, options)
-          if block
-            block.call(query.body)
+        class << self
+
+          def searchkick_index
+            index = class_variable_get :@@searchkick_index
+            index = index.call if index.respond_to? :call
+            Searchkick::Index.new(index, class_variable_get(:@@searchkick_options))
           end
-          if options[:execute] == false
-            query
-          else
-            query.execute
+
+          def enable_search_callbacks
+            class_variable_set :@@searchkick_callbacks, true
+          end
+
+          def disable_search_callbacks
+            class_variable_set :@@searchkick_callbacks, false
+          end
+
+          def search_callbacks?
+            class_variable_get(:@@searchkick_callbacks) && Searchkick.callbacks?
+          end
+
+          def reindex(options = {})
+            searchkick_index.reindex_scope(searchkick_klass, options)
+          end
+
+          def clean_indices
+            searchkick_index.clean_indices
+          end
+
+          def searchkick_import(options = {})
+            (options[:index] || searchkick_index).import_scope(searchkick_klass)
+          end
+
+          def searchkick_create_index
+            searchkick_index.create_index
+          end
+
+          def searchkick_index_options
+            searchkick_index.index_options
           end
-        end
-        extend Searchkick::Reindex
-        include Searchkick::Similar
-        def reindex_async
-          self.class.searchkick_index.reindex_record_async(self)
         end
         if callbacks
@@ -48,30 +72,26 @@ module Searchkick
           end
         end
-        def self.enable_search_callbacks
-          class_variable_set :@@searchkick_callbacks, true
-        end
-
-        def self.disable_search_callbacks
-          class_variable_set :@@searchkick_callbacks, false
-        end
-
-        def self.search_callbacks?
-          class_variable_get(:@@searchkick_callbacks) && Searchkick.callbacks?
+        def reindex
+          self.class.searchkick_index.reindex_record(self)
         end
-        def should_index?
-          true
+        def reindex_async
+          self.class.searchkick_index.reindex_record_async(self)
         end
-        def reindex
-          self.class.searchkick_index.reindex_record(self)
+        def similar(options = {})
+          self.class.searchkick_index.similar_record(self, options)
         end
         def search_data
           respond_to?(:to_hash) ? to_hash : serializable_hash
         end
+        def should_index?
+          true
+        end
+
       end
     end
@@ -1,30 +0,0 @@
-module Searchkick
-  module Reindex
-
-    def self.extended(klass)
-      @descendents ||= []
-      @descendents << klass unless @descendents.include?(klass)
-    end
-
-    def reindex(options = {})
-      searchkick_index.reindex_scope(searchkick_klass, options)
-    end
-
-    def clean_indices
-      searchkick_index.clean_indices
-    end
-
-    def searchkick_import(options = {})
-      (options[:index] || searchkick_index).import_scope(searchkick_klass)
-    end
-
-    def searchkick_create_index
-      searchkick_index.create_index
-    end
-
-    def searchkick_index_options
-      searchkick_index.index_options
-    end
-
-  end
-end
@@ -1,19 +0,0 @@
-module Searchkick
-  module Similar
-
-    def similar(options = {})
-      like_text = self.class.searchkick_index.retrieve(self).to_hash
-        .keep_if{|k,v| !options[:fields] || options[:fields].map(&:to_s).include?(k) }
-        .values.compact.join(" ")
-
-      # TODO deep merge method
-      options[:where] ||= {}
-      options[:where][:_id] ||= {}
-      options[:where][:_id][:not] = id.to_s
-      options[:limit] ||= 10
-      options[:similar] = true
-      self.class.send(Searchkick.search_method_name, like_text, options)
-    end
-
-  end
-end
@@ -22,7 +22,7 @@ namespace :searchkick do
       desc "reindex all models"
       task :all => :environment do
         Rails.application.eager_load!
-        (Searchkick::Reindex.instance_variable_get(:@descendents) || []).each do |model|
+        Searchkick.models.each do |model|
           puts "Reindexing #{model.name}..."
           model.reindex
         end
	@@ -27,6 +27,34 @@ module Searchkick		@@ -27,6 +27,34 @@ module Searchkick
27	client.indices.exists_alias name: name	27	client.indices.exists_alias name: name
28	end	28	end
29		29
		30	+ def search_model(searchkick_klass, term = nil, options = {}, &block)
		31	+ query = Searchkick::Query.new(searchkick_klass, term, options)
		32	+ if block
		33	+ block.call(query.body)
		34	+ end
		35	+ if options[:execute] == false
		36	+ query
		37	+ else
		38	+ query.execute
		39	+ end
		40	+ end
		41	+
		42	+ def similar_record(record, options = {})
		43	+ like_text = retrieve(record).to_hash
		44	+ .keep_if{\|k,v\| !options[:fields] \|\| options[:fields].map(&:to_s).include?(k) }
		45	+ .values.compact.join(" ")
		46	+
		47	+ # TODO deep merge method
		48	+ options[:where] \|\|= {}
		49	+ options[:where][:_id] \|\|= {}
		50	+ options[:where][:_id][:not] = record.id.to_s
		51	+ options[:limit] \|\|= 10
		52	+ options[:similar] = true
		53	+
		54	+ # TODO use index class instead of record class
		55	+ search_model(record.class, like_text, options)
		56	+ end
		57	+
30	def swap(new_name)	58	def swap(new_name)
31	old_indices =	59	old_indices =
32	begin	60	begin
	@@ -1,30 +0,0 @@	@@ -1,30 +0,0 @@
1	-module Searchkick
2	- module Reindex
3	-
4	- def self.extended(klass)
5	- @descendents \|\|= []
6	- @descendents << klass unless @descendents.include?(klass)
7	- end
8	-
9	- def reindex(options = {})
10	- searchkick_index.reindex_scope(searchkick_klass, options)
11	- end
12	-
13	- def clean_indices
14	- searchkick_index.clean_indices
15	- end
16	-
17	- def searchkick_import(options = {})
18	- (options[:index] \|\| searchkick_index).import_scope(searchkick_klass)
19	- end
20	-
21	- def searchkick_create_index
22	- searchkick_index.create_index
23	- end
24	-
25	- def searchkick_index_options
26	- searchkick_index.index_options
27	- end
28	-
29	- end
30	-end
	@@ -1,19 +0,0 @@	@@ -1,19 +0,0 @@
1	-module Searchkick
2	- module Similar
3	-
4	- def similar(options = {})
5	- like_text = self.class.searchkick_index.retrieve(self).to_hash
6	- .keep_if{\|k,v\| !options[:fields] \|\| options[:fields].map(&:to_s).include?(k) }
7	- .values.compact.join(" ")
8	-
9	- # TODO deep merge method
10	- options[:where] \|\|= {}
11	- options[:where][:_id] \|\|= {}
12	- options[:where][:_id][:not] = id.to_s
13	- options[:limit] \|\|= 10
14	- options[:similar] = true
15	- self.class.send(Searchkick.search_method_name, like_text, options)
16	- end
17	-
18	- end
19	-end
	@@ -22,7 +22,7 @@ namespace :searchkick do		@@ -22,7 +22,7 @@ namespace :searchkick do
22	desc "reindex all models"	22	desc "reindex all models"
23	task :all => :environment do	23	task :all => :environment do
24	Rails.application.eager_load!	24	Rails.application.eager_load!
25	- (Searchkick::Reindex.instance_variable_get(:@descendents) \|\| []).each do \|model\|	25	+ Searchkick.models.each do \|model\|
26	puts "Reindexing #{model.name}..."	26	puts "Reindexing #{model.name}..."
27	model.reindex	27	model.reindex
28	end	28	end