influxdb 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 922d7fb8e14dbf9ed19a5be9309589f17ca56772
-  data.tar.gz: e13dbb25d5cc539b31751a8e6fc28f1561c6f5db
+  metadata.gz: 0d70a9878bd1e5c317027674416232aa8a04ae7d
+  data.tar.gz: 04aa90bf5904206307fe68d2ea09dec094792e9a
 SHA512:
-  metadata.gz: 8770fa30c86622dc5da0cc973bb7642ec1840be9fddd68280c810c2be3313fab4803db4067f5c88c271a71def0b27a6208aa16af539e2d62f245d8cc3d15c446
-  data.tar.gz: c32e3f4298a9b67af57695db14459eface58346a56ba7da079ad4764d5a7891b572d13bff04dd75afb4efa125d273cb4f2e53dea3671c952e53fdb2e5ec19aee
+  metadata.gz: be3a486311a2a5506dad439e1aba5d6dfd1c11d54bfd665be5f80d89a958ae40ae641eb40718c4ffe422a1b4d1a02dac4a7ec7dbdb530c7dff1dee91dc4caa62
+  data.tar.gz: 59e4d64307c3b4662cf652511ec9f2a1b4c0df7cb293792d5eccfa0d4c804f65ecce0b970ee22c3cd607f39d8d778142f86917df467c1127191ea3e54c47709e

data/README.md

@@ -94,7 +94,7 @@ influxdb = InfluxDB::Client.new database, :username => username,
                                           :time_precision => time_precision
 
 data = {
-  :value => 0
+  :value => 0,
   :time => Time.now.to_i
 }
 
@@ -114,7 +114,7 @@ time_precision = 's'
 influxdb = InfluxDB::Client.new database, :username => username, :password => password
 
 data = {
-  :value => 0
+  :value => 0,
   :time => Time.now.to_i
 }
 
@@ -152,6 +152,16 @@ influxdb = InfluxDB::Client.new
 influxdb.get_database_user_list(database)
 ```
 
+List a database user:
+
+``` ruby
+require 'influxdb'
+
+influxdb = InfluxDB::Client.new
+
+influxdb.get_database_user_info(database, username)
+```
+
 Delete a database:
 
 ``` ruby
@@ -197,5 +207,5 @@ Testing
 git clone git@github.com:influxdb/influxdb-ruby.git
 cd influxdb-ruby
 bundle
-rake 
+bundle exec rspec
 ```

data/lib/influxdb/client.rb

@@ -40,7 +40,7 @@ module InfluxDB
       @password = opts[:password] || "root"
       @http = Net::HTTP.new(@host, @port)
       @http.use_ssl = opts[:use_ssl]
-      @time_precision = opts[:time_precision] || "m"
+      @time_precision = opts[:time_precision] || "s"
     end
 
     ## allow options, e.g. influxdb.create_database('foo', replicationFactor: 3)
@@ -99,10 +99,18 @@ module InfluxDB
       get full_url("db/#{database}/users")
     end
 
+    def get_database_user_info(database, username)
+      get full_url("db/#{database}/users/#{username}")
+    end
+
     def alter_database_privilege(database, username, admin=true)
       update_database_user(database, username, :admin => admin)
     end
 
+    def continuous_queries
+      get full_url("continuous_queries")
+    end
+
     def write_point(name, data, async=false, time_precision=@time_precision)
       data = data.is_a?(Array) ? data : [data]
       columns = data.reduce(:merge).keys.sort {|a,b| a.to_s <=> b.to_s}
@@ -125,11 +133,7 @@ module InfluxDB
     def _write(payload, time_precision=nil)
       url = full_url("db/#{@database}/series", "time_precision=#{time_precision}")
       data = JSON.generate(payload)
-
-      headers = {"Content-Type" => "application/json"}
-      response = @http.request(Net::HTTP::Post.new(url, headers), data)
-      raise "Write failed with '#{response.message}'" unless (200...300).include?(response.code.to_i)
-      response
+      post(url, data)
     end
 
     def query(query)
@@ -192,6 +196,10 @@ module InfluxDB
 
     def denormalize_series series
       columns = series['columns']
+
+      h = Hash.new(-1)
+      columns = columns.map {|v| h[v] += 1; h[v] > 0 ? "#{v}~#{h[v]}" : v }
+
       series['points'].map do |point|
         decoded_point = point.map do |value|
           InfluxDB::PointValue.new(value).load

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/spec/influxdb/client_spec.rb

@@ -19,7 +19,7 @@ describe InfluxDB::Client do
         @influxdb.username.should == "root"
         @influxdb.password.should == "root"
         @influxdb.instance_variable_get(:@http).use_ssl?.should == false
-        @influxdb.time_precision.should == "m"
+        @influxdb.time_precision.should == "s"
       end
     end
 
@@ -29,7 +29,7 @@ describe InfluxDB::Client do
                                          :port => "port",
                                          :username => "username",
                                          :password => "password",
-                                         :time_precision => "s"
+                                         :time_precision => "m"
 
         @influxdb.should be_a InfluxDB::Client
         @influxdb.database.should be_nil
@@ -37,7 +37,7 @@ describe InfluxDB::Client do
         @influxdb.port.should == "port"
         @influxdb.username.should == "username"
         @influxdb.password.should == "password"
-        @influxdb.time_precision.should == "s"
+        @influxdb.time_precision.should == "m"
       end
     end
 
@@ -51,7 +51,7 @@ describe InfluxDB::Client do
         @influxdb.port.should == 8086
         @influxdb.username.should == "root"
         @influxdb.password.should == "root"
-        @influxdb.time_precision.should == "m"        
+        @influxdb.time_precision.should == "s"
       end
     end
 
@@ -61,7 +61,7 @@ describe InfluxDB::Client do
                                                      :port => "port",
                                                      :username => "username",
                                                      :password => "password",
-                                                     :time_precision => "s"
+                                                     :time_precision => "m"
 
         @influxdb.should be_a(InfluxDB::Client)
         @influxdb.database.should == "database"
@@ -69,7 +69,7 @@ describe InfluxDB::Client do
         @influxdb.port.should == "port"
         @influxdb.username.should == "username"
         @influxdb.password.should == "password"
-        @influxdb.time_precision.should == "s"
+        @influxdb.time_precision.should == "m"
       end
     end
 
@@ -217,6 +217,17 @@ describe InfluxDB::Client do
     end
   end
 
+  describe "#get_database_user_info" do
+    it "should GET information about a database user" do
+      user_info = {"name" => "bar", "isAdmin" => true}
+      stub_request(:get, "http://influxdb.test:9999/db/foo/users/bar").with(
+        :query => {:u => "username", :p => "password"}
+      ).to_return(:body => JSON.generate(user_info, :status => 200))
+
+      @influxdb.get_database_user_info("foo", "bar").should == user_info
+    end
+  end
+
   describe "#write_point" do
     it "should POST to add points" do
       body = [{
@@ -361,7 +372,7 @@ describe InfluxDB::Client do
 
   describe "#execute_queries" do
     before(:each) do
-      data = [{ :name => "foo", :columns => ["name", "age"], :points => [["shahid", 99],["dix", 50]]}]
+      data = [{ :name => "foo", :columns => ["name", "age", "count", "count"], :points => [["shahid", 99, 1, 2],["dix", 50, 3, 4]]}]
 
       stub_request(:get, "http://influxdb.test:9999/db/database/series").with(
         :query => { :q => "select * from foo", :u => "username", :p => "password"}
@@ -370,7 +381,7 @@ describe InfluxDB::Client do
       )
     end
 
-    expected_series = { 'foo' => [{"name" => "shahid", "age" => 99}, {"name" => "dix", "age" => 50}]}
+    expected_series = { 'foo' => [{"name" => "shahid", "age" => 99, "count" => 1, "count~1" => 2}, {"name" => "dix", "age" => 50, "count" => 3, "count~1" => 4}]}
 
     it 'can execute a query with a block' do
       series = { }

data/spec/influxdb/logger_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe InfluxDB::Logger do
+  class LoggerTest
+    include InfluxDB::Logger
+
+    def write_to_log(level, message)
+      log(level, message)
+    end
+  end
+
+  subject { LoggerTest.new }
+
+  context 'with DEBUG level' do
+    it 'should not write a log message to STDERR' do
+      expect(STDERR).to_not receive(:puts)
+
+      subject.write_to_log(:debug, 'debug')
+    end
+  end
+
+  context 'with non-DEBUG level' do
+    it 'should write a log message to STDERR' do
+      expect(STDERR).to receive(:puts).with('[InfluxDB] (info) info')
+
+      subject.write_to_log(:info, 'info')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -104,6 +104,7 @@ files:
 - lib/influxdb/version.rb
 - lib/influxdb/worker.rb
 - spec/influxdb/client_spec.rb
+- spec/influxdb/logger_spec.rb
 - spec/influxdb/point_value_spec.rb
 - spec/influxdb_spec.rb
 - spec/max_queue_spec.rb
@@ -134,6 +135,7 @@ specification_version: 4
 summary: Ruby library for InfluxDB.
 test_files:
 - spec/influxdb/client_spec.rb
+- spec/influxdb/logger_spec.rb
 - spec/influxdb/point_value_spec.rb
 - spec/influxdb_spec.rb
 - spec/max_queue_spec.rb