td-client 0.8.17 → 0.8.18

data/ChangeLog

@@ -1,4 +1,11 @@
 
+== 2012-06-26 version 0.8.18
+
+* Client#result_each(&block) uses streaming raed not to read all data into memory
+* Client#result_format(format, io=nil) supports second argument not to read
+all data into memory
+
+
 == 2012-06-11 version 0.8.17
 
 * Client#jobs supports status option

data/lib/td/client.rb

@@ -136,8 +136,8 @@ class Client
   end
 
   # => result:String
-  def job_result_format(job_id, format)
-    @api.job_result_format(job_id, format)
+  def job_result_format(job_id, format, io=nil)
+    @api.job_result_format(job_id, format, io=nil)
   end
 
   # => nil

data/lib/td/client/api.rb

@@ -333,25 +333,32 @@ class API
     return result
   end
 
-  def job_result_format(job_id, format)
-    # TODO chunked encoding
-    code, body, res = get("/v3/job/result/#{e job_id}", {'format'=>format})
-    if code != "200"
-      raise_error("Get job result failed", res)
+  def job_result_format(job_id, format, io=nil)
+    code, body, res = 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.read_body {|fragment|
+          io.write(fragment)
+        }
+      end
+    }
+    unless io
+      return body
     end
-    return body
   end
 
   def job_result_each(job_id, &block)
-    # TODO chunked encoding
     require 'msgpack'
-    code, body, res = get("/v3/job/result/#{e job_id}", {'format'=>'msgpack'})
-    if code != "200"
-      raise_error("Get job result failed", res)
-    end
-    result = []
-    MessagePack::Unpacker.new.feed_each(body) {|row|
-      yield row
+    get("/v3/job/result/#{e job_id}", {'format'=>'msgpack'}) {|res|
+      if res.code != "200"
+        raise_error("Get job result failed", res)
+      end
+      u = MessagePack::Unpacker.new
+      res.read_body {|fragment|
+        u.feed_each(fragment, &block)
+      }
     }
     nil
   end
@@ -857,8 +864,7 @@ class API
   end
 
   private
-
-  def get(url, params=nil)
+  def get(url, params=nil, &block)
     http, header = new_http
 
     path = @base_path + url
@@ -870,7 +876,8 @@ class API
 
     request = Net::HTTP::Get.new(path, header)
 
-    response = http.request(request)
+    response = http.request(request, &block)
+
     return [response.code, response.body, response]
   end
 

data/lib/td/client/model.rb

@@ -239,9 +239,9 @@ class Job < Model
     @result
   end
 
-  def result_format(format)
+  def result_format(format, io=nil)
     return nil unless finished?
-    @client.job_result_format(@job_id, format)
+    @client.job_result_format(@job_id, format, io)
   end
 
   def result_each(&block)

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.17'
+VERSION = '0.8.18'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.17
+  version: 0.8.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000Z
+date: 2012-06-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70183080337620 !ruby/object:Gem::Requirement
+  requirement: &70231327028320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70183080337620
+  version_requirements: *70231327028320
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70183080336900 !ruby/object:Gem::Requirement
+  requirement: &70231327027100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70183080336900
+  version_requirements: *70231327027100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70183080336060 !ruby/object:Gem::Requirement
+  requirement: &70231327025120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70183080336060
+  version_requirements: *70231327025120
 description: 
 email: 
 executables: []