td-client 0.8.23 → 0.8.24

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-08-30 version 0.8.24
+
+* TreasureData::Client.new supports :http_proxy option
+
+
 == 2012-08-30 version 0.8.23
 
 * Supports HTTP_PROXY environment variable

data/lib/td/client/api.rb

@@ -20,6 +20,10 @@ class API
     require 'json'
     require 'time'
     require 'uri'
+    require 'net/http'
+    require 'net/https'
+    require 'time'
+
     @apikey = apikey
 
     endpoint = opts[:endpoint] || ENV['TD_API_SERVER'] || 'api.treasure-data.com'
@@ -50,6 +54,18 @@ class API
       end
       @base_path = ''
     end
+
+    @http_proxy = opts[:http_proxy] || ENV['HTTP_PROXY']
+    if @http_proxy = ENV['HTTP_PROXY']
+      if @http_proxy =~ /\Ahttp:\/\/(.*)\z/
+        @http_proxy = $~[1]
+      end
+      proxy_host, proxy_port = @http_proxy.split(':',2)
+      proxy_port = (proxy_port ? proxy_port.to_i : 80)
+      @http_class = Net::HTTP::Proxy(proxy_host, proxy_port)
+    else
+      @http_class = Net::HTTP
+    end
   end
 
   # TODO error check & raise appropriate errors
@@ -1191,22 +1207,7 @@ class API
   end
 
   def new_http
-    require 'net/http'
-    require 'net/https'
-    require 'time'
-
-    if proxy = ENV['HTTP_PROXY']
-      if proxy =~ /\Ahttp:\/\/(.*)\z/
-        proxy = $~[1]
-      end
-      proxy_host, proxy_port = proxy.split(':',2)
-      proxy_port = (proxy_port ? proxy_port.to_i : 80)
-      http_class = Net::HTTP::Proxy(proxy_host, proxy_port)
-    else
-      http_class = Net::HTTP
-    end
-
-    http = http_class.new(@host, @port)
+    http = @http_class.new(@host, @port)
     if @ssl
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.23'
+VERSION = '0.8.24'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.23
+  version: 0.8.24
   prerelease: 
 platform: ruby
 authors: