td-client 0.8.74 → 0.8.75

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e7c8e5d2d7a083101d43af5aac57da1832683b2
-  data.tar.gz: 95dd9d3cd7e6ee9a743e774dbabcc0c78981d9e8
+  metadata.gz: 1ecd6b8aed80e8f53f2d1558d5d3eb7a46139bb4
+  data.tar.gz: cf9e411eb507cc49dbd37cce1a9dfa0b1a9b4338
 SHA512:
-  metadata.gz: a031a8d19b916bb07ca496612388349fb922577f15dbaddbd8b54c78f054d5ebd4bb894ea877f13a5bdd8e4166fd30b69c46918cb989510b035deac3631ee2ac
-  data.tar.gz: d528d13d61573d7f89b50a8b2a6cb05656705f4a39cad03ae59aa2b10cd49f95a08b318f847c1c8d6e685ad97dc0d3ccfb1a66b99c43642bad0f98e008b8826f
+  metadata.gz: ec2506706f26dce0390218f20dd350b0d0389172ad6b1adf1b047a8fff1e233c45c1cdd0ac74ae9b02cea68414b273e63d0ac2aad582a2857e42d795eea8aa35
+  data.tar.gz: 47094392a7112ef70587f9994a83299cac26da9a86e660ac51046efd429ae998aed4880132dcf2150aff982f0679e19298ac1eac3404c10cb85589623f1e4a36

data/lib/td/client/api.rb

@@ -685,21 +685,29 @@ private
   # @param [response] res
   # @return [String]
   def get_error(res)
+    parse_error_response(res)['message']
+  end
+
+  def parse_error_response(res)
+    error = {}
+
     begin
       js = JSON.load(res.body)
       if js.nil?
-        error_msg = if res.respond_to?(:message)
+        error['message'] = if res.respond_to?(:message)
                       res.message # Net::HTTP
                     else
                       res.reason # HttpClient
                     end
       else
-        error_msg = js['message'] || js['error']
+        error['message']    = js['message'] || js['error']
+        error['stacktrace'] = js['stacktrace']
       end
     rescue JSON::ParserError
-      error_msg = res.body
+      error['message'] = res.body
     end
-    error_msg
+
+    error
   end
 
   # @param [String] msg
@@ -707,21 +715,33 @@ private
   # @param [Class] klass
   def raise_error(msg, res, klass=nil)
     status_code = res.code.to_s
-    error_msg = get_error(res)
-    if klass
-      raise klass, "#{status_code}: #{msg}: #{res.body}"
-    elsif status_code == "404"
-      raise NotFoundError, "#{msg}: #{res.body}"
-    elsif status_code == "409"
-      raise AlreadyExistsError, "#{msg}: #{res.body}"
-    elsif status_code == "401"
-      raise AuthError, "#{msg}: #{res.body}"
-    elsif status_code == "403"
-      raise ForbiddenError, "#{msg}: #{res.body}"
+    error       = parse_error_response(res)
+    message     = "#{msg}: #{error['message']}"
+
+    error_class = if klass
+      message = "#{status_code}: #{message}"
+      klass
+    else
+      case status_code
+      when "404"
+        NotFoundError
+      when "409"
+        AlreadyExistsError
+      when "401"
+        AuthError
+      when "403"
+        ForbiddenError
+      else
+        message = "#{status_code}: #{message}"
+        APIError
+      end
+    end
+
+    if error_class.method_defined?(:api_backtrace)
+      raise error_class.new(message, error['stacktrace'])
     else
-      raise APIError, "#{status_code}: #{msg}: #{res.body}"
+      raise error_class, message
     end
-    # TODO error
   end
 
   if ''.respond_to?(:encode)

data/lib/td/client/api_error.rb

@@ -5,6 +5,12 @@ end
 
 # Generic API error
 class APIError < StandardError
+  attr_reader :api_backtrace
+
+  def initialize(error_message = nil, api_backtrace = nil)
+    super(error_message)
+    @api_backtrace = api_backtrace == '' ? nil : api_backtrace
+  end
 end
 
 # 401 API errors

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '0.8.74'
+    VERSION = '0.8.75'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.74
+  version: 0.8.75
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack