influxdb-client 1.0.0.beta → 1.0.0.pre.3

data/lib/{influxdb2 → influxdb}/client/point.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-module InfluxDB2
+module InfluxDB
   DEFAULT_WRITE_PRECISION = WritePrecision::NANOSECOND
   ESCAPE_KEY_LIST = ['\\'.freeze, ','.freeze, ' '.freeze, '='.freeze].freeze
   ESCAPE_VALUE_LIST = ['\\'.freeze, '"'.freeze].freeze
@@ -117,7 +117,7 @@ module InfluxDB2
       line_protocol << measurement
 
       tags = _escape_tags
-      line_protocol << ",#{tags}" unless tags.empty?
+      line_protocol << ",#{tags}" if tags
       line_protocol << ' '.freeze if line_protocol[-1] == '\\'
 
       fields = _escape_fields
@@ -191,19 +191,17 @@ module InfluxDB2
         nil
       elsif @time.is_a?(Integer)
         @time.to_s
-      elsif @time.is_a?(Float)
-        @time.round.to_s
       elsif @time.is_a?(Time)
         nano_seconds = @time.to_i * 1e9
         nano_seconds += @time.tv_nsec
         case @precision || DEFAULT_WRITE_PRECISION
-        when InfluxDB2::WritePrecision::MILLISECOND then
+        when InfluxDB::WritePrecision::MILLISECOND then
           (nano_seconds / 1e6).round
-        when InfluxDB2::WritePrecision::SECOND then
+        when InfluxDB::WritePrecision::SECOND then
           (nano_seconds / 1e9).round
-        when InfluxDB2::WritePrecision::MICROSECOND then
+        when InfluxDB::WritePrecision::MICROSECOND then
           (nano_seconds / 1e3).round
-        when InfluxDB2::WritePrecision::NANOSECOND then
+        when InfluxDB::WritePrecision::NANOSECOND then
           nano_seconds.round
         end
       else

data/lib/{influxdb2 → influxdb}/client/version.rb

@@ -18,6 +18,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-module InfluxDB2
-  VERSION = '1.0.0.beta'.freeze
+module InfluxDB
+  VERSION = '1.0.0'.freeze
 end

data/lib/{influxdb2 → influxdb}/client/write_api.rb

@@ -18,21 +18,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-module InfluxDB2
-  # Precision constants.
-  #
+module InfluxDB
   class WritePrecision
     SECOND = 's'.freeze
     MILLISECOND = 'ms'.freeze
     MICROSECOND = 'us'.freeze
     NANOSECOND = 'ns'.freeze
-
-    def get_from_value(value)
-      constants = WritePrecision.constants.select { |c| WritePrecision.const_get(c) == value }
-      raise "The time precision #{value} is not supported." if constants.empty?
-
-      value
-    end
   end
 
   # Write time series data into InfluxDB.
@@ -105,7 +96,6 @@ module InfluxDB2
       http.open_timeout = @options[:open_timeout] || DEFAULT_TIMEOUT
       http.write_timeout = @options[:write_timeout] || DEFAULT_TIMEOUT if Net::HTTP.method_defined? :write_timeout
       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['Authorization'] = "Token #{@options[:token]}"
@@ -147,7 +137,7 @@ module InfluxDB2
       elsif data.respond_to? :map
         data.map do |item|
           _generate_payload(item)
-        end.reject(&:nil?).join("\n".freeze)
+        end.reject(&:nil?).join('\n'.freeze)
       end
     end
   end

data/test/influxdb/client_test.rb

@@ -22,49 +22,49 @@ require 'test_helper'
 
 class ClientTest < Minitest::Test
   def test_defined_version_number
-    refute_nil ::InfluxDB2::VERSION
+    refute_nil ::InfluxDB::VERSION
   end
 
   def test_client_new
-    refute_nil InfluxDB2::Client.new('http://localhost:9999', 'my-token')
+    refute_nil InfluxDB::Client.new('http://localhost:9999', 'my-token')
   end
 
   def test_client_hash
