influxdb 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ed83d11d5fa7d16964912a9d586796f26bd785c
-  data.tar.gz: 4a30560d5455f23971e4d86afb87ea0d2918049b
+  metadata.gz: 21dc84dab9784b7ed05591fdb8a9da60b04bd7c2
+  data.tar.gz: c1c64ca06a1a2a477e2815551bd319438da95b42
 SHA512:
-  metadata.gz: f3a132de196624683b6cf3a2ecc02ec9e0f6ba2fd013432f72ca5d87c2b8e8e827250260414df002507cb554e6acca4181a05b6be6d40d4f0c36add80ffb60d7
-  data.tar.gz: 9265b98d24c2a5ebfbd1569eaf25d926285c9a45f70b1ffc480156eac612b10b59cb3277c269c8a26eac4963bd00213570d5272aa546eef979fbc3ab0c3d9186
+  metadata.gz: 8c4d7f8e1521a5d98aa70a6697573bff443823c6d7ff9841ec521ac4fca6eb2a50afacb3b161be7be78b48947861ad243835249c96e83abe65dd081fbc19aa8c
+  data.tar.gz: 2ca93da0da83248bb783236647011eff99565217fab015e7dd779b19bd936778b0ca6dd62d9fb6f40e05742e9d60a7baef7665cd3cfef726ec022405722dcdc6

data/.travis.yml

@@ -7,9 +7,9 @@ before_install:
   - gem update bundler --no-doc
   - smoke/provision.sh
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
   - ruby-head
 env:
   - TEST_TASK=spec
@@ -19,23 +19,23 @@ matrix:
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: jruby-9.1.5.0
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TEST_TASK=smoke influx_version=nightly channel=nightlies
   include:
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TEST_TASK=rubocop
     - rvm: jruby-9.1.5.0
     - rvm: jruby-head
       env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TEST_TASK=smoke influx_version=1.0.2 pkghash=3e4c349cb57507913d9abda1459bdbed
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TEST_TASK=smoke influx_version=1.1.0 pkghash=682904c350ecfc2a60ec9c6c08453ef2
-    - rvm: 2.4.1
+    - rvm: 2.4.2
       env: TEST_TASK=smoke influx_version=1.2.4 pkghash=0545d67217393282188e5d5cdedfdc85
-    - rvm: 2.4.1
-      env: TEST_TASK=smoke influx_version=1.3.2 pkghash=27b200344bed9de9df193b62a59d378f
-    - rvm: 2.4.1
+    - rvm: 2.4.2
+      env: TEST_TASK=smoke influx_version=1.3.5 pkghash=479c63bbb66561c302aff2d9bf639bf3
+    - rvm: 2.4.2
       env: TEST_TASK=smoke influx_version=nightly channel=nightlies
   fail_fast: true
 addons:

data/CHANGELOG.md

@@ -6,6 +6,10 @@ For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/
 
 - None yet.
 
+## v0.4.2, released 2017-09-26
+
+- Bugfix in `InfluxDB::PointValue`: Properly encode backslashes (#200)
+
 ## v0.4.1, released 2017-08-30
 
 - Bugfix in async client: Flush queue before exit (#198, #199 @onlynone)

data/influxdb.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'influxdb/version'

data/lib/influxdb/point_value.rb

@@ -25,7 +25,7 @@ module InfluxDB
       tag_key:      ['='.freeze, ' '.freeze, ','.freeze],
       tag_value:    ['='.freeze, ' '.freeze, ','.freeze],
       field_key:    ['='.freeze, ' '.freeze, ','.freeze, '"'.freeze],
-      field_value:  ['"'.freeze],
+      field_value:  ["\\".freeze, '"'.freeze],
     }.freeze
 
     private_constant :ESCAPES

data/lib/influxdb/query/core.rb

@@ -58,7 +58,7 @@ module InfluxDB
         data = data.is_a?(Array) ? data : [data]
         payload = generate_payload(data)
         writer.write(payload, precision, retention_policy, database)
-      rescue => e
+      rescue StandardError => e
         raise e unless config.discard_write_errors
 
         log :error, "Cannot write data: #{e.inspect}"

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB # :nodoc:
-  VERSION = "0.4.1".freeze
+  VERSION = "0.4.2".freeze
 end

data/lib/influxdb/writer/async.rb

@@ -101,8 +101,12 @@ module InfluxDB
             data = []
 
             while data.size < max_post_points && !queue.empty?
-              p = queue.pop(true) rescue next
-              data.push p
+              begin
+                p = queue.pop(true)
+                data.push p
+              rescue ThreadError
+                next
+              end
             end
 
             return if data.empty?
@@ -110,7 +114,7 @@ module InfluxDB
             begin
               log(:debug) { "Found data in the queue! (#{data.length} points)" }
               client.write(data.join("\n"), nil)
-            rescue => e
+            rescue StandardError => e
               log :error, "Cannot write data: #{e.inspect}"
             end
 

data/spec/influxdb/point_value_spec.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require "spec_helper"
 
 describe InfluxDB::PointValue do
@@ -14,21 +12,30 @@ describe InfluxDB::PointValue do
           '4= ,"\\4' => '5= ,"\\5',
           intval:           5,
           floatval:         7.0,
-          invalid_encoding: "a b",
-          non_latin:        "Улан-Удэ"
+          invalid_encoding: "a\255 b", # issue #171
+          non_latin:        "Улан-Удэ",
+          backslash:        "C:\\", # issue #200
         }
       }
-      if RUBY_VERSION > "2.0.0"
-        # see github.com/influxdata/influxdb-ruby/issues/171 for details
-        point[:values][:invalid_encoding] = "a\255 b"
-      end
       point
     end
 
     it 'should escape correctly' do
       point = InfluxDB::PointValue.new(data)
-      expected = %(1=\\ \\,"\\1,2\\=\\ \\,"\\2=3\\=\\ \\,"\\3 ) +
-                 %(4\\=\\ \\,\\"\\4="5= ,\\"\\5",intval=5i,floatval=7.0,invalid_encoding="a b",non_latin="Улан-Удэ")
+      series = [
+        %(1=\\ \\,"\\1),
+        %(2\\=\\ \\,"\\2=3\\=\\ \\,"\\3),
+      ]
+      fields = [
+        %(4\\=\\ \\,\\"\\4="5= ,\\"\\\\5"),
+        %(intval=5i),
+        %(floatval=7.0),
+        %(invalid_encoding="a b"),
+        %(non_latin="Улан-Удэ"),
+        %(backslash="C:\\\\"),
+      ]
+
+      expected = series.join(",") + " " + fields.join(",")
       expect(point.dump).to eq(expected)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake