influxdb-client 1.5.0.pre.902 → 1.6.0.pre.991

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fb881dfbea813cd8a4c63dbf778de162fc4f1ba37be58a0555f64794a9fa25e
-  data.tar.gz: 3266cfa6a527ef97310db6b31aa8777341d76280a481cc15f44dac5fdd1fba5a
+  metadata.gz: 0156a96fd72e6c6399a477be62f2dede9f0e304877ccf8ccf000f0cc4036e30d
+  data.tar.gz: a1e090188d81d22b7005805a6600c939c0da47d84952faf2b8ae74fbe18794e8
 SHA512:
-  metadata.gz: 9ddf825b908fa9806cb1edf1215d185478ad38369e36e513f21c3a0cb97ffafdb48a7f779faced596aab77c7ea469626b6c3d3544847dfae7a992744ac8215b4
-  data.tar.gz: 48d55a91cbf597ee0b8a3afa12019ab157c0f24c3a237b7c245bbd1246f459a66b691b5fdec9d6584f2158214d24cbf53433def87b61e68f11b918523d4d2b9b
+  metadata.gz: cc8a078ca5f9130aaafa9ed1654a0ac1923d02cde7bdaa797d96968ced146698834bb3633769f4dd603b05fc4171dc98d98cc492ca6da8fc48787c4445bb20da
+  data.tar.gz: b42eee4713e33c84ee40fe9c608adfa226925cb2748038c6ce1f4f207a9d69ae6bed4bdd312c19c03bddd5e4ba83c01880022a1f2aac1e011662b2bd012c7619

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 1.5.0 [unreleased]
+## 1.6.0 [unreleased]
+
+### Bug Fixes
+1. [#42](https://github.com/influxdata/influxdb-client-ruby/pull/42): Fixed serialization of `\n`, `\r` and `\t` to Line Protocol, `=` is valid sign for measurement name  
+1. [#44](https://github.com/influxdata/influxdb-client-ruby/pull/44): Fixed supporting of Ruby 2.2
+
+## 1.5.0 [2020-06-19]
 
 ### API
 1. [#41](https://github.com/influxdata/influxdb-client-ruby/pull/41): Updated swagger to latest version

data/README.md

@@ -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.4.0
+gem install influxdb-client -v 1.5.0
 ```
 
 ## Usage
@@ -122,7 +122,7 @@ The writes are processed in batches which are configurable by `WriteOptions`:
 | Property | Description | Default Value |
 | --- | --- | --- |
 | batchSize | the number of data point to collect in batch | 1000 |
-| flushInterval | the number of milliseconds before the batch is written | 1000 |
+| flush_interval | the number of milliseconds before the batch is written | 1000 |
 | retry_interval | the number of milliseconds to retry unsuccessful write. The retry interval is used when the InfluxDB server does not specify "Retry-After" header. | 1000 |
 | jitter_interval | the number of milliseconds to increase the batch flush interval by a random amount | 0 |
 

data/lib/influxdb2/client/point.rb

@@ -21,6 +21,8 @@
 module InfluxDB2
   DEFAULT_WRITE_PRECISION = WritePrecision::NANOSECOND
   ESCAPE_KEY_LIST = ['\\'.freeze, ','.freeze, ' '.freeze, '='.freeze].freeze
+  ESCAPE_MEASUREMENT_LIST = ['\\'.freeze, ','.freeze, ' '.freeze].freeze
+  REPLACE_KEY_LIST = { "\n".freeze => '\n'.freeze, "\r".freeze => '\r'.freeze, "\t".freeze => '\t'.freeze }.freeze
   ESCAPE_VALUE_LIST = ['\\'.freeze, '"'.freeze].freeze
 
   # Point defines the values that will be written to the database.
@@ -113,7 +115,7 @@ module InfluxDB2
     # @return a string representation of the point
     def to_line_protocol
       line_protocol = ''
-      measurement = _escape_key(@name || '')
+      measurement = _escape_key(@name || '', ESCAPE_MEASUREMENT_LIST)
 
       line_protocol << measurement
 
@@ -161,11 +163,14 @@ module InfluxDB2
       end.reject(&:nil?).join(','.freeze)
     end
 
-    def _escape_key(value)
+    def _escape_key(value, escape_list = ESCAPE_KEY_LIST)
       result = value.dup
-      ESCAPE_KEY_LIST.each do |ch|
+      escape_list.each do |ch|
         result = result.gsub(ch) { "\\#{ch}" }
       end
+      REPLACE_KEY_LIST.keys.each do |ch|
+        result = result.gsub(ch) { REPLACE_KEY_LIST[ch] }
+      end
       result
     end
 

data/lib/influxdb2/client/version.rb

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

data/lib/influxdb2/client/worker.rb

@@ -99,7 +99,7 @@ module InfluxDB2
     end
 
     def _write_raw(key, points)
-      if @write_options.jitter_interval.positive?
+      if @write_options.jitter_interval > 0
         jitter_delay = (@write_options.jitter_interval.to_f / 1_000) * rand
         sleep jitter_delay
       end

data/test/influxdb/point_test.rb

@@ -218,4 +218,25 @@ class PointTest < MiniTest::Test
 
     assert_equal 'h2o level=2i 123', point.to_line_protocol
   end
+
+  def test_tag_escaping
+    point = InfluxDB2::Point.new(name: "h\n2\ro\t_data")
+                            .add_tag("new\nline", "new\nline")
+                            .add_tag("carriage\rreturn", "carriage\nreturn")
+                            .add_tag("t\tab", "t\tab")
+                            .add_field('level', 2)
+
+    puts point.to_line_protocol
+
+    assert_equal 'h\\n2\\ro\\t_data,carriage\\rreturn=carriage\\nreturn,new\\nline=new\\nline,t\\tab=t\\tab level=2i',
+                 point.to_line_protocol
+  end
+
+  def test_equal_sign_escaping
+    point = InfluxDB2::Point.new(name: 'h=2o')
+                            .add_tag('l=ocation', 'e=urope')
+                            .add_field('l=evel', 2)
+
+    assert_equal 'h=2o,l\\=ocation=e\\=urope l\\=evel=2i', point.to_line_protocol
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.902
+  version: 1.6.0.pre.991
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler