td-client 0.8.54 → 0.8.55

data/ChangeLog

@@ -1,75 +1,82 @@
-== 2012-08-23 version 0.8.54
+== 2013-09-13 version 0.8.55
+
+* Use httpclient gem for import and bulk_import upload
+* connect_timeout / read_timeout / send_timeout options are available.
+  * these options affect only import and bulk_import upload.
+
+
+== 2013-08-23 version 0.8.54
 
 * Support table's expire_days API
 
 
-== 2012-07-22 version 0.8.53
+== 2013-07-22 version 0.8.53
 
 * Add normalized_msgpack method to serialize Bignum type
 
 
-== 2012-06-24 version 0.8.52
+== 2013-06-24 version 0.8.52
 
 * Add last_log_timestamp to Table model
 
 
-== 2012-06-17 version 0.8.51
+== 2013-06-17 version 0.8.51
 
 * Relax dependent gem versions
 
 
-== 2012-05-27 version 0.8.50
+== 2013-05-27 version 0.8.50
 
 * add_user now requires email and passowrd
 
 
-== 2012-05-06 version 0.8.49
+== 2013-05-06 version 0.8.49
 
 * Add User-Agent header
 * VERSION constant moved to under TreasureData::Client
 
 
-== 2012-04-22 version 0.8.48
+== 2013-04-22 version 0.8.48
 
 * create_schedule now takes :type option
 * Fix wrong error messages
 * Ues 'api-import' instead of 'api' on data import
 
 
-== 2012-04-09 version 0.8.47
+== 2013-04-09 version 0.8.47
 
 * Fix HTTP proxy handlig issue which is overwritten with ENV['HTTP_PROXY']
 
 
-== 2012-03-29 version 0.8.46
+== 2013-03-29 version 0.8.46
 
 * Add IP limitation API
 
 
-== 2012-01-25 version 0.8.45
+== 2013-01-25 version 0.8.45
 
 * Re-implement Client#job_status using /v3/job/status/job_id
   instead of /v3/job/show/job_id to poll the progress of a job
 
 
-== 2012-01-23 version 0.8.44
+== 2013-01-23 version 0.8.44
 
 * Re-add json gem dependency
 
 
-== 2012-01-23 version 0.8.43
+== 2013-01-23 version 0.8.43
 
 * Add organization parameter support to create_database, query,
   partial_delete, create_bulk_import, create_result
 
 
-== 2012-01-16 version 0.8.42
+== 2013-01-16 version 0.8.42
 
 * Added retry_limit to job and schedule APIs
 * Increased table/database name limit from 32 to 256
 
 
-== 2012-01-10 version 0.8.41
+== 2013-01-10 version 0.8.41
 
 * Fix API#job_result_format to handle Content-Encoding properly
 

data/lib/td/client/api.rb

@@ -27,6 +27,8 @@ class API
     require 'net/http'
     require 'net/https'
     require 'time'
+    #require 'faraday' # faraday doesn't support streaming upload with httpclient yet so now disabled
+    require 'httpclient'
 
     @apikey = apikey
     @user_agent = "TD-Client-Ruby: #{TreasureData::Client::VERSION}"
@@ -35,6 +37,10 @@ class API
     endpoint = opts[:endpoint] || ENV['TD_API_SERVER'] || DEFAULT_ENDPOINT
     uri = URI.parse(endpoint)
 
+    @connect_timeout = opts[:connect_timeout] || 60
+    @read_timeout = opts[:read_timeout] || 600
+    @send_timeout = opts[:send_timeout] || 600
+
     case uri.scheme
     when 'http', 'https'
       @host = uri.host
@@ -63,10 +69,12 @@ class API
 
     @http_proxy = opts[:http_proxy] || ENV['HTTP_PROXY']
     if @http_proxy
-      if @http_proxy =~ /\Ahttp:\/\/(.*)\z/
-        @http_proxy = $~[1]
-      end
-      proxy_host, proxy_port = @http_proxy.split(':',2)
+      http_proxy = if @http_proxy =~ /\Ahttp:\/\/(.*)\z/
+                     $~[1]
+                   else
+                     @http_proxy
+                   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
@@ -1404,28 +1412,26 @@ class API
   end
 
   def put(url, stream, size, opts = {})
-    http, header = new_http(opts)
-
-    http.read_timeout = 600
-
-    path = @base_path + url
+    client, header = new_client(opts)
+    client.send_timeout = @send_timeout
+    client.receive_timeout = @read_timeout
 
     header['Content-Type'] = 'application/octet-stream'
     header['Content-Length'] = size.to_s
 
-    request = Net::HTTP::Put.new(url, header)
-    if stream.class.name == 'StringIO'
-      request.body = stream.string
-    else
-      if request.respond_to?(:body_stream=)
-        request.body_stream = stream
-      else  # Ruby 1.8
-        request.body = stream.read
-      end
-    end
+    body = if stream.class.name == 'StringIO'
+             stream.string
+           else
+             stream
+           end
+    target = build_endpoint(url, opts[:host] || @host)
+    response = client.put(target, body, header)
+    return [response.code.to_s, response.body, response]
+  end
 
-    response = http.request(request)
-    return [response.code, response.body, response]
+  def build_endpoint(url, host)
+    schema = @ssl ? 'https' : 'http'
+    "#{schema}://#{host}:#{@port}/#{@base_path + url}"
   end
 
   def new_http(opts = {})
@@ -1450,17 +1456,36 @@ class API
     return http, header
   end
 
+  def new_client(opts = {})
+    client = HTTPClient.new(@http_proxy, @user_agent)
+    client.connect_timeout = @connect_timeout
+
+    if @ssl
+      client.ssl_config.add_trust_ca(File.join(File.dirname(__FILE__), '..', '..', '..', 'data', 'ca-bundle.crt'))
+      client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    end
+
+    header = {}
+    if @apikey
+      header['Authorization'] = "TD1 #{apikey}"
+    end
+    header['Date'] = Time.now.rfc2822
+
+    return client, header
+  end
+
   def raise_error(msg, res, klass=nil)
     begin
       js = JSON.load(res.body)
       msg = js['message']
       error_code = js['error_code']
+      status_code = res.code.to_s
 
       if klass
         raise klass, "#{error_code}: #{msg}"
-      elsif res.code == "404"
+      elsif status_code == "404"
         raise NotFoundError, "#{error_code}: #{msg}"
-      elsif res.code == "409"
+      elsif status_code == "409"
         raise AlreadyExistsError, "#{error_code}: #{msg}"
       else
         raise APIError, "#{error_code}: #{msg}"
@@ -1469,9 +1494,9 @@ class API
     rescue
       if klass
         raise klass, "#{error_code}: #{msg}"
-      elsif res.code == "404"
+      elsif status_code == "404"
         raise NotFoundError, "#{msg}: #{res.body}"
-      elsif res.code == "409"
+      elsif status_code == "409"
         raise AlreadyExistsError, "#{msg}: #{res.body}"
       else
         raise APIError, "#{msg}: #{res.body}"

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '0.8.54'
+    VERSION = '0.8.55'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.54
+  version: 0.8.55
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -73,6 +73,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.6
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement