influxdb-client 1.2.0.pre.503 → 1.2.0.pre.529

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 369c8281b3985a0757703f1c68a95d25793508a8c1c3c6dd458646ae01c768d8
-  data.tar.gz: 82c4dae23afd29ccb574a6314443ef53fc4fe3ff17f9f952d435c7522441d7e3
+  metadata.gz: '0350846a0e09c3e3aeb2cb139b9dd6e0ff29b2ecf8ec77f8cc99c571db645261'
+  data.tar.gz: e2c2e114b352b4e2334efc31516ab34648270ebc9af0b2a923367e6cc9b98f00
 SHA512:
-  metadata.gz: 17c810f5d87978b3c7359031b52fa86d39c06d70bb118a15e4f686f5f0b515de2001bc77cae24bce50a1dec6d4f3b366b104997e657d61219586e266c67b3d4b
-  data.tar.gz: 5255b4b24ffd03b9895c624a501e765881a944368cd31d41eb02c421b29344955ad941532df9d02b416acb0ab9a7ff389142c432fca974ecf301ef88ba3f7c88
+  metadata.gz: 526e08ed0e716028379040714ed54a995856c2517d646b3cb6aecc4ead0f182ca5aeaefd14c864fb871af50677db07877e058b47b83a385a91bf4d16d2aadd9a
+  data.tar.gz: eedc0d2bffb13eab86e8b42064f99543e37dd128a4bbcd43977c65ab444f45dba433cb25c1f9cd4fb28d2ec475bb4ce11ce3bfaf3632a8cf0963da61e140c796

data/.rubocop.yml

@@ -31,7 +31,7 @@ Metrics/MethodLength:
 Metrics/ClassLength:
   Max: 200
 Metrics/AbcSize:
-  Max: 30
+  Max: 40
 Metrics/CyclomaticComplexity:
   Max: 15
 Metrics/PerceivedComplexity:

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 1.2.0 [unreleased]
 
+### Features
+1. [#23](https://github.com/influxdata/influxdb-client-ruby/issues/23): Added DeleteApi to delete time series data from InfluxDB.
+
 ### Bugs
 1. [#22](https://github.com/influxdata/influxdb-client-ruby/pull/22): Fixed batch write
 

data/README.md

@@ -208,6 +208,27 @@ write_api = client.create_write_api
 write_api.write(data: ['h2o,location=west value=33i 15', point, hash])
 ```
 
+### Delete data
+
+The [DeleteApi](https://github.com/influxdata/influxdb-client-ruby/blob/master/lib/influxdb2/client/delete_api.rb) supports deletes [points](https://v2.docs.influxdata.com/v2.0/reference/glossary/#point) from an InfluxDB bucket.
+
+```ruby
+client = InfluxDB2::Client.new('http://localhost:9999', 'my-token',
+                               bucket: 'my-bucket',
+                               org: 'my-org',
+                               precision: InfluxDB2::WritePrecision::NANOSECOND)
+
+client.create_delete_api.delete(DateTime.rfc3339('2019-02-03T04:05:06+07:00'),
+                                DateTime.rfc3339('2019-03-03T04:05:06+07:00'),
+                                predicate: 'key1="value1" AND key2="value"')
+```
+
+The time range could be specified as:
+
+1. String - `"2019-02-03T04:05:06+07:00"`
+1. DateTime - `DateTime.rfc3339('2019-03-03T04:05:06+07:00')`
+1. Time - `Time.utc(2015, 10, 16, 8, 20, 15)`
+
 ## Local tests
 
 ```

data/bin/generate-sources.sh

@@ -4,12 +4,7 @@
 
 SCRIPT_PATH="$( cd "$(dirname "$0")" || exit ; pwd -P )"
 
-# Generate OpenAPI generator
-#cd "${SCRIPT_PATH}"/../openapi-generator/ || exit
-#mvn clean install -DskipTests
-
 # delete old sources
-#rm "${SCRIPT_PATH}"/../influxdb_client/domain/*.py
 rm "${SCRIPT_PATH}"/../lib/influxdb2/client/models/*
 
 # Generate client
@@ -21,10 +16,8 @@ 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 "\<query.rb\>\|\<dialect.rb\>")
+rm -r $(ls | grep -v "\<dialect.rb\>\|\<query.rb\>\|\<delete_predicate_request.rb\>")
 
 # Clean
 rmdir "${SCRIPT_PATH}"/../lib/influx_db2/models
 rmdir "${SCRIPT_PATH}"/../lib/influx_db2/
-
-#rm -r $(ls | grep -v "\<query.rb\>\|\<dialect.rb\>")

data/lib/influxdb2/client.rb

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

data/lib/influxdb2/client/client.rb

@@ -70,6 +70,13 @@ module InfluxDB2
       QueryApi.new(options: @options)
     end
 
+    # Get the Delete API to delete time series data from InfluxDB.
+    #
+    # @return [DeleteApi] New instance of DeleteApi.
+    def create_delete_api
+      DeleteApi.new(options: @options)
+    end
+
     # Close all connections into InfluxDB 2.
     #
     # @return [ true ] Always true.

data/lib/influxdb2/client/delete_api.rb

@@ -0,0 +1,80 @@
+# 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/delete_predicate_request'
+
+module InfluxDB2
+  # Delete time series data from InfluxDB
+  #
+  class DeleteApi < DefaultApi
+    # @param [Hash] options The options to be used by the client.
+    def initialize(options:)
+      super(options: options)
+    end
+
+    # Delete time series data from InfluxDB.
+    #
+    # @example
+    # delete('2019-02-03T04:05:06+07:00', '2019-04-03T04:05:06+07:00',
+    #        predicate: 'key1="value1" AND key2="value"', bucket: 'my-bucket', org: 'my-org')
+    #
+    # @example
+    # delete(DateTime.rfc3339('2019-02-03T04:05:06+07:00'), DateTime.rfc3339('2019-03-03T04:05:06+07:00'),
+    #        predicate: 'key1="value1" AND key2="value"', bucket: 'my-bucket', org: 'my-org')
+    #
+    # @param [Object] start Start time of interval to delete data.
+    #   The start could be represent by [Time], [DateTime] or [String] formatted as RFC3339.
+    # @param [Object] stop Stop time of interval to delete data
+    #   The stop could be represent by [Time], [DateTime] or [String] formatted as RFC3339.
+    # @param [String] predicate InfluxQL-like predicate Stop time of interval to delete data
+    # @param [String] bucket specifies the bucket to remove data from
+    # @param [String] org specifies the organization to remove data from
+    def delete(start, stop, predicate: nil, bucket: nil, org: nil)
+      delete_request = InfluxDB2::DeletePredicateRequest.new(start: _to_rfc3339(start), stop: _to_rfc3339(stop),
+                                                             predicate: predicate)
+
+      _delete(delete_request, bucket: bucket, org: org)
+    end
+
+    private
+
+    def _delete(delete_request, bucket: nil, org: nil)
+      bucket_param = bucket || @options[:bucket]
+      org_param = org || @options[:org]
+      _check('bucket', bucket_param)
+      _check('org', org_param)
+
+      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)
+    end
+
+    def _to_rfc3339(time)
+      if time.is_a?(String)
+        time
+      elsif time.is_a?(Time)
+        _to_rfc3339(time.to_datetime)
+      elsif time.is_a?(DateTime)
+        _to_rfc3339(time.rfc3339)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,215 @@
+=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
+  # The delete predicate request.
+  class DeletePredicateRequest
+    # RFC3339Nano
+    attr_accessor :start
+
+    # RFC3339Nano
+    attr_accessor :stop
+
+    # InfluxQL-like delete statement
+    attr_accessor :predicate
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'start' => :'start',
+        :'stop' => :'stop',
+        :'predicate' => :'predicate'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+        :'start' => :'DateTime',
+        :'stop' => :'DateTime',
+        :'predicate' => :'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?(:'start')
+        self.start = attributes[:'start']
+      end
+
+      if attributes.has_key?(:'stop')
+        self.stop = attributes[:'stop']
+      end
+
+      if attributes.has_key?(:'predicate')
+        self.predicate = attributes[:'predicate']
+      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 @start.nil?
+        invalid_properties.push('invalid value for "start", start cannot be nil.')
+      end
+
+      if @stop.nil?
+        invalid_properties.push('invalid value for "stop", stop 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 @start.nil?
+      return false if @stop.nil?
+      true
+    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 &&
+          start == o.start &&
+          stop == o.stop &&
+          predicate == o.predicate
+    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
+      [start, stop, predicate].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/test/influxdb/delete_api_integration_test.rb

@@ -0,0 +1,100 @@
+# 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 'test_helper'
+
+class DeleteApiIntegrationTest < MiniTest::Test
+  def setup
+    WebMock.allow_net_connect!
+
+    @client = InfluxDB2::Client.new('http://localhost:9999', 'my-token',
+                                    bucket: 'my-bucket',
+                                    org: 'my-org',
+                                    precision: InfluxDB2::WritePrecision::NANOSECOND,
+                                    use_ssl: false)
+
+    now = Time.now.utc
+    @measurement = 'h2o_delete_' + now.to_i.to_s + +now.nsec.to_s
+
+    data = [InfluxDB2::Point.new(name: @measurement)
+                            .add_tag('location', 'europe')
+                            .add_field('level', 2)
+                            .time(Time.utc(2015, 10, 15, 8, 20, 15), InfluxDB2::WritePrecision::MILLISECOND),
+            InfluxDB2::Point.new(name: @measurement)
+                            .add_tag('location', 'us')
+                            .add_field('level', 2)
+                            .time(Time.utc(2016, 10, 15, 8, 20, 15), InfluxDB2::WritePrecision::MILLISECOND),
+            InfluxDB2::Point.new(name: @measurement)
+                            .add_tag('location', 'india')
+                            .add_field('level', 2)
+                            .time(Time.utc(2017, 10, 15, 8, 20, 15), InfluxDB2::WritePrecision::MILLISECOND),
+            InfluxDB2::Point.new(name: @measurement)
+                            .add_tag('location', 'europe')
+                            .add_field('level', 2)
+                            .time(Time.utc(2018, 10, 15, 8, 20, 15), InfluxDB2::WritePrecision::MILLISECOND)]
+
+    @client.create_write_api.write(data: data, precision: InfluxDB2::WritePrecision::MILLISECOND)
+
+    assert_equal 4, _query_count
+  end
+
+  def test_delete
+    @client.create_delete_api.delete(Time.utc(2015, 10, 16, 8, 20, 15), Time.utc(2020, 10, 16, 8, 20, 15),
+                                     predicate: 'location="europe"')
+
+    assert_equal 3, _query_count
+  end
+
+  def test_delete_without_predicate
+    @client.create_delete_api.delete(Time.utc(2016, 10, 15, 7, 20, 15), Time.utc(2018, 10, 14, 8, 20, 15))
+
+    assert_equal 2, _query_count
+  end
+
+  def test_delete_all
+    @client.create_delete_api.delete(Time.utc(2010, 10, 15, 7, 20, 15), Time.utc(2020, 10, 14, 8, 20, 15))
+
+    assert_equal 0, _query_count
+  end
+
+  def test_delete_without_interval
+    error = assert_raises InfluxDB2::InfluxError do
+      @client.create_delete_api.delete(nil, nil)
+    end
+
+    assert error.message.include?('invalid request'),
+           "Error message: '#{error.message}' doesn't contains 'invalid request'"
+  end
+
+  private
+
+  def _query_count
+    query = 'from(bucket: "my-bucket") |> range(start: 0) |> ' \
+           "filter(fn: (r) => r._measurement == \"#{@measurement}\") " \
+           '|> drop(columns: ["location"]) |> count()'
+
+    table = @client.create_query_api.query(query: InfluxDB2::Query.new(query: query,
+                                                                       dialect: InfluxDB2::QueryApi::DEFAULT_DIALECT,
+                                                                       type: nil))[0]
+    return 0 if table.nil?
+
+    table.records[0].value
+  end
+end

data/test/influxdb/delete_api_test.rb

@@ -0,0 +1,99 @@
+# 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 'test_helper'
+
+class DeleteApiTest < MiniTest::Test
+  def setup
+    WebMock.disable_net_connect!
+  end
+
+  def test_delete
+    stub_request(:any, 'http://localhost:9999/api/v2/delete?bucket=my-bucket&org=my-org')
+      .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_delete_api.delete(Time.utc(2019, 10, 15, 8, 20, 15), Time.utc(2019, 11, 15, 8, 20, 15),
+                                    predicate: 'key1="value1" AND key2="value"', bucket: 'my-bucket', org: 'my-org')
+
+    body = '{"start":"2019-10-15T08:20:15+00:00","stop":"2019-11-15T08:20:15+00:00","predicate":"key1=\"value1\" ' \
+           'AND key2=\"value\""}'
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/delete?bucket=my-bucket&org=my-org', times: 1, body: body)
+  end
+
+  def test_delete_time_as_date_time
+    stub_request(:any, 'http://localhost:9999/api/v2/delete?bucket=my-bucket&org=my-org')
+      .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_delete_api.delete(DateTime.rfc3339('2019-02-03T04:05:06+07:00'),
+                                    DateTime.rfc3339('2019-03-03T04:05:06+07:00'),
+                                    predicate: 'key1="value1" AND key2="value"', bucket: 'my-bucket', org: 'my-org')
+
+    body = '{"start":"2019-02-03T04:05:06+07:00","stop":"2019-03-03T04:05:06+07:00","predicate":"key1=\"value1\" ' \
+           'AND key2=\"value\""}'
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/delete?bucket=my-bucket&org=my-org', times: 1, body: body)
+  end
+
+  def test_delete_time_as_string
+    stub_request(:any, 'http://localhost:9999/api/v2/delete?bucket=my-bucket&org=my-org')
+      .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_delete_api.delete('2019-02-03T04:05:06+07:00',  '2019-04-03T04:05:06+07:00',
+                                    predicate: 'key1="value1" AND key2="value"', bucket: 'my-bucket', org: 'my-org')
+
+    body = '{"start":"2019-02-03T04:05:06+07:00","stop":"2019-04-03T04:05:06+07:00","predicate":"key1=\"value1\" ' \
+           'AND key2=\"value\""}'
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/delete?bucket=my-bucket&org=my-org', times: 1, body: body)
+  end
+
+  def test_without_predicate
+    stub_request(:any, 'http://localhost:9999/api/v2/delete?bucket=my-bucket&org=my-org')
+      .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_delete_api.delete('2019-02-03T04:05:06+07:00', '2019-04-03T04:05:06+07:00',
+                                    bucket: 'my-bucket', org: 'my-org')
+
+    body = '{"start":"2019-02-03T04:05:06+07:00","stop":"2019-04-03T04:05:06+07:00"}'
+
+    assert_requested(:post, 'http://localhost:9999/api/v2/delete?bucket=my-bucket&org=my-org', times: 1, body: body)
+  end
+end

data/test/influxdb/query_api_integration_test.rb

@@ -33,7 +33,7 @@ class QueryApiIntegrationTest < MiniTest::Test
 
   def test_query
     now = Time.now.utc
-    measurement = 'h2o_query_' + now.to_i.to_s
+    measurement = 'h2o_query_' + now.to_i.to_s + now.nsec.to_s
 
     @client.create_write_api.write(data: InfluxDB2::Point.new(name: measurement)
                                                          .add_tag('location', 'europe')

data/test/influxdb/write_api_integration_test.rb

@@ -35,7 +35,7 @@ class WriteApiIntegrationTest < MiniTest::Test
 
     now = Time.now.utc
 
-    measurement = 'h2o_' + now.to_i.to_s
+    measurement = 'h2o_' + now.to_i.to_s + now.nsec.to_s
     point = InfluxDB2::Point.new(name: measurement)
                             .add_tag('location', 'europe')
                             .add_field('level', 2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.503
+  version: 1.2.0.pre.529
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,9 +149,11 @@ files:
 - lib/influxdb2/client.rb
 - lib/influxdb2/client/client.rb
 - lib/influxdb2/client/default_api.rb
+- lib/influxdb2/client/delete_api.rb
 - lib/influxdb2/client/flux_csv_parser.rb
 - lib/influxdb2/client/flux_table.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/query.rb
 - lib/influxdb2/client/point.rb
@@ -160,6 +162,8 @@ files:
 - lib/influxdb2/client/worker.rb
 - lib/influxdb2/client/write_api.rb
 - test/influxdb/client_test.rb
+- test/influxdb/delete_api_integration_test.rb
+- test/influxdb/delete_api_test.rb
 - test/influxdb/flux_csv_parser_test.rb
 - test/influxdb/point_test.rb
 - test/influxdb/query_api_integration_test.rb
@@ -197,6 +201,8 @@ specification_version: 4
 summary: Ruby library for InfluxDB 2.
 test_files:
 - test/influxdb/client_test.rb
+- test/influxdb/delete_api_integration_test.rb
+- test/influxdb/delete_api_test.rb
 - test/influxdb/flux_csv_parser_test.rb
 - test/influxdb/point_test.rb
 - test/influxdb/query_api_integration_test.rb