influxdb 0.1.9 → 0.2.0

data/spec/influxdb/config_spec.rb

@@ -0,0 +1,118 @@
+require 'spec_helper'
+
+describe InfluxDB::Config do
+  let(:conf) do
+    InfluxDB::Client.new(*args).config
+  end
+
+  let(:args) { {} }
+
+  context "with no parameters specified" do
+    specify { expect(conf.database).to be_nil }
+    specify { expect(conf.hosts).to eq ["localhost"] }
+    specify { expect(conf.port).to eq 8086 }
+    specify { expect(conf.username).to eq "root" }
+    specify { expect(conf.password).to eq "root" }
+    specify { expect(conf.use_ssl).to be_falsey }
+    specify { expect(conf.time_precision).to eq "s" }
+    specify { expect(conf.auth_method).to eq "params" }
+    specify { expect(conf.denormalize).to be_truthy }
+    specify { expect(conf).not_to be_udp }
+    specify { expect(conf).not_to be_async }
+  end
+
+  context "with no database specified" do
+    let(:args) do
+      [{
+        host: "host",
+        port: "port",
+        username: "username",
+        password: "password",
+        time_precision: "m"
+      }]
+    end
+
+    specify { expect(conf.database).to be_nil }
+    specify { expect(conf.hosts).to eq ["host"] }
+    specify { expect(conf.port).to eq "port" }
+    specify { expect(conf.username).to eq "username" }
+    specify { expect(conf.password).to eq "password" }
+    specify { expect(conf.time_precision).to eq "m" }
+  end
+
+  context "with both a database and options specified" do
+    let(:args) do
+      [
+        "database",
+        host: "host",
+        port: "port",
+        username: "username",
+        password: "password",
+        time_precision: "m"
+      ]
+    end
+
+    specify { expect(conf.database).to eq "database" }
+    specify { expect(conf.hosts).to eq ["host"] }
+    specify { expect(conf.port).to eq "port" }
+    specify { expect(conf.username).to eq "username" }
+    specify { expect(conf.password).to eq "password" }
+    specify { expect(conf.time_precision).to eq "m" }
+  end
+
+  context "with ssl option specified" do
+    let(:args) { [{ use_ssl: true }] }
+
+    specify { expect(conf.database).to be_nil }
+    specify { expect(conf.hosts).to eq ["localhost"] }
+    specify { expect(conf.port).to eq 8086 }
+    specify { expect(conf.username).to eq "root" }
+    specify { expect(conf.password).to eq "root" }
+    specify { expect(conf.use_ssl).to be_truthy }
+  end
+
+  context "with multiple hosts specified" do
+    let(:args) { [{ hosts: ["1.1.1.1", "2.2.2.2"] }] }
+
+    specify { expect(conf.database).to be_nil }
+    specify { expect(conf.port).to eq 8086 }
+    specify { expect(conf.username).to eq "root" }
+    specify { expect(conf.password).to eq "root" }
+    specify { expect(conf.hosts).to eq ["1.1.1.1", "2.2.2.2"] }
+  end
+
+  context "with auth_method basic auth specified" do
+    let(:args) { [{ auth_method: 'basic_auth' }] }
+
+    specify { expect(conf.database).to be_nil }
+    specify { expect(conf.hosts).to eq ["localhost"] }
+    specify { expect(conf.port).to eq 8086 }
+    specify { expect(conf.username).to eq "root" }
+    specify { expect(conf.password).to eq "root" }
+    specify { expect(conf.auth_method).to eq "basic_auth" }
+  end
+
+  context "with udp specified with params" do
+    let(:args) { [{ udp: { host: 'localhost', port: 4444 } }] }
+
+    specify { expect(conf).to be_udp }
+  end
+
+  context "with udp specified as true" do
+    let(:args) { [{ udp: true }] }
+
+    specify { expect(conf).to be_udp }
+  end
+
+  context "with async specified with params" do
+    let(:args) { [{ async: { max_queue: 20_000 } }] }
+
+    specify { expect(conf).to be_async }
+  end
+
+  context "with async specified as true" do
+    let(:args) { [{ async: true }] }
+
+    specify { expect(conf).to be_async }
+  end
+end

data/spec/influxdb/{logger_spec.rb → logging_spec.rb}

@@ -2,13 +2,12 @@ require 'spec_helper'
 require 'logger'
 
 describe InfluxDB::Logging do
-  class LoggerTest
+  class LoggerTest # :nodoc:
     include InfluxDB::Logging
 
     def write_to_log(level, message)
       log(level, message)
     end
-
   end
 
   before { @old_logger = InfluxDB::Logging.logger }
@@ -23,25 +22,22 @@ describe InfluxDB::Logging do
     InfluxDB::Logging.logger = new_logger
     expect(InfluxDB::Logging.logger).to eq(new_logger)
   end
-  
+
   it "allows disabling of a logger" do
     InfluxDB::Logging.logger = false
     expect(InfluxDB::Logging.logger).to eql false
   end
-  
+
   context "when logging is disabled" do
-    
     subject { LoggerTest.new }
-    
     it "does not log" do
       InfluxDB::Logging.logger = false
       expect(InfluxDB::Logging.logger).not_to receive(:debug)
       subject.write_to_log(:debug, 'test')
-    end      
+    end
   end
 
   context "when included in classes" do
-
     subject { LoggerTest.new }
 
     it "logs" do

data/spec/influxdb/max_queue_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe InfluxDB::MaxQueue do
+  specify { is_expected.to be_a(Queue) }
+
+  context "#new" do
+    it "allows max_depth to be set" do
+      expect(described_class.new(500).max).to eq 500
+    end
+  end
+
+  context "#push" do
+    let(:queue) { described_class.new(5) }
+
+    it "allows an item to be added if the queue is not full" do
+      expect(queue.size).to be_zero
+      queue.push(1)
+      expect(queue.size).to eq 1
+    end
+
+    it "doesn't allow items to be added if the queue is full" do
+      expect(queue.size).to be_zero
+      5.times { |n| queue.push(n) }
+      expect(queue.size).to eq 5
+      queue.push(6)
+      expect(queue.size).to eq 5
+    end
+  end
+end

data/spec/influxdb/point_value_spec.rb

@@ -1,27 +1,94 @@
 require "spec_helper"
 
 describe InfluxDB::PointValue do
+  describe "whitespace escaping" do
+    it 'should escape series name' do
+      point = InfluxDB::PointValue.new(series: "Some Long String", values: { value: 5 })
+      expect(point.series).to eq("Some\\ Long\\ String")
+    end
+
+    it 'should escape keys of passed value keys' do
+      point = InfluxDB::PointValue.new(series: "responses",
+                                       values: { 'some string key' => 5 })
+      expect(point.values.split("=").first).to eq("some\\ string\\ key")
+    end
 
-  describe 'load' do
+    it 'should escape passed values' do
+      point = InfluxDB::PointValue.new(series: "responses",
+                                       values: { response_time: 0.34343 },
+                                       tags: { city: "Twin Peaks" })
+      expect(point.tags.split("=").last).to eq('"Twin\\ Peaks"')
+    end
+  end
 
-    it 'should parse json as array' do
-      val = InfluxDB::PointValue.new('["foo", "bar"]')
-      val.load.should == %w(foo bar)
+  describe "comma escaping" do
+    it 'should escape series name' do
+      point = InfluxDB::PointValue.new(series: "Some Long String,", values: { value: 5 })
+      expect(point.series).to eq("Some\\ Long\\ String\\,")
     end
 
-    it 'should parse json as hash' do
-      val = InfluxDB::PointValue.new('{"foo":"bar"}')
-      val.load.should == {"foo" => "bar"}
+    it 'should escape keys of passed value keys' do
+      point = InfluxDB::PointValue.new(series: "responses",
+                                       values: { 'some string key,' => 5 })
+      expect(point.values.split("=").first).to eq("some\\ string\\ key\\,")
     end
 
-    it 'should return string value if invalid json array' do
-      val = InfluxDB::PointValue.new('[foo,bar]')
-      val.load.should == '[foo,bar]'
+    it 'should escape passed values' do
+      point = InfluxDB::PointValue.new(series: "responses",
+                                       values: { response_time: 0.34343 },
+                                       tags: { city: "Twin Peaks," })
+      expect(point.tags.split("=").last).to eq('"Twin\\ Peaks\\,"')
     end
+  end
+
+  describe "double quote escaping" do
+    it 'should escape passed values' do
+      point = InfluxDB::PointValue.new(series: "responses",
+                                       values: { response_time: 0.34343 },
+                                       tags: { city: "Twin Peaks\"" })
+      expect(point.tags.split("=").last).to eq('"Twin\\ Peaks\\""')
+    end
+  end
+
+
+  describe 'dump' do
+    context "with all possible data passed" do
+      let(:expected_value) do
+        'responses,region="eu",status=200 value=5,threshold=0.54 1436349652'
+      end
+      it 'should have proper form' do
+        point = InfluxDB::PointValue.new(series: "responses",
+                                         values: { value: 5, threshold: 0.54 },
+                                         tags: { region: 'eu', status: 200 },
+                                         timestamp: 1_436_349_652)
+
+        expect(point.dump).to eq(expected_value)
+      end
+    end
+
+    context "with no tags" do
+      let(:expected_value) do
+        "responses value=5,threshold=0.54 1436349652"
+      end
+      it 'should have proper form' do
+        point = InfluxDB::PointValue.new(series: "responses",
+                                         values: { value: 5, threshold: 0.54 },
+                                         timestamp: 1_436_349_652)
+
+        expect(point.dump).to eq(expected_value)
+      end
+    end
+
+    context "with values only" do
+      let(:expected_value) do
+        "responses value=5,threshold=0.54"
+      end
+      it 'should have proper form' do
+        point = InfluxDB::PointValue.new(series: "responses",
+                                         values: { value: 5, threshold: 0.54 })
 
-    it 'should return string value if invalid json hash' do
-      val = InfluxDB::PointValue.new('{foo:"bar"}')
-      val.load.should == '{foo:"bar"}'
+        expect(point.dump).to eq(expected_value)
+      end
     end
   end
-end
+end

data/spec/influxdb/worker_spec.rb

@@ -1,26 +1,23 @@
 require "spec_helper"
 require 'timeout'
 
-describe InfluxDB::Worker do
-  let(:fake_client) { double(:stopped? => false) }
-  let(:worker) { InfluxDB::Worker.new(fake_client) }
+describe InfluxDB::Writer::Async::Worker do
+  let(:fake_client) { double(stopped?: false) }
+  let(:worker) { described_class.new(fake_client, {}) }
 
   describe "#push" do
-    let(:payload) { {:name => "juan", :age => 87, :time => Time.now.to_i} }
+    let(:payload) { "responses,region=eu value=5" }
 
-    it "should _write to the client" do
+    it "writes to the client" do
       queue = Queue.new
-      expect(fake_client).to receive(:_write).once.with([payload]) do |data|
+      expect(fake_client).to receive(:write).once.with([payload]) do |_data|
         queue.push(:received)
       end
       worker.push(payload)
 
-      Timeout.timeout(InfluxDB::Worker::SLEEP_INTERVAL) do
-        queue.pop()
+      Timeout.timeout(described_class::SLEEP_INTERVAL) do
+        queue.pop
       end
     end
-
   end
-
-
 end

data/spec/spec_helper.rb

@@ -1,11 +1,8 @@
-require 'influxdb'
-require 'webmock/rspec'
-
-RSpec.configure do |config|
-  config.mock_with :rspec do |mocks|
-    mocks.syntax = [:should, :expect]
-  end
-  config.expect_with :rspec do |expectations|
-    expectations.syntax = [:should, :expect]
-  end
+require "influxdb"
+require "webmock/rspec"
+begin
+  require "pry-byebug"
+rescue LoadError
 end
+
+InfluxDB::Logging.logger = Logger.new(STDOUT) if ENV['LOG']

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-07-20 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: cause
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   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'
 description: This is the official Ruby library for InfluxDB.
@@ -101,8 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -110,20 +111,41 @@ files:
 - influxdb.gemspec
 - lib/influxdb.rb
 - lib/influxdb/client.rb
+- lib/influxdb/client/http.rb
+- lib/influxdb/config.rb
 - lib/influxdb/errors.rb
-- lib/influxdb/logger.rb
+- lib/influxdb/logging.rb
 - lib/influxdb/max_queue.rb
 - lib/influxdb/point_value.rb
-- lib/influxdb/udp_client.rb
+- lib/influxdb/query/cluster.rb
+- lib/influxdb/query/continuous_query.rb
+- lib/influxdb/query/core.rb
+- lib/influxdb/query/database.rb
+- lib/influxdb/query/retention_policy.rb
+- lib/influxdb/query/user.rb
 - lib/influxdb/version.rb
-- lib/influxdb/worker.rb
+- lib/influxdb/writer/async.rb
+- lib/influxdb/writer/udp.rb
+- spec/influxdb/cases/async_client_spec.rb
+- spec/influxdb/cases/query_cluster_spec.rb
+- spec/influxdb/cases/query_continuous_query_spec.rb
+- spec/influxdb/cases/query_core.rb
+- spec/influxdb/cases/query_database_spec.rb
+- spec/influxdb/cases/query_retention_policy_spec.rb
+- spec/influxdb/cases/query_series_spec.rb
+- spec/influxdb/cases/query_shard_space_spec.rb
+- spec/influxdb/cases/query_shard_spec.rb
+- spec/influxdb/cases/query_user_spec.rb
+- spec/influxdb/cases/querying_spec.rb
+- spec/influxdb/cases/retry_requests_spec.rb
+- spec/influxdb/cases/udp_client_spec.rb
+- spec/influxdb/cases/write_points_spec.rb
 - spec/influxdb/client_spec.rb
-- spec/influxdb/logger_spec.rb
+- spec/influxdb/config_spec.rb
+- spec/influxdb/logging_spec.rb
+- spec/influxdb/max_queue_spec.rb
 - spec/influxdb/point_value_spec.rb
-- spec/influxdb/udp_client_spec.rb
 - spec/influxdb/worker_spec.rb
-- spec/influxdb_spec.rb
-- spec/max_queue_spec.rb
 - spec/spec_helper.rb
 homepage: http://influxdb.org
 licenses:
@@ -135,26 +157,39 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby library for InfluxDB.
 test_files:
+- spec/influxdb/cases/async_client_spec.rb
+- spec/influxdb/cases/query_cluster_spec.rb
+- spec/influxdb/cases/query_continuous_query_spec.rb
+- spec/influxdb/cases/query_core.rb
+- spec/influxdb/cases/query_database_spec.rb
+- spec/influxdb/cases/query_retention_policy_spec.rb
+- spec/influxdb/cases/query_series_spec.rb
+- spec/influxdb/cases/query_shard_space_spec.rb
+- spec/influxdb/cases/query_shard_spec.rb
+- spec/influxdb/cases/query_user_spec.rb
+- spec/influxdb/cases/querying_spec.rb
+- spec/influxdb/cases/retry_requests_spec.rb
+- spec/influxdb/cases/udp_client_spec.rb
+- spec/influxdb/cases/write_points_spec.rb
 - spec/influxdb/client_spec.rb
-- spec/influxdb/logger_spec.rb
+- spec/influxdb/config_spec.rb
+- spec/influxdb/logging_spec.rb
+- spec/influxdb/max_queue_spec.rb
 - spec/influxdb/point_value_spec.rb
-- spec/influxdb/udp_client_spec.rb
 - spec/influxdb/worker_spec.rb
-- spec/influxdb_spec.rb
-- spec/max_queue_spec.rb
 - spec/spec_helper.rb