[MODEL] Added, that options are merged into search definition in SearchRequest

Author: karmi

Diff for: elasticsearch-model/lib/elasticsearch/model/searching.rb

@@ -36,9 +36,9 @@ def initialize(klass, query_or_payload, options={})
           end
 
           if body
-            @definition = { index: __index_name, type: __document_type, body: body }
+            @definition = { index: __index_name, type: __document_type, body: body }.update options
           else
-            @definition = { index: __index_name, type: __document_type, q: q }
+            @definition = { index: __index_name, type: __document_type, q: q }.update options
           end
         end
 

Diff for: elasticsearch-model/test/unit/searching_search_request_test.rb

@@ -58,5 +58,16 @@ def to_hash; {foo: 'bar'}; end
       s = Elasticsearch::Model::Searching::SearchRequest.new ::DummySearchingModel, MySpecialQueryBuilder.new
       s.execute!
     end
+
+    should "pass the options to the client" do
+      @client.expects(:search).with do |params|
+        assert_equal 'foo', params[:q]
+        assert_equal 15,    params[:size]
+      end
+      .returns({})
+
+      s = Elasticsearch::Model::Searching::SearchRequest.new ::DummySearchingModel, 'foo', size: 15
+      s.execute!
+    end
   end
 end