td-client 0.8.71 → 0.8.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0915d6c13f678942cf1ee8e343177889927a563
-  data.tar.gz: b328275191c096f34ab5d1bd249233864d9ca142
+  metadata.gz: a0f239495e96d72f93277ab75395f7e5f48596bd
+  data.tar.gz: b707ac4743e65d6bbd950a665f7889b64f1aaebd
 SHA512:
-  metadata.gz: 52ca215f45608498aa20e47d3ba7f4cb025be9a8ebb8161ee5a09d7d939f5f24a45fd9ba4954770116813bf0f0bf58549afca9a626c7bd82aacd4a3ab7e28b0c
-  data.tar.gz: 37155a1c498499cd4f43acc7839fcecff438ec827b1c89fca75bc81b8e5bbe727979c4b647fabe6661bb745dd0f4df27fd7eadef607e8a1ae330df19c3c95855
+  metadata.gz: 2e219700d74240c7080c8bfc6d717ea9d4efcaa027d9cecfd86c2e21c404d6d9aa4c4c4a150fb7058f8353a93492aa91500b7adc39a6dccc29eb698db1485802
+  data.tar.gz: 8099a83cdd1d941c350d30fd4c1f9d6eae658c799aae719d2e6477f75c22d829b23e4fd677e56d4a59da4bed511ad23342fccb7eaba27cdba92a60ce01b98a33

data/lib/td/client.rb

@@ -229,6 +229,10 @@ class Client
     @api.job_result_format(job_id, format, io, &block)
   end
 
+  def job_result_raw(job_id, format, io=nil, &block)
+    @api.job_result_raw(job_id, format, io, &block)
+  end
+
   # @param [String] job_id
   # @param [Proc] block
   # @return [nil]

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

@@ -233,12 +233,28 @@ module Job
   # @param [String] job_id
   # @param [String] format
   # @return [String]
-  def job_result_raw(job_id, format)
-    code, body, res = get("/v3/job/result/#{e job_id}", {'format'=>format})
-    if code != "200"
-      raise_error("Get job result failed", res)
-    end
-    return body
+  def job_result_raw(job_id, format, io = nil, &block)
+    body = nil
+
+    get("/v3/job/result/#{e job_id}", {'format'=>format}) {|res|
+      if res.code != "200"
+        raise_error("Get job result failed", res)
+      end
+
+      if io
+        res.extend(DirectReadBodyMixin)
+
+        total_compr_size = 0
+        res.each_fragment {|fragment|
+          total_compr_size += fragment.size
+          io.write(fragment)
+          block.call(total_compr_size) if block_given?
+        }
+      else
+        body = res.read_body
+      end
+    }
+    body
   end
 
   # @param [String] job_id

data/lib/td/client/model.rb

@@ -495,6 +495,11 @@ class Job < Model
     @client.job_result_format(@job_id, format, io, &block)
   end
 
+  def result_raw(format, io=nil, &block)
+    return nil unless finished?
+    @client.job_result_raw(@job_id, format, io, &block)
+  end
+
   # @yield [result]
   # @return [nil]
   def result_each_with_compr_size(&block)

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '0.8.71'
+    VERSION = '0.8.72'
   end
 end

data/spec/td/client/job_api_spec.rb

@@ -271,11 +271,26 @@ describe 'Job API' do
   end
 
   describe 'job_result_raw' do
-    it 'returns raw result' do
-      stub_api_request(:get, '/v3/job/result/12345').
-        with(:query => {'format' => 'json'}).
-        to_return(:body => 'raw binary')
-      api.job_result_raw(12345, 'json').should == 'raw binary'
+    context 'with io' do
+      let(:io) { StringIO.new }
+
+      it 'returns raw result' do
+        stub_api_request(:get, '/v3/job/result/12345').
+          with(:query => {'format' => 'json'}).
+          to_return(:body => 'raw binary')
+        api.job_result_raw(12345, 'json', io)
+
+        io.string.should == 'raw binary'
+      end
+    end
+
+    context 'witout io' do
+      it 'returns raw result' do
+        stub_api_request(:get, '/v3/job/result/12345').
+          with(:query => {'format' => 'json'}).
+          to_return(:body => 'raw binary')
+        api.job_result_raw(12345, 'json').should == 'raw binary'
+      end
     end
   end
 

data/spec/td/client/model_job_spec.rb

@@ -34,4 +34,32 @@ describe 'Job Model' do
       expect(subject).to eq client
     end
   end
+
+  describe '#result_raw' do
+    let(:client) { Client.authenticate('user', 'password') }
+    let(:job_id) { 12345678 }
+    let(:job)    { Job.new(client, job_id, nil, nil) }
+    let(:format) { 'json' }
+    let(:io)     { StringIO.new }
+
+    context 'not finished?' do
+      before { job.stub(:finished?) { false } }
+
+      it 'do not call #job_result_raw' do
+        client.should_not_receive(:job_result_raw)
+
+        expect(job.result_raw(format, io)).to_not be
+      end
+    end
+
+    context 'finished?' do
+      before { job.stub(:finished?) { true } }
+
+      it 'call #job_result_raw' do
+        client.should_receive(:job_result_raw).with(job_id, format, io)
+
+        job.result_raw(format, io)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.71
+  version: 0.8.72
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.2
     - - <
       - !ruby/object:Gem::Version
         version: 2.6.0
@@ -84,7 +84,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.2
     - - <
       - !ruby/object:Gem::Version
         version: 2.6.0