influxdb 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5317b3f282142902370f70efe284c0b3bc26fd33
-  data.tar.gz: 7c8d66553e69ca83a7c7bd195c15b720ce566db4
+  metadata.gz: e4c1d9fba941cead2557e6067144733298d81599
+  data.tar.gz: 4859b9674377a0c4cd613f79b4db5488179523ca
 SHA512:
-  metadata.gz: 4aa6353445b0e3741e9618389f96db0494c0bca4d9287275db4eb09abbc092adea05fd294800f7a3b06fd80402fdf58fdebbc9174a493c0abb379841b7a7c307
-  data.tar.gz: 6d04fd6f05351872f029af105b2c7a183d136ab76be4580339e97bb9d58c5ff37d48c1a81e54e1ece16a4ad58a13ff660a064d275305aa70520fccbf61bd6fcf
+  metadata.gz: 65633c47e35680828609e2ed6b84dc74f72c506b3c58271db3aa69b18debccd2a5b3e0bace93eefbaa7fe1a0965a28f2142abb4eb5af072fa5833e2b3f15cf5e
+  data.tar.gz: 41492fac4c940702fbe15d2c17bf3c3c6afd54b70d3777b09eeab563b8ba9bde13a2ee1885fe1569a13fd91952877520544addf5b5ed1184f569cbef4de2a393

data/Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
 gemspec
+

data/README.md

@@ -1,7 +1,7 @@
 influxdb-ruby
 =============
 
-![InfluxDB Build Status](https://travis-ci.org/influxdb/influxdb-ruby.png)
+[![Build Status](https://travis-ci.org/influxdb/influxdb-ruby.png?branch=master)](https://travis-ci.org/influxdb/influxdb-ruby)
 
 Ruby client library for [InfluxDB](http://influxdb.org/).
 

data/influxdb.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "json"
+  spec.add_runtime_dependency "addressable"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/influxdb/client.rb

@@ -1,5 +1,6 @@
 require 'net/http'
 require 'json'
+require 'addressable/uri'
 
 module InfluxDB
   class Client
@@ -69,15 +70,44 @@ module InfluxDB
       url = "/db/#{@database}/series?u=#{@username}&p=#{@password}"
       payload = {:name => name, :points => [], :columns => []}
 
-      point = []
-      data.each_pair do |k,v|
-        payload[:columns].push k.to_s
-        point.push v
+      data = data.is_a?(Array) ? data : [data]
+      columns = data.reduce(:merge).keys
+      payload[:columns] = columns
+
+      data.each do |p|
+        point = []
+        columns.each { |c| point << p[c] }
+        payload[:points].push point
       end
 
-      payload[:points].push point
       data = JSON.generate([payload])
       response = http.request(Net::HTTP::Post.new(url), data)
     end
+
+    def query query
+      http = Net::HTTP.new(@host, @port)
+      url = "/db/#{@database}/query?u=#{@username}&p=#{@password}&q=#{query}"
+      url = Addressable::URI.encode url
+      response = http.request(Net::HTTP::Get.new(url))
+      series = JSON.parse(response.body)
+
+      if block_given?
+        series.each { |s| yield s['name'], denormalize_series(s) }
+      else
+        series.reduce({}) do |col, s|
+          name                  = s['name']
+          denormalized_series   = denormalize_series s
+          col[name]             = denormalized_series
+          col
+        end
+      end
+    end
+
+    private
+
+    def denormalize_series series
+      columns = series['columns']
+      series['values'].map { |point| Hash[columns.zip(point)]}
+    end
   end
 end

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/influxdb/client_spec.rb

@@ -91,5 +91,68 @@ describe InfluxDB::Client do
 
       @influxdb.write_point("seriez", data).should be_a(Net::HTTPOK)
     end
+
+    it "should POST multiple points" do
+      body = [{
+        :name => "seriez",
+        :points => [["juan", 87], ["shahid", 99]],
+        :columns => ["name", "age"]
+      }]
+
+      stub_request(:post, "http://influxdb.test:9999/db/database/series").with(
+        :query => {:u => "username", :p => "password"},
+        :body => JSON.generate(body)
+      )
+
+      data = [{:name => "juan", :age => 87}, { :name => "shahid", :age => 99}]
+
+      @influxdb.write_point("seriez", data).should be_a(Net::HTTPOK)
+    end
+
+    it "should POST multiple points with missing columns" do
+      body = [{
+        :name => "seriez",
+        :points => [["juan", 87], ["shahid", nil]],
+        :columns => ["name", "age"]
+      }]
+
+      stub_request(:post, "http://influxdb.test:9999/db/database/series").with(
+        :query => {:u => "username", :p => "password"},
+        :body => JSON.generate(body)
+      )
+
+      data = [{:name => "juan", :age => 87}, { :name => "shahid"}]
+
+      @influxdb.write_point("seriez", data).should be_a(Net::HTTPOK)
+    end
+  end
+
+  describe "#execute_queries" do
+    before(:each) do
+      data = [{ :name => "foo", :columns => ["name", "age"], :values => [["shahid", 99],["dix", 50]]}]
+
+      stub_request(:get, "http://influxdb.test:9999/db/database/query").with(
+        :query => { :q => "select * from foo", :u => "username", :p => "password"}
+      ).to_return(
+        :body => JSON.generate(data)
+      )
+    end
+
+    expected_series = { 'foo' => [{"name" => "shahid", "age" => 99}, {"name" => "dix", "age" => 50}]}
+
+    it 'can execute a query with a block' do
+      series = { }
+
+      @influxdb.query "select * from foo" do |name, points|
+        series[name] = points
+      end
+
+      series.should ==(expected_series)
+    end
+
+    it 'can execute a query without a block' do
+      series = @influxdb.query 'select * from foo'
+      series.should ==(expected_series)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Todd Persen
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  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