opentsdb-ruby 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1285259961020932f0391df4f5cd77dbf56b499
-  data.tar.gz: a01d76c47e616c708612ca0ebcf4cf33e8d76f07
+  metadata.gz: 396a2a052ae0d82b4274013863dad2facd4b721a
+  data.tar.gz: bcbb297f74620263b1c9d898760ed0b12459e416
 SHA512:
-  metadata.gz: 3d5665f76f11f40d806197e7c7ed1cab4ed5ba098d2d4644b1e6c263e958e89bb95681dea62519788a53dd76b3a2aa8aaf49079ef5c96afaf7cc709a302f36e1
-  data.tar.gz: f9258a781d687b1933d32c667424194a4d6cdf74c563ca0d5a870650076afb9bf55789b4101a1ea7f8d76ec851405f12bdb13741b7ef00e1d0e5c4025d90d617
+  metadata.gz: bec700d46ca429c3ff43472a2fd113bbe08336864853e06addb1fe65d5e08ff9377c841c474dca1b8c1b958b4add9b70a9921a3e1e159612c43ce1eef5e6bba4
+  data.tar.gz: 478d12399e15128b99d7e7b8e16f09df53ab759b051a4c2329cbbe900ac1e60bd696bfde52c1a768ea04456a6971d76fffcf36845f32563c6e8d7e0e562f0155

data/lib/opentsdb.rb

@@ -2,7 +2,7 @@
 module Opentsdb
   #:nodoc:
   class << self
-    attr_accessor :host, :port, :logger
+    attr_accessor :host, :port, :logger, :options
 
     def configure
       yield self
@@ -16,6 +16,10 @@ module Opentsdb
       @port || 4242
     end
 
+    def options
+      @options || {}
+    end
+
     def reset
       @host = nil
       @port = nil

data/lib/opentsdb/client.rb

@@ -5,14 +5,15 @@ module Opentsdb
 
     def_instance_delegators :@faraday, :post
 
-    attr_reader :host, :port
+    attr_reader :host, :port, :query_options
     attr_accessor :query_commads
 
     def initialize(options = {})
       @host = options.delete(:host) || Opentsdb.host
       @port = options.delete(:port) || Opentsdb.port
-      @faraday = Opentsdb::Faraday.new(query_url)
-      @query_commads = parse_queries options
+      @query_options = options.merge(Opentsdb.options)
+      @faraday = Opentsdb::Faraday.new(query_url, @query_options)
+      @query_commads = parse_queries
     end
 
     def query
@@ -29,7 +30,7 @@ module Opentsdb
       end
     end
 
-    def parse_queries(query_options = {})
+    def parse_queries
       [].tap do |qs|
         query_options[:q].split(';').each do |q|
           query = QueryParser.parse(q)

data/lib/opentsdb/faraday.rb

@@ -2,7 +2,8 @@ require 'faraday'
 module Opentsdb
   # :nodoc:
   class Faraday
-    attr_reader :url
+    attr_reader :url, :options
+    DEFAULT_TIMEOUT = 5
 
     def initialize(url, options = {})
       @url = url
@@ -13,8 +14,8 @@ module Opentsdb
       connection.post do |req|
         req.headers         = headers
         req.body            = body
-        req.options.timeout = 5
-        req.options.open_timeout = 5
+        req.options.timeout = options[:timeout] || DEFAULT_TIMEOUT
+        req.options.open_timeout = options[:open_timeout] || DEFAULT_TIMEOUT
       end
     end
 

data/lib/opentsdb/version.rb

@@ -1,3 +1,3 @@
 module Opentsdb
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.0.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentsdb-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - lizhe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement