influxdb 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 517db1c21a2efdd7d7c7e5e94ae64cca4eb3a5c3
-  data.tar.gz: dd2672cc951a3a920375902e65e9b15252d01c8d
+  metadata.gz: b721d82a22974293685ba5fc0275d58e14d91c95
+  data.tar.gz: 8b45e5a10d9d8018c3919bdc8b62651819cf18d5
 SHA512:
-  metadata.gz: febf1da8976eb80dd67dc0e85c671e1e1f650c7fdc74da7894ca2b6df9e434c63ed5fc700efc7c105899a9c8146c4ad8e61f902da73298588cb3b1f38d01c279
-  data.tar.gz: 4d735fb568163110e21c1a8cc0300658948a99489391fe41476e6308fabf16de027211ae149912328bbbd126b5823e98042ac8418f4c97e6280ce3a8b1db211a
+  metadata.gz: ed273daa7368a7529acfd072273345056eb4001402d4869e5021776fe3a9e89ce967e519a1224aaa74e01d8205982a3109e2a250e35c997d96aed01e699d8409
+  data.tar.gz: 02f5b7f0c6e4050be231d33b5dd56068faa6ec7607a20ef48d885b6c38e04f628c88673d449cc34a15c8c488951e02c987be6797421da5a2c3394371a69c3243

data/.travis.yml

@@ -39,6 +39,8 @@ matrix:
       env: TEST_TASK=smoke influx_version=0.13.0 pkghash=4f0aa76fee22cf4c18e2a0779ba4f462
     - rvm: 2.3.1
       env: TEST_TASK=smoke influx_version=1.0.2 pkghash=3e4c349cb57507913d9abda1459bdbed
+    - rvm: 2.3.1
+      env: TEST_TASK=smoke influx_version=1.1.0 pkghash=682904c350ecfc2a60ec9c6c08453ef2
     - 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.12, released 2016-11-15
+
+- Bugfix for broken Unicode support (regression introduced in #169).
+  Please note, this is only properly tested on Ruby 2.1+ (#171).
+
 ## v0.3.11, released 2016-10-12
 
 - Bugfix/Enhancement in `PointValue#escape`. Input strings are now scrubbed

data/Gemfile

@@ -2,6 +2,7 @@ source "https://rubygems.org"
 
 if RUBY_ENGINE != "jruby" && RUBY_VERSION < "2.0"
   gem "json", "~> 1.8.3"
+  gem "public_suffix", "< 1.5"
 end
 
 gemspec

data/lib/influxdb/client/http.rb

@@ -56,14 +56,13 @@ module InfluxDB
         raise InfluxDB::ConnectionError, InfluxDB::NON_RECOVERABLE_MESSAGE
       rescue Timeout::Error, *InfluxDB::RECOVERABLE_EXCEPTIONS => e
         retry_count += 1
-        if (config.retry == -1 || retry_count <= config.retry) && !stopped?
-          log :error, "Failed to contact host #{host}: #{e.inspect} - retrying in #{delay}s."
-          sleep delay
-          delay = [config.max_delay, delay * 2].min
-          retry
-        else
+        unless (config.retry == -1 || retry_count <= config.retry) && !stopped?
           raise InfluxDB::ConnectionError, "Tried #{retry_count - 1} times to reconnect but failed."
         end
+        log :error, "Failed to contact host #{host}: #{e.inspect} - retrying in #{delay}s."
+        sleep delay
+        delay = [config.max_delay, delay * 2].min
+        retry
       ensure
         http.finish if http.started?
       end

data/lib/influxdb/point_value.rb

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

data/lib/influxdb/version.rb

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

data/spec/influxdb/cases/query_continuous_query_spec.rb

@@ -22,11 +22,9 @@ describe InfluxDB::Client do
     let(:database) { "testdb" }
     let(:response) do
       { "results" => [{ "series" => [{ "name" => "otherdb", "columns" => %w(name query),
-                                       "values" =>
-                                          [["clicks_per_hour", "CREATE CONTINUOUS QUERY clicks_per_hour ON otherdb BEGIN SELECT count(name) INTO \"otherdb\".\"default\".clicksCount_1h FROM \"otherdb\".\"default\".clicks GROUP BY time(1h) END"]] },
+                                       "values" => [["clicks_per_hour", "CREATE CONTINUOUS QUERY clicks_per_hour ON otherdb BEGIN SELECT count(name) INTO \"otherdb\".\"default\".clicksCount_1h FROM \"otherdb\".\"default\".clicks GROUP BY time(1h) END"]] },
                                      { "name" => "testdb", "columns" => %w(name query),
-                                       "values" =>
-                                          [["event_counts", "CREATE CONTINUOUS QUERY event_counts ON testdb BEGIN SELECT count(type) INTO \"testdb\".\"default\".typeCount_10m_byType FROM \"testdb\".\"default\".events GROUP BY time(10m), type END"]] }] }] }
+                                       "values" => [["event_counts", "CREATE CONTINUOUS QUERY event_counts ON testdb BEGIN SELECT count(type) INTO \"testdb\".\"default\".typeCount_10m_byType FROM \"testdb\".\"default\".events GROUP BY time(10m), type END"]] }] }] }
     end
 
     let(:expected_result) do

data/spec/influxdb/cases/query_database_spec.rb

@@ -16,14 +16,18 @@ describe InfluxDB::Client do
   end
 
   let(:args) { {} }
+  let(:query) { nil }
+  let(:response) { { "results" => [] } }
+
+  before do
+    stub_request(:get, "http://influxdb.test:9999/query").with(
+      query: { u: "username", p: "password", q: query }
+    ).to_return(body: JSON.generate(response))
+  end
 
   describe "#create_database" do
     describe "from param" do
-      before do
-        stub_request(:get, "http://influxdb.test:9999/query").with(
-          query: { u: "username", p: "password", q: "CREATE DATABASE foo" }
-        )
-      end
+      let(:query) { "CREATE DATABASE foo" }
 
       it "should GET to create a new database" do
         expect(subject.create_database("foo")).to be_a(Net::HTTPOK)
@@ -31,11 +35,7 @@ describe InfluxDB::Client do
     end
 
     describe "from config" do
-      before do
-        stub_request(:get, "http://influxdb.test:9999/query").with(
-          query: { u: "username", p: "password", q: "CREATE DATABASE database" }
-        )
-      end
+      let(:query) { "CREATE DATABASE database" }
 
       it "should GET to create a new database using database name from config" do
         expect(subject.create_database).to be_a(Net::HTTPOK)
@@ -45,11 +45,7 @@ describe InfluxDB::Client do
 
   describe "#delete_database" do
     describe "from param" do
-      before do
-        stub_request(:get, "http://influxdb.test:9999/query").with(
-          query: { u: "username", p: "password", q: "DROP DATABASE foo" }
-        )
-      end
+      let(:query) { "DROP DATABASE foo" }
 
       it "should GET to remove a database" do
         expect(subject.delete_database("foo")).to be_a(Net::HTTPOK)
@@ -57,11 +53,7 @@ describe InfluxDB::Client do
     end
 
     describe "from config" do
-      before do
-        stub_request(:get, "http://influxdb.test:9999/query").with(
-          query: { u: "username", p: "password", q: "DROP DATABASE database" }
-        )
-      end
+      let(:query) { "DROP DATABASE database" }
 
       it "should GET to remove a database using database name from config" do
         expect(subject.delete_database).to be_a(Net::HTTPOK)
@@ -70,15 +62,10 @@ describe InfluxDB::Client do
   end
 
   describe "#list_databases" do
+    let(:query) { "SHOW DATABASES" }
     let(:response) { { "results" => [{ "series" => [{ "name" => "databases", "columns" => ["name"], "values" => [["foobar"]] }] }] } }
     let(:expected_result) { [{ "name" => "foobar" }] }
 
-    before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: "SHOW DATABASES" }
-      ).to_return(body: JSON.generate(response), status: 200)
-    end
-
     it "should GET a list of databases" do
       expect(subject.list_databases).to eq(expected_result)
     end

data/spec/influxdb/cases/query_retention_policy_spec.rb

@@ -16,17 +16,20 @@ describe InfluxDB::Client do
   end
 
   let(:args) { {} }
+  let(:query) { nil }
+  let(:response) { { "results" => [] } }
+
+  before do
+    stub_request(:get, "http://influxdb.test:9999/query").with(
+      query: { u: "username", p: "password", q: query }
+    ).to_return(body: JSON.generate(response))
+  end
 
   describe "#list_retention_policies" do
     let(:response) { { "results" => [{ "series" => [{ "columns" => %w(name duration replicaN default), "values" => [["default", "0", 1, true], ["another", "1", 2, false]] }] }] } }
+    let(:query) { "SHOW RETENTION POLICIES ON \"database\"" }
     let(:expected_result) { [{ "name" => "default", "duration" => "0", "replicaN" => 1, "default" => true }, { "name" => "another", "duration" => "1", "replicaN" => 2, "default" => false }] }
 
-    before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: "SHOW RETENTION POLICIES ON \"database\"" }
-      ).to_return(body: JSON.generate(response), status: 200)
-    end
-
     it "should GET a list of retention policies" do
       expect(subject.list_retention_policies('database')).to eq(expected_result)
     end
@@ -34,17 +37,7 @@ describe InfluxDB::Client do
 
   describe "#create_retention_policy" do
     context "default" do
-      before do
-        stub_request(:get, "http://influxdb.test:9999/query")
-          .with(
-            query:
-              {
-                u: "username",
-                p: "password",
-                q: "CREATE RETENTION POLICY \"1h.cpu\" ON foo DURATION 1h REPLICATION 2 DEFAULT"
-              }
-          )
-      end
+      let(:query) { "CREATE RETENTION POLICY \"1h.cpu\" ON foo DURATION 1h REPLICATION 2 DEFAULT" }
 
       it "should GET to create a new database" do
         expect(subject.create_retention_policy('1h.cpu', 'foo', '1h', 2, true)).to be_a(Net::HTTPOK)
@@ -52,17 +45,7 @@ describe InfluxDB::Client do
     end
 
     context "non-default" do
-      before do
-        stub_request(:get, "http://influxdb.test:9999/query")
-          .with(
-            query:
-              {
-                u: "username",
-                p: "password",
-                q: "CREATE RETENTION POLICY \"1h.cpu\" ON foo DURATION 1h REPLICATION 2"
-              }
-          )
-      end
+      let(:query) { "CREATE RETENTION POLICY \"1h.cpu\" ON foo DURATION 1h REPLICATION 2" }
 
       it "should GET to create a new database" do
         expect(subject.create_retention_policy('1h.cpu', 'foo', '1h', 2)).to be_a(Net::HTTPOK)
@@ -71,11 +54,7 @@ describe InfluxDB::Client do
   end
 
   describe "#delete_retention_policy" do
-    before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: "DROP RETENTION POLICY \"1h.cpu\" ON foo" }
-      )
-    end
+    let(:query) { "DROP RETENTION POLICY \"1h.cpu\" ON foo" }
 
     it "should GET to remove a database" do
       expect(subject.delete_retention_policy('1h.cpu', 'foo')).to be_a(Net::HTTPOK)
@@ -84,17 +63,7 @@ describe InfluxDB::Client do
 
   describe "#alter_retention_policy" do
     context "default" do
-      before do
-        stub_request(:get, "http://influxdb.test:9999/query")
-          .with(
-            query:
-              {
-                u: "username",
-                p: "password",
-                q: "ALTER RETENTION POLICY \"1h.cpu\" ON foo DURATION 1h REPLICATION 2 DEFAULT"
-              }
-          )
-      end
+      let(:query) { "ALTER RETENTION POLICY \"1h.cpu\" ON foo DURATION 1h REPLICATION 2 DEFAULT" }
 
       it "should GET to alter a new database" do
         expect(subject.alter_retention_policy('1h.cpu', 'foo', '1h', 2, true)).to be_a(Net::HTTPOK)
@@ -102,17 +71,7 @@ describe InfluxDB::Client do
     end
 
     context "non-default" do
-      before do
-        stub_request(:get, "http://influxdb.test:9999/query")
-          .with(
-            query:
-              {
-                u: "username",
-                p: "password",
-                q: "ALTER RETENTION POLICY \"1h.cpu\" ON foo DURATION 1h REPLICATION 2"
-              }
-          )
-      end
+      let(:query) { "ALTER RETENTION POLICY \"1h.cpu\" ON foo DURATION 1h REPLICATION 2" }
 
       it "should GET to alter a new database" do
         expect(subject.alter_retention_policy('1h.cpu', 'foo', '1h', 2)).to be_a(Net::HTTPOK)

data/spec/influxdb/cases/query_user_spec.rb

@@ -16,18 +16,20 @@ describe InfluxDB::Client do
   end
 
   let(:args) { {} }
+  let(:query) { nil }
+  let(:response) { { "results" => [] } }
+
+  before do
+    stub_request(:get, "http://influxdb.test:9999/query").with(
+      query: { u: "username", p: "password", q: query }
+    ).to_return(body: JSON.generate(response))
+  end
 
   describe "#update user password" do
     let(:user) { 'useruser' }
     let(:pass) { 'passpass' }
     let(:query) { "SET PASSWORD FOR #{user} = '#{pass}'" }
 
-    before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: query }
-      )
-    end
-
     it "should GET to update user password" do
       expect(subject.update_user_password(user, pass)).to be_a(Net::HTTPOK)
     end
@@ -39,12 +41,6 @@ describe InfluxDB::Client do
     let(:db) { 'foo' }
     let(:query) { "GRANT #{perm.to_s.upcase} ON #{db} TO #{user}" }
 
-    before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: query }
-      )
-    end
-
     it "should GET to grant privileges for a user on a database" do
       expect(subject.grant_user_privileges(user, db, perm)).to be_a(Net::HTTPOK)
     end
@@ -54,12 +50,6 @@ describe InfluxDB::Client do
     let(:user) { 'useruser' }
     let(:query) { "GRANT ALL PRIVILEGES TO #{user}" }
 
-    before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: query }
-      )
-    end
-
     it "should GET to grant privileges for a user on a database" do
       expect(subject.grant_user_admin_privileges(user)).to be_a(Net::HTTPOK)
     end
@@ -71,12 +61,6 @@ describe InfluxDB::Client do
     let(:db) { 'foo' }
     let(:query) { "REVOKE #{perm.to_s.upcase} ON #{db} FROM #{user}" }
 
-    before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: query }
-      )
-    end
-
     it "should GET to revoke privileges from a user on a database" do
       expect(subject.revoke_user_privileges(user, db, perm)).to be_a(Net::HTTPOK)
     end
@@ -88,12 +72,6 @@ describe InfluxDB::Client do
     let(:db) { 'foo' }
     let(:query) { "CREATE user #{user} WITH PASSWORD '#{pass}'; GRANT ALL ON #{db} TO #{user}" }
 
-    before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: query }
-      )
-    end
-
     context "without specifying permissions" do
       it "should GET to create a new database user with all permissions" do
         expect(subject.create_database_user(db, user, pass)).to be_a(Net::HTTPOK)
@@ -114,12 +92,6 @@ describe InfluxDB::Client do
     let(:user) { 'useruser' }
     let(:query) { "DROP USER #{user}" }
 
-    before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: query }
-      )
-    end
-
     it "should GET to delete a user" do
       expect(subject.delete_user(user)).to be_a(Net::HTTPOK)
     end
@@ -127,14 +99,9 @@ describe InfluxDB::Client do
 
   describe "#list_users" do
     let(:response) { { "results" => [{ "series" => [{ "columns" => %w(user admin), "values" => [["dbadmin", true], ["foobar", false]] }] }] } }
+    let(:query) { "SHOW USERS" }
     let(:expected_result) { [{ "username" => "dbadmin", "admin" => true }, { "username" => "foobar", "admin" => false }] }
 
-    before do
-      stub_request(:get, "http://influxdb.test:9999/query").with(
-        query: { u: "username", p: "password", q: "SHOW USERS" }
-      ).to_return(body: JSON.generate(response, status: 200))
-    end
-
     it "should GET a list of database users" do
       expect(subject.list_users).to eq(expected_result)
     end

data/spec/influxdb/point_value_spec.rb

@@ -1,26 +1,34 @@
+# encoding: UTF-8
+
 require "spec_helper"
 
 describe InfluxDB::PointValue do
   describe "escaping" do
     let(:data) do
-      {
+      point = {
         series: '1= ,"\\1',
         tags: {
           '2= ,"\\2' => '3= ,"\\3'
         },
         values: {
           '4= ,"\\4' => '5= ,"\\5',
-          intval:       5,
-          floatval:     7.0,
-          encoding:     "a\255 b"
+          intval:           5,
+          floatval:         7.0,
+          invalid_encoding: "a b",
+          non_latin:        "Улан-Удэ"
         }
       }
+      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,encoding="a b")
+                 %(4\\=\\ \\,\\"\\4="5= ,\\"\\5",intval=5i,floatval=7.0,invalid_encoding="a b",non_latin="Улан-Удэ")
       expect(point.dump).to eq(expected)
     end
   end

data/spec/spec_helper.rb

@@ -22,7 +22,7 @@ RSpec.configure do |config|
     logfile = File.open("tmp/spec.log", File::WRONLY | File::TRUNC | File::CREAT)
 
     InfluxDB::Logging.logger = Logger.new(logfile).tap do |logger|
-      logger.formatter = proc {|severity, _datetime, progname, message|
+      logger.formatter = proc { |severity, _datetime, progname, message|
         "%-5s - %s: %s\n".format severity, progname, message
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json