td-client 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 140238f578d4cee66cc4ef09c155375719ad1c9e
-  data.tar.gz: cc7df46122c3186fc80c99ca1911aff0bcf8c994
+  metadata.gz: 1319b82466ec1059629cb62dbe33cdacc0488d60
+  data.tar.gz: fd2b1bc6ee9211e3b225537d753bbef3a5fe6f19
 SHA512:
-  metadata.gz: bdd1ba7cfb27afbc22a07845c06cf420afa1d9d40411137573ec2406ceeb923838a65be2e3ce7dbdc5120126a3386aa6234dca79426e9341d57e3a82ebe559d3
-  data.tar.gz: 8045b7325a7492b35db7962ed36d3bb6895d3307990c1e43d7523e0832b9a33b7d2ac4d792a0b8284755342726c231ea994f83d0829a72a19a3b7a891789a738
+  metadata.gz: fa93f95456b45d53a8621f2e22a87537fc8955c59954ef52155b71b7938b67d1794e5cba4b89b9f398f7089fe49638d4e15e216b2e73c76a8505b3eab770db45
+  data.tar.gz: dd3ef388960816cadae765c39f705778987c2490895e36c74704a076135349b7dbacfbc8cfa123314abfa718fcef68d725a2e9009c437df00fc6d60d057fb113

data/lib/td/client/api/job.rb

@@ -272,6 +272,9 @@ module Job
     end
   end
 
+  class HTTPServerException < StandardError
+  end
+
   def job_result_download(job_id, format='msgpack', autodecode=true)
     client, header = new_client
     client.send_timeout = @send_timeout
@@ -305,12 +308,8 @@ module Job
             end
           when 206 # resuming
           else
-            if res.status/100 == 5 && cumul_retry_delay < @max_cumul_retry_delay
-              $stderr.puts "Error #{res.status}: #{get_error(res)}. Retrying after #{retry_delay} seconds..."
-              sleep retry_delay
-              cumul_retry_delay += retry_delay
-              retry_delay *= 2
-              redo
+            if res.status/100 == 5
+              raise HTTPServerException
             end
             raise_error("Get job result failed", res)
           end
@@ -331,7 +330,8 @@ module Job
 
       # completed?
       validate_content_length_with_range(response, current_total_chunk_size)
-    rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Timeout::Error, EOFError, OpenSSL::SSL::SSLError, SocketError => e
+    rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Timeout::Error, EOFError,
+      OpenSSL::SSL::SSLError, SocketError, HTTPServerException => e
       if response # at least a chunk is downloaded
         if etag = response.header['ETag'][0]
           header['If-Range'] = etag

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/spec/td/client/job_api_spec.rb

@@ -286,7 +286,7 @@ describe 'Job API' do
       expect(api.job_result(12345)).to eq ['hello', 'world']
     end
 
-    it '200->500->206 can resume' do
+    it '200->206 can resume' do
       sz = packed.bytesize / 3
       stub_api_request(:get, '/v3/job/result/12345').
         with(:query => {'format' => 'msgpack'}).
@@ -297,23 +297,6 @@ describe 'Job API' do
           },
           :body => packed[0, sz]
         )
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(
-          :headers => {
-            'If-Range' => '"abcdefghijklmn"',
-            'Range' => "bytes=#{sz}-",
-          },
-          :query => {'format' => 'msgpack'}
-        ).
-        to_return(
-          :status => 500,
-          :headers => {
-            'Content-Length' => packed.bytesize - sz,
-            'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
-            'Etag' => '"abcdefghijklmn"',
-          },
-          :body => packed
-        )
       stub_api_request(:get, '/v3/job/result/12345').
         with(
           :headers => {
@@ -783,6 +766,57 @@ describe 'Job API' do
       end
     end
 
+    context '500 -> 200' do
+      before do
+        sz = packed.bytesize / 3
+        count = 0
+        stub_api_request(:get, '/v3/job/result/12345').
+          with(:query => {'format' => format}).
+        to_return do
+          count += 1
+          if count == 1
+            {:status => 500}
+          else
+            {
+              :headers => {
+                'Content-Encoding' => content_encoding,
+                'Content-Length' => packed.bytesize,
+                'Etag' => '"abcdefghijklmn"',
+              },
+              :body => packed,
+            }
+          end
+        end
+        expect(api).to receive(:sleep).once
+        allow($stderr).to receive(:print)
+        allow($stderr).to receive(:puts)
+      end
+      context 'Content-Encoding: gzip' do
+        let (:content_encoding){ 'gzip' }
+        let (:packed){ gziped }
+        context 'msgpack' do
+          let (:format){ 'msgpack' }
+          it { is_expected.to eq formatted }
+        end
+        context 'json' do
+          let (:format){ 'json' }
+          it { is_expected.to eq formatted }
+        end
+      end
+      context 'Content-Encoding: deflate' do
+        let (:content_encoding){ 'deflate' }
+        let (:packed){ deflated }
+        context 'msgpack' do
+          let (:format){ 'msgpack' }
+          it { is_expected.to eq formatted }
+        end
+        context 'json' do
+          let (:format){ 'json' }
+          it { is_expected.to eq formatted }
+        end
+      end
+    end
+
     context 'without autodecode' do
       before do
         sz = packed.bytesize / 3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Treasure Data API library for Ruby