influxdb 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1338ae151de766b8f05c29b117133b19e4d993e0
-  data.tar.gz: e9f74096f0c73ca57877354f14919e02a81d5db6
+  metadata.gz: 4126a6d8021cd7ae64f6ebc12bd9760ef482c9df
+  data.tar.gz: 33c78e146fc49a8d0302ae0f4704837d1f3f5b9d
 SHA512:
-  metadata.gz: a18bb479c32e71163beb834f8141bdc4cf6ce4bb2f4e4f153ca0a0b28c820be8f765e1cc29a89d37868b7878fb6b9c9921f56347b5e9c4cf12802d9b8a7da66a
-  data.tar.gz: 2f008e1a615393c162cb1491317495f47b076484a275b6e9e01e42995b68835cd92523224d008dad24413a8b8739647cee82274e827359db5b20d75e8560dbf5
+  metadata.gz: 0b9ec022755c6e03bb0c2473102358c3f60b64eb80a44160ae5b0398d413e5f90c293e596a0996935a35e2ef50a2c90d091a6cb0690eab380bdca5e24b9b06e7
+  data.tar.gz: 0058ee385c54b9b0a70bf794ab16b5a94a617825b58f4a9821fbdc668b0fa37bddea415fb762eab1b6cd7e3d517c2dc5da8d8ed9d9e35ea5fb50d796d27d9de0

data/.rubocop.yml

@@ -12,6 +12,12 @@ AllCops:
 Rails:
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
 Style/StringLiterals:
   Enabled: false
 

data/CHANGELOG.md

@@ -6,6 +6,12 @@ For the full commit log, [see here](https://github.com/influxdata/influxdb-ruby/
 
 - None.
 
+## v0.3.9, released 2016-09-20
+
+- Changed retry behaviour slightly. When the server responds with an incomplete
+  response, we now assume a major server-side problem (insufficient resources,
+  e.g. out-of-memory) and cancel any retry attempts (#165, #166).
+
 ## v0.3.8, released 2016-08-31
 
 - Added support for named and positional query parameters (#160, @retorquere).

data/README.md

@@ -5,23 +5,44 @@
 The official Ruby client library for [InfluxDB](https://influxdata.com/time-series-platform/influxdb/).
 Maintained by [@toddboom](https://github.com/toddboom) and [@dmke](https://github.com/dmke).
 
+## Contents
+
+- [Platform support](#platform-support)
+- [Ruby support](#ruby-support)
+- [Installation](#installation)
+- [Usage](#usage)
+  - [Creating a client](#creating-a-client)
+  - [Administrative tasks](#administrative-tasks)
+  - [Continuous queries](#continuous-queries)
+  - [Retention policies](#retention-policies)
+  - [Writing data](#writing-data)
+  - [Reading data](#reading-data)
+    - [Querying](#querying)
+    - [De-normalization](#de--normalization)
+    - [Streaming response](#streaming-response)
+    - [Retry](#retry)
+  - [Testing](#testing)
+  - [Contributing](#contributing)
+
 ## Platform support
 
-> **Support for InfluxDB v0.8.x is now deprecated**. The final version of this library that
-> will support the older InfluxDB interface is `v0.1.9`, which is available as a gem and
-> tagged on this repository.
+> **Support for InfluxDB v0.8.x is now deprecated**. The final version of this
+> library that will support the older InfluxDB interface is `v0.1.9`, which is
+> available as a gem and tagged on this repository.
 >
-> If you're reading this message, then you should only expect support for InfluxDB v0.9.1
-> and higher.
+> If you're reading this message, then you should only expect support for
+> InfluxDB v0.9.1 and higher.
 
 ## Ruby support
 
-This gem should work with Ruby 1.9+, but starting with v0.4, we'll likely drop Ruby 1.9 support.
+This gem should work with Ruby 1.9+, but starting with v0.4, we'll likely drop
+Ruby 1.9 support.
 
-Please note that for Ruby 1.9, you'll need to install the JSON gem in version 1.8.x yourself,
-for example by pinning the version in your `Gemfile` (i.e. `gem "json", "~> 1.8.3"`).
+Please note that for Ruby 1.9, you'll need to install the JSON gem in version
+1.8.x yourself, for example by pinning the version in your `Gemfile` (i.e.
+`gem "json", "~> 1.8.3"`).
 
-## Install
+## Installation
 
 ```
 $ [sudo] gem install influxdb
@@ -175,7 +196,8 @@ query = 'SELECT COUNT(name) INTO clicksCount_1h FROM clicks GROUP BY time(1h)'
 influxdb.create_continuous_query(name, database, query)
 ```
 
-Additionally, you can specify the resample interval and the time range over which the CQ runs:
+Additionally, you can specify the resample interval and the time range over
+which the CQ runs:
 
 ``` ruby
 influxdb.create_continuous_query(name, database, query, resample_every: "10m", resample_for: "65m")
@@ -203,9 +225,9 @@ influxdb.list_retention_policies(database)
 Create a retention policy for a database:
 
 ``` ruby
-database = 'foo'
-name = '1h.cpu'
-duration = '10m'
+database    = 'foo'
+name        = '1h.cpu'
+duration    = '10m'
 replication = 2
 
 influxdb.create_retention_policy(name, database, duration, replication)
@@ -215,7 +237,7 @@ Delete a retention policy from a database:
 
 ``` ruby
 database = 'foo'
-name = '1h.cpu'
+name     = '1h.cpu'
 
 influxdb.delete_retention_policy(name, database)
 ```
@@ -223,9 +245,9 @@ influxdb.delete_retention_policy(name, database)
 Alter a retention policy for a database:
 
 ``` ruby
-database = 'foo'
-name = '1h.cpu'
-duration = '10m'
+database    = 'foo'
+name        = '1h.cpu'
+duration    = '10m'
 replication = 2
 
 influxdb.alter_retention_policy(name, database, duration, replication)
@@ -241,9 +263,7 @@ password = 'bar'
 database = 'site_development'
 name     = 'foobar'
 
-influxdb = InfluxDB::Client.new database,
-                                username: username,
-                                password: password
+influxdb = InfluxDB::Client.new database, username: username, password: password
 
 # Enumerator that emits a sine wave
 Value = (0..360).to_a.map {|i| Math.send(:sin, i / 10.0) * 10 }.each
@@ -251,7 +271,7 @@ Value = (0..360).to_a.map {|i| Math.send(:sin, i / 10.0) * 10 }.each
 loop do
   data = {
     values: { value: Value.next },
-    tags: { wave: 'sine' } # tags are optional
+    tags:   { wave: 'sine' } # tags are optional
   }
 
   influxdb.write_point(name, data)
@@ -272,9 +292,10 @@ name           = 'foobar'
 time_precision = 's'
 
 # either in the client initialization:
-influxdb = InfluxDB::Client.new database, username: username,
-                                          password: password,
-                                          time_precision: time_precision
+influxdb = InfluxDB::Client.new database,
+  username: username,
+  password: password,
+  time_precision: time_precision
 
 data = {
   values: { value: 0 },
@@ -301,12 +322,12 @@ precision = 's'
 retention = '1h.cpu'
 
 influxdb = InfluxDB::Client.new database,
-                                username: username,
-                                password: password
+  username: username,
+  password: password
 
 data = {
-  values: { value: 0 },
-  tags: { foo: 'bar', bar: 'baz' }
+  values:    { value: 0 },
+  tags:      { foo: 'bar', bar: 'baz' }
   timestamp: Time.now.to_i
 }
 
@@ -320,12 +341,12 @@ Write multiple points in a batch (performance boost):
 data = [
   {
     series: 'cpu',
-    tags: { host: 'server_1', region: 'us' },
-    values: {internal: 5, external: 0.453345}
+    tags:   { host: 'server_1', region: 'us' },
+    values: { internal: 5, external: 0.453345 }
   },
   {
     series: 'gpu',
-    values: {value: 0.9999},
+    values: { value: 0.9999 },
   }
 ]
 
@@ -335,22 +356,20 @@ influxdb.write_points(data)
 
 precision = 'm'
 influxdb.write_points(data, precision)
-
 ```
 
 Write multiple points in a batch with a specific retention policy:
 
 ``` ruby
-
 data = [
   {
     series: 'cpu',
-    tags: { host: 'server_1', region: 'us' },
-    values: {internal: 5, external: 0.453345}
+    tags:   { host: 'server_1', region: 'us' },
+    values: { internal: 5, external: 0.453345 }
   },
   {
     series: 'gpu',
-    values: {value: 0.9999},
+    values: { value: 0.9999 },
   }
 ]
 
@@ -371,13 +390,13 @@ database = 'site_development'
 name     = 'foobar'
 
 influxdb = InfluxDB::Client.new database,
-                                username: username,
-                                password: password,
-                                async:    true
+  username: username,
+  password: password,
+  async:    true
 
 data = {
-  values: { value: 0 },
-  tags: { foo: 'bar', bar: 'baz' }
+  values:    { value: 0 },
+  tags:      { foo: 'bar', bar: 'baz' },
   timestamp: Time.now.to_i
 }
 
@@ -400,9 +419,9 @@ async_options = {
 }
 
 influxdb = InfluxDB::Client.new database,
-                                username: username,
-                                password: password,
-                                async:    async_options
+  username: username,
+  password: password,
+  async:    async_options
 ```
 
 
@@ -419,7 +438,7 @@ name = 'hitchhiker'
 
 data = {
   values: { value: 666 },
-  tags: { foo: 'bar', bar: 'baz' }
+  tags:   { foo: 'bar', bar: 'baz' }
 }
 
 influxdb.write_point(name, data)
@@ -435,40 +454,77 @@ password = 'bar'
 database = 'site_development'
 
 influxdb = InfluxDB::Client.new database,
-                                username: username,
-                                password: password
+  username: username,
+  password: password
 
 # without a block:
-influxdb.query 'select * from time_series_1' # results are grouped by name, but also their tags
-
-# result:
-# [{"name"=>"time_series_1", "tags"=>{"region"=>"uk"}, "values"=>[{"time"=>"2015-07-09T09:03:31Z", "count"=>32, "value"=>0.9673}, {"time"=>"2015-07-09T09:03:49Z", "count"=>122, "value"=>0.4444}]},
-# {"name"=>"time_series_1", "tags"=>{"region"=>"us"}, "values"=>[{"time"=>"2015-07-09T09:02:54Z", "count"=>55, "value"=>0.4343}]}]
+influxdb.query 'select * from time_series_1'
+
+# results are grouped by name, but also their tags:
+#
+# [
+#   {
+#     "name"=>"time_series_1",
+#     "tags"=>{"region"=>"uk"},
+#     "values"=>[
+#       {"time"=>"2015-07-09T09:03:31Z", "count"=>32, "value"=>0.9673},
+#       {"time"=>"2015-07-09T09:03:49Z", "count"=>122, "value"=>0.4444}
+#     ]
+#   },
+#   {
+#     "name"=>"time_series_1",
+#     "tags"=>{"region"=>"us"},
+#     "values"=>[
+#       {"time"=>"2015-07-09T09:02:54Z", "count"=>55, "value"=>0.4343}
+#     ]
+#   }
+# ]
 
 # with a block:
 influxdb.query 'select * from time_series_1' do |name, tags, points|
-  puts "#{name} [ #{tags} ] => #{points}"
+  puts "#{name} [ #{tags.inspect} ]"
+  points.each do |pt|
+    puts "  -> #{pt.inspect}"
+  end
 end
 
 # result:
-# time_series_1 [ {"region"=>"uk"} ] => [{"time"=>"2015-07-09T09:03:31Z", "count"=>32, "value"=>0.9673}, {"time"=>"2015-07-09T09:03:49Z", "count"=>122, "value"=>0.4444}]
-# time_series_1 [ {"region"=>"us"} ] => [{"time"=>"2015-07-09T09:02:54Z", "count"=>55, "value"=>0.4343}]
+# time_series_1 [ {"region"=>"uk"} ]
+#   -> {"time"=>"2015-07-09T09:03:31Z", "count"=>32, "value"=>0.9673}
+#   -> {"time"=>"2015-07-09T09:03:49Z", "count"=>122, "value"=>0.4444}]
+# time_series_1 [ {"region"=>"us"} ]
+#   -> {"time"=>"2015-07-09T09:02:54Z", "count"=>55, "value"=>0.4343}
 ```
 
-If you would rather receive points with integer timestamp, it's possible to set `epoch` parameter:
+If you would rather receive points with integer timestamp, it's possible to set
+`epoch` parameter:
 
 ``` ruby
 # globally, on client initialization:
 influxdb = InfluxDB::Client.new database, epoch: 's'
 
 influxdb.query 'select * from time_series'
-# result:
-# [{"name"=>"time_series", "tags"=>{"region"=>"uk"}, "values"=>[{"time"=>1438411376, "count"=>32, "value"=>0.9673}]}]
+# [
+#   {
+#     "name"=>"time_series",
+#     "tags"=>{"region"=>"uk"},
+#     "values"=>[
+#       {"time"=>1438411376, "count"=>32, "value"=>0.9673}
+#     ]
+#   }
+# ]
 
 # or for a specific query call:
 influxdb.query 'select * from time_series', epoch: 'ms'
-# result:
-# [{"name"=>"time_series", "tags"=>{"region"=>"uk"}, "values"=>[{"time"=>1438411376000, "count"=>32, "value"=>0.9673}]}]
+# [
+#   {
+#     "name"=>"time_series",
+#     "tags"=>{"region"=>"uk"},
+#     "values"=>[
+#       {"time"=>1438411376000, "count"=>32, "value"=>0.9673}
+#     ]
+#   }
+# ]
 ```
 
 Working with parameterized query strings works as expected:
@@ -490,28 +546,54 @@ influxdb.query positional_params_query, params: ["foobar", 42]
 
 #### (De-) Normalization
 
-By default, InfluxDB::Client will denormalize points (received from InfluxDB as columns and rows), if you want to get _raw_ data add `denormalize: false` to initialization options or to query itself:
+By default, InfluxDB::Client will denormalize points (received from InfluxDB as
+columns and rows). If you want to get *raw* data add `denormalize: false` to
+the initialization options or to query itself:
 
 ``` ruby
 influxdb.query 'select * from time_series_1', denormalize: false
 
-# result
-[{"name"=>"time_series_1", "tags"=>{"region"=>"uk"}, "columns"=>["time", "count", "value"], "values"=>[["2015-07-09T09:03:31Z", 32, 0.9673], ["2015-07-09T09:03:49Z", 122, 0.4444]]},
- {"name"=>"time_series_1", "tags"=>{"region"=>"us"}, "columns"=>["time", "count", "value"], "values"=>[["2015-07-09T09:02:54Z", 55, 0.4343]]}]
+# [
+#   {
+#     "name"=>"time_series_1",
+#     "tags"=>{"region"=>"uk"},
+#     "columns"=>["time", "count", "value"],
+#     "values"=>[
+#       ["2015-07-09T09:03:31Z", 32, 0.9673],
+#       ["2015-07-09T09:03:49Z", 122, 0.4444]
+#     ]
+#   },
+#   {
+#     "name"=>"time_series_1",
+#     "tags"=>{"region"=>"us"},
+#     "columns"=>["time", "count", "value"],
+#     "values"=>[
+#       ["2015-07-09T09:02:54Z", 55, 0.4343]
+#     ]
+#   }
+# ]
 
 
 influxdb.query 'select * from time_series_1', denormalize: false do |name, tags, points|
-  puts "#{name} [ #{tags} ] => #{points}"
+  puts "#{name} [ #{tags.inspect} ]"
+  points.each do |key, values|
+    puts "  #{key.inspect} -> #{values.inspect}"
+  end
 end
 
-# result:
-# time_series_1 [ {"region"=>"uk"} ] => {"columns"=>["time", "count", "value"], "values"=>[["2015-07-09T09:03:31Z", 32, 0.9673], ["2015-07-09T09:03:49Z", 122, 0.4444]]}
-# time_series_1 [ {"region"=>"us"} ] => {"columns"=>["time", "count", "value"], "values"=>[["2015-07-09T09:02:54Z", 55, 0.4343]]}
+
+# time_series_1 [ {"region"=>"uk"} ]
+#   columns -> ["time", "count", "value"]
+#   values -> [["2015-07-09T09:03:31Z", 32, 0.9673], ["2015-07-09T09:03:49Z", 122, 0.4444]]}
+# time_series_1 [ {"region"=>"us"} ]
+#   columns -> ["time", "count", "value"]
+#   values -> [["2015-07-09T09:02:54Z", 55, 0.4343]]}
 ```
 
 #### Streaming response
 
-If you expect large quantities of data in a response, you may want to enable JSON streaming by setting a `chunk_size`:
+If you expect large quantities of data in a response, you may want to enable
+JSON streaming by setting a `chunk_size`:
 
 ``` ruby
 influxdb = InfluxDB::Client.new database,
@@ -520,43 +602,37 @@ influxdb = InfluxDB::Client.new database,
   chunk_size: 10000
 ```
 
-See the [official documentation](http://docs.influxdata.com/influxdb/v0.13/guides/querying_data/#chunking) for more details.
+See the [official documentation](http://docs.influxdata.com/influxdb/v0.13/guides/querying_data/#chunking)
+for more details.
 
 
 #### Retry
 
-By default, InfluxDB::Client will keep trying to connect to the database when it gets connection denied,
-if you want to retry a finite number of times (or disable retries altogether), you should pass the `:retry`
-value.
+By default, InfluxDB::Client will keep trying (with exponential fall-off) to
+connect to the database until it gets a connection. If you want to retry only
+a finite number of times (or disable retries altogether), you can pass the
+`:retry` option.
 
-`:retry` can be either `true`, `false` or an `Integer` to retry infinite times, disable retries or retry
-a finite number of times, respectively. `0` is equivalent to `false`
+`:retry` can be either `true`, `false` or an `Integer` to retry infinite times,
+disable retries or retry a finite number of times, respectively. Passing `0` is
+equivalent to `false` and `-1` is equivalent to `true`.
 
 ```
 $ irb -r influxdb
-> influxdb = InfluxDB::Client.new 'database', :retry => 4
-=> #<InfluxDB::Client:0x00000002bb5ce0 @database="database", @hosts=["localhost"],
-@port=8086, @username="root", @password="root", @use_ssl=false,
-@time_precision="s", @initial_delay=0.01, @max_delay=30,
-@open_timeout=5, @read_timeout=300, @async=false, @retry=4>
+> influxdb = InfluxDB::Client.new 'database', retry: 8
+=> #<InfluxDB::Client:0x00000002bb5ce0 ...>
 
 > influxdb.query 'select * from serie limit 1'
-E, [2014-06-02T11:04:13.416209 #22825] ERROR -- : [InfluxDB] Failed to
-contact host localhost: #<SocketError: getaddrinfo: Name or service not known> -
-retrying in 0.01s.
-E, [2014-06-02T11:04:13.433646 #22825] ERROR -- : [InfluxDB] Failed to
-contact host localhost: #<SocketError: getaddrinfo: Name or service not known> -
-retrying in 0.02s.
-E, [2014-06-02T11:04:13.462566 #22825] ERROR -- : [InfluxDB] Failed to
-contact host localhost: #<SocketError: getaddrinfo: Name or service not known> -
-retrying in 0.04s.
-E, [2014-06-02T11:04:13.510853 #22825] ERROR -- : [InfluxDB] Failed to
-contact host localhost: #<SocketError: getaddrinfo: Name or service not known> -
-retrying in 0.08s.
-SocketError: Tried 4 times to reconnect but failed.
-```
-
-If you pass `:retry => -1` it will keep trying forever until it gets the connection.
+E, [2016-08-31T23:55:18.287947 #23476] ERROR -- InfluxDB: Failed to contact host localhost: #<Errno::ECONNREFUSED: Failed to open TCP connection to localhost:8086 (Connection refused - connect(2) for "localhost" port 8086)> - retrying in 0.01s.
+E, [2016-08-31T23:55:18.298455 #23476] ERROR -- InfluxDB: Failed to contact host localhost: #<Errno::ECONNREFUSED: Failed to open TCP connection to localhost:8086 (Connection refused - connect(2) for "localhost" port 8086)> - retrying in 0.02s.
+E, [2016-08-31T23:55:18.319122 #23476] ERROR -- InfluxDB: Failed to contact host localhost: #<Errno::ECONNREFUSED: Failed to open TCP connection to localhost:8086 (Connection refused - connect(2) for "localhost" port 8086)> - retrying in 0.04s.
+E, [2016-08-31T23:55:18.359785 #23476] ERROR -- InfluxDB: Failed to contact host localhost: #<Errno::ECONNREFUSED: Failed to open TCP connection to localhost:8086 (Connection refused - connect(2) for "localhost" port 8086)> - retrying in 0.08s.
+E, [2016-08-31T23:55:18.440422 #23476] ERROR -- InfluxDB: Failed to contact host localhost: #<Errno::ECONNREFUSED: Failed to open TCP connection to localhost:8086 (Connection refused - connect(2) for "localhost" port 8086)> - retrying in 0.16s.
+E, [2016-08-31T23:55:18.600936 #23476] ERROR -- InfluxDB: Failed to contact host localhost: #<Errno::ECONNREFUSED: Failed to open TCP connection to localhost:8086 (Connection refused - connect(2) for "localhost" port 8086)> - retrying in 0.32s.
+E, [2016-08-31T23:55:18.921740 #23476] ERROR -- InfluxDB: Failed to contact host localhost: #<Errno::ECONNREFUSED: Failed to open TCP connection to localhost:8086 (Connection refused - connect(2) for "localhost" port 8086)> - retrying in 0.64s.
+E, [2016-08-31T23:55:19.562428 #23476] ERROR -- InfluxDB: Failed to contact host localhost: #<Errno::ECONNREFUSED: Failed to open TCP connection to localhost:8086 (Connection refused - connect(2) for "localhost" port 8086)> - retrying in 1.28s.
+InfluxDB::ConnectionError: Tried 8 times to reconnect but failed.
+```
 
 ## Testing
 

data/influxdb.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "bundler",  "~> 1.3"
-  spec.add_development_dependency "rspec",    "~> 3.4.0"
-  spec.add_development_dependency "webmock",  "~> 1.24.2"
-  spec.add_development_dependency "rubocop",  "~> 0.39.0"
+  spec.add_development_dependency "rspec",    "~> 3.5.0"
+  spec.add_development_dependency "webmock",  "~> 2.1.0"
+  spec.add_development_dependency "rubocop",  "~> 0.41.2"
 end

data/lib/influxdb/client/http.rb

@@ -52,7 +52,9 @@ module InfluxDB
         http = setup_ssl(http)
         yield http
 
-      rescue Timeout::Error, *InfluxDB::NET_HTTP_EXCEPTIONS => e
+      rescue *InfluxDB::NON_RECOVERABLE_EXCEPTIONS => e
+        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."

data/lib/influxdb/errors.rb

@@ -20,9 +20,12 @@ module InfluxDB # :nodoc:
   class QueryError < Error
   end
 
+  # When executing queries via HTTP, some errors can more or less safely
+  # be ignored and we can retry the query again. This following
+  # exception classes shall be deemed as "safe".
+  #
   # Taken from: https://github.com/lostisland/faraday/blob/master/lib/faraday/adapter/net_http.rb
-  NET_HTTP_EXCEPTIONS = [
-    EOFError,
+  RECOVERABLE_EXCEPTIONS = [
     Errno::ECONNABORTED,
     Errno::ECONNREFUSED,
     Errno::ECONNRESET,
@@ -33,7 +36,17 @@ module InfluxDB # :nodoc:
     Net::HTTPHeaderSyntaxError,
     Net::ProtocolError,
     SocketError,
-    Zlib::GzipFile::Error,
     (OpenSSL::SSL::SSLError if defined?(OpenSSL))
   ].compact.freeze
+
+  # Exception classes which hint to a larger problem on the server side,
+  # like insuffient resources. If we encouter on of the following, wo
+  # _don't_ retry a query but escalate it upwards.
+  NON_RECOVERABLE_EXCEPTIONS = [
+    EOFError,
+    Zlib::Error
+  ].freeze
+
+  NON_RECOVERABLE_MESSAGE = "The server has sent incomplete data" \
+    " (insufficient resources are a possible cause).".freeze
 end

data/lib/influxdb/query/retention_policy.rb

@@ -3,8 +3,9 @@ module InfluxDB
     module RetentionPolicy # :nodoc:
       def create_retention_policy(name, database, duration, replication, default = false)
         execute(
-          "CREATE RETENTION POLICY \"#{name}\" ON #{database} "\
-          "DURATION #{duration} REPLICATION #{replication}#{default ? ' DEFAULT' : ''}")
+          "CREATE RETENTION POLICY \"#{name}\" ON #{database} " \
+          "DURATION #{duration} REPLICATION #{replication}#{default ? ' DEFAULT' : ''}"
+        )
       end
 
       def list_retention_policies(database)
@@ -24,8 +25,9 @@ module InfluxDB
 
       def alter_retention_policy(name, database, duration, replication, default = false)
         execute(
-          "ALTER RETENTION POLICY \"#{name}\" ON #{database} "\
-          "DURATION #{duration} REPLICATION #{replication}#{default ? ' DEFAULT' : ''}")
+          "ALTER RETENTION POLICY \"#{name}\" ON #{database} " \
+          "DURATION #{duration} REPLICATION #{replication}#{default ? ' DEFAULT' : ''}"
+        )
       end
     end
   end

data/lib/influxdb/version.rb

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

data/spec/influxdb/cases/query_core_spec.rb

@@ -17,7 +17,7 @@ describe InfluxDB::Client do
     let(:query) { "SELECT value FROM requests_per_minute WHERE time > 1437019900" }
     let(:response) do
       { "results" => [{ "series" => [{ "name" => "requests_per_minute",
-                                       "columns" => %w( time value ) }] }] }
+                                       "columns" => %w(time value) }] }] }
     end
 
     before do

data/spec/influxdb/cases/query_with_params_spec.rb

@@ -20,7 +20,7 @@ describe InfluxDB::Client do
 
     let(:response) do
       { "results" => [{ "series" => [{ "name" => "requests_per_minute",
-                                       "columns" => %w( time value ) }] }] }
+                                       "columns" => %w(time value) }] }] }
     end
 
     before do

data/spec/influxdb/client_spec.rb

@@ -22,16 +22,19 @@ describe InfluxDB::Client do
   context "with basic auth" do
     let(:args) { { auth_method: 'basic_auth' } }
 
-    let(:stub_url) { "http://username:password@influxdb.test:9999/" }
-    let(:url) { subject.send(:full_url, '/') }
+    let(:credentials) { "username:password" }
+    let(:auth_header) { { "Authorization" => "Basic " + Base64.encode64(credentials).chomp } }
+
+    let(:stub_url)  { "http://influxdb.test:9999/" }
+    let(:url)       { subject.send(:full_url, '/') }
 
     it "GET" do
-      stub_request(:get, stub_url).to_return(body: '[]')
+      stub_request(:get, stub_url).with(headers: auth_header).to_return(body: '[]')
       expect(subject.get(url, parse: true)).to eq []
     end
 
     it "POST" do
-      stub_request(:post, stub_url).to_return(status: 204)
+      stub_request(:post, stub_url).with(headers: auth_header).to_return(status: 204)
       expect(subject.post(url, {})).to be_a(Net::HTTPNoContent)
     end
   end

data/spec/influxdb/query_builder_spec.rb

@@ -48,7 +48,7 @@ RSpec.describe InfluxDB::Query::Builder do
       let(:query)  { "SELECT value FROM rpm WHERE time > %{1}" }
       let(:params) { [] }
 
-      it { expect { subject }.to raise_error(/key\{1\} not found/) }
+      it { expect { subject }.to raise_error(/key.1. not found/) }
     end
 
     context "extra parameters" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.2
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.41.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.41.2
 description: This is the official Ruby library for InfluxDB.
 email:
 - influxdb@googlegroups.com