[STORE] Changed, that search requests are executed through SearchRequest class

Extracted the `gateway.search` call into a specific class, `SearchRequest`,
primarily to allow hooking into the `SearchRequest#execute!` method in Rails instrumentation.

Updated unit tests, this change should be totally opaque to the user.

Related: elastic#238

Author: karmi

elasticsearch-persistence/lib/elasticsearch/persistence.rb

@@ -1,5 +1,6 @@
 require 'elasticsearch'
 require 'elasticsearch/model/indexing'
+require 'elasticsearch/model/searching'
 require 'hashie'
 
 require 'active_support/inflector'

elasticsearch-persistence/lib/elasticsearch/persistence/model.rb

@@ -75,7 +75,6 @@ def gateway(&block)
                      :document_type=,
                      :index_name,
                      :index_name=,
-                     :search,
                      :find,
                      :exists?,
                      :create_index!,

elasticsearch-persistence/lib/elasticsearch/persistence/model/find.rb

@@ -3,8 +3,18 @@ module Persistence
     module Model
 
       module Find
+        class SearchRequest < Elasticsearch::Model::Searching::SearchRequest
+          def execute!
+            klass.gateway.search(definition[:body] || definition[:q], options)
+          end
+        end
+
         module ClassMethods
 
+          def search(query_or_definition, options={})
+            SearchRequest.new(self, query_or_definition, options).execute!
+          end
+
           # Returns all models (up to 10,000)
           #
           # @example Retrieve all people
@@ -17,8 +27,9 @@ module ClassMethods
           #     Person.all query: { match: { last_name: 'Smith'  } }
           #     # => [#<Person:0x007ff1d8fb04b0 ... ]
           #
-          def all(options={})
-            gateway.search( { query: { match_all: {} }, size: 10_000 }.merge(options) )
+          def all(query={ query: { match_all: {} } }, options={})
+            query[:size] ||= 10_000
+            search(query, options)
           end
 
           # Returns the number of models

elasticsearch-persistence/test/test_helper.rb

@@ -2,6 +2,8 @@
 
 exit(0) if RUBY_1_8
 
+$LOAD_PATH.unshift File.expand_path('../../../elasticsearch-model/lib', __FILE__) if File.exists? File.expand_path('../../../elasticsearch-model/lib', __FILE__)
+
 require 'simplecov' and SimpleCov.start { add_filter "/test|test_/" } if ENV["COVERAGE"]
 
 # Register `at_exit` handler for integration tests shutdown.

elasticsearch-persistence/test/unit/model_find_test.rb

@@ -31,9 +31,12 @@ class DummyFindModel
     end
 
     setup do
-      @gateway         = stub(client: stub(), index_name: 'foo', document_type: 'bar')
+      @gateway = stub(client: stub(), index_name: 'foo', document_type: 'bar')
       DummyFindModel.stubs(:gateway).returns(@gateway)
 
+      DummyFindModel.stubs(:index_name).returns('foo')
+      DummyFindModel.stubs(:document_type).returns('bar')
+
       @response = MultiJson.load <<-JSON
         {
           "took": 14,
@@ -63,21 +66,21 @@ class DummyFindModel
     end
 
     should "find all records" do
-      @gateway
-        .expects(:search)
-        .with({ query: { match_all: {} }, size: 10_000 })
+      DummyFindModel
+        .stubs(:search)
+        .with({ query: { match_all: {} }, size: 10_000 }, {})
         .returns(@response)
 
       DummyFindModel.all
     end
 
     should "pass options when finding all records" do
-      @gateway
+      DummyFindModel
         .expects(:search)
-        .with({ query: { match: { title: 'test' } }, size: 10_000, routing: 'abc123' })
+        .with({ query: { match: { title: 'test' } }, size: 10_000 }, { routing: 'abc123' })
         .returns(@response)
 
-      DummyFindModel.all( { query: { match: { title: 'test' } }, routing: 'abc123' } )
+      DummyFindModel.all( { query: { match: { title: 'test' } } }, { routing: 'abc123' } )
     end
 
     context "finding via scan/scroll" do