Added support for upserts in import endpoint

Author: jasonbosco

lib/typesense/api_call.rb

@@ -25,20 +25,22 @@ def initialize(configuration)
     end
 
     def post(endpoint, parameters = {})
-      headers, body = extract_headers_and_body_from(parameters)
+      headers, query, body = split_post_put_parameters(parameters)
 
       perform_request :post,
                       endpoint,
                       headers,
+                      params: query,
                       body: body
     end
 
     def put(endpoint, parameters = {})
-      headers, body = extract_headers_and_body_from(parameters)
+      headers, query, body = split_post_put_parameters(parameters)
 
       perform_request :put,
                       endpoint,
                       headers,
+                      params: query,
                       body: body
     end
 
@@ -110,15 +112,17 @@ def perform_request(method, endpoint, headers = {}, options = {})
 
     private
 
-    def extract_headers_and_body_from(parameters)
+    def split_post_put_parameters(parameters)
       if json_request?(parameters)
         headers = { 'Content-Type' => 'application/json' }
+        query = parameters[:query]
         body = Oj.dump(sanitize_parameters(parameters))
       else
         headers = {}
+        query = parameters[:query]
         body = parameters[:body]
       end
-      [headers, body]
+      [headers, query, body]
     end
 
     def extract_headers_and_query_from(parameters)

lib/typesense/documents.rb

@@ -22,8 +22,11 @@ def create_many(documents)
       results_in_jsonl_format.split("\n").map { |r| Oj.load(r) }
     end
 
-    def import(documents_in_jsonl_format)
-      @api_call.post(endpoint_path('import'), as_json: false, body: documents_in_jsonl_format)
+    def import(documents_in_jsonl_format, query_parameters = {})
+      @api_call.post(endpoint_path('import'),
+                     as_json: false,
+                     query: query_parameters,
+                     body: documents_in_jsonl_format)
     end
 
     def export

lib/typesense/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Typesense
-  VERSION = '0.7.0'
+  VERSION = '0.8.0pre'
 end

spec/typesense/documents_spec.rb

@@ -74,17 +74,37 @@
   end
 
   describe '#import' do
-    it 'imports documents in JSONL format' do
-      stub_request(:post, Typesense::ApiCall.new(typesense.configuration).send(:uri_for, '/collections/companies/documents/import', typesense.configuration.nodes[0]))
-        .with(body: "#{JSON.dump(document)}\n#{JSON.dump(document)}",
-              headers: {
-                'X-Typesense-Api-Key' => typesense.configuration.api_key
-              })
-        .to_return(status: 200, body: '{}', headers: { 'Content-Type': 'application/json' })
-
-      result = companies_documents.import("#{JSON.dump(document)}\n#{JSON.dump(document)}")
+    context 'when upsert is not specified' do
+      it 'imports documents in JSONL format' do
+        stub_request(:post, Typesense::ApiCall.new(typesense.configuration).send(:uri_for, '/collections/companies/documents/import', typesense.configuration.nodes[0]))
+          .with(body: "#{JSON.dump(document)}\n#{JSON.dump(document)}",
+                headers: {
+                  'X-Typesense-Api-Key' => typesense.configuration.api_key
+                })
+          .to_return(status: 200, body: '{}', headers: { 'Content-Type': 'application/json' })
+
+        result = companies_documents.import("#{JSON.dump(document)}\n#{JSON.dump(document)}")
+
+        expect(result).to eq({})
+      end
+    end
 
-      expect(result).to eq({})
+    context 'when upsert is true' do
+      it 'imports documents in JSONL format, with upsert query parameter' do
+        stub_request(:post, Typesense::ApiCall.new(typesense.configuration).send(:uri_for, '/collections/companies/documents/import', typesense.configuration.nodes[0]))
+          .with(body: "#{JSON.dump(document)}\n#{JSON.dump(document)}",
+                headers: {
+                  'X-Typesense-Api-Key' => typesense.configuration.api_key
+                },
+                query: {
+                  'upsert' => 'true'
+                })
+          .to_return(status: 200, body: '{}', headers: { 'Content-Type': 'application/json' })
+
+        result = companies_documents.import("#{JSON.dump(document)}\n#{JSON.dump(document)}", upsert: true)
+
+        expect(result).to eq({})
+      end
     end
   end