Merge a432fc1 into 85518d9

nathanl · Aug 28, 2014 · 7ac071f · 7ac071f
2 parents 85518d9 + a432fc1
commit 7ac071f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/searchlight/search.rb b/lib/searchlight/search.rb
@@ -13,7 +13,14 @@ def initialize(options = {})
     end
 
     def search
-      @search ||= self.class.search_target
+      @search ||= begin
+                    target = self.class.search_target
+                    if target.respond_to?(:call)
+                      target.call
+                    else
+                      target
+                    end
+                  end
     end
 
     def results

diff --git a/spec/searchlight/search_spec.rb b/spec/searchlight/search_spec.rb
@@ -329,6 +329,17 @@ def search_age;  end
       expect(search.search).to eq(MockModel)
     end
 
+    context "when target is a proc" do
+      let(:proc_result) { 'some string' }
+      let(:proc_search_target) { -> { proc_result } }
+      let(:search_class) { AccountSearch }
+      let(:search) { search_class.new }
+
+      it "returns proc result" do
+        search_class.search_on proc_search_target
+        expect(search.search).to eq(proc_result)
+      end
+    end
   end
 
   describe "results" do