td-client 0.8.81 → 0.8.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6639c3d87e9a018b4d8270c64165afc64ddb5c1
-  data.tar.gz: f0d2a64b5cb60ec6bc0b43f53f6ea0f8136e236f
+  metadata.gz: bf42a2c04e997054b7071bd6dc6038738a8857a6
+  data.tar.gz: 360933ff5ee21f22dbb9fce7b5acab14a23006f4
 SHA512:
-  metadata.gz: 7fe4f5336064479b42b5f867bd54014530aae360b175e3953aa3d82ee06822361d2c41219b9f64179791c08e918102de712ad323de39ef8f5e06ea2990d17e95
-  data.tar.gz: dd8dffeca422ea5d9e57ece36ed2655b4a2b57ef072dcf697dddd6f6c01d8a8a8ba04fd1f946d442982242d1028101830a8c6aefed676350ce168708c8d90324
+  metadata.gz: ab861c2082d0eb19039a928c59e18414f64d31b15303ab4e11144f3290eeb9b29bacbd26ec721d2eb85f25b8935c571c3b0a27ae660885454756fddfae37fbdc
+  data.tar.gz: d562b950d3c9c09d2bf25cef45d2397212a5ea654fc7ca6bf002c403dd9cc76022a0a8db6203f9218ccf40457bfd4fe8c7134592d71875993a5c40181db1e6b4

data/lib/td/client/api.rb

@@ -592,18 +592,15 @@ private
   end
 
   def parse_error_response(res)
-    error = {}
-
     begin
-      js = JSON.load(res.body)
-      if js.nil?
-        error['message'] = res.reason
+      error = JSON.load(res.body)
+      if error
+        error['message']    = error['error'] unless error['message']
       else
-        error['message']    = js['message'] || js['error']
-        error['stacktrace'] = js['stacktrace']
+        error = {'message' => res.reason}
       end
     rescue JSON::ParserError
-      error['message'] = res.body[0,1000].dump
+      error = {'message' => res.body}
     end
 
     error
@@ -625,6 +622,7 @@ private
       when "404"
         NotFoundError
       when "409"
+        message = "#{message}: conflicts_with job:#{error["details"]["conflicts_with"]}" if error["details"] && error["details"]["conflicts_with"]
         AlreadyExistsError
       when "401"
         AuthError
@@ -636,11 +634,15 @@ private
       end
     end
 
-    if error_class.method_defined?(:api_backtrace)
-      raise error_class.new(message, error['stacktrace'])
+    exc = nil
+    if error_class.method_defined?(:conflicts_with) && error["details"] && error["details"]["conflicts_with"]
+      exc = error_class.new(message, error['stacktrace'], error["details"]["conflicts_with"])
+    elsif error_class.method_defined?(:api_backtrace)
+      exc = error_class.new(message, error['stacktrace'])
     else
-      raise error_class, message
+      exc = error_class.new(message)
     end
+    raise exc
   end
 
   if ''.respond_to?(:encode)

data/lib/td/client/api_error.rb

@@ -23,6 +23,11 @@ end
 
 # 409 API errors
 class AlreadyExistsError < APIError
+  attr_reader :conflicts_with
+  def initialize(error_message = nil, api_backtrace = nil, conflicts_with=nil)
+    super(error_message, api_backtrace)
+    @conflicts_with = conflicts_with
+  end
 end
 
 # 404 API errors

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '0.8.81'
+    VERSION = '0.8.82'
   end
 end

data/spec/td/client/api_error_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe APIError do
+  let (:message){ 'message' }
+  let (:api_backtrace){ double('api_backtrace') }
+  describe 'new' do
+    context '' do
+      it do
+        exc = APIError.new(message, api_backtrace)
+        expect(exc).to be_an(APIError)
+        expect(exc.message).to eq message
+        expect(exc.api_backtrace).to eq api_backtrace
+      end
+    end
+    context 'api_backtrace is ""' do
+      let (:api_backtrace){ '' }
+      it do
+        exc = APIError.new(message, api_backtrace)
+        expect(exc).to be_an(APIError)
+        expect(exc.message).to eq message
+        expect(exc.api_backtrace).to be_nil
+      end
+    end
+    context 'api_backtrace is nil' do
+      let (:api_backtrace){ nil }
+      it do
+        exc = APIError.new(message, api_backtrace)
+        expect(exc).to be_an(APIError)
+        expect(exc.message).to eq message
+        expect(exc.api_backtrace).to be_nil
+      end
+    end
+  end
+end
+
+describe AlreadyExistsError do
+  let (:message){ 'message' }
+  let (:api_backtrace){ double('api_backtrace') }
+  let (:conflicts_with){ '12345' }
+  describe 'new' do
+    context '' do
+      it do
+        exc = AlreadyExistsError.new(message, api_backtrace)
+        expect(exc).to be_an(AlreadyExistsError)
+        expect(exc.message).to eq message
+        expect(exc.api_backtrace).to eq api_backtrace
+      end
+    end
+    context 'api_backtrace is ""' do
+      let (:api_backtrace){ '' }
+      it do
+        exc = AlreadyExistsError.new(message, api_backtrace)
+        expect(exc).to be_an(AlreadyExistsError)
+        expect(exc.message).to eq message
+        expect(exc.api_backtrace).to be_nil
+      end
+    end
+    context 'api_backtrace is nil' do
+      let (:api_backtrace){ nil }
+      it do
+        exc = AlreadyExistsError.new(message, api_backtrace)
+        expect(exc).to be_an(AlreadyExistsError)
+        expect(exc.message).to eq message
+        expect(exc.api_backtrace).to be_nil
+      end
+    end
+    context 'conflict' do
+      it do
+        exc = AlreadyExistsError.new(message, api_backtrace, conflicts_with)
+        expect(exc).to be_an(AlreadyExistsError)
+        expect(exc.message).to eq message
+        expect(exc.api_backtrace).to eq api_backtrace
+        expect(exc.conflicts_with).to eq conflicts_with
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.81
+  version: 0.8.82
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -226,6 +226,7 @@ files:
 - spec/spec_helper.rb
 - spec/td/client/access_control_api_spec.rb
 - spec/td/client/account_api_spec.rb
+- spec/td/client/api_error_spec.rb
 - spec/td/client/api_spec.rb
 - spec/td/client/api_ssl_connection_spec.rb
 - spec/td/client/bulk_import_spec.rb
@@ -271,6 +272,7 @@ summary: Treasure Data API library for Ruby
 test_files:
 - spec/td/client/access_control_api_spec.rb
 - spec/td/client/account_api_spec.rb
+- spec/td/client/api_error_spec.rb
 - spec/td/client/api_spec.rb
 - spec/td/client/api_ssl_connection_spec.rb
 - spec/td/client/bulk_import_spec.rb