influxdb 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd312f5542686ccddcc5913b25f6cd55b6c892ac
-  data.tar.gz: 63bbe7b5008a916da5bd411b5c4a0f0a0f8705a8
+  metadata.gz: 48b3b597ccffb495aafb01038b0a00300a5aaf85
+  data.tar.gz: ae802e95ce9675869e5ae482d30d6a46ed7318ac
 SHA512:
-  metadata.gz: 2d4c579c9af119065cb5d1d30f1d5caf6c3b1b368864d537231ec63ef0a092d543141af4daf8a2860cbb22ad0a6e326aa647aef19b43db79932502c3091c34d3
-  data.tar.gz: 1857f6d61f6475e0330acc86e2baa5502cb9c2b59f7f18c9d414d375da0c3dc5e332d7fc7b4a662f1ea983599770cefde6fb1fed3021ad763df998e40e7a69a3
+  metadata.gz: 9725f16e1b6cf6b15dfab0b0717a30fff9a1eca6dc7b1b7463adf5a985745ff83c14e90191aa58a06167b6be7bc3e085a79424ce303d78172ef8e7f513816f43
+  data.tar.gz: 6875eff543b72a4791fd8d7e73b0ceef5a079983dfee1356d758ad43a900d88f77f86bbdb3a0d9d789eeceaab576203a015e83e5ae09ad5ebda2ece3fb2fcfc3

data/Gemfile

@@ -2,8 +2,6 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "webmock", git: "https://github.com/influxdb/webmock.git"
-
 local_gemfile = 'Gemfile.local'
 
 if File.exist?(local_gemfile)

data/README.md

@@ -5,6 +5,8 @@ influxdb-ruby
 
 The official ruby client library for [InfluxDB](https://influxdb.com/).
 
+> **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.
+
 Install
 -------
 

data/influxdb.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0.0"
-  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "webmock", "~> 1.21.0"
 end

data/lib/influxdb/point_value.rb

@@ -35,11 +35,12 @@ module InfluxDB
     end
 
     def escape_value(value, quote_escape)
-      value.gsub!(/\s/, '\ ')
-      value.gsub!(',', '\,')
-      value.gsub!('"', '\"')
-      value = %("#{value}") if quote_escape
-      value
+      val = value.
+        gsub(/\s/, '\ ').
+        gsub(',', '\,').
+        gsub('"', '\"')
+      val = %("#{val}") if quote_escape
+      val
     end
 
     def escape_key(key)

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB # :nodoc:
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/influxdb/writer/async.rb

@@ -101,7 +101,7 @@ module InfluxDB
 
             begin
               log :debug, "Found data in the queue! (#{data.length} points)"
-              client.write(data)
+              client.write(data.join("\n"), nil)
             rescue => e
               puts "Cannot write data: #{e.inspect}"
             end

data/spec/influxdb/cases/async_client_spec.rb

@@ -3,7 +3,7 @@ require "timeout"
 
 describe InfluxDB::Client do
   let(:subject) { described_class.new(async: true) }
-
+  let(:stub_url) { "http://localhost:8086/write?db=&p=root&precision=s&u=root" }
   let(:worker_klass) { InfluxDB::Writer::Async::Worker }
 
   specify { expect(subject.writer).to be_a(InfluxDB::Writer::Async) }
@@ -12,9 +12,7 @@ describe InfluxDB::Client do
     let(:payload) { "responses,region=eu value=5" }
 
     it "sends writes to client" do
-      # exact times can be 2 or 3 (because we have 3 worker threads),
-      # but cannot be less than 2 due to MAX_POST_POINTS limit
-      expect(subject).to(receive(:write)).at_least(2).times
+      post_request = stub_request(:post, stub_url)
 
       (worker_klass::MAX_POST_POINTS + 100).times do
         subject.write_point('a', {})
@@ -28,6 +26,10 @@ describe InfluxDB::Client do
         # flush queue (we cannot test `at_exit`)
         subject.writer.worker.check_background_queue
       end
+
+      # exact times can be 2 or 3 (because we have 3 worker threads),
+      # but cannot be less than 2 due to MAX_POST_POINTS limit
+      expect(post_request).to have_been_requested.at_least_times(2)
     end
   end
 end

data/spec/influxdb/worker_spec.rb

@@ -6,17 +6,21 @@ describe InfluxDB::Writer::Async::Worker do
   let(:worker) { described_class.new(fake_client, {}) }
 
   describe "#push" do
-    let(:payload) { "responses,region=eu value=5" }
+    let(:payload1) { "responses,region=eu value=5" }
+    let(:payload2) { "responses,region=eu value=6" }
+    let(:aggregate) { "#{payload1}\n#{payload2}" }
 
-    it "writes to the client" do
+    it "writes aggregate payload to the client" do
       queue = Queue.new
-      expect(fake_client).to receive(:write).once.with([payload]) do |_data|
-        queue.push(:received)
+      allow(fake_client).to receive(:write) do |data, _precision|
+        queue.push(data)
       end
-      worker.push(payload)
+      worker.push(payload1)
+      worker.push(payload2)
 
       Timeout.timeout(described_class::SLEEP_INTERVAL) do
-        queue.pop
+        result = queue.pop
+        expect(result).to eq aggregate
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -84,16 +84,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.21.0
 description: This is the official Ruby library for InfluxDB.
 email:
 - influxdb@googlegroups.com