influxdb 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2a420cee21fd581baa624089984defee6907a8c
-  data.tar.gz: 5dfb27c78ace10b2a8c9c84bc98bcc49024000f9
+  metadata.gz: 340e103295b0398a309d3e05e64da660e9fc220e
+  data.tar.gz: 794b43a718b6a3d0a4cd9779a428958d228b400f
 SHA512:
-  metadata.gz: 38af5bb53a3dc79ba014c64d98464d0653ad004f795e89545e1ec8d25fbb501c5001c2bc2c8c59a6cafd30069e8266b2d02ad916f1dafb80e9b3196136727e3a
-  data.tar.gz: 87d24e5dcbe7d02beddaa522759e8897b388a3da15f54fe5646d7affb0397aa492d84430b0514f82c967852b594a03747ae42559b9c7082567e3878cd845415d
+  metadata.gz: 9b2e87b5273b7b7d593ae48a0d90d375a2bb16a5c6f3ea207b163082fbb8ce8b4441b821f3238fedd1963b351003d455e0d06db2a767f8f19144234b351193b9
+  data.tar.gz: 6441b368ba226e0ff02dbc064a8ff8ba38f1a3de473e2329959d7bd4ee45a02bbfb88443dcdc4d5da2463e791bef77ba77a40db10a29ddd0c2f3dfefbdfdc14b

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
+before_install:
+  - gem update bundler
 rvm:
-  - 1.8.7
+  - 1.8.7-p374
   - ree
   - 1.9.3
   - 2.0.0

data/README.md

@@ -223,5 +223,5 @@ Testing
 git clone git@github.com:influxdb/influxdb-ruby.git
 cd influxdb-ruby
 bundle
-bundle exec rspec
+bundle exec rake
 ```

data/lib/influxdb/client.rb

@@ -1,4 +1,5 @@
 require 'uri'
+require 'cgi'
 require 'net/http'
 require 'net/https'
 require 'json'
@@ -53,6 +54,7 @@ module InfluxDB
       @open_timeout = opts[:write_timeout] || 5
       @read_timeout = opts[:read_timeout] || 300
       @async = opts[:async] || false
+      @retry = opts.fetch(:retry) { true }
 
       @worker = InfluxDB::Worker.new(self) if @async
 
@@ -61,62 +63,62 @@ module InfluxDB
 
     ## allow options, e.g. influxdb.create_database('foo', replicationFactor: 3)
     def create_database(name, options = {})
-      url = full_url("db")
+      url = full_url("/db")
       options[:name] = name
       data = JSON.generate(options)
       post(url, data)
     end
 
     def delete_database(name)
-      delete full_url("db/#{name}")
+      delete full_url("/db/#{name}")
     end
 
     def get_database_list
-      get full_url("db")
+      get full_url("/db")
     end
 
     def create_cluster_admin(username, password)
-      url = full_url("cluster_admins")
+      url = full_url("/cluster_admins")
       data = JSON.generate({:name => username, :password => password})
       post(url, data)
     end
 
     def update_cluster_admin(username, password)
-      url = full_url("cluster_admins/#{username}")
+      url = full_url("/cluster_admins/#{username}")
       data = JSON.generate({:password => password})
       post(url, data)
     end
 
     def delete_cluster_admin(username)
-      delete full_url("cluster_admins/#{username}")
+      delete full_url("/cluster_admins/#{username}")
     end
 
     def get_cluster_admin_list
-      get full_url("cluster_admins")
+      get full_url("/cluster_admins")
     end
 
     def create_database_user(database, username, password)
-      url = full_url("db/#{database}/users")
+      url = full_url("/db/#{database}/users")
       data = JSON.generate({:name => username, :password => password})
       post(url, data)
     end
 
     def update_database_user(database, username, options = {})
-      url = full_url("db/#{database}/users/#{username}")
+      url = full_url("/db/#{database}/users/#{username}")
       data = JSON.generate(options)
       post(url, data)
     end
 
     def delete_database_user(database, username)
-      delete full_url("db/#{database}/users/#{username}")
+      delete full_url("/db/#{database}/users/#{username}")
     end
 
     def get_database_user_list(database)
-      get full_url("db/#{database}/users")
+      get full_url("/db/#{database}/users")
     end
 
     def get_database_user_info(database, username)
-      get full_url("db/#{database}/users/#{username}")
+      get full_url("/db/#{database}/users/#{username}")
     end
 
     def alter_database_privilege(database, username, admin=true)
@@ -124,7 +126,7 @@ module InfluxDB
     end
 
     def continuous_queries(database)
-      get full_url("db/#{database}/continuous_queries")
+      get full_url("/db/#{database}/continuous_queries")
     end
 
     def write_point(name, data, async=@async, time_precision=@time_precision)
@@ -146,13 +148,13 @@ module InfluxDB
     end
 
     def _write(payload, time_precision=@time_precision)
-      url = full_url("db/#{@database}/series", "time_precision=#{time_precision}")
+      url = full_url("/db/#{@database}/series", :time_precision => time_precision)
       data = JSON.generate(payload)
       post(url, data)
     end
 
     def query(query, time_precision=@time_precision)
-      url = URI.encode full_url("db/#{@database}/series", "q=#{query}&time_precision=#{time_precision}")
+      url = full_url("/db/#{@database}/series", :q => query, :time_precision => time_precision)
       series = get(url)
 
       if block_given?
@@ -176,11 +178,14 @@ module InfluxDB
     end
 
     private
-    def full_url(path, params=nil)
-      "".tap do |url|
-        url << "/#{path}?u=#{@username}&p=#{@password}"
-        url << "&#{params}" unless params.nil?
-      end
+
+    def full_url(path, params={})
+      params[:u] = @username
+      params[:p] = @password
+
+      query = params.map { |k, v| [CGI.escape(k.to_s), "=", CGI.escape(v.to_s)].join }.join("&")
+
+      URI::Generic.build(:path => path, :query => query).to_s
     end
 
     def get(url)
@@ -236,8 +241,9 @@ module InfluxDB
         block.call(http)
 
       rescue Timeout::Error, *InfluxDB::NET_HTTP_EXCEPTIONS => e
-        log :error, "Failed to contact host #{host}: #{e.inspect} #{"- retrying in #{delay}s." unless stopped?}"
+        log :error, "Failed to contact host #{host}: #{e.inspect} #{"- retrying in #{delay}s." if retry?}"
         log :info, "Queue size is #{@queue.length}." unless @queue.nil?
+        stop! unless retry?
         if stopped?
           raise e
         else
@@ -250,6 +256,10 @@ module InfluxDB
       end
     end
 
+    def retry?
+      !stopped? && @retry
+    end
+
     def denormalize_series series
       columns = series['columns']
 

data/lib/influxdb/version.rb

@@ -1,3 +1,3 @@
 module InfluxDB
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/influxdb/client_spec.rb

@@ -3,9 +3,11 @@ require "json"
 
 describe InfluxDB::Client do
   before do
-    @influxdb = InfluxDB::Client.new "database", :host => "influxdb.test",
-      :port => 9999, :username => "username", :password => "password", :time_precision => "s"
+    @influxdb = InfluxDB::Client.new "database", {
+      :host => "influxdb.test", :port => 9999, :username => "username",
+      :password => "password", :time_precision => "s" }.merge(args)
   end
+  let(:args) { {} }
 
   describe "#new" do
     describe "with no parameters specified" do
@@ -289,6 +291,13 @@ describe InfluxDB::Client do
         expect { subject }.to raise_error(Timeout::Error)
       end
 
+      context "when retry disabled" do
+        let(:args) { { :retry => false } }
+
+        it "raises" do
+          expect { subject }.to raise_error(Timeout::Error)
+        end
+      end
     end
 
     it "raise an exception if the server didn't return 200" do
@@ -481,4 +490,15 @@ describe InfluxDB::Client do
       @influxdb.query('select * from orders').should == {'orders' => [{'id' => 1, 'line_items' => line_items}]}
     end
   end
+
+  describe "#full_url" do
+    it "should return String" do
+      @influxdb.send(:full_url, "/unknown").should be_a String
+    end
+
+    it "should escape params" do
+      url = @influxdb.send(:full_url, "/unknown", :value => ' !@#$%^&*()/\\_+-=?|`~')
+      url.should include("value=+%21%40%23%24%25%5E%26%2A%28%29%2F%5C_%2B-%3D%3F%7C%60%7E")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json