influxdb-client 1.4.0.pre.771 → 1.4.0.pre.827

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 734edcb4d049de6b3840ee1110dfd3c7cc5a2f2d506fb5f1dc6f650500affb3a
-  data.tar.gz: 590208d88970bc9cc078ffc4d04df564e64e2744fcbea5b8714658be48722171
+  metadata.gz: 3f07f57cbad7ef808ff1fa63def34ff6f06f29c1b2e14b5859f9a55e9ab7398a
+  data.tar.gz: f4af2e128dbf11e3465c469a0899c3898c01e81b4970fdfaecb0b3e8e6e2f771
 SHA512:
-  metadata.gz: a0a5994cc3bd5e24d1d1c65448f077e3791bd56d53c1bfd5cb6104de6cd02119fd1a9370d4a43110f7ce3f55ba885c80893de2653251129845ae0c1f32a21d0b
-  data.tar.gz: 5d15203d7148c2b144e6a329849ffdb2191d372a7d633264639c856f84a6614d1c8ca4ac5c3999ff0ff9c653e44564e1fae82e8645c23a88ef273251f7fb03c3
+  metadata.gz: 277df5a8efc57fa2a087bf2b4a45b6d2a2e54b7752df1b0ea20e445b0a34ed22690b9a5dff184db11bd7cf9df58b7cd95b0596c13374847963931d9860123de7
+  data.tar.gz: 6aab7f0f004344524d988502bbe8819cc959f4d3060ef4779f3bdd11dd9e6aa0b5e9b4c5efcb4faa2cfc94ae1a9c6b3327367ead9b1cecd0081f67fc68000390

data/.rubocop.yml

@@ -29,7 +29,7 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Max: 50
 Metrics/ClassLength:
-  Max: 200
+  Max: 300
 Metrics/AbcSize:
   Max: 40
 Metrics/CyclomaticComplexity:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## 1.4.0 [unreleased]
 
+### Features
+
+1. [#38](https://github.com/influxdata/influxdb-client-ruby/pull/38): Remove trailing slash from connection URL
+
 ## 1.3.0 [2020-04-17]
 
 ### Features

data/lib/influxdb2/client/default_api.rb

@@ -34,6 +34,10 @@ module InfluxDB2
 
     private
 
+    def _parse_uri(api_path)
+      URI.parse(File.join(@options[:url], api_path))
+    end
+
     def _post_json(payload, uri, headers: {})
       _check_arg_type(:headers, headers, Hash)
       _post(payload, uri, headers: headers.merge(HEADER_CONTENT_TYPE => 'application/json'))

data/lib/influxdb2/client/delete_api.rb

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

data/lib/influxdb2/client/health_api.rb

@@ -32,7 +32,7 @@ module InfluxDB2
     #
     # @return [HealthCheck]
     def health
-      uri = URI.parse(File.join(@options[:url], '/health'))
+      uri = _parse_uri('/health')
       body = _get(uri).body
       data = JSON.parse("[#{body}]", symbolize_names: true)[0]
       HealthCheck.new.tap do |model|

data/lib/influxdb2/client/query_api.rb

@@ -70,7 +70,7 @@ module InfluxDB2
       payload = _generate_payload(query, dialect)
       return nil if payload.nil?
 
-      uri = URI.parse(File.join(@options[:url], '/api/v2/query'))
+      uri = _parse_uri('/api/v2/query')
       uri.query = URI.encode_www_form(org: org_param)
 
       _post_json(payload.to_body.to_json, uri)

data/lib/influxdb2/client/write_api.rb

@@ -160,7 +160,7 @@ module InfluxDB2
 
       return nil unless payload.instance_of?(String) || payload.empty?
 
-      uri = URI.parse(File.join(@options[:url], '/api/v2/write'))
+      uri = _parse_uri('/api/v2/write')
       uri.query = URI.encode_www_form(bucket: bucket_param, org: org_param, precision: precision_param.to_s)
 
       _post_text(payload, uri)

data/test/influxdb/client_test.rb

@@ -89,4 +89,11 @@ class ClientTest < Minitest::Test
     assert_equal 'influxdb', health.name
     assert_equal 'fail', health.status
   end
+
+  def test_trailing_slash_in_url
+    uri = URI.parse(File.join('http://localhost:8099', '/api/v2/write'))
+    assert_equal 'http://localhost:8099/api/v2/write', uri.to_s
+    uri = URI.parse(File.join('http://localhost:8099/', '/api/v2/write'))
+    assert_equal 'http://localhost:8099/api/v2/write', uri.to_s
+  end
 end

data/test/influxdb/write_api_test.rb

@@ -272,4 +272,19 @@ class WriteApiTest < MiniTest::Test
     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)
   end
+
+  def test_trailing_slash_in_url
+    stub_request(:any, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
+      .to_return(status: 204)
+    client = InfluxDB2::Client.new('http://localhost:9999/', 'my-token',
+                                   bucket: 'my-bucket',
+                                   org: 'my-org',
+                                   precision: InfluxDB2::WritePrecision::NANOSECOND,
+                                   use_ssl: false)
+
+    client.create_write_api.write(data: 'h2o,location=west value=33i 15')
+
+    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')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 1.4.0.pre.771
+  version: 1.4.0.pre.827
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler