influxdb 0.3.17 → 0.4.0

data/lib/influxdb/errors.rb

@@ -2,23 +2,12 @@ require "net/http"
 require "zlib"
 
 module InfluxDB # :nodoc:
-  class Error < StandardError
-  end
-
-  class AuthenticationError < Error
-  end
-
-  class ConnectionError < Error
-  end
-
-  class SeriesNotFound < Error
-  end
-
-  class JSONParserError < Error
-  end
-
-  class QueryError < Error
-  end
+  Error               = Class.new StandardError
+  AuthenticationError = Class.new Error
+  ConnectionError     = Class.new Error
+  SeriesNotFound      = Class.new Error
+  JSONParserError     = Class.new Error
+  QueryError          = Class.new Error
 
   # When executing queries via HTTP, some errors can more or less safely
   # be ignored and we can retry the query again. This following

data/lib/influxdb/logging.rb

@@ -6,18 +6,40 @@ module InfluxDB
 
     class << self
       attr_writer :logger
-    end
+      attr_writer :log_level
+
+      def logger
+        return false if @logger == false
+        @logger ||= ::Logger.new(STDERR).tap { |logger| logger.level = Logger::INFO }
+      end
 
-    def self.logger
-      return false if @logger == false
-      @logger ||= ::Logger.new(STDERR).tap { |logger| logger.level = Logger::INFO }
+      def log_level
+        @log_level || Logger::INFO
+      end
+
+      def log?(level)
+        case level
+        when :debug then log_level <= Logger::DEBUG
+        when :info  then log_level <= Logger::INFO
+        when :warn  then log_level <= Logger::WARN
+        when :error then log_level <= Logger::ERROR
+        when :fatal then log_level <= Logger::FATAL
+        else true
+        end
+      end
     end
 
     private
 
-    def log(level, message)
+    def log(level, message = nil, &block)
       return unless InfluxDB::Logging.logger
-      InfluxDB::Logging.logger.send(level.to_sym, PREFIX) { message }
+      return unless InfluxDB::Logging.log?(level)
+
+      if block_given?
+        InfluxDB::Logging.logger.send(level.to_sym, PREFIX, &block)
+      else
+        InfluxDB::Logging.logger.send(level.to_sym, PREFIX) { message }
+      end
     end
   end
 end

data/lib/influxdb/point_value.rb

@@ -25,11 +25,13 @@ module InfluxDB
       tag_key:      ['='.freeze, ' '.freeze, ','.freeze],
       tag_value:    ['='.freeze, ' '.freeze, ','.freeze],
       field_key:    ['='.freeze, ' '.freeze, ','.freeze, '"'.freeze],
-      field_value:  ["\\".freeze, '"'.freeze],
+      field_value:  ['"'.freeze],
     }.freeze
 
+    private_constant :ESCAPES
+
     def escape(s, type)
-      # rubocop:disable Style/AlignParameters
+      # rubocop:disable Layout/AlignParameters
       s = s.encode "UTF-8".freeze, "UTF-8".freeze,
         invalid: :replace,
         undef: :replace,
@@ -47,12 +49,12 @@ module InfluxDB
         key = escape(k.to_s, :field_key)
         val = escape_value(v)
         "#{key}=#{val}"
-      end.join(",")
+      end.join(",".freeze)
     end
 
     def escape_value(value)
       if value.is_a?(String)
-        '"' + escape(value, :field_value) + '"'
+        '"'.freeze + escape(value, :field_value) + '"'.freeze
       elsif value.is_a?(Integer)
         "#{value}i"
       else
@@ -67,7 +69,7 @@ module InfluxDB
         key = escape(k.to_s, :tag_key)
         val = escape(v.to_s, :tag_value)
 
-        "#{key}=#{val}" unless key == "" || val == ""
+        "#{key}=#{val}" unless key == "".freeze || val == "".freeze
       end.compact
 
       tags.join(",") unless tags.empty?

data/lib/influxdb/query/builder.rb

@@ -10,7 +10,6 @@ module InfluxDB
         end
 
         query % params
-
       rescue KeyError => e
         raise ArgumentError, e.message
       end
@@ -18,7 +17,7 @@ module InfluxDB
       def quote(param)
         case param
         when String, Symbol
-          "'" + param.to_s.gsub(/['"\\\x0]/, '\\\\\0') + "'"
+          "'".freeze + param.to_s.gsub(/['"\\\x0]/, '\\\\\0') + "'".freeze
         when Integer, Float, TrueClass, FalseClass
           param.to_s
         else

data/lib/influxdb/query/cluster.rb

@@ -6,7 +6,7 @@ module InfluxDB
       end
 
       def list_cluster_admins
-        list_users.select { |u| u['admin'] }.map { |u| u['username'] }
+        list_users.select { |u| u["admin".freeze] }.map { |u| u["username".freeze] }
       end
 
       def revoke_cluster_admin_privileges(username)

data/lib/influxdb/query/continuous_query.rb

@@ -10,16 +10,16 @@ module InfluxDB
           .map { |v| { 'name' => v.first, 'query' => v.last } }
       end
 
-      def create_continuous_query(name, database, query, options = {})
+      def create_continuous_query(name, database, query, resample_every: nil, resample_for: nil)
         clause = ["CREATE CONTINUOUS QUERY", name, "ON", database]
 
-        if options[:resample_every] || options[:resample_for]
-          clause << "RESAMPLE"
-          clause << "EVERY #{options[:resample_every]}" if options[:resample_every]
-          clause << "FOR #{options[:resample_for]}"     if options[:resample_for]
+        if resample_every || resample_for
+          clause << "RESAMPLE".freeze
+          clause << "EVERY #{resample_every}" if resample_every
+          clause << "FOR #{resample_for}"     if resample_for
         end
 
-        clause = clause.join(" ") << " BEGIN\n" << query << "\nEND"
+        clause = clause.join(" ".freeze) << " BEGIN\n".freeze << query << "\nEND".freeze
         execute(clause)
       end
 

data/lib/influxdb/query/core.rb

@@ -18,14 +18,17 @@ module InfluxDB
       end
 
       # rubocop:disable Metrics/MethodLength
-      def query(query, opts = {})
-        query = builder.build(query, opts[:params])
-        denormalize = opts.fetch(:denormalize, config.denormalize)
-        json_streaming = !opts.fetch(:chunk_size, config.chunk_size).nil?
-
-        params = query_params(query, opts)
-        url = full_url("/query".freeze, params)
-        series = fetch_series(get(url, parse: true, json_streaming: json_streaming))
+      def query(
+        query,
+        params:       nil,
+        denormalize:  config.denormalize,
+        chunk_size:   config.chunk_size,
+        **opts
+      )
+        query = builder.build(query, params)
+
+        url = full_url("/query".freeze, query_params(query, opts))
+        series = fetch_series(get(url, parse: true, json_streaming: !chunk_size.nil?))
 
         if block_given?
           series.each do |s|
@@ -80,13 +83,13 @@ module InfluxDB
 
       private
 
-      # rubocop:disable Metrics/MethodLength
-      def query_params(query, opts)
-        precision   = opts.fetch(:precision, config.time_precision)
-        epoch       = opts.fetch(:epoch, config.epoch)
-        chunk_size  = opts.fetch(:chunk_size, config.chunk_size)
-        database    = opts.fetch(:database, config.database)
-
+      def query_params(
+          query,
+          precision:  config.time_precision,
+          epoch:      config.epoch,
+          chunk_size: config.chunk_size,
+          database:   config.database
+      )
         params = { q: query, db: database }
         params[:precision] = precision if precision
         params[:epoch]     = epoch     if epoch
@@ -98,7 +101,6 @@ module InfluxDB
 
         params
       end
-      # rubocop:enable Metrics/MethodLength
 
       def denormalized_series_list(series)
         series.map do |s|
@@ -122,9 +124,9 @@ module InfluxDB
         end.join("\n".freeze)
       end
 
-      def execute(query, options = {})
+      def execute(query, db: nil, **options)
         params = { q: query }
-        params[:db] = options.delete(:db) if options.key?(:db)
+        params[:db] = db if db
         url = full_url("/query".freeze, params)
         get(url, options)
       end
@@ -136,7 +138,7 @@ module InfluxDB
       end
 
       def raw_values(series)
-        series.select { |k, _| %w(columns values).include?(k) }
+        series.select { |k, _| %w[columns values].include?(k) }
       end
 
       def full_url(path, params = {})

data/lib/influxdb/version.rb

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

data/lib/influxdb/writer/async.rb

@@ -77,7 +77,7 @@ module InfluxDB
         def spawn_threads!
           @threads = []
           num_worker_threads.times do |thread_num|
-            log :debug, "Spawning background worker thread #{thread_num}."
+            log(:debug) { "Spawning background worker thread #{thread_num}." }
 
             @threads << Thread.new do
               Thread.current[:influxdb] = object_id
@@ -87,14 +87,15 @@ module InfluxDB
                 sleep rand(sleep_interval)
               end
 
-              log :debug, "Exit background worker thread #{thread_num}."
+              log(:debug) { "Exit background worker thread #{thread_num}." }
             end
           end
         end
 
         def check_background_queue(thread_num = 0)
-          log :debug,
-              "Checking background queue on thread #{thread_num} (#{current_thread_count} active)"
+          log(:debug) do
+            "Checking background queue on thread #{thread_num} (#{current_thread_count} active)"
+          end
 
           loop do
             data = []
@@ -107,7 +108,7 @@ module InfluxDB
             return if data.empty?
 
             begin
-              log :debug, "Found data in the queue! (#{data.length} points)"
+              log(:debug) { "Found data in the queue! (#{data.length} points)" }
               client.write(data.join("\n"), nil)
             rescue => e
               log :error, "Cannot write data: #{e.inspect}"
@@ -118,7 +119,7 @@ module InfluxDB
         end
 
         def stop!
-          log :debug, "Thread exiting, flushing queue."
+          log(:debug) { "Thread exiting, flushing queue." }
           check_background_queue until queue.empty?
         end
       end

data/lib/influxdb/writer/udp.rb

@@ -4,17 +4,26 @@ module InfluxDB
     class UDP
       attr_accessor :socket
       attr_reader :host, :port
-      def initialize(client, config)
+
+      def initialize(client, host: "localhost".freeze, port: 4444)
         @client = client
-        config = config.is_a?(Hash) ? config : {}
-        @host = config.fetch(:host, "localhost".freeze)
-        @port = config.fetch(:port, 4444)
-        self.socket = UDPSocket.new
-        socket.connect(host, port)
+        @host = host
+        @port = port
       end
 
       def write(payload, _precision = nil, _retention_policy = nil, _database = nil)
-        socket.send(payload, 0)
+        with_socket { |sock| sock.send(payload, 0) }
+      end
+
+      private
+
+      def with_socket
+        unless socket
+          self.socket = UDPSocket.new
+          socket.connect(host, port)
+        end
+
+        yield socket
       end
     end
   end

data/spec/influxdb/cases/query_cluster_spec.rb

@@ -52,7 +52,7 @@ describe InfluxDB::Client do
   describe "#list_cluster_admins" do
     let(:response) do
       { "results" => [{ "statement_id" => 0,
-                        "series" => [{ "columns" => %w(user admin), "values" => [["dbadmin", true], ["foobar", false]] }] }] }
+                        "series" => [{ "columns" => %w[user admin], "values" => [["dbadmin", true], ["foobar", false]] }] }] }
     end
     let(:expected_result) { ["dbadmin"] }
 

data/spec/influxdb/cases/query_continuous_query_spec.rb

@@ -22,9 +22,9 @@ describe InfluxDB::Client do
     let(:database) { "testdb" }
     let(:response) do
       { "results" => [{ "statement_id" => 0,
-                        "series" => [{ "name" => "otherdb", "columns" => %w(name query),
+                        "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"]] },
-                                     { "name" => "testdb", "columns" => %w(name query),
+                                     { "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"]] }] }] }
     end
 

data/spec/influxdb/cases/query_core_spec.rb

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

data/spec/influxdb/cases/query_retention_policy_spec.rb

@@ -27,7 +27,7 @@ describe InfluxDB::Client do
 
   describe "#list_retention_policies" do
     let(:query) { "SHOW RETENTION POLICIES ON \"database\"" }
-    let(:response) { { "results" => [{ "statement_id" => 0, "series" => [{ "columns" => %w(name duration replicaN default), "values" => [["default", "0", 1, true], ["another", "1", 2, false]] }] }] } }
+    let(:response) { { "results" => [{ "statement_id" => 0, "series" => [{ "columns" => %w[name duration replicaN default], "values" => [["default", "0", 1, true], ["another", "1", 2, false]] }] }] } }
     let(:expected_result) { [{ "name" => "default", "duration" => "0", "replicaN" => 1, "default" => true }, { "name" => "another", "duration" => "1", "replicaN" => 2, "default" => false }] }
 
     it "should GET a list of retention policies" do

data/spec/influxdb/cases/query_series_spec.rb

@@ -19,7 +19,7 @@ describe InfluxDB::Client do
 
   describe "GET #list_series" do
     let(:response) { { "results" => [{ "series" => [{ "columns" => "key", "values" => [["series1,name=default,duration=0"], ["series2,name=another,duration=1"]] }] }] } }
-    let(:data) { %w(series1 series2) }
+    let(:data) { %w[series1 series2] }
     let(:query) { "SHOW SERIES" }
 
     before do

data/spec/influxdb/cases/query_user_spec.rb

@@ -99,7 +99,7 @@ describe InfluxDB::Client do
 
   describe "#list_users" do
     let(:query) { "SHOW USERS" }
-    let(:response) { { "results" => [{ "statement_id" => 0, "series" => [{ "columns" => %w(user admin), "values" => [["dbadmin", true], ["foobar", false]] }] }] } }
+    let(:response) { { "results" => [{ "statement_id" => 0, "series" => [{ "columns" => %w[user admin], "values" => [["dbadmin", true], ["foobar", false]] }] }] } }
     let(:expected_result) { [{ "username" => "dbadmin", "admin" => true }, { "username" => "foobar", "admin" => false }] }
 
     it "should GET a list of database users" do

data/spec/influxdb/cases/query_with_params_spec.rb

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

data/spec/influxdb/cases/querying_issue_7000_spec.rb

@@ -33,11 +33,11 @@ describe InfluxDB::Client do
 
       let(:response_line_1) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w(time temp value), "values" => [["2015-07-07T15:13:04Z", 34, 0.343443]] }] }] }
+                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w[time temp value], "values" => [["2015-07-07T15:13:04Z", 34, 0.343443]] }] }] }
       end
       let(:response_line_2) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w(time temp value), "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] }] }
+                          "series" => [{ "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w[time temp value], "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] }] }
       end
       let(:response) do
         JSON.generate(response_line_1) + "\n" + JSON.generate(response_line_2)
@@ -62,19 +62,19 @@ describe InfluxDB::Client do
 
       let(:response_line_1) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "access_times.service_1", "tags" => { "code" => "200", "result" => "failure", "status" => "OK" }, "columns" => %w(time value), "values" => [["2015-07-08T07:15:22Z", 327]] }] }] }
+                          "series" => [{ "name" => "access_times.service_1", "tags" => { "code" => "200", "result" => "failure", "status" => "OK" }, "columns" => %w[time value], "values" => [["2015-07-08T07:15:22Z", 327]] }] }] }
       end
       let(:response_line_2) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "access_times.service_1", "tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" }, "columns" => %w(time value), "values" => [["2015-07-08T06:15:22Z", 873]] }] }] }
