influxdb-client 1.2.0.pre.591 → 1.3.0.pre.716

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9dc109c0da3edd23cb1d54412a102e47f21a2c149c359637051be8aa9b894f
-  data.tar.gz: c2985b21be98321a305fe68dc4ffa40fcb89b5456605ca014c24767de4563085
+  metadata.gz: 0c1a5b7d8cbd5e2eaab2671332a11643b6ca8a8ee8498dcba18221ccd977c264
+  data.tar.gz: 2739279c947e40774385ab5e74db30efa149e3679085b431359cdf38bd78283d
 SHA512:
-  metadata.gz: d83d15691520858955c0f800d9cc753c2a5a1f83e2321fbab81068a576e9cd20b8146c39309d9ba3d5b1ee97030396d43da27a8f34e342286da13b27b4f555be
-  data.tar.gz: 4c5ad67e4d11d4665881ea29f42e09b2d3d7800a62b2e664cce202d4c61144d55028f21de1e0f9581e64a3b80d96ed701e2739e0c39a9ba5b8fe2828a19f0076
+  metadata.gz: 9bd655b519db1270283620fa7130eb2a9b30c0127dcf4aa73f8f5a5ef84572a5091abb263b35cad299c13221272643fd7eeb07c113189100015ef93dcaa49fd3
+  data.tar.gz: 45c0a04e7c8d75f89d3ef733aa0a0e31f7a51dbf7a4ce2e5a08cb880627873901018a875671d790e1b0f48c6a9812fe9394e9f11325a55a966e443c32ff1f35a

data/.rubocop.yml

@@ -27,7 +27,7 @@ AllCops:
 Metrics/LineLength:
   Max: 120
 Metrics/MethodLength:
-  Max: 30
+  Max: 50
 Metrics/ClassLength:
   Max: 200
 Metrics/AbcSize:

data/CHANGELOG.md

@@ -1,12 +1,22 @@
-## 1.2.0 [unreleased]
+## 1.3.0 [unreleased]
+
+### Features
+1. [#32](https://github.com/influxdata/influxdb-client-ruby/pull/32): Checks the health of a running InfluxDB instance by querying the /health
+
+## 1.2.0 [2020-03-13]
 
 ### Features
 1. [#23](https://github.com/influxdata/influxdb-client-ruby/issues/23): Added DeleteApi to delete time series data from InfluxDB.
 1. [#24](https://github.com/influxdata/influxdb-client-ruby/issues/24): Added jitter_interval and retry_interval to WriteApi
 1. [#26](https://github.com/influxdata/influxdb-client-ruby/issues/26): Set User-Agent to influxdb-client-ruby/VERSION for all requests
 
+### Security
+1. [#29](https://github.com/influxdata/influxdb-client-ruby/pull/29): Upgrade rake to version 12.3.3 - [CVE-2020-8130](https://github.com/advisories/GHSA-jppv-gw3r-w3q8)
+
 ### 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/README.md

@@ -10,7 +10,7 @@
 
 This repository contains the reference Ruby client for the InfluxDB 2.0.
 
-#### Note: This library is for use with InfluxDB 2.x. For connecting to InfluxDB 1.x instances, please use the [influxdb-ruby](https://github.com/influxdata/influxdb-ruby) client.
+#### Note: Use this client library with InfluxDB 2.x and InfluxDB 1.8+. For connecting to InfluxDB 1.7 or earlier instances, use the [influxdb-ruby](https://github.com/influxdata/influxdb-ruby) client library.
 
 ## Installation
 
@@ -23,7 +23,7 @@ The client can be installed manually or with bundler.
 To install the client gem manually:
 
 ```
-gem install influxdb-client -v 1.1.0
+gem install influxdb-client -v 1.2.0
 ```
 
 ## Usage
@@ -231,6 +231,12 @@ The time range could be specified as:
 1. DateTime - `DateTime.rfc3339('2019-03-03T04:05:06+07:00')`
 1. Time - `Time.utc(2015, 10, 16, 8, 20, 15)`
 
+## Advanced Usage
+
+### Check the server status 
+
+Server availability can be checked using the `client.health` method. That is equivalent of the [influx ping](https://v2.docs.influxdata.com/v2.0/reference/cli/influx/ping/).
+
 ## Local tests
 
 ```

data/bin/generate-sources.sh

@@ -16,7 +16,7 @@ mkdir -p "${SCRIPT_PATH}"/../lib/influxdb2/client/models
 mv "${SCRIPT_PATH}"/../lib/influx_db2/models/* "${SCRIPT_PATH}"/../lib/influxdb2/client/models
 
 cd "${SCRIPT_PATH}"/../lib/influxdb2/client/models || exit
-rm -r $(ls | grep -v "\<dialect.rb\>\|\<query.rb\>\|\<delete_predicate_request.rb\>")
+rm -r $(ls | grep -v "\<health_check.rb\>\|\<dialect.rb\>\|\<query.rb\>\|\<delete_predicate_request.rb\>")
 
 # Clean
 rmdir "${SCRIPT_PATH}"/../lib/influx_db2/models

data/influxdb-client.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'codecov', '~> 0.1.16'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'minitest-reporters', '~> 1.4'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rubocop', '~> 0.66.0'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'webmock', '~> 3.7'

data/lib/influxdb2/client.rb

@@ -25,5 +25,6 @@ require 'influxdb2/client/influx_error'
 require 'influxdb2/client/write_api'
 require 'influxdb2/client/query_api'
 require 'influxdb2/client/delete_api'
+require 'influxdb2/client/health_api'
 require 'influxdb2/client/point'
 require 'influxdb2/client/flux_table'

data/lib/influxdb2/client/client.rb

@@ -77,6 +77,13 @@ module InfluxDB2
       DeleteApi.new(options: @options)
     end
 
+    # Get the health of an instance.
+    #
+    # @return [HealthCheck]
+    def health
+      HealthApi.new(options: @options).health
+    end
+
     # Close all connections into InfluxDB 2.
     #
     # @return [ true ] Always true.

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,25 @@ 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: {})
+      _request(payload, uri, limit: limit, headers: headers, request: Net::HTTP::Post)
+    end
+
+    def _get(uri, limit: @max_redirect_count, headers: {})
+      _request(nil, uri, limit: limit, headers: headers.merge('Accept' => 'application/json'), request: Net::HTTP::Get)
+    end
+
+    def _request(payload, uri, limit: @max_redirect_count, headers: {}, request: Net::HTTP::Post)
       raise InfluxError.from_message("Too many HTTP redirects. Exceeded limit: #{@max_redirect_count}") if limit.zero?
 
       http = Net::HTTP.new(uri.host, uri.port)
@@ -41,9 +61,11 @@ module InfluxDB2
       http.read_timeout = @options[:read_timeout] || DEFAULT_TIMEOUT
       http.use_ssl = @options[:use_ssl].nil? ? true : @options[:use_ssl]
 
-      request = Net::HTTP::Post.new(uri.request_uri)
+      request = request.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 +75,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 +84,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/flux_csv_parser.rb

@@ -51,6 +51,7 @@ module InfluxDB2
       @tables = {}
 
       @table_index = 0
+      @table_id = -1
       @start_new_table = false
       @table = nil
       @parsing_state_error = false
@@ -113,6 +114,7 @@ module InfluxDB2
         @tables[@table_index] = @table unless @stream
 
         @table_index += 1
+        @table_id = -1
       elsif @table.nil?
         raise FluxCsvParserError, 'Unable to parse CSV response. FluxTable definition was not found.'
       end
@@ -173,9 +175,10 @@ module InfluxDB2
         return
       end
 
-      @current_index = csv[2].to_i
+      current_id = csv[2].to_i
+      @table_id = current_id if @table_id == -1
 
-      if @current_index > (@table_index - 1)
+      if @table_id != current_id
         # create new table with previous column headers settings
         @flux_columns = @table.columns
         @table = InfluxDB2::FluxTable.new
@@ -186,6 +189,7 @@ module InfluxDB2
 
         @tables[@table_index] = @table unless @stream
         @table_index += 1
+        @table_id = current_id
       end
 
       flux_record = _parse_record(@table_index - 1, @table, csv)

data/lib/influxdb2/client/health_api.rb

@@ -0,0 +1,49 @@
+# The MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+require_relative 'models/health_check'
+
+module InfluxDB2
+  # The client of the InfluxDB 2.0 that implement Health HTTP API endpoint.
+  #
+  class HealthApi < DefaultApi
+    # @param [Hash] options The options to be used by the client.
+    def initialize(options:)
+      super(options: options)
+    end
+
+    # Get the health of an instance.
+    #
+    # @return [HealthCheck]
+    def health
+      uri = URI.parse(File.join(@options[:url], '/health'))
+      body = _get(uri).body
+      data = JSON.parse("[#{body}]", symbolize_names: true)[0]
+      HealthCheck.new.tap do |model|
+        model.build_from_hash data
+      end
+    rescue StandardError => e
+      HealthCheck.new.tap do |model|
+        model.name = 'influxdb'
+        model.status = 'fail'
+        model.message = e.message
+      end
+    end
+  end
+end

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

@@ -0,0 +1,256 @@
+=begin
+#Influx API Service
+
+#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+OpenAPI spec version: 0.1.0
+
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 3.3.4
+
+=end
+
+require 'date'
+
+module InfluxDB2
+  class HealthCheck
+    attr_accessor :name
+
+    attr_accessor :message
+
+    attr_accessor :checks
+
+    attr_accessor :status
+
+    class EnumAttributeValidator
+      attr_reader :datatype
+      attr_reader :allowable_values
+
+      def initialize(datatype, allowable_values)
+        @allowable_values = allowable_values.map do |value|
+          case datatype.to_s
+          when /Integer/i
+            value.to_i
+          when /Float/i
+            value.to_f
+          else
+            value
+          end
+        end
+      end
+
+      def valid?(value)
+        !value || allowable_values.include?(value)
+      end
+    end
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'name' => :'name',
+        :'message' => :'message',
+        :'checks' => :'checks',
+        :'status' => :'status'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+        :'name' => :'String',
+        :'message' => :'String',
+        :'checks' => :'Array<HealthCheck>',
+        :'status' => :'String'
+      }
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+
+      if attributes.has_key?(:'name')
+        self.name = attributes[:'name']
+      end
+
+      if attributes.has_key?(:'message')
+        self.message = attributes[:'message']
+      end
+
+      if attributes.has_key?(:'checks')
+        if (value = attributes[:'checks']).is_a?(Array)
+          self.checks = value
+        end
+      end
+
+      if attributes.has_key?(:'status')
+        self.status = attributes[:'status']
+      end
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
+      if @name.nil?
+        invalid_properties.push('invalid value for "name", name cannot be nil.')
+      end
+
+      if @status.nil?
+        invalid_properties.push('invalid value for "status", status cannot be nil.')
+      end
+
+      invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      return false if @name.nil?
+      return false if @status.nil?
+      status_validator = EnumAttributeValidator.new('String', ['pass', 'fail'])
+      return false unless status_validator.valid?(@status)
+      true
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] status Object to be assigned
+    def status=(status)
+      validator = EnumAttributeValidator.new('String', ['pass', 'fail'])
+      unless validator.valid?(status)
+        fail ArgumentError, 'invalid value for "status", must be one of #{validator.allowable_values}.'
+      end
+      @status = status
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          name == o.name &&
+          message == o.message &&
+          checks == o.checks &&
+          status == o.status
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [name, message, checks, status].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.openapi_types.each_pair do |key, type|
+        if type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        temp_model = InfluxDB2.const_get(type).new
+        temp_model.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end

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

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

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

@@ -21,6 +21,10 @@
 require 'test_helper'
 
 class ClientTest < Minitest::Test
+  def setup
+    WebMock.allow_net_connect!
+  end
+
   def test_defined_version_number
     refute_nil ::InfluxDB2::VERSION
   end
@@ -67,4 +71,22 @@ class ClientTest < Minitest::Test
     refute_nil write_api
     assert_instance_of InfluxDB2::WriteApi, write_api
   end
+
+  def test_health
+    client = InfluxDB2::Client.new('http://localhost:9999', 'my-token', use_ssl: false)
+
+    health = client.health
+    assert_equal 'ready for queries and writes', health.message
+    assert_equal 'influxdb', health.name
+    assert_equal 'pass', health.status
+  end
+
+  def test_health_not_running
+    client_not_running = InfluxDB2::Client.new('http://localhost:8099', 'my-token', use_ssl: false)
+    health = client_not_running.health
+
+    assert_match 'Failed to open TCP connection to localhost:8099', health.message
+    assert_equal 'influxdb', health.name
+    assert_equal 'fail', health.status
+  end
 end

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

@@ -323,4 +323,79 @@ class FluxCsvParserErrorTest < MiniTest::Test
 
     assert_equal 'Unable to parse CSV response. FluxTable definition was not found.', error.message
   end
+
+  def test_multiple_queries
+    data = "#datatype,string,long,string,string,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string\n" \
+      "#group,false,false,true,true,true,true,false,false,true\n" \
+       "#default,t1,,,,,,,,\n" \
+       ",result,table,_field,_measurement,_start,_stop,_time,_value,tag\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:20:00Z,2,test1\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:21:40Z,2,test1\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:23:20Z,2,test1\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:25:00Z,2,test1\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:26:40Z,2,test1\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:28:20Z,2,test1\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:30:00Z,2,test1\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:20:00Z,2,test2\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:21:40Z,2,test2\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:23:20Z,2,test2\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:25:00Z,2,test2\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:26:40Z,2,test2\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:28:20Z,2,test2\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:30:00Z,2,test2\n" \
+       "\n" \
+       "#datatype,string,long,string,string,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string\n" \
+       "#group,false,false,true,true,true,true,false,false,true\n" \
+       "#default,t2,,,,,,,,\n" \
+       ",result,table,_field,_measurement,_start,_stop,_time,_value,tag\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:20:00Z,2,test1\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:21:40Z,2,test1\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:23:20Z,2,test1\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:25:00Z,2,test1\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:26:40Z,2,test1\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:28:20Z,2,test1\n" \
+       ",,0,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:30:00Z,2,test1\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:20:00Z,2,test2\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:21:40Z,2,test2\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:23:20Z,2,test2\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:25:00Z,2,test2\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:26:40Z,2,test2\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:28:20Z,2,test2\n" \
+       ',,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:30:00Z,2,test2'
+
+    tables = InfluxDB2::FluxCsvParser.new(data).parse.tables
+
+    assert_equal 4, tables.size
+    assert_equal 7, tables[0].records.size
+    assert_equal 7, tables[1].records.size
+    assert_equal 7, tables[2].records.size
+    assert_equal 7, tables[3].records.size
+  end
+
+  def test_table_not_start_at_zero
+    data = "#datatype,string,long,string,string,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,double,string\n" \
+       "#group,false,false,true,true,true,true,false,false,true\n" \
+       "#default,t1,,,,,,,,\n" \
+       ",result,table,_field,_measurement,_start,_stop,_time,_value,tag\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:20:00Z,2,test1\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:21:40Z,2,test1\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:23:20Z,2,test1\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:25:00Z,2,test1\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:26:40Z,2,test1\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:28:20Z,2,test1\n" \
+       ",,1,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:30:00Z,2,test1\n" \
+       ",,2,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:20:00Z,2,test2\n" \
+       ",,2,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:21:40Z,2,test2\n" \
+       ",,2,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:23:20Z,2,test2\n" \
+       ",,2,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:25:00Z,2,test2\n" \
+       ",,2,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:26:40Z,2,test2\n" \
+       ",,2,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:28:20Z,2,test2\n" \
+       ',,2,value,pct,2010-02-27T04:48:32.752600083Z,2020-02-27T16:48:32.752600083Z,2020-02-27T16:30:00Z,2,test2\n'
+
+    tables = InfluxDB2::FluxCsvParser.new(data).parse.tables
+
+    assert_equal 2, tables.size
+    assert_equal 7, tables[0].records.size
+    assert_equal 7, tables[1].records.size
+  end
 end

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.591
+  version: 1.3.0.pre.716
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -152,9 +152,11 @@ files:
 - lib/influxdb2/client/delete_api.rb
 - lib/influxdb2/client/flux_csv_parser.rb
 - lib/influxdb2/client/flux_table.rb
+- lib/influxdb2/client/health_api.rb
 - lib/influxdb2/client/influx_error.rb
 - lib/influxdb2/client/models/delete_predicate_request.rb
 - lib/influxdb2/client/models/dialect.rb
+- lib/influxdb2/client/models/health_check.rb
 - lib/influxdb2/client/models/query.rb
 - lib/influxdb2/client/point.rb
 - lib/influxdb2/client/query_api.rb