influxdb-client 1.4.0.pre.771 → 1.5.0.pre.902

data/examples/influxdb_18_example.rb

@@ -1,5 +1,5 @@
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
-require 'influxdb2/client'
+require 'influxdb-client'
 
 username = 'username'
 password = 'password'

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/models/health_check.rb

@@ -22,6 +22,10 @@ module InfluxDB2
 
     attr_accessor :status
 
+    attr_accessor :version
+
+    attr_accessor :commit
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -50,7 +54,9 @@ module InfluxDB2
         :'name' => :'name',
         :'message' => :'message',
         :'checks' => :'checks',
-        :'status' => :'status'
+        :'status' => :'status',
+        :'version' => :'version',
+        :'commit' => :'commit'
       }
     end
 
@@ -60,7 +66,9 @@ module InfluxDB2
         :'name' => :'String',
         :'message' => :'String',
         :'checks' => :'Array<HealthCheck>',
-        :'status' => :'String'
+        :'status' => :'String',
+        :'version' => :'String',
+        :'commit' => :'String'
       }
     end
 
@@ -89,6 +97,14 @@ module InfluxDB2
       if attributes.has_key?(:'status')
         self.status = attributes[:'status']
       end
+
+      if attributes.has_key?(:'version')
+        self.version = attributes[:'version']
+      end
+
+      if attributes.has_key?(:'commit')
+        self.commit = attributes[:'commit']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -134,7 +150,9 @@ module InfluxDB2
           name == o.name &&
           message == o.message &&
           checks == o.checks &&
-          status == o.status
+          status == o.status &&
+          version == o.version &&
+          commit == o.commit
     end
 
     # @see the `==` method
@@ -146,7 +164,7 @@ module InfluxDB2
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [name, message, checks, status].hash
+      [name, message, checks, status, version, commit].hash
     end
 
     # Builds the object from hash

data/lib/influxdb2/client/models/query.rb

@@ -13,27 +13,21 @@ OpenAPI Generator version: 3.3.4
 require 'date'
 
 module InfluxDB2
-  # Query influx with specific return formatting.
+  # Query influx using the Flux language
   class Query
     attr_accessor :extern
 
     # Query script to execute.
     attr_accessor :query
 
-    # The type of query.
+    # The type of query. Must be \"flux\".
     attr_accessor :type
 
-    # Required for `influxql` type queries.
-    attr_accessor :db
-
-    # Required for `influxql` type queries.
-    attr_accessor :rp
-
-    # Required for `influxql` type queries.
-    attr_accessor :cluster
-
     attr_accessor :dialect
 
+    # Specifies the time that should be reported as \"now\" in the query. Default is the server's now time.
+    attr_accessor :now
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -62,10 +56,8 @@ module InfluxDB2
         :'extern' => :'extern',
         :'query' => :'query',
         :'type' => :'type',
-        :'db' => :'db',
-        :'rp' => :'rp',
-        :'cluster' => :'cluster',
-        :'dialect' => :'dialect'
+        :'dialect' => :'dialect',
+        :'now' => :'now'
       }
     end
 
@@ -75,10 +67,8 @@ module InfluxDB2
         :'extern' => :'File',
         :'query' => :'String',
         :'type' => :'String',
-        :'db' => :'String',
-        :'rp' => :'String',
-        :'cluster' => :'String',
-        :'dialect' => :'Dialect'
+        :'dialect' => :'Dialect',
+        :'now' => :'DateTime'
       }
     end
 
@@ -100,25 +90,15 @@ module InfluxDB2
 
       if attributes.has_key?(:'type')
         self.type = attributes[:'type']
-      else
-        self.type = 'flux'
-      end
-
-      if attributes.has_key?(:'db')
-        self.db = attributes[:'db']
-      end
-
-      if attributes.has_key?(:'rp')
-        self.rp = attributes[:'rp']
-      end
-
-      if attributes.has_key?(:'cluster')
-        self.cluster = attributes[:'cluster']
       end
 
       if attributes.has_key?(:'dialect')
         self.dialect = attributes[:'dialect']
       end
+
+      if attributes.has_key?(:'now')
+        self.now = attributes[:'now']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -136,7 +116,7 @@ module InfluxDB2
     # @return true if the model is valid
     def valid?
       return false if @query.nil?
-      type_validator = EnumAttributeValidator.new('String', ['flux', 'influxql'])
+      type_validator = EnumAttributeValidator.new('String', ['flux'])
       return false unless type_validator.valid?(@type)
       true
     end
@@ -144,7 +124,7 @@ module InfluxDB2
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] type Object to be assigned
     def type=(type)
-      validator = EnumAttributeValidator.new('String', ['flux', 'influxql'])
+      validator = EnumAttributeValidator.new('String', ['flux'])
       unless validator.valid?(type)
         fail ArgumentError, 'invalid value for "type", must be one of #{validator.allowable_values}.'
       end
@@ -159,10 +139,8 @@ module InfluxDB2
           extern == o.extern &&
           query == o.query &&
           type == o.type &&
-          db == o.db &&
-          rp == o.rp &&
-          cluster == o.cluster &&
-          dialect == o.dialect
+          dialect == o.dialect &&
+          now == o.now
     end
 
     # @see the `==` method
@@ -174,7 +152,7 @@ module InfluxDB2
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [extern, query, type, db, rp, cluster, dialect].hash
+      [extern, query, type, dialect, now].hash
     end
 
     # Builds the object from hash

data/lib/influxdb2/client/point.rb

@@ -28,7 +28,7 @@ module InfluxDB2
   class Point
     # Create DataPoint instance for specified measurement name.
     #
-    # @example InfluxDB::Point.new(name: "h2o",
+    # @example InfluxDB2::Point.new(name: "h2o",
     #   tags: {host: 'aws', region: 'us'},
     #   fields: {level: 5, saturation: "99%"},
     #   time: 123)
@@ -64,7 +64,7 @@ module InfluxDB2
 
     # Adds or replaces a tag value for a point.
     #
-    # @example InfluxDB::Point.new(name: "h2o")
+    # @example InfluxDB2::Point.new(name: "h2o")
     #   .add_tag("location", "europe")
     #   .add_field("level", 2)
     #
@@ -77,7 +77,7 @@ module InfluxDB2
 
     # Adds or replaces a field value for a point.
     #
-    # @example InfluxDB::Point.new(name: "h2o")
+    # @example InfluxDB2::Point.new(name: "h2o")
     #   .add_tag("location", "europe")
     #   .add_field("level", 2)
     #
@@ -90,15 +90,15 @@ module InfluxDB2
 
     # Updates the timestamp for the point.
     #
-    # @example InfluxDB::Point.new(name: "h2o")
+    # @example InfluxDB2::Point.new(name: "h2o")
     #   .add_tag("location", "europe")
     #   .add_field("level", 2)
-    #   .time(Time.new(2015, 10, 15, 8, 20, 15), InfluxDB::WritePrecision::MILLISECOND)
+    #   .time(Time.new(2015, 10, 15, 8, 20, 15), InfluxDB2::WritePrecision::MILLISECOND)
     #
-    # @example InfluxDB::Point.new(name: "h2o")
+    # @example InfluxDB2::Point.new(name: "h2o")
     #   .add_tag("location", "europe")
     #   .add_field("level", 2)
-    #   .time(123, InfluxDB::WritePrecision::NANOSECOND)
+    #   .time(123, InfluxDB2::WritePrecision::NANOSECOND)
     #
     # @param [Object] time the timestamp
     # @param [WritePrecision] precision the timestamp precision

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/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module InfluxDB2
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/lib/influxdb2/client/write_api.rb

@@ -101,14 +101,14 @@ module InfluxDB2
     #     },
     #     {name: 'gpu', fields: {value: 0.9999}}
     #   ],
-    #   precision: InfluxDB::WritePrecision::NANOSECOND,
+    #   precision: InfluxDB2::WritePrecision::NANOSECOND,
     #   bucket: 'my-bucket',
     #   org: 'my-org'
     # )
     #
     # @example write(data: 'h2o,location=west value=33i 15')
     #
-    # @example point = InfluxDB::Point.new(name: 'h2o')
+    # @example point = InfluxDB2::Point.new(name: 'h2o')
     #   .add_tag('location', 'europe')
     #   .add_field('level', 2)
     #
@@ -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

data/test/test_helper.rb

@@ -30,7 +30,7 @@ if ENV['CI'] == 'true'
 end
 
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
-require 'influxdb2/client'
+require 'influxdb-client'
 
 require 'minitest/autorun'
 require 'minitest/reporters'

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.5.0.pre.902
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -147,7 +147,7 @@ files:
 - bin/swagger.yml
 - examples/influxdb_18_example.rb
 - influxdb-client.gemspec
-- lib/influxdb2/client.rb
+- lib/influxdb-client.rb
 - lib/influxdb2/client/client.rb
 - lib/influxdb2/client/default_api.rb
 - lib/influxdb2/client/delete_api.rb