-    client1 = InfluxDB2::Client.new('http://localhost:9999', 'my-token')
-    client2 = InfluxDB2::Client.new('http://localhost:9999', 'my-token-diff')
+    client1 = InfluxDB::Client.new('http://localhost:9999', 'my-token')
+    client2 = InfluxDB::Client.new('http://localhost:9999', 'my-token-diff')
 
     refute_equal client1.hash, client2.hash
     assert_equal client1.hash, client1.hash
   end
 
   def test_client_eq
-    client1 = InfluxDB2::Client.new('http://localhost:9999', 'my-token')
-    client2 = InfluxDB2::Client.new('http://localhost:9999', 'my-token-diff')
+    client1 = InfluxDB::Client.new('http://localhost:9999', 'my-token')
+    client2 = InfluxDB::Client.new('http://localhost:9999', 'my-token-diff')
 
     refute_equal client1, client2
     assert_equal client1, client1
   end
 
   def test_client_options
-    client = InfluxDB2::Client.new('http://localhost:9999', 'my-token')
+    client = InfluxDB::Client.new('http://localhost:9999', 'my-token')
 
     assert_equal 'http://localhost:9999', client.options[:url]
     assert_equal 'my-token', client.options[:token]
   end
 
   def test_close
-    client = InfluxDB2::Client.new('http://localhost:9999', 'my-token')
+    client = InfluxDB::Client.new('http://localhost:9999', 'my-token')
 
-    assert_equal true, client.close!
-    assert_equal true, client.close!
+    assert_equal true, client.close
+    assert_equal true, client.close
   end
 
   def test_get_write_api
-    client = InfluxDB2::Client.new('http://localhost:9999', 'my-token')
+    client = InfluxDB::Client.new('http://localhost:9999', 'my-token')
 
     write_api = client.create_write_api
 
     refute_nil write_api
-    assert_instance_of InfluxDB2::WriteApi, write_api
+    assert_instance_of InfluxDB::WriteApi, write_api
   end
 end

data/test/influxdb/point_test.rb

@@ -22,90 +22,90 @@ require 'test_helper'
 
 class PointTest < MiniTest::Test
   def test_to_line_protocol
-    point_args = InfluxDB2::Point.new(name: 'h2o',
-                                      tags: { host: 'aws', region: 'us' },
-                                      fields: { level: 5, saturation: '99%' }, time: 123)
+    point_args = InfluxDB::Point.new(name: 'h2o',
+                                     tags: { host: 'aws', region: 'us' },
+                                     fields: { level: 5, saturation: '99%' }, time: 123)
     assert_equal 'h2o,host=aws,region=us level=5i,saturation="99%" 123', point_args.to_line_protocol
 
-    point_hash = InfluxDB2::Point.from_hash(name: 'h2o',
-                                            tags: { host: 'aws', region: 'us' },
-                                            fields: { level: 5, saturation: '99%' }, time: 123)
+    point_hash = InfluxDB::Point.from_hash(name: 'h2o',
+                                           tags: { host: 'aws', region: 'us' },
+                                           fields: { level: 5, saturation: '99%' }, time: 123)
     assert_equal 'h2o,host=aws,region=us level=5i,saturation="99%" 123', point_hash.to_line_protocol
   end
 
   def test_measurement_escape
-    point = InfluxDB2::Point.new(name: 'h2 o', tags: { location: 'europe' }, fields: { level: 2 })
+    point = InfluxDB::Point.new(name: 'h2 o', tags: { location: 'europe' }, fields: { level: 2 })
     assert_equal 'h2\\ o,location=europe level=2i', point.to_line_protocol
 
-    point = InfluxDB2::Point.new(name: 'h2,o', tags: { location: 'europe' }, fields: { level: 2 })
+    point = InfluxDB::Point.new(name: 'h2,o', tags: { location: 'europe' }, fields: { level: 2 })
     assert_equal 'h2\\,o,location=europe level=2i', point.to_line_protocol
   end
 
   def test_tag_empty_key
-    point = InfluxDB2::Point.new(name: 'h2o', fields: { level: 2 }).add_tag('location', 'europe').add_tag('', 'warn')
+    point = InfluxDB::Point.new(name: 'h2o', fields: { level: 2 }).add_tag('location', 'europe').add_tag('', 'warn')
 
     assert_equal 'h2o,location=europe level=2i', point.to_line_protocol
   end
 
   def test_tag_empty_value
-    point = InfluxDB2::Point.new(name: 'h2o', fields: { level: 2 }).add_tag('location', 'europe').add_tag('log', '')
+    point = InfluxDB::Point.new(name: 'h2o', fields: { level: 2 }).add_tag('location', 'europe').add_tag('log', '')
 
     assert_equal 'h2o,location=europe level=2i', point.to_line_protocol
   end
 
   def test_override_tag_and_field
-    point = InfluxDB2::Point.new(name: 'h2o', fields: { level: '1' })
-                            .add_tag('location', 'europe')
-                            .add_tag('location', 'europe2')
-                            .add_field(:level, 2)
-                            .add_field(:level, 3)
+    point = InfluxDB::Point.new(name: 'h2o', fields: { level: '1' })
+                           .add_tag('location', 'europe')
+                           .add_tag('location', 'europe2')
+                           .add_field(:level, 2)
+                           .add_field(:level, 3)
 
     assert_equal 'h2o,location=europe2 level=3i', point.to_line_protocol
   end
 
   def test_field_types
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_tag('tag_b', 'b')
-                            .add_tag('tag_a', 'a')
-                            .add_field('n1', -2)
-                            .add_field('n2', 10)
-                            .add_field('n3', 1_265_437_718_438_866_624_512)
-                            .add_field('n4', 5.5)
-                            .add_field('bool', true)
-                            .add_field('string', 'string value')
+    point = InfluxDB::Point.new(name: 'h2o')
+                           .add_tag('tag_b', 'b')
+                           .add_tag('tag_a', 'a')
+                           .add_field('n1', -2)
+                           .add_field('n2', 10)
+                           .add_field('n3', 1_265_437_718_438_866_624_512)
+                           .add_field('n4', 5.5)
+                           .add_field('bool', true)
+                           .add_field('string', 'string value')
 
     expected = 'h2o,tag_a=a,tag_b=b bool=true,n1=-2i,n2=10i,n3=1265437718438866624512i,n4=5.5,string="string value"'
     assert_equal expected, point.to_line_protocol
   end
 
   def test_field_null_value
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_tag('location', 'europe')
-                            .add_field('level', 2)
-                            .add_field('warning', nil)
+    point = InfluxDB::Point.new(name: 'h2o')
+                           .add_tag('location', 'europe')
+                           .add_field('level', 2)
+                           .add_field('warning', nil)
 
     assert_equal 'h2o,location=europe level=2i', point.to_line_protocol
   end
 
   def test_field_escape
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_tag('location', 'europe')
-                            .add_field('level', 'string esc\\ape value')
+    point = InfluxDB::Point.new(name: 'h2o')
+                           .add_tag('location', 'europe')
+                           .add_field('level', 'string esc\\ape value')
 
     assert_equal 'h2o,location=europe level="string esc\\\\ape value"', point.to_line_protocol
 
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_tag('location', 'europe')
-                            .add_field('level', 'string esc"ape value')
+    point = InfluxDB::Point.new(name: 'h2o')
+                           .add_tag('location', 'europe')
+                           .add_field('level', 'string esc"ape value')
 
     assert_equal 'h2o,location=europe level="string esc\"ape value"', point.to_line_protocol
   end
 
   def test_time
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_tag('location', 'europe')
-                            .add_field('level', 2)
-                            .time(123, InfluxDB2::WritePrecision::NANOSECOND)
+    point = InfluxDB::Point.new(name: 'h2o')
+                           .add_tag('location', 'europe')
+                           .add_field('level', 2)
+                           .time(123, InfluxDB::WritePrecision::NANOSECOND)
 
     assert_equal 'h2o,location=europe level=2i 123', point.to_line_protocol
   end
@@ -113,31 +113,31 @@ class PointTest < MiniTest::Test
   def test_time_formatting
     time = Time.utc(2015, 10, 15, 8, 20, 15)
 
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_tag('location', 'europe')
-                            .add_field('level', 2)
-                            .time(time, InfluxDB2::WritePrecision::MILLISECOND)
+    point = InfluxDB::Point.new(name: 'h2o')
+                           .add_tag('location', 'europe')
+                           .add_field('level', 2)
+                           .time(time, InfluxDB::WritePrecision::MILLISECOND)
 
     assert_equal 'h2o,location=europe level=2i 1444897215000', point.to_line_protocol
 
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_tag('location', 'europe')
-                            .add_field('level', 2)
-                            .time(time, InfluxDB2::WritePrecision::SECOND)
+    point = InfluxDB::Point.new(name: 'h2o')
+                           .add_tag('location', 'europe')
+                           .add_field('level', 2)
+                           .time(time, InfluxDB::WritePrecision::SECOND)
 
     assert_equal 'h2o,location=europe level=2i 1444897215', point.to_line_protocol
 
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_tag('location', 'europe')
-                            .add_field('level', 2)
-                            .time(time, InfluxDB2::WritePrecision::MICROSECOND)
+    point = InfluxDB::Point.new(name: 'h2o')
+                           .add_tag('location', 'europe')
+                           .add_field('level', 2)
+                           .time(time, InfluxDB::WritePrecision::MICROSECOND)
 
     assert_equal 'h2o,location=europe level=2i 1444897215000000', point.to_line_protocol
 
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_tag('location', 'europe')
-                            .add_field('level', 2)
-                            .time(time, InfluxDB2::WritePrecision::NANOSECOND)
+    point = InfluxDB::Point.new(name: 'h2o')
+                           .add_tag('location', 'europe')
+                           .add_field('level', 2)
+                           .time(time, InfluxDB::WritePrecision::NANOSECOND)
 
     assert_equal 'h2o,location=europe level=2i 1444897215000000000', point.to_line_protocol
   end
@@ -145,77 +145,55 @@ class PointTest < MiniTest::Test
   def test_time_formatting_default
     time = Time.utc(2015, 10, 15, 8, 20, 15)
 
-    point = InfluxDB2::Point.new(name: 'h2o', time: time)
-                            .add_tag('location', 'europe')
-                            .add_field('level', 2)
+    point = InfluxDB::Point.new(name: 'h2o', time: time)
+                           .add_tag('location', 'europe')
+                           .add_field('level', 2)
 
     assert_equal 'h2o,location=europe level=2i 1444897215000000000', point.to_line_protocol
 
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_tag('location', 'europe')
-                            .add_field('level', 2)
-                            .time(time, nil)
+    point = InfluxDB::Point.new(name: 'h2o')
+                           .add_tag('location', 'europe')
+                           .add_field('level', 2)
+                           .time(time, nil)
 
     assert_equal 'h2o,location=europe level=2i 1444897215000000000', point.to_line_protocol
   end
 
   def test_time_string
-    point_args = InfluxDB2::Point.new(name: 'h2o',
-                                      tags: { host: 'aws', region: 'us' },
-                                      fields: { level: 5 }, time: '123')
+    point_args = InfluxDB::Point.new(name: 'h2o',
+                                     tags: { host: 'aws', region: 'us' },
+                                     fields: { level: 5 }, time: '123')
 
     assert_equal 'h2o,host=aws,region=us level=5i 123', point_args.to_line_protocol
   end
 
-  def test_time_float
-    point_args = InfluxDB2::Point.new(name: 'h2o',
-                                      tags: { host: 'aws', region: 'us' },
-                                      fields: { level: 5 }, time: 1.444897215e+18)
-
-    assert_equal 'h2o,host=aws,region=us level=5i 1444897215000000000', point_args.to_line_protocol
-
-    point_args = InfluxDB2::Point.new(name: 'h2o',
-                                      tags: { host: 'aws', region: 'us' },
-                                      fields: { level: 5 }, time: 102_030_405_060)
-
-    assert_equal 'h2o,host=aws,region=us level=5i 102030405060', point_args.to_line_protocol
-  end
-
   def test_utf_8
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_tag('location', 'Přerov')
-                            .add_field('level', 2)
-                            .time(123, InfluxDB2::WritePrecision::NANOSECOND)
+    point = InfluxDB::Point.new(name: 'h2o')
+                           .add_tag('location', 'Přerov')
+                           .add_field('level', 2)
+                           .time(123, InfluxDB::WritePrecision::NANOSECOND)
 
     assert_equal 'h2o,location=Přerov level=2i 123', point.to_line_protocol
   end
 
   def test_infinity_values
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_tag('location', 'europe')
-                            .add_field('infinity_constant', Float::INFINITY)
-                            .add_field('infinity_positive', 1 / 0.0)
-                            .add_field('infinity_negative', -1 / 0.0)
-                            .add_field('level', 2)
+    point = InfluxDB::Point.new(name: 'h2o')
+                           .add_tag('location', 'europe')
+                           .add_field('infinity_constant', Float::INFINITY)
+                           .add_field('infinity_positive', 1 / 0.0)
+                           .add_field('infinity_negative', -1 / 0.0)
+                           .add_field('level', 2)
 
     assert_equal 'h2o,location=europe level=2i', point.to_line_protocol
   end
 
   def test_only_infinity_values
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_tag('location', 'europe')
-                            .add_field('infinity_constant', Float::INFINITY)
-                            .add_field('infinity_positive', 1 / 0.0)
-                            .add_field('infinity_negative', -1 / 0.0)
+    point = InfluxDB::Point.new(name: 'h2o')
+                           .add_tag('location', 'europe')
+                           .add_field('infinity_constant', Float::INFINITY)
+                           .add_field('infinity_positive', 1 / 0.0)
+                           .add_field('infinity_negative', -1 / 0.0)
 
     assert_nil point.to_line_protocol
   end
-
-  def test_without_tags
-    point = InfluxDB2::Point.new(name: 'h2o')
-                            .add_field('level', 2)
-                            .time(123, InfluxDB2::WritePrecision::NANOSECOND)
-
-    assert_equal 'h2o level=2i 123', point.to_line_protocol
-  end
 end

data/test/influxdb/write_api_integration_test.rb

@@ -27,19 +27,18 @@ class WriteApiIntegrationTest < MiniTest::Test
   end
 
   def test_write_into_influx_db
-    client = InfluxDB2::Client.new('http://localhost:9999', 'my-token',
-                                   bucket: 'my-bucket',
-                                   org: 'my-org',
-                                   precision: InfluxDB2::WritePrecision::NANOSECOND,
-                                   use_ssl: false)
+    client = InfluxDB::Client.new('http://localhost:9999', 'my-token',
+                                  bucket: 'my-bucket',
+                                  org: 'my-org',
+                                  precision: InfluxDB::WritePrecision::NANOSECOND)
 
     now = Time.now.utc
 
     measurement = 'h2o_' + now.to_i.to_s
-    point = InfluxDB2::Point.new(name: measurement)
-                            .add_tag('location', 'europe')
-                            .add_field('level', 2)
-                            .time(now, InfluxDB2::WritePrecision::NANOSECOND)
+    point = InfluxDB::Point.new(name: measurement)
+                           .add_tag('location', 'europe')
+                           .add_field('level', 2)
+                           .time(now, InfluxDB::WritePrecision::NANOSECOND)
 
     client.create_write_api.write(data: point)