Added model and model_includes

Andrew Kane
1 parent 5d050c74
Showing 2 changed files with 31 additions and 1 deletions Show diff stats
lib/searchkick/relation.rb
test/sql_test.rb
@@ -136,6 +136,27 @@ module Searchkick
       self
     end
+    def models(*args)
+      spawn.models!(*args)
+    end
+
+    def models!(*args)
+      options[:models] = Array(options[:models]) + args
+      self
+    end
+
+    def model_includes(value)
+      spawn.model_includes!(value)
+    end
+
+    def model_includes!(value)
+      options[:model_includes] ||= {}
+      value.each do |k, v|
+        options[:model_includes][k] = Array(options[:model_includes][k]) + v
+      end
+      self
+    end
+
     # same as Active Record
     def inspect
       entries = results.first(11).map!(&:inspect)
@@ -169,8 +169,10 @@ class SqlTest &lt; Minitest::Test
   def test_includes
     skip unless defined?(ActiveRecord)
+
     store_names ["Product A"]
     assert Product.search("product", includes: [:store]).first.association(:store).loaded?
+    assert Product.search("product", relation: true).includes(:store).first.association(:store).loaded?
   end
   def test_model_includes
@@ -180,10 +182,17 @@ class SqlTest &lt; Minitest::Test
     store_names ["Store A"], Store
     associations = {Product => [:store], Store => [:products]}
-    result = Searchkick.search("*", models: [Product, Store], model_includes: associations)
+    result = Searchkick.search("*", models: [Product, Store], model_includes: associations)
     assert_equal 2, result.length
+    result.group_by(&:class).each_pair do |klass, records|
+      assert records.first.association(associations[klass].first).loaded?
+    end
+    skip "Not working yet"
+
+    result = Searchkick.search("*", relation: true).models(Product, Store).model_includes(associations)
+    assert_equal 2, result.length
     result.group_by(&:class).each_pair do |klass, records|
       assert records.first.association(associations[klass].first).loaded?
     end
	@@ -136,6 +136,27 @@ module Searchkick		@@ -136,6 +136,27 @@ module Searchkick
136	self	136	self
137	end	137	end
138		138
		139	+ def models(*args)
		140	+ spawn.models!(*args)
		141	+ end
		142	+
		143	+ def models!(*args)
		144	+ options[:models] = Array(options[:models]) + args
		145	+ self
		146	+ end
		147	+
		148	+ def model_includes(value)
		149	+ spawn.model_includes!(value)
		150	+ end
		151	+
		152	+ def model_includes!(value)
		153	+ options[:model_includes] \|\|= {}
		154	+ value.each do \|k, v\|
		155	+ options[:model_includes][k] = Array(options[:model_includes][k]) + v
		156	+ end
		157	+ self
		158	+ end
		159	+
139	# same as Active Record	160	# same as Active Record
140	def inspect	161	def inspect
141	entries = results.first(11).map!(&:inspect)	162	entries = results.first(11).map!(&:inspect)