influxdb 0.3.17 → 0.4.0

data/spec/influxdb/cases/show_field_keys_spec.rb

@@ -26,15 +26,15 @@ describe InfluxDB::Client do
         "results" => [{
           "series" => [{
             "name"    => "measurement_a",
-            "columns" => %w(fieldKey fieldType),
-            "values"  => [%w(a_string_field string),
-                          %w(a_boolean_field boolean),
-                          %w(a_float_field float),
-                          %w(an_integer_field integer)]
+            "columns" => %w[fieldKey fieldType],
+            "values"  => [%w[a_string_field string],
+                          %w[a_boolean_field boolean],
+                          %w[a_float_field float],
+                          %w[an_integer_field integer]]
           }, {
             "name"    => "measurement_b",
-            "columns" => %w(fieldKey fieldType),
-            "values"  => [%w(another_string string)]
+            "columns" => %w[fieldKey fieldType],
+            "values"  => [%w[another_string string]]
           }]
         }]
       }

data/spec/influxdb/client_spec.rb

@@ -46,7 +46,9 @@ describe InfluxDB::Client do
 
     it "escapes params" do
       url = subject.send(:full_url, "/unknown", value: ' !@#$%^&*()/\\_+-=?|`~')
-      expect(url).to include("value=+%21%40%23%24%25%5E%26%2A%28%29%2F%5C_%2B-%3D%3F%7C%60%7E")
+      encoded_fragment = "value=+%21%40%23%24%25%5E%26%2A%28%29%2F%5C_%2B-%3D%3F%7C%60"
+      encoded_fragment << (RUBY_ENGINE == "ruby" && RUBY_VERSION >= "2.5.0" ? "~" : "%7E")
+      expect(url).to include(encoded_fragment)
     end
 
     context "with prefix" do

data/spec/influxdb/config_spec.rb

@@ -124,4 +124,85 @@ describe InfluxDB::Config do
 
     specify { expect(conf.epoch).to eq 's' }
   end
+
+  context "given a config URL" do
+    let(:url) { "https://foo:bar@influx.example.com:8765/testdb?open_timeout=42&unknown=false&denormalize=false" }
+    let(:args) { [{ url: url }] }
+
+    it "applies values found in URL" do
+      expect(conf.database).to eq "testdb"
+      expect(conf.hosts).to eq ["influx.example.com"]
+      expect(conf.port).to eq 8765
+      expect(conf.username).to eq "foo"
+      expect(conf.password).to eq "bar"
+      expect(conf.use_ssl).to be true
+      expect(conf.denormalize).to be false
+      expect(conf.open_timeout).to eq 42
+    end
+
+    it "applies defaults" do
+      expect(conf.prefix).to eq ""
+      expect(conf.read_timeout).to be 300
+      expect(conf.max_delay).to be 30
+      expect(conf.initial_delay).to be_within(0.0001).of(0.01)
+      expect(conf.verify_ssl).to be true
+      expect(conf.ssl_ca_cert).to be false
+      expect(conf.epoch).to be false
+      expect(conf.discard_write_errors).to be false
+      expect(conf.retry).to be(-1)
+      expect(conf.chunk_size).to be nil
+      expect(conf).not_to be_udp
+      expect(conf.auth_method).to eq "params"
+      expect(conf).not_to be_async
+    end
+
+    context "UDP" do
+      let(:url) { "udp://test.localhost:2345?discard_write_errors=1" }
+      specify { expect(conf).to be_udp }
+      specify { expect(conf.udp[:port]).to be 2345 }
+      specify { expect(conf.discard_write_errors).to be true }
+    end
+  end
+
+  context "given a config URL and explicit options" do
+    let(:url) { "https://foo:bar@influx.example.com:8765/testdb?open_timeout=42&unknown=false&denormalize=false" }
+    let(:args) do
+      [
+        "primarydb",
+        url: url,
+        open_timeout: 20,
+        read_timeout: 30,
+      ]
+    end
+
+    it "applies values found in URL" do
+      expect(conf.hosts).to eq ["influx.example.com"]
+      expect(conf.port).to eq 8765
+      expect(conf.username).to eq "foo"
+      expect(conf.password).to eq "bar"
+      expect(conf.use_ssl).to be true
+      expect(conf.denormalize).to be false
+    end
+
+    it "applies values found in opts hash" do
+      expect(conf.database).to eq "primarydb"
+      expect(conf.open_timeout).to eq 20
+      expect(conf.read_timeout).to be 30
+    end
+
+    it "applies defaults" do
+      expect(conf.prefix).to eq ""
+      expect(conf.max_delay).to be 30
+      expect(conf.initial_delay).to be_within(0.0001).of(0.01)
+      expect(conf.verify_ssl).to be true
+      expect(conf.ssl_ca_cert).to be false
+      expect(conf.epoch).to be false
+      expect(conf.discard_write_errors).to be false
+      expect(conf.retry).to be(-1)
+      expect(conf.chunk_size).to be nil
+      expect(conf).not_to be_udp
+      expect(conf.auth_method).to eq "params"
+      expect(conf).not_to be_async
+    end
+  end
 end

data/spec/influxdb/logging_spec.rb

@@ -8,6 +8,10 @@ describe InfluxDB::Logging do
     def write_to_log(level, message)
       log(level, message)
     end
+
+    def block_log(level, &block)
+      log(level, &block)
+    end
   end
 
   around do |example|
@@ -43,9 +47,16 @@ describe InfluxDB::Logging do
   context "when included in classes" do
     subject { LoggerTest.new }
 
-    it "logs" do
-      expect(InfluxDB::Logging.logger).to receive(:debug).with(an_instance_of(String)).once
-      subject.write_to_log(:debug, 'test')
+    it "logs with string message" do
+      expect(InfluxDB::Logging.logger).to receive(:info).with(an_instance_of(String)).once
+      subject.write_to_log(:info, 'test')
+    end
+
+    it "logs with block message" do
+      msg = double("message")
+      expect(msg).to receive(:expensive_message).and_return("42")
+      expect(InfluxDB::Logging.logger).to receive(:info).and_yield.once
+      subject.block_log(:info) { msg.expensive_message }
     end
   end
 end

data/spec/influxdb/point_value_spec.rb

@@ -15,8 +15,7 @@ describe InfluxDB::PointValue do
           intval:           5,
           floatval:         7.0,
           invalid_encoding: "a b",
-          non_latin:        "Улан-Удэ",
-          backslash:        "C:\\", # issue #200
+          non_latin:        "Улан-Удэ"
         }
       }
       if RUBY_VERSION > "2.0.0"
@@ -28,20 +27,8 @@ describe InfluxDB::PointValue do
 
     it 'should escape correctly' do
       point = InfluxDB::PointValue.new(data)
-      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(",")
+      expected = %(1=\\ \\,"\\1,2\\=\\ \\,"\\2=3\\=\\ \\,"\\3 ) +
+                 %(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

@@ -1,12 +1,12 @@
 require "influxdb"
 require "webmock/rspec"
-require "cause" unless Exception.instance_methods.include?(:cause)
 
+# rubocop:disable Lint/HandleExceptions
 begin
-  # rubocop:disable Lint/HandleExceptions
   require "pry-byebug"
 rescue LoadError
 end
+# rubocop:enable Lint/HandleExceptions
 
 RSpec.configure do |config|
   config.color = ENV["TRAVIS"] != "true"
@@ -17,6 +17,7 @@ RSpec.configure do |config|
   else
     config.formatter = :progress
   end
+  # rubocop:enable Style/ConditionalAssignment
 
   if ENV["LOG"]
     Dir.mkdir("tmp") unless Dir.exist?("tmp")
@@ -24,13 +25,14 @@ RSpec.configure do |config|
 
     InfluxDB::Logging.logger = Logger.new(logfile).tap do |logger|
       logger.formatter = proc { |severity, _datetime, progname, message|
-        "%-5s - %s: %s\n".format severity, progname, message
+        format "%-5s - %s: %s\n", severity, progname, message
       }
     end
 
     config.before(:each) do
       InfluxDB::Logging.logger.info("RSpec") { self.class }
       InfluxDB::Logging.logger.info("RSpec") { @__inspect_output }
+      InfluxDB::Logging.log_level = Logger.const_get(ENV["LOG"].upcase)
     end
 
     config.after(:each) do

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.4.0
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-08-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,56 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.2
-- !ruby/object:Gem::Dependency
-  name: cause
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.49'
 description: This is the official Ruby library for InfluxDB.
 email:
 - influxdb@googlegroups.com
@@ -175,7 +147,7 @@ homepage: http://influxdb.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 'Heads up: version 0.4 will drop support for MRI <= 2.1'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -183,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="