td-client 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a45d6b813ecd784711b722f4092e5bae4092f7f
-  data.tar.gz: 1b0371ff2fbdc251693656e9e63b91f9763417eb
+  metadata.gz: f8123cb6d1ba413d6e482a5396d2675340256e1b
+  data.tar.gz: 3e8541a2b1070b50dc270c54bb5f76a24e29cd24
 SHA512:
-  metadata.gz: 7da7f3bd0bef93c74d9adb84f5b9190a1781b50aced54ad8366d04cdf6f27ac745e7a37d7e17b20c62ced7a6d176d1fb3adc68ed9434834c973322f3b4a1b5ea
-  data.tar.gz: a27712fd626d72ac2811b00590d887c786ad113ea40cf67ab5b1d89a3e48ec724c97809d6bed1be8bba908eddfe54346c0b96871db7189800ee1f9f7176bdcac
+  metadata.gz: 7bdbacf95cd257c635dd6d72486b32974408d9f09e4f81e1ec1233c4db0b709bbb0b48991c2820c80d1a94c305295b7809771dbc34ca5e8b0e885a1146053277
+  data.tar.gz: 901e31f20e95e0aa83fabaa4daf18470376aee5396cbe09cad474e5680ab1e56fee43ceae3e466b91f92d1b60b7de1a4b2ad777e86e309807bf3d5a733007fcd

data/lib/td/client/api.rb

@@ -289,6 +289,7 @@ private
         if block
           current_total_chunk_size = 0
           response = client.get(target, params, header) {|res, chunk|
+            break if res.status != 200
             current_total_chunk_size += chunk.bytesize
             block.call(res, chunk, current_total_chunk_size)
           }
@@ -300,17 +301,17 @@ private
         else
           response = client.get(target, params, header)
 
-          validate_content_length!(response, response.body.bytesize) if @ssl
-        end
+          status = response.code
+          # retry if the HTTP error code is 500 or higher and we did not run out of retrying attempts
+          if status >= 500 && cumul_retry_delay < @max_cumul_retry_delay
+            $stderr.puts "Error #{status}: #{get_error(response)}. Retrying after #{retry_delay} seconds..."
+            sleep retry_delay
+            cumul_retry_delay += retry_delay
+            retry_delay *= 2
+            redo # restart from beginning of do-while loop
+          end
 
-        status = response.code
-        # retry if the HTTP error code is 500 or higher and we did not run out of retrying attempts
-        if !block_given? && status >= 500 && cumul_retry_delay < @max_cumul_retry_delay
-          $stderr.puts "Error #{status}: #{get_error(response)}. Retrying after #{retry_delay} seconds..."
-          sleep retry_delay
-          cumul_retry_delay += retry_delay
-          retry_delay *= 2
-          redo # restart from beginning of do-while loop
+          validate_content_length!(response, response.body.to_s.bytesize) if @ssl
         end
       rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Timeout::Error, EOFError,
         SystemCallError, OpenSSL::SSL::SSLError, SocketError, HTTPClient::TimeoutError,

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

@@ -272,6 +272,22 @@ module Job
     end
   end
 
+  def validate_response_status(res, current_total_chunk_size=0)
+    case res.status
+    when 200
+      if current_total_chunk_size != 0
+        # try to resume but the server returns 200
+        raise_error("Get job result failed", res)
+      end
+    when 206 # resuming
+    else
+      if res.status/100 == 5
+        raise HTTPServerException
+      end
+      raise_error("Get job result failed", res)
+    end
+  end
+
   class HTTPServerException < StandardError
   end
 
@@ -297,43 +313,31 @@ module Job
     current_total_chunk_size = 0
     infl = nil
     begin # LOOP of Network/Server errors
-      response = nil
-      client.get(url, params, header) do |res, chunk|
-        unless response
-          case res.status
-          when 200
-            if current_total_chunk_size != 0
-              # try to resume but the server returns 200
-              raise_error("Get job result failed", res)
-            end
-          when 206 # resuming
-          else
-            if res.status/100 == 5
-              raise HTTPServerException
-            end
-            raise_error("Get job result failed", res)
-          end
-          if infl.nil? && autodecode
-            case res.header['Content-Encoding'][0].to_s.downcase
-            when 'gzip'
-              infl = Zlib::Inflate.new(Zlib::MAX_WBITS + 16)
-            when 'deflate'
-              infl = Zlib::Inflate.new
-            end
+      response = client.get(url, params, header) do |res, chunk|
+        validate_response_status(res, current_total_chunk_size)
+        if infl.nil? && autodecode
+          case res.header['Content-Encoding'][0].to_s.downcase
+          when 'gzip'
+            infl = Zlib::Inflate.new(Zlib::MAX_WBITS + 16)
+          when 'deflate'
+            infl = Zlib::Inflate.new
           end
         end
-        response = res
         current_total_chunk_size += chunk.bytesize
         chunk = infl.inflate(chunk) if infl
         yield chunk, current_total_chunk_size
       end
 
+      # for the case response body is empty
+      # Note that webmock returns response.body as "" instead of nil
+      validate_response_status(response, 0) if response.body.to_s.empty?
+
       # completed?
       validate_content_length_with_range(response, current_total_chunk_size)
     rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Timeout::Error, EOFError,
       SystemCallError, OpenSSL::SSL::SSLError, SocketError, HTTPClient::TimeoutError,
       HTTPServerException => e
-      if response # at least a chunk is downloaded
+      if current_total_chunk_size > 0
         if etag = response.header['ETag'][0]
           header['If-Range'] = etag
           header['Range'] = "bytes=#{current_total_chunk_size}-"

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

data/spec/spec_helper.rb

@@ -34,6 +34,15 @@ require 'json'
 
 include TreasureData
 
+RSpec.configure do |config|
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+end
+
 shared_context 'common helper' do
   let :account_id do
     1

data/spec/td/client/job_api_spec.rb

@@ -320,6 +320,27 @@ describe 'Job API' do
       expect(api.job_result(12345)).to eq ['hello', 'world']
     end
 
+    it '200 (blank) -> 200 works fine' do
+      i = 0
+      stub_api_request(:get, '/v3/job/result/12345').
+        with(:query => {'format' => 'msgpack'}).
+        to_return do
+        i += 1
+        puts "count : #{i}"
+        {
+          :headers => {
+            'Content-Length' => packed.bytesize,
+            'Etag' => '"abcdefghijklmn"',
+          },
+          :body => (i == 1 ? nil : packed)
+        }
+      end
+      expect(api).to receive(:sleep).once
+      expect($stderr).to receive(:print)
+      expect($stderr).to receive(:puts)
+      expect(api.job_result(12345)).to eq ['hello', 'world']
+    end
+
   end
 
   describe 'job_result_format' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-09-15 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.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Treasure Data API library for Ruby