+                          "series" => [{ "name" => "access_times.service_1", "tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" }, "columns" => %w[time value], "values" => [["2015-07-08T06:15:22Z", 873]] }] }] }
       end
       let(:response_line_3) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "access_times.service_2", "tags" => { "code" => "200", "result" => "failure", "status" => "OK" }, "columns" => %w(time value), "values" => [["2015-07-08T07:15:22Z", 943]] }] }] }
+                          "series" => [{ "name" => "access_times.service_2", "tags" => { "code" => "200", "result" => "failure", "status" => "OK" }, "columns" => %w[time value], "values" => [["2015-07-08T07:15:22Z", 943]] }] }] }
       end
       let(:response_line_4) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "access_times.service_2", "tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" }, "columns" => %w(time value), "values" => [["2015-07-08T06:15:22Z", 606]] }] }] }
+                          "series" => [{ "name" => "access_times.service_2", "tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" }, "columns" => %w[time value], "values" => [["2015-07-08T06:15:22Z", 606]] }] }] }
       end
       let(:response) do
         JSON.generate(response_line_1) + "\n" + JSON.generate(response_line_2) + "\n" + JSON.generate(response_line_3) + "\n" + JSON.generate(response_line_4)

data/spec/influxdb/cases/querying_spec.rb

@@ -28,7 +28,7 @@ describe InfluxDB::Client do
       let(:response) do
         { "results" => [{ "statement_id" => 0,
                           "series" => [{ "name" => "cpu", "tags" => { "region" => "us" },
-                                         "columns" => %w(time temp value),
+                                         "columns" => %w[time temp value],
                                          "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] }] }
       end
       let(:expected_result) do
@@ -46,8 +46,8 @@ describe InfluxDB::Client do
     context "with series with different tags" do
       let(:response) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w(time temp value), "values" => [["2015-07-07T15:13:04Z", 34, 0.343443]] },
-                                       { "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w(time temp value), "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] }] }
+                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w[time temp value], "values" => [["2015-07-07T15:13:04Z", 34, 0.343443]] },
+                                       { "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w[time temp value], "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] }] }
       end
       let(:expected_result) do
         [{ "name" => "cpu", "tags" => { "region" => "pl" },
@@ -66,10 +66,10 @@ describe InfluxDB::Client do
     context "with multiple series with different tags" do
       let(:response) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "access_times.service_1", "tags" => { "code" => "200", "result" => "failure", "status" => "OK" }, "columns" => %w(time value), "values" => [["2015-07-08T07:15:22Z", 327]] },
-                                       { "name" => "access_times.service_1", "tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" }, "columns" => %w(time value), "values" => [["2015-07-08T06:15:22Z", 873]] },
-                                       { "name" => "access_times.service_2", "tags" => { "code" => "200", "result" => "failure", "status" => "OK" }, "columns" => %w(time value), "values" => [["2015-07-08T07:15:22Z", 943]] },
-                                       { "name" => "access_times.service_2", "tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" }, "columns" => %w(time value), "values" => [["2015-07-08T06:15:22Z", 606]] }] }] }
+                          "series" => [{ "name" => "access_times.service_1", "tags" => { "code" => "200", "result" => "failure", "status" => "OK" }, "columns" => %w[time value], "values" => [["2015-07-08T07:15:22Z", 327]] },
+                                       { "name" => "access_times.service_1", "tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" }, "columns" => %w[time value], "values" => [["2015-07-08T06:15:22Z", 873]] },
+                                       { "name" => "access_times.service_2", "tags" => { "code" => "200", "result" => "failure", "status" => "OK" }, "columns" => %w[time value], "values" => [["2015-07-08T07:15:22Z", 943]] },
+                                       { "name" => "access_times.service_2", "tags" => { "code" => "500", "result" => "failure", "status" => "Internal Server Error" }, "columns" => %w[time value], "values" => [["2015-07-08T06:15:22Z", 606]] }] }] }
       end
       let(:expected_result) do
         [{ "name" => "access_times.service_1", "tags" => { "code" => "200", "result" => "failure", "status" => "OK" }, "values" => [{ "time" => "2015-07-08T07:15:22Z", "value" => 327 }] },
@@ -87,8 +87,8 @@ describe InfluxDB::Client do
     context "with multiple series for explicit value only" do
       let(:response) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "access_times.service_1", "columns" => %w(time value), "values" => [["2015-07-08T06:15:22Z", 873], ["2015-07-08T07:15:22Z", 327]] },
-                                       { "name" => "access_times.service_2", "columns" => %w(time value), "values" => [["2015-07-08T06:15:22Z", 606], ["2015-07-08T07:15:22Z", 943]] }] }] }
+                          "series" => [{ "name" => "access_times.service_1", "columns" => %w[time value], "values" => [["2015-07-08T06:15:22Z", 873], ["2015-07-08T07:15:22Z", 327]] },
+                                       { "name" => "access_times.service_2", "columns" => %w[time value], "values" => [["2015-07-08T06:15:22Z", 606], ["2015-07-08T07:15:22Z", 943]] }] }] }
       end
       let(:expected_result) do
         [{ "name" => "access_times.service_1", "tags" => nil, "values" => [{ "time" => "2015-07-08T06:15:22Z", "value" => 873 }, { "time" => "2015-07-08T07:15:22Z", "value" => 327 }] },
@@ -104,8 +104,8 @@ describe InfluxDB::Client do
     context "with a block" do
       let(:response) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w(time temp value), "values" => [["2015-07-07T15:13:04Z", 34, 0.343443]] },
-                                       { "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w(time temp value), "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] }] }
+                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w[time temp value], "values" => [["2015-07-07T15:13:04Z", 34, 0.343443]] },
+                                       { "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w[time temp value], "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] }] }
       end
 
       let(:expected_result) do
@@ -132,8 +132,8 @@ describe InfluxDB::Client do
 
       let(:response) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w(time temp value), "values" => [[1_438_580_576, 34, 0.343443]] },
-                                       { "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w(time temp value), "values" => [[1_438_612_976, 92, 0.3445], [1_438_612_989, 68, 0.8787]] }] }] }
+                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w[time temp value], "values" => [[1_438_580_576, 34, 0.343443]] },
+                                       { "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w[time temp value], "values" => [[1_438_612_976, 92, 0.3445], [1_438_612_989, 68, 0.8787]] }] }] }
       end
       let(:expected_result) do
         [{ "name" => "cpu", "tags" => { "region" => "pl" },
@@ -155,7 +155,7 @@ describe InfluxDB::Client do
 
       let(:response) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w(time temp value), "values" => [[1_438_580_576, 34, 0.343443]] }] }] }
+                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w[time temp value], "values" => [[1_438_580_576, 34, 0.343443]] }] }] }
       end
       let(:expected_result) do
         [{ "name" => "cpu", "tags" => { "region" => "pl" }, "values" => [{ "time" => 1_438_580_576, "temp" => 34, "value" => 0.343443 }] }]
@@ -171,7 +171,7 @@ describe InfluxDB::Client do
       let(:extra_params) { { db: 'overriden_db' } }
       let(:response) do
         { "results" => [{ "series" => [{ "name" => "cpu", "tags" => { "region" => "us" },
-                                         "columns" => %w(time temp value),
+                                         "columns" => %w[time temp value],
                                          "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] }] }
       end
       let(:expected_result) do
@@ -192,11 +192,11 @@ describe InfluxDB::Client do
       let(:response) do
         { "results" => [{ "statement_id" => 0,
                           "series" => [{ "name" => "cpu", "tags" => { "region" => "us" },
-                                         "columns" => %w(time temp value),
+                                         "columns" => %w[time temp value],
                                          "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] },
                         { "statement_id" => 1,
                           "series" => [{ "name" => "memory", "tags" => { "region" => "us" },
-                                         "columns" => %w(time free total),
+                                         "columns" => %w[time free total],
                                          "values" => [["2015-07-07T14:58:37Z", 96_468_992, 134_217_728], ["2015-07-07T14:59:09Z", 71_303_168, 134_217_728]] }] }] }
       end
       let(:expected_result) do
@@ -217,11 +217,11 @@ describe InfluxDB::Client do
     context "with series with different tags" do
       let(:response) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w(time temp value), "values" => [["2015-07-07T15:13:04Z", 34, 0.343443]] },
-                                       { "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w(time temp value), "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] },
+                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w[time temp value], "values" => [["2015-07-07T15:13:04Z", 34, 0.343443]] },
+                                       { "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w[time temp value], "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] },
                         { "statement_id" => 1,
-                          "series" => [{ "name" => "memory", "tags" => { "region" => "pl" }, "columns" => %w(time free total), "values" => [["2015-07-07T15:13:04Z", 35_651_584, 134_217_728]] },
-                                       { "name" => "memory", "tags" => { "region" => "us" }, "columns" => %w(time free total), "values" => [["2015-07-07T14:58:37Z", 96_468_992, 134_217_728], ["2015-07-07T14:59:09Z", 71_303_168, 134_217_728]] }] }] }
+                          "series" => [{ "name" => "memory", "tags" => { "region" => "pl" }, "columns" => %w[time free total], "values" => [["2015-07-07T15:13:04Z", 35_651_584, 134_217_728]] },
+                                       { "name" => "memory", "tags" => { "region" => "us" }, "columns" => %w[time free total], "values" => [["2015-07-07T14:58:37Z", 96_468_992, 134_217_728], ["2015-07-07T14:59:09Z", 71_303_168, 134_217_728]] }] }] }
       end
       let(:expected_result) do
         [{ "name" => "cpu", "tags" => { "region" => "pl" },
@@ -245,11 +245,11 @@ describe InfluxDB::Client do
     context "with a block" do
       let(:response) do
         { "results" => [{ "statement_id" => 0,
-                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w(time temp value), "values" => [["2015-07-07T15:13:04Z", 34, 0.343443]] },
-                                       { "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w(time temp value), "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] },
+                          "series" => [{ "name" => "cpu", "tags" => { "region" => "pl" }, "columns" => %w[time temp value], "values" => [["2015-07-07T15:13:04Z", 34, 0.343443]] },
+                                       { "name" => "cpu", "tags" => { "region" => "us" }, "columns" => %w[time temp value], "values" => [["2015-07-07T14:58:37Z", 92, 0.3445], ["2015-07-07T14:59:09Z", 68, 0.8787]] }] },
                         { "statement_id" => 1,
-                          "series" => [{ "name" => "memory", "tags" => { "region" => "pl" }, "columns" => %w(time free total), "values" => [["2015-07-07T15:13:04Z", 35_651_584, 134_217_728]] },
-                                       { "name" => "memory", "tags" => { "region" => "us" }, "columns" => %w(time free total), "values" => [["2015-07-07T14:58:37Z", 96_468_992, 134_217_728], ["2015-07-07T14:59:09Z", 71_303_168, 134_217_728]] }] }] }
+                          "series" => [{ "name" => "memory", "tags" => { "region" => "pl" }, "columns" => %w[time free total], "values" => [["2015-07-07T15:13:04Z", 35_651_584, 134_217_728]] },
+                                       { "name" => "memory", "tags" => { "region" => "us" }, "columns" => %w[time free total], "values" => [["2015-07-07T14:58:37Z", 96_468_992, 134_217_728], ["2015-07-07T14:59:09Z", 71_303_168, 134_217_728]] }] }] }
       end
 
       let(:expected_result) do