influxdb 0.0.12 → 0.0.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWYyOTdjYTlkOGM4ZTk0Y2Q1MmQ5YmMwMDM0ODlmNTQ0YmI5MDQzNw==
+    MDEzYzNkNTY1OWIxYzcxMDI0ODVjNDMwMDZmZDgwMjI3OWZkODg2Mw==
   data.tar.gz: !binary |-
-    NmFhMjg0MmU3M2Q2NzVjNWMyYzg4ZGVkNzQ3NmI4NzBlNTdjMTA3Nw==
+    ZTYxODNmYWVhYzUwMzY2ZGMxM2YyN2M1OGZkOGU1MGNhOGFiY2YwZQ==
 SHA512:
   metadata.gz: !binary |-
-    YWVhZjdhN2NmOGU5ZTVhMjMyNjc0N2RlZThmNWJiNDU1ODRmN2Q2ZWI0N2Ex
-    N2MyMmU4YmNjYTM0YmY3ZWUwNTNjOTE3ZDBiMzNlOGZjZjZlYzk0Yjc5MWE5
-    N2M0MGI2NDE4Mzg3OGU4ZDQwYzU3ODVjZmIyNzNhMjcxNzU4ZjM=
+    OTNmNjMwZGFkYjEyMTA5MWEzZDc0YTQzZWJiZTNiYTlkY2UyNWZhODU1ODYw
+    Mzg4ZjMwZDQwZDk1Yzc4OGI1NjQyNzVmNzNjNDU4OWFkNjYxN2Q0MDM4NWRl
+    NGE5ZGNhN2Y4N2JlMWE0ZTRjY2ViMTIwNWY0N2Q5OTFlMjQ5Y2Q=
   data.tar.gz: !binary |-
-    ZGUxYmU5YWE0ZjQ5OWVlODcxMDEyM2M4ZDdlN2FlMmI2NjcyZjhmMTg2Mjdl
-    OTlhYWFhZmMxMjExNDMwYTgwZGIxMDFiOTRmNzU4ZDNlNTcxZmFlMDFkNjdi
-    ZWQ0MzNkMzYyNjNjMWYwOTQzMjRlNTk3YTRlZTZmYTA4MjE2NjY=
+    M2RjNThlNjNlOTlkYTA1YTA4MmM4ODQ2ZDQ5ZmQ2YzRmOTI3NTg0NjgyZmZk
+    YzdhNjg5MTk0Yjk1NjUzNjk1ZTNiMGJiN2Y3MjZlMTRjNjFkMzU0Y2M4ZWZi
+    ZmE1ZDlmMTEwMjYwMDk1OGQwMGNjY2ExYzU4MWJiODAwMzM0MWU=

data/lib/influxdb.rb

@@ -1,4 +1,5 @@
 require "influxdb/version"
+require "influxdb/errors"
 require "influxdb/logger"
 
 require "influxdb/max_queue"

data/lib/influxdb/client.rb

@@ -10,19 +10,19 @@ module InfluxDB
 
     include InfluxDB::Logger
 
-    # Initializes a new Influxdb client
+    # Initializes a new InfluxDB client
     #
     # === Examples:
     #
-    #     Influxdb.new                               # connect to localhost using root/root
-    #                                                # as the credentials and doesn't connect to a db
+    #     InfluxDB::Client.new                               # connect to localhost using root/root
+    #                                                        # as the credentials and doesn't connect to a db
     #
-    #     Influxdb.new 'db'                          # connect to localhost using root/root
-    #                                                # as the credentials and 'db' as the db name
+    #     InfluxDB::Client.new 'db'                          # connect to localhost using root/root
+    #                                                        # as the credentials and 'db' as the db name
     #
-    #     Influxdb.new :username => 'username'       # override username, other defaults remain unchanged
+    #     InfluxDB::Client.new :username => 'username'       # override username, other defaults remain unchanged
     #
-    #     Influxdb.new 'db', :username => 'username' # override username, use 'db' as the db name
+    #     Influxdb::Client.new 'db', :username => 'username' # override username, use 'db' as the db name
     #
     # === Valid options in hash
     #
@@ -45,80 +45,55 @@ module InfluxDB
     def create_database(name)
       url = full_url("db")
       data = JSON.generate({:name => name})
-
-      headers = {"Content-Type" => "application/json"}
-      response = @http.request(Net::HTTP::Post.new(url, headers), data)
+      post(url, data)
     end
 
     def delete_database(name)
-      url = full_url("db/#{name}")
-
-      response = @http.request(Net::HTTP::Delete.new(url))
+      delete full_url("db/#{name}")
     end
 
     def get_database_list
-      url = full_url("db")
-
-      response = @http.request(Net::HTTP::Get.new(url))
-      JSON.parse(response.body)
+      get full_url("db")
     end
 
     def create_cluster_admin(username, password)
       url = full_url("cluster_admins")
       data = JSON.generate({:name => username, :password => password})
-
-      headers = {"Content-Type" => "application/json"}
-      response = @http.request(Net::HTTP::Post.new(url, headers), data)
+      post(url, data)
     end
 
     def update_cluster_admin(username, password)
       url = full_url("cluster_admins/#{username}")
       data = JSON.generate({:password => password})
-
-      headers = {"Content-Type" => "application/json"}
-      response = @http.request(Net::HTTP::Post.new(url, headers), data)
+      post(url, data)
     end
 
     def delete_cluster_admin(username)
-      url = full_url("cluster_admins/#{username}")
-
-      response = @http.request(Net::HTTP::Delete.new(url))
+      delete full_url("cluster_admins/#{username}")
     end
 
     def get_cluster_admin_list
-      url = full_url("cluster_admins")
-
-      response = @http.request(Net::HTTP::Get.new(url))
-      JSON.parse(response.body)
+      get full_url("cluster_admins")
     end
 
     def create_database_user(database, username, password)
       url = full_url("db/#{database}/users")
       data = JSON.generate({:name => username, :password => password})
-
-      headers = {"Content-Type" => "application/json"}
-      response = @http.request(Net::HTTP::Post.new(url, headers), data)
+      post(url, data)
     end
 
     def update_database_user(database, username, options = {})
       url = full_url("db/#{database}/users/#{username}")
       data = JSON.generate(options)
-
-      headers = {"Content-Type" => "application/json"}
-      @http.request(Net::HTTP::Post.new(url, headers), data)
+      post(url, data)
     end
 
     def delete_database_user(database, username)
-      url = full_url("db/#{database}/users/#{username}")
-
-      @http.request(Net::HTTP::Delete.new(url))
+      delete full_url("db/#{database}/users/#{username}")
     end
 
     def get_database_user_list(database)
-      url = full_url("db/#{database}/users")
-
-      response = @http.request(Net::HTTP::Get.new(url))
-      JSON.parse(response.body)
+      get full_url("db/#{database}/users")
     end
 
     def alter_database_privilege(database, username, admin=true)
@@ -155,10 +130,8 @@ module InfluxDB
     end
 
     def query(query)
-      url = full_url("db/#{@database}/series", "q=#{query}")
-      url = URI.encode url
-      response = @http.request(Net::HTTP::Get.new(url))
-      series = JSON.parse(response.body)
+      url = URI.encode full_url("db/#{@database}/series", "q=#{query}")
+      series = get(url)
 
       if block_given?
         series.each { |s| yield s['name'], denormalize_series(s) }
@@ -180,6 +153,40 @@ module InfluxDB
       end
     end
 
+    def get(url)
+      response = @http.request(Net::HTTP::Get.new(url))
+      if response.kind_of? Net::HTTPSuccess
+        return JSON.parse(response.body)
+      elsif response.kind_of? Net::HTTPUnauthorized
+        raise InfluxDB::AuthenticationError.new response.body
+      else
+        raise InfluxDB::Error.new response.body
+      end
+    end
+
+    def post(url, data)
+      headers = {"Content-Type" => "application/json"}
+      response = @http.request(Net::HTTP::Post.new(url, headers), data)
+      if response.kind_of? Net::HTTPSuccess
+        return response
+      elsif response.kind_of? Net::HTTPUnauthorized
+        raise InfluxDB::AuthenticationError.new response.body
+      else
+        raise InfluxDB::Error.new response.body
+      end
+    end
+
+    def delete(url)
+      response = @http.request(Net::HTTP::Delete.new(url))
+      if response.kind_of? Net::HTTPSuccess
+        return response
+      elsif response.kind_of? Net::HTTPUnauthorized
+        raise InfluxDB::AuthenticationError.new response.body
+      else
+        raise InfluxDB::Error.new response.body
+      end
+    end
+
     def denormalize_series series
       columns = series['columns']
       series['points'].map { |point| Hash[columns.zip(point)]}

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Todd Persen