influxdb 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1335ca5adba19fcf5c4e9aefaa7860ccbfe5cc8
-  data.tar.gz: dd6c3fafc967d12eb4854db1ae7e0a3604257301
+  metadata.gz: 517db1c21a2efdd7d7c7e5e94ae64cca4eb3a5c3
+  data.tar.gz: dd2672cc951a3a920375902e65e9b15252d01c8d
 SHA512:
-  metadata.gz: 4a0e9060cd27e1700f8bc814f0aff76ef41baa592a906ec1da2b61eb7d4bc558ca1cb6edc3297b057f5482334b6f855ffea36ee6b14f725882f80973d9bf2816
-  data.tar.gz: 7282436fe2ae3b971910561851c3c2ea1d328185ea08dcc6a1b666d477a99f8142df36dc7dd6b79546f9ea9392a7851a066a95417b543578f34de2204aa127a9
+  metadata.gz: febf1da8976eb80dd67dc0e85c671e1e1f650c7fdc74da7894ca2b6df9e434c63ed5fc700efc7c105899a9c8146c4ad8e61f902da73298588cb3b1f38d01c279
+  data.tar.gz: 4d735fb568163110e21c1a8cc0300658948a99489391fe41476e6308fabf16de027211ae149912328bbbd126b5823e98042ac8418f4c97e6280ce3a8b1db211a

data/.travis.yml

@@ -38,7 +38,7 @@ matrix:
     - rvm: 2.3.1
       env: TEST_TASK=smoke influx_version=0.13.0 pkghash=4f0aa76fee22cf4c18e2a0779ba4f462
     - rvm: 2.3.1
-      env: TEST_TASK=smoke influx_version=1.0.0 pkghash=a25daf049d2482166b248fe2d0be4b69
+      env: TEST_TASK=smoke influx_version=1.0.2 pkghash=3e4c349cb57507913d9abda1459bdbed
     - rvm: 2.3.1
       env: TEST_TASK=smoke influx_version=nightly channel=nightlies
   fail_fast: true

data/CHANGELOG.md

@@ -6,6 +6,11 @@ For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/
 
 - None.
 
+## v0.3.11, released 2016-10-12
+
+- Bugfix/Enhancement in `PointValue#escape`. Input strings are now scrubbed
+  of invalid UTF byte sequences (#169, @ton31337).
+
 ## v0.3.10, released 2016-10-03
 
 - Bugfix in `Query::Builder#quote` (#168, @cthulhu666).

data/lib/influxdb/point_value.rb

@@ -30,8 +30,14 @@ module InfluxDB
     }.freeze
 
     def escape(s, type)
+      # rubocop:disable Style/AlignParameters
+      s = s.encode "UTF-8".freeze, "binary".freeze,
+        invalid: :replace,
+        undef: :replace,
+        replace: "".freeze
+
       ESCAPES[type].each do |ch|
-        s = s.gsub(ch) { "\\#{ch}" }
+        s = s.encode.gsub(ch) { "\\#{ch}" }
       end
       s
     end

data/lib/influxdb/version.rb

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

data/smoke/noaa-sample-data.rb

@@ -12,11 +12,19 @@ client = InfluxDB::Client.new \
   password: "resu_tset",
   retry:    4
 
+TestFailure         = Class.new StandardError
+TestAllowedFailure  = Class.new StandardError
+
 def test_case(name)
   print name
   yield
   puts " [ OK ]"
-rescue
+
+rescue TestAllowedFailure
+  puts " [WARN]"
+  puts $!.message
+
+rescue TestFailure
   puts " [FAIL]"
   puts $!.message
   exit 1
@@ -27,21 +35,27 @@ test_case "See all five measurements?" do
   expected    = %w[ average_temperature h2o_feet h2o_pH h2o_quality h2o_temperature ]
   actual      = result[0]["values"].map{|v| v["name"] }
   unexpected  = actual - expected
-  raise "unexpected measurements: #{unexpected.join(", ")}" if unexpected.any?
+  if unexpected.any?
+    raise TestFailure, "unexpected measurements: #{unexpected.join(", ")}"
+  end
 end
 
 test_case "Count the number of non-null values of water_level in h2o_feet" do
   result      = client.query "select count(water_level) from h2o_feet"
   expected    = 15258
   actual      = result[0]["values"][0]["count"]
-  raise "expected to find #{expected} points, got #{actual}" if expected != actual
+  if expected != actual
+    raise TestFailure, "expected to find #{expected} points, got #{actual}"
+  end
 end
 
 test_case "Select the first five observations in the measurement h2o_feet" do
   result    = client.query("select * from h2o_feet limit 5").first["values"]
   expected  = 5
   actual    = result.size
-  raise "expected #{expected} observations, got #{actual}" if expected != actual
+  if expected != actual
+    raise TestFailure, "expected #{expected} observations, got #{actual}"
+  end
 
   expected = {
     "time"              => "2015-08-18T00:00:00Z",
@@ -49,7 +63,9 @@ test_case "Select the first five observations in the measurement h2o_feet" do
     "location"          => "coyote_creek",
     "water_level"       => 8.12
   }
-  raise "unexpected first result, got #{result[0]}" if expected != result[0]
+  if expected != result[0]
+    raise TestAllowedFailure, "unexpected first result, got #{result[0]}"
+  end
 
   expected = {
     "time"              => "2015-08-18T00:12:00Z",
@@ -57,5 +73,7 @@ test_case "Select the first five observations in the measurement h2o_feet" do
     "location"          => "coyote_creek",
     "water_level"       => 7.887
   }
-  raise "unexpected last result, got #{result[-1]}" if expected != result[-1]
+  if expected != result[-1]
+    raise TestAllowedFailure, "unexpected last result, got #{result[-1]}"
+  end
 end

data/spec/influxdb/point_value_spec.rb

@@ -5,15 +5,22 @@ describe InfluxDB::PointValue do
     let(:data) do
       {
         series: '1= ,"\\1',
-        tags: { '2= ,"\\2' => '3= ,"\\3' },
-        values: { '4= ,"\\4' => '5= ,"\\5', intval: 5, floatval: 7.0 }
+        tags: {
+          '2= ,"\\2' => '3= ,"\\3'
+        },
+        values: {
+          '4= ,"\\4' => '5= ,"\\5',
+          intval:       5,
+          floatval:     7.0,
+          encoding:     "a\255 b"
+        }
       }
     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)
+                 %(4\\=\\ \\,\\"\\4="5= ,\\"\\5",intval=5i,floatval=7.0,encoding="a b")
       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.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json