influxdb-client 1.2.0.pre.618 → 1.2.0.pre.639

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad438641f5726343f225cda984046fb1efc961b72be1fb5ba2fd0e6e16d1164
-  data.tar.gz: 6464e15970dd4f6106f747e02e6b06483f769324524c58c9ea852bc158d9b5f5
+  metadata.gz: 172c1e4bb1951e9314cd52824e3f09fe64a5148dd9c2c89fa143d66cdfd3fd93
+  data.tar.gz: 3eed57dd71787b1341fe487ba3d03e20902a4f3fd97f690b56f0408b6778b1c3
 SHA512:
-  metadata.gz: 256090a137253d1458ba53d3ca0ab8193c6bd7847e642c25219d57130fbc234eca2d049b54be5a6cfecee9b5b4a1d32b4401ef36c2a15a654181d227f73f3d12
-  data.tar.gz: e1142f3894eb825fa341d5b85b1f3ee55d9a869a05d0c210d5b92c1428cf90a18d10366e6b9c6ce9b7613245fee1e8212fe923e3f36565c3712f0604f8457b7c
+  metadata.gz: eaf2473a3cbbac664343fbe2648d18331f5f0d5b0eac484d255a9fb11d7841ad4f970a08bf3a16987ce150938e86637e15f4c335b61092baa041ad629cd9d600
+  data.tar.gz: acafe6bc8ae5987b6bf0b0e57c3bb692d21ddfdb1263c5213b75c4f895f7a1966705d1d5cf3c8cb842e23616dc38f4d9b3c4b1b4920011498d30db671420adf1

data/CHANGELOG.md

@@ -11,6 +11,7 @@
 ### Bugs
 1. [#22](https://github.com/influxdata/influxdb-client-ruby/pull/22): Fixed batch write
 1. [#28](https://github.com/influxdata/influxdb-client-ruby/pull/28): Correctly parse CSV where multiple results include multiple tables
+1. [#30](https://github.com/influxdata/influxdb-client-ruby/pull/30): Send Content-Type headers
 
 ## 1.1.0 [2020-02-14]
 

data/lib/influxdb2/client/default_api.rb

@@ -24,6 +24,8 @@ module InfluxDB2
     DEFAULT_TIMEOUT = 10
     DEFAULT_REDIRECT_COUNT = 10
 
+    HEADER_CONTENT_TYPE = 'Content-Type'.freeze
+
     # @param [Hash] options The options to be used by the client.
     def initialize(options:)
       @options = options
@@ -32,7 +34,17 @@ module InfluxDB2
 
     private
 
-    def _post(payload, uri, limit = @max_redirect_count)
+    def _post_json(payload, uri, headers: {})
+      _check_arg_type(:headers, headers, Hash)
+      _post(payload, uri, headers: headers.merge(HEADER_CONTENT_TYPE => 'application/json'))
+    end
+
+    def _post_text(payload, uri, headers: {})
+      _check_arg_type(:headers, headers, Hash)
+      _post(payload, uri, headers: headers.merge(HEADER_CONTENT_TYPE => 'text/plain'))
+    end
+
+    def _post(payload, uri, limit: @max_redirect_count, headers: {})
       raise InfluxError.from_message("Too many HTTP redirects. Exceeded limit: #{@max_redirect_count}") if limit.zero?
 
       http = Net::HTTP.new(uri.host, uri.port)
@@ -44,6 +56,8 @@ module InfluxDB2
       request = Net::HTTP::Post.new(uri.request_uri)
       request['Authorization'] = "Token #{@options[:token]}"
       request['User-Agent'] = "influxdb-client-ruby/#{InfluxDB2::VERSION}"
+      headers.each { |k, v| request[k] = v }
+
       request.body = payload
 
       begin
@@ -53,7 +67,7 @@ module InfluxDB2
           response
         when Net::HTTPRedirection then
           location = response['location']
-          _post(payload, URI.parse(location), limit - 1)
+          _post(payload, URI.parse(location), limit: limit - 1, headers: headers)
         else
           raise InfluxError.from_response(response)
         end
@@ -62,6 +76,10 @@ module InfluxDB2
       end
     end
 
+    def _check_arg_type(name, value, klass)
+      raise TypeError, "expected a #{klass.name} for #{name}; got #{value.class.name}" unless value.is_a?(klass)
+    end
+
     def _check(key, value)
       raise ArgumentError, "The '#{key}' should be defined as argument or default option: #{@options}" if value.nil?
     end

data/lib/influxdb2/client/delete_api.rb

@@ -64,7 +64,7 @@ module InfluxDB2
       uri = URI.parse(File.join(@options[:url], '/api/v2/delete'))
       uri.query = URI.encode_www_form(org: org_param, bucket: bucket_param)
 
-      _post(delete_request.to_body.to_json, uri)
+      _post_json(delete_request.to_body.to_json, uri)
     end
 
     def _to_rfc3339(time)

data/lib/influxdb2/client/query_api.rb

@@ -73,7 +73,7 @@ module InfluxDB2
       uri = URI.parse(File.join(@options[:url], '/api/v2/query'))
       uri.query = URI.encode_www_form(org: org_param)
 
-      _post(payload.to_body.to_json, uri)
+      _post_json(payload.to_body.to_json, uri)
     end
 
     def _generate_payload(query, dialect)

data/lib/influxdb2/client/write_api.rb

@@ -163,7 +163,7 @@ module InfluxDB2
       uri = URI.parse(File.join(@options[:url], '/api/v2/write'))
       uri.query = URI.encode_www_form(bucket: bucket_param, org: org_param, precision: precision_param.to_s)
 
-      _post(payload, uri)
+      _post_text(payload, uri)
     end
 
     # Item for batching queue

data/test/influxdb/delete_api_test.rb

@@ -112,7 +112,8 @@ class DeleteApiTest < MiniTest::Test
     body = '{"start":"2019-02-03T04:05:06+07:00","stop":"2019-04-03T04:05:06+07:00"}'
     headers = {
       'Authorization' => 'Token my-token',
-      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}"
+      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}",
+      'Content-Type' => 'application/json'
     }
     assert_requested(:post, 'http://localhost:9999/api/v2/delete?bucket=my-bucket&org=my-org',
                      times: 1, body: body, headers: headers)

data/test/influxdb/query_api_test.rb

@@ -73,7 +73,7 @@ class QueryApiTest < MiniTest::Test
     assert_equal 'free', record1.field
   end
 
-  def test_user_agent_header
+  def test_headers
     stub_request(:post, 'http://localhost:9999/api/v2/query?org=my-org')
       .to_return(body: SUCCESS_DATA)
 
@@ -87,7 +87,8 @@ class QueryApiTest < MiniTest::Test
 
     headers = {
       'Authorization' => 'Token my-token',
-      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}"
+      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}",
+      'Content-Type' => 'application/json'
     }
     assert_requested(:post, 'http://localhost:9999/api/v2/query?org=my-org',
                      times: 1, headers: headers)

data/test/influxdb/write_api_integration_test.rb

@@ -61,6 +61,7 @@ class WriteApiIntegrationTest < MiniTest::Test
     uri = URI.parse('http://localhost:9999/api/v2/query?org=my-org')
     request = Net::HTTP::Post.new(uri.request_uri)
     request['Authorization'] = 'Token my-token'
+    request[InfluxDB2::DefaultApi::HEADER_CONTENT_TYPE] = 'application/json'
     request.body = query.to_json
 
     http = Net::HTTP.new(uri.host, uri.port)

data/test/influxdb/write_api_test.rb

@@ -252,7 +252,7 @@ class WriteApiTest < MiniTest::Test
     assert_equal 'The time precision not_supported is not supported.', error.message
   end
 
-  def test_user_agent_header
+  def test_headers
     stub_request(:any, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
       .to_return(status: 204)
 
@@ -266,7 +266,8 @@ class WriteApiTest < MiniTest::Test
 
     headers = {
       'Authorization' => 'Token my-token',
-      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}"
+      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}",
+      'Content-Type' => 'text/plain'
     }
     assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
                      times: 1, body: 'h2o,location=west value=33i 15', headers: headers)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.618
+  version: 1.2.0.pre.639
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler