td-client 1.0.3 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f8123cb6d1ba413d6e482a5396d2675340256e1b
-  data.tar.gz: 3e8541a2b1070b50dc270c54bb5f76a24e29cd24
+SHA256:
+  metadata.gz: 8650b4fe6267d1edb91dad045ac0b31f77d0d0e37d776ea5433ec88debfe4b81
+  data.tar.gz: baf35bbd09b187c8f76ee48f68328f23ac09721ddb31641154a97900dc4ac93b
 SHA512:
-  metadata.gz: 7bdbacf95cd257c635dd6d72486b32974408d9f09e4f81e1ec1233c4db0b709bbb0b48991c2820c80d1a94c305295b7809771dbc34ca5e8b0e885a1146053277
-  data.tar.gz: 901e31f20e95e0aa83fabaa4daf18470376aee5396cbe09cad474e5680ab1e56fee43ceae3e466b91f92d1b60b7de1a4b2ad777e86e309807bf3d5a733007fcd
+  metadata.gz: 643dc4c3d7ec6e5e73b506f3b18750a7aeaf73e915890c68ccd7b590f8d539a1fb047f5adbb4652bb0a732f2e8466658be112384d9d57aae1cb72b902b8a4b46
+  data.tar.gz: fbf3228a704dd954299becd06462920f72934674d8cae49ba1db91d169441fe4a079348e33ec8f2e3b08c986b5383fbf476f7161de8711a3677583da1b4b3169

data/lib/td/client.rb

@@ -88,9 +88,14 @@ class Client
     raise NotFoundError, "Database '#{db_name}' does not exist"
   end
 
+  # @param [String] db
+  # @param [String] table
+  # @option params [Fixnum] :expire_days days to expire table
+  # @option params [Boolean] :include_v (true) include v column on Hive
+  # @option params [Boolean] :detect_schema (true) detect schema on import
   # @return [true]
-  def create_log_table(db_name, table_name)
-    @api.create_log_table(db_name, table_name)
+  def create_log_table(db_name, table_name, params={})
+    @api.create_log_table(db_name, table_name, params)
   end
 
   # Swap table names
@@ -111,6 +116,16 @@ class Client
     @api.update_schema(db_name, table_name, schema.to_json)
   end
 
+  # @param [String] db
+  # @param [String] table
+  # @option params [Fixnum] :expire_days days to expire table
+  # @option params [Boolean] :include_v (true) include v column on Hive
+  # @option params [Boolean] :detect_schema (true) detect schema on import
+  # @return [true]
+  def update_table(db_name, table_name, params={})
+    @api.update_table(db_name, table_name, params)
+  end
+
   # @param [String] db_name
   # @param [String] table_name
   # @param [Fixnum] expire_days
@@ -130,10 +145,10 @@ class Client
   # @return [Array] Tables
   def tables(db_name)
     m = @api.list_tables(db_name)
-    m.map {|table_name, (type, schema, count, created_at, updated_at, estimated_storage_size, last_import, last_log_timestamp, expire_days)|
+    m.map {|table_name, (type, schema, count, created_at, updated_at, estimated_storage_size, last_import, last_log_timestamp, expire_days, include_v)|
       schema = Schema.new.from_json(schema)
       Table.new(self, db_name, table_name, type, schema, count, created_at, updated_at,
-        estimated_storage_size, last_import, last_log_timestamp, expire_days)
+        estimated_storage_size, last_import, last_log_timestamp, expire_days, include_v)
     }
   end
 
@@ -158,6 +173,14 @@ class Client
     @api.tail(db_name, table_name, count, to, from, &block)
   end
 
+  # @param [String] db_name
+  # @param [String] table_name
+  # @param [String] new_db_name
+  # @return [true]
+  def change_database(db_name, table_name, new_db_name)
+    @api.change_database(db_name, table_name, new_db_name)
+  end
+
   # @param [String] db_name
   # @param [String] q
   # @param [String] result_url
@@ -519,39 +542,6 @@ class Client
     @api.change_my_password(old_password, password)
   end
 
-  # @return [Array<AccessControl>]
-  def access_controls
-    list = @api.list_access_controls
-    list.map {|subject,action,scope,grant_option|
-      AccessControl.new(self, subject, action, scope, grant_option)
-    }
-  end
-
-  # @param [String] subject
-  # @param [String] action
-  # @param [String] scope
-  # @param [Array] grant_option
-  # @return [true]
-  def grant_access_control(subject, action, scope, grant_option)
-    @api.grant_access_control(subject, action, scope, grant_option)
-  end
-
-  # @param [String] subject
-  # @param [String] action
-  # @param [String] scope
-  # @return [true]
-  def revoke_access_control(subject, action, scope)
-    @api.revoke_access_control(subject, action, scope)
-  end
-
-  # @param [String] user
-  # @param [String] action
-  # @param [String] scope
-  # @return [Array]
-  def test_access_control(user, action, scope)
-    @api.test_access_control(user, action, scope)
-  end
-
   # => BulkLoad::Job
   def bulk_load_guess(job)
     @api.bulk_load_guess(job)

data/lib/td/client/api.rb

@@ -1,6 +1,5 @@
 require 'td/client/api_error'
 require 'td/client/version'
-require 'td/client/api/access_control'
 require 'td/client/api/account'
 require 'td/client/api/bulk_import'
 require 'td/client/api/bulk_load'
@@ -21,7 +20,6 @@ require 'td/core_ext/openssl/ssl/sslcontext/set_params'
 module TreasureData
 
 class API
-  include API::AccessControl
   include API::Account
   include API::BulkImport
   include API::BulkLoad
@@ -638,15 +636,27 @@ private
       klass
     else
       case status_code
+      when "400"
+        BadRequestError
+      when "401"
+        AuthError
+      when "403"
+        ForbiddenError
       when "404"
         NotFoundError
+      when "405"
+        MethodNotAllowedError
       when "409"
         message = "#{message}: conflicts_with job:#{error["details"]["conflicts_with"]}" if error["details"] && error["details"]["conflicts_with"]
         AlreadyExistsError
-      when "401"
-        AuthError
-      when "403"
-        ForbiddenError
+      when "415"
+        UnsupportedMediaTypeError
+      when "422"
+        UnprocessableEntityError
+      when "429"
+        TooManyRequestsError
+      when /\A4\d\d\z/
+        ClientError
       else
         message = "#{status_code}: #{message}"
         APIError

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

@@ -28,7 +28,7 @@ module Export
   # @return [String] job_id
   def result_export(target_job_id, opts={})
     code, body, res = post("/v3/job/result_export/#{target_job_id}", opts)
-    if code != "200"
+    if code[0] != ?2
       raise_error("Result Export failed", res)
     end
     js = checked_json(body, %w[job_id])

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

@@ -29,9 +29,7 @@ module Import
     if code[0] != ?2
       raise_error("Import failed", res)
     end
-    js = checked_json(body, %w[])
-    time = js['elapsed_time'].to_f
-    return time
+    return true
   end
 
 end

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

@@ -6,7 +6,7 @@ module Job
   ##
 
   # @param [Fixnum] from
-  # @param [Fixnum] to
+  # @param [Fixnum] to (to is inclusive)
   # @param [String] status
   # @param [Hash] conditions
   # @return [Array]
@@ -67,6 +67,8 @@ module Job
     num_records = js['num_records']
     duration = js['duration']
     result = js['result'] # result target URL
+    linked_result_export_job_id = js['linked_result_export_job_id']
+    result_export_target_job_id = js['result_export_target_job_id']
     hive_result_schema = (js['hive_result_schema'] || '')
     if hive_result_schema.empty?
       hive_result_schema = nil
@@ -100,7 +102,8 @@ module Job
     priority = js['priority']
     retry_limit = js['retry_limit']
     return [type, query, status, url, debug, start_at, end_at, cpu_time,
-            result_size, result, hive_result_schema, priority, retry_limit, nil, database, duration, num_records]
+            result_size, result, hive_result_schema, priority, retry_limit, nil, database, duration, num_records,
+            linked_result_export_job_id, result_export_target_job_id]
   end
 
   # @param [String] job_id
@@ -313,8 +316,12 @@ module Job
     current_total_chunk_size = 0
     infl = nil
     begin # LOOP of Network/Server errors
+      first_chunk_p = true
       response = client.get(url, params, header) do |res, chunk|
-        validate_response_status(res, current_total_chunk_size)
+        # Validate only on first chunk
+        validate_response_status(res, current_total_chunk_size) if first_chunk_p
+        first_chunk_p = false
+
         if infl.nil? && autodecode
           case res.header['Content-Encoding'][0].to_s.downcase
           when 'gzip'

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

@@ -66,7 +66,7 @@ module Schedule
 
   # @param [String] name
   # @param [Fixnum] from
-  # @param [Fixnum] to
+  # @param [Fixnum] to (to is exclusive)
   # @return [Array]
   def history(name, from=0, to=nil)
     params = {}

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

@@ -25,16 +25,18 @@ module Table
       estimated_storage_size = m['estimated_storage_size'].to_i
       schema = JSON.parse(m['schema'] || '[]')
       expire_days = m['expire_days']
-      result[name] = [type, schema, count, created_at, updated_at, estimated_storage_size, last_import, last_log_timestamp, expire_days]
+      include_v = m['include_v']
+      result[name] = [type, schema, count, created_at, updated_at, estimated_storage_size, last_import, last_log_timestamp, expire_days, include_v]
     }
     return result
   end
 
   # @param [String] db
   # @param [String] table
+  # @param [Hash] params
   # @return [true]
-  def create_log_table(db, table)
-    create_table(db, table, :log)
+  def create_log_table(db, table, params={})
+    create_table(db, table, :log, params)
   end
 
   # @param [String] db
@@ -81,9 +83,19 @@ module Table
   # @param [Fixnum] expire_days
   # @return [true]
   def update_expire(db, table, expire_days)
-    code, body, res = post("/v3/table/update/#{e db}/#{e table}", {'expire_days'=>expire_days})
+    update_table(db, table, {:expire_days=>expire_days})
+  end
+
+  # @param [String] db
+  # @param [String] table
+  # @option params [Fixnum] :expire_days days to expire table
+  # @option params [Boolean] :include_v (true) include v column on Hive
+  # @option params [Boolean] :detect_schema (true) detect schema on import
+  # @return [true]
+  def update_table(db, table, params={})
+    code, body, res = post("/v3/table/update/#{e db}/#{e table}", params)
     if code != "200"
-      raise_error("Update table expiration failed", res)
+      raise_error("Update table failed", res)
     end
     return true
   end
@@ -128,5 +140,14 @@ module Table
     end
   end
 
+  def change_database(db, table, dest_db)
+    params = { 'dest_database_name' => dest_db }
+    code, body, res = post("/v3/table/change_database/#{e db}/#{e table}", params)
+    if code != "200"
+      raise_error("Change database failed", res)
+    end
+    return true
+  end
+
 end
 end

data/lib/td/client/api_error.rb

@@ -13,16 +13,32 @@ class APIError < StandardError
   end
 end
 
-# 401 API errors
-class AuthError < APIError
+# 4xx Client Errors
+class ClientError < APIError
 end
 
-# 403 API errors, used for database permissions
-class ForbiddenError < APIError
+# 400 Bad Request
+class BadRequestError < ClientError
 end
 
-# 409 API errors
-class AlreadyExistsError < APIError
+# 401 Unauthorized
+class AuthError < ClientError
+end
+
+# 403 Forbidden, used for database permissions
+class ForbiddenError < ClientError
+end
+
+# 404 Not Found
+class NotFoundError < ClientError
+end
+
+# 405 Method Not Allowed
+class MethodNotAllowedError < ClientError
+end
+
+# 409 Conflict
+class AlreadyExistsError < ClientError
   attr_reader :conflicts_with
   def initialize(error_message = nil, api_backtrace = nil, conflicts_with=nil)
     super(error_message, api_backtrace)
@@ -30,8 +46,16 @@ class AlreadyExistsError < APIError
   end
 end
 
-# 404 API errors
-class NotFoundError < APIError
+# 415 Unsupported Media Type
+class UnsupportedMediaTypeError < ClientError
+end
+
+# 422 Unprocessable Entity
+class UnprocessableEntityError < ClientError
+end
+
+# 429 Too Many Requests
+class TooManyRequestsError < ClientError
 end
 
 end

data/lib/td/client/model.rb

@@ -153,7 +153,7 @@ class Table < Model
   # @param [String] last_import
   # @param [String] last_log_timestamp
   # @param [Fixnum, String] expire_days
-  def initialize(client, db_name, table_name, type, schema, count, created_at=nil, updated_at=nil, estimated_storage_size=nil, last_import=nil, last_log_timestamp=nil, expire_days=nil)
+  def initialize(client, db_name, table_name, type, schema, count, created_at=nil, updated_at=nil, estimated_storage_size=nil, last_import=nil, last_log_timestamp=nil, expire_days=nil, include_v=false)
     super(client)
     @database = nil
     @db_name = db_name
@@ -167,6 +167,7 @@ class Table < Model
     @last_import = last_import
     @last_log_timestamp = last_log_timestamp
     @expire_days = expire_days
+    @include_v = include_v
   end
 
   # @!attribute [r] type
@@ -175,7 +176,7 @@ class Table < Model
   # @!attribute [r] schema
   # @!attribute [r] count
   # @!attribute [r] estimated_storage_size
-  attr_reader :type, :db_name, :table_name, :schema, :count, :estimated_storage_size
+  attr_reader :type, :db_name, :table_name, :schema, :count, :estimated_storage_size, :include_v
 
   alias database_name db_name
   alias name table_name
@@ -425,6 +426,7 @@ class Job < Model
     @db_name = db_name
     @duration = duration
     @num_records = num_records
+    @auto_update_status = true
   end
 
   # @!attribute [r] job_id
@@ -440,6 +442,16 @@ class Job < Model
   attr_reader :priority, :retry_limit, :org_name, :db_name
   attr_reader :duration, :num_records
 
+  # whether it update status if the job is not finished yet or not
+  def auto_update_status?
+    @auto_update_status
+  end
+
+  # set whether it update status if the job is not finished yet or not
+  def auto_update_status=(bool)
+    @auto_update_status = bool ? true : false
+  end
+
   # @option timeout [Integer,nil] timeout in second
   # @option wait_interval [Integer,nil] interval in second of polling the job status
   # @param detail [Boolean] update job detail or not
@@ -478,55 +490,55 @@ class Job < Model
 
   # @return [String]
   def query
-    update_status! unless @query || finished?
+    update_status! unless @query || !@auto_update_status || finished?
     @query
   end
 
   # @return [String]
   def status
-    update_status! unless @status || finished?
+    update_status! unless @status || !@auto_update_status || finished?
     @status
   end
 
   # @return [String]
   def url
-    update_status! unless @url || finished?
+    update_status! unless @url || !@auto_update_status || finished?
     @url
   end
 
   # @return [Boolean]
   def debug
-    update_status! unless @debug || finished?
+    update_status! unless @debug || !@auto_update_status || finished?
     @debug
   end
 
   # @return [Time, nil]
   def start_at
-    update_status! unless @start_at || finished?
+    update_status! unless @start_at || !@auto_update_status || finished?
     @start_at && !@start_at.empty? ? Time.parse(@start_at) : nil
   end
 
   # @return [Time, nil]
   def end_at
-    update_status! unless @end_at || finished?
+    update_status! unless @end_at || !@auto_update_status || finished?
     @end_at && !@end_at.empty? ? Time.parse(@end_at) : nil
   end
 
   # @return [String]
   def cpu_time
-    update_status! unless @cpu_time || finished?
+    update_status! unless @cpu_time || !@auto_update_status || finished?
     @cpu_time
   end
 
   # @return [Array]
   def hive_result_schema
-    update_status! unless @hive_result_schema.instance_of? Array || finished?
+    update_status! unless @hive_result_schema.instance_of?(Array) || !@auto_update_status || finished?
     @hive_result_schema
   end
 
   # @return [String]
   def result_size
-    update_status! unless @result_size || finished?
+    update_status! unless @result_size || !@auto_update_status || finished?
     @result_size
   end
 

data/lib/td/client/version.rb

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

data/spec/spec_helper.rb

@@ -49,11 +49,7 @@ shared_context 'common helper' do
   end
 
   let :headers do
-    if RUBY_VERSION >= "2.0.0"
-      {'Accept' => '*/*', 'Accept-Encoding' => /gzip/, 'Date' => /.*/, 'User-Agent' => /Ruby/}
-    else
-      {'Accept' => '*/*', 'Date' => /.*/, 'User-Agent' => /Ruby/}
-    end
+    {'Accept' => '*/*', 'Accept-Encoding' => /gzip/, 'Date' => /.*/, 'User-Agent' => /Ruby/}
   end
 
   def stub_api_request(method, path, opts = nil)

data/spec/td/client/api_ssl_connection_spec.rb

@@ -39,29 +39,30 @@ describe 'API SSL connection' do
     api = API.new(nil, :endpoint => "https://localhost:#{@serverport}", :retry_post_requests => false)
     api.ssl_ca_file = File.join(DIR, 'ca-all.cert')
     expect {
-      api.delete_database('no_such_database')
+      begin
+        api.delete_database('no_such_database')
+      rescue Errno::ECONNRESET
+        raise OpenSSL::SSL::SSLError # When openssl does not support SSLv3, httpclient server will not start. For context: https://github.com/nahi/httpclient/pull/424#issuecomment-731714786
+      end
     }.to raise_error OpenSSL::SSL::SSLError
   end
 
-  # 1.8.7's net/http does not call SSLContext#set_params. Use 1.8.7 where you don't care security.
-  if RUBY_VERSION >= '1.9.0'
-    it 'should success to connect TLSv1 only server' do
-      @server = setup_server(:TLSv1)
-      api = API.new(nil, :endpoint => "https://localhost:#{@serverport}", :retry_post_requests => false)
-      api.ssl_ca_file = File.join(DIR, 'ca-all.cert')
-      expect {
-        api.delete_database('no_such_database')
-      }.to raise_error TreasureData::NotFoundError
-    end
+  it 'should success to connect TLSv1 only server' do
+    @server = setup_server(:TLSv1)
+    api = API.new(nil, :endpoint => "https://localhost:#{@serverport}", :retry_post_requests => false)
+    api.ssl_ca_file = File.join(DIR, 'ca-all.cert')
+    expect {
+      api.delete_database('no_such_database')
+    }.to raise_error TreasureData::NotFoundError
   end
 
-  def setup_server(ssl_version)
+  def setup_server(ssl_version, port = 1000 + rand(1000))
     logger = Logger.new(STDERR)
     logger.level = Logger::Severity::FATAL  # avoid logging SSLError (ERROR level)
     @server = WEBrick::HTTPServer.new(
       :BindAddress => "localhost",
       :Logger => logger,
-      :Port => 0,
+      :Port => port,
       :AccessLog => [],
       :DocumentRoot => '.',
       :SSLEnable => true,

data/spec/td/client/import_api_spec.rb

@@ -46,9 +46,9 @@ describe 'Import API' do
       end
       stub_request(:put, "https://#{endpoint_import}/v3/table/import_with_id/db/table/unique_id/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api.import('db', 'table', 'format', f, 5, 'unique_id')).to eq(1.23)
+        expect(api.import('db', 'table', 'format', f, 5, 'unique_id')).to eq(true)
       end
     end
 
@@ -59,9 +59,9 @@ describe 'Import API' do
       end
       stub_request(:put, "https://#{endpoint_import}/v3/table/import/db/table/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api.import('db', 'table', 'format', f, 5)).to eq(1.23)
+        expect(api.import('db', 'table', 'format', f, 5)).to eq(true)
       end
     end
 
@@ -72,9 +72,9 @@ describe 'Import API' do
       end
       stub_request(:put, "http://#{endpoint_import_old}/v3/table/import/db/table/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api_old.import('db', 'table', 'format', f, 5)).to eq(1.23)
+        expect(api_old.import('db', 'table', 'format', f, 5)).to eq(true)
       end
     end
 
@@ -85,9 +85,9 @@ describe 'Import API' do
       end
       stub_request(:put, "https://#{endpoint_import}/v3/table/import/db/table/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api_default.import('db', 'table', 'format', f, 5)).to eq 1.23
+        expect(api_default.import('db', 'table', 'format', f, 5)).to eq true
       end
     end
 
@@ -98,9 +98,9 @@ describe 'Import API' do
       end
       stub_request(:put, "http://#{endpoint_import}/v3/table/import/db/table/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api_default_http.import('db', 'table', 'format', f, 5)).to eq 1.23
+        expect(api_default_http.import('db', 'table', 'format', f, 5)).to eq true
       end
     end
 
@@ -111,9 +111,9 @@ describe 'Import API' do
       end
       stub_request(:put, "https://#{endpoint_unknown}/v3/table/import/db/table/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api_unknown_host.import('db', 'table', 'format', f, 5)).to eq 1.23
+        expect(api_unknown_host.import('db', 'table', 'format', f, 5)).to eq true
       end
     end
 
@@ -124,9 +124,9 @@ describe 'Import API' do
       end
       stub_request(:put, "http://#{endpoint_unknown}/v3/table/import/db/table/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api_unknown_host_http.import('db', 'table', 'format', f, 5)).to eq 1.23
+        expect(api_unknown_host_http.import('db', 'table', 'format', f, 5)).to eq true
       end
     end
 

data/spec/td/client/job_api_spec.rb

@@ -31,7 +31,7 @@ describe 'Job API' do
         jobs = api.list_jobs
         jobs[i..i].map {|job_id, type, status, query, start_at, end_at, cpu_time,
                       result_size, result_url, priority, retry_limit, org, db,
-                      duration, num_records|
+                      duration, num_records, linked_result_export_job_id, result_export_target_job_id|
           expect(job_id).to eq(job['job_id'])
           expect(type).to eq(job['type'])
           expect(status).to eq(job['status'])
@@ -47,6 +47,8 @@ describe 'Job API' do
           expect(db).to eq(job['database'])
           expect(duration).to eq(job['duration'])
           expect(num_records).to eq(job['num_records'])
+          expect(linked_result_export_job_id).to eq(job['linked_result_export_job_id'])
+          expect(result_export_target_job_id).to eq(job['result_export_target_job_id'])
         }
       end
     }
@@ -341,6 +343,21 @@ describe 'Job API' do
       expect(api.job_result(12345)).to eq ['hello', 'world']
     end
 
+    it 'has multiple chunks' do
+      client = double('client')
+      allow(api).to receive(:new_client).and_return([client, {}])
+      allow(client).to receive(:send_timeout=)
+      allow(client).to receive(:receive_timeout=)
+      res = HTTP::Message.new_response(nil, HTTP::Message::Headers.new)
+      sz = 3
+      chunk1 = packed[0, sz]
+      chunk2 = packed[sz, packed.bytesize-sz]
+      expect(client).to receive(:get).
+        and_yield(res, chunk1).
+        and_yield(res, chunk2).
+        and_return(res)
+      expect(api.job_result(12345)).to eq ['hello', 'world']
+    end
   end
 
   describe 'job_result_format' do

data/spec/td/client/model_job_spec.rb

@@ -35,6 +35,56 @@ describe 'Job Model' do
     end
   end
 
+  describe '#auto_update_status' 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 }
+    before { allow(job).to receive(:finished?) { false } }
+
+    it 'can set' do
+      expect(job.auto_update_status?).to eq true
+      job.auto_update_status = false
+      expect(job.auto_update_status?).to eq false
+      job.auto_update_status = true
+      expect(job.auto_update_status?).to eq true
+    end
+
+    it 'calls API if auto_update_status=true' do
+      job.auto_update_status = true
+      result_job = {
+        'job_id' => job_id,
+        'status' => 'queued',
+        'created_at' => Time.now,
+      }
+      stub_request(:get, "https://api.treasuredata.com/v3/job/show/#{job_id}").
+        to_return(:body => result_job.to_json)
+      expect(job.query).to be_nil
+      expect(job.status).to eq "queued"
+      expect(job.url).to be_nil
+      expect(job.debug).to be_nil
+      expect(job.start_at).to be_nil
+      expect(job.end_at).to be_nil
+      expect(job.cpu_time).to be_nil
+      expect(job.hive_result_schema).to be_nil
+      expect(job.result_size).to be_nil
+    end
+
+    it "doesn't call API if auto_update_status=false" do
+      job.auto_update_status = false
+      expect(job.query).to be_nil
+      expect(job.status).to be_nil
+      expect(job.url).to be_nil
+      expect(job.debug).to be_nil
+      expect(job.start_at).to be_nil
+      expect(job.end_at).to be_nil
+      expect(job.cpu_time).to be_nil
+      expect(job.hive_result_schema).to be_nil
+      expect(job.result_size).to be_nil
+    end
+  end
+
   describe '#result_raw' do
     let(:client) { Client.authenticate('user', 'password') }
     let(:job_id) { 12345678 }
@@ -90,15 +140,16 @@ describe 'Job Model' do
       end
 
       it 'calls a given block in every wait_interval second' do
-        now = 1_400_000_000
-        allow(self).to receive(:sleep){|arg| now += arg }
-        allow(Process).to receive(:clock_gettime){ now }
+        # Let's try disable stubbing #sleep for now
+        # now = 1_400_000_000
+        # allow(self).to receive(:sleep){|arg| now += arg }
+        # allow(Process).to receive(:clock_gettime){ now }
         expect { |b|
           begin
             thread = Thread.start {
-              job.wait(nil, 2, &b)
+              job.wait(nil, 0.1, &b)
             }
-            sleep 6
+            sleep 0.3
             change_job_status(Job::STATUS_SUCCESS)
             thread.join(1)
             expect(thread).to be_stop

data/spec/td/client/table_api_spec.rb

@@ -30,6 +30,13 @@ describe 'Table API' do
       expect(api.create_log_table(db_name, table_name)).to be true
     end
 
+    it 'should create a new table with params' do
+      stub_api_request(:post, "/v3/table/create/#{e db_name}/#{e(table_name)}/log").
+        with(:body => {'include_v' => 'false'}).
+        to_return(:body => {'database' => db_name, 'table' => table_name, 'type' => 'log', 'include_v' => 'false'}.to_json)
+      expect(api.create_log_table(db_name, table_name, include_v: false)).to be true
+    end
+
     it 'should return 400 error with invalid name' do
       invalid_name = 'a'
       err_msg = "Name must be 3 to 256 characters, got #{invalid_name.length} characters. name = '#{invalid_name}'"
@@ -52,6 +59,52 @@ describe 'Table API' do
     end
   end
 
+  describe "'create_log_table' client API" do
+    it 'should return 404 error if the database does not exist' do
+      err_msg = "Create log table failed: Couldn't find UserDatabase with name = #{db_name}"
+      stub_api_request(:post, "/v3/table/create/#{e db_name}/#{e(table_name)}/log").
+        to_return(:status => 404, :body => {'message' => err_msg}.to_json)
+
+      expect {
+        client.create_log_table(db_name, table_name)
+      }.to raise_error(TreasureData::NotFoundError, /#{err_msg}/)
+    end
+
+    it 'should create a new table if the database exists' do
+      stub_api_request(:post, "/v3/table/create/#{e db_name}/#{e(table_name)}/log").
+        to_return(:body => {'database' => db_name, 'table' => table_name, 'type' => 'log'}.to_json)
+      expect(client.create_log_table(db_name, table_name)).to be true
+    end
+
+    it 'should create a new table with params' do
+      stub_api_request(:post, "/v3/table/create/#{e db_name}/#{e(table_name)}/log").
+        with(:body => {'include_v' => 'false'}).
+        to_return(:body => {'database' => db_name, 'table' => table_name, 'type' => 'log', 'include_v' => 'false'}.to_json)
+      expect(client.create_log_table(db_name, table_name, include_v: false)).to be true
+    end
+
+    it 'should return 400 error with invalid name' do
+      invalid_name = 'a'
+      err_msg = "Name must be 3 to 256 characters, got #{invalid_name.length} characters. name = '#{invalid_name}'"
+      stub_api_request(:post, "/v3/table/create/#{e db_name}/#{e invalid_name}/log").
+        to_return(:status => 400, :body => {'message' => err_msg}.to_json)
+
+      expect {
+        client.create_log_table(db_name, invalid_name)
+      }.to raise_error(TreasureData::APIError, /#{err_msg}/)
+    end
+
+    it 'should return 409 error with duplicated name' do
+      err_msg = "Table #{table_name} already exists"
+      stub_api_request(:post, "/v3/table/create/#{e db_name}/#{e table_name}/log").
+        to_return(:status => 409, :body => {'message' => err_msg}.to_json)
+
+      expect {
+        client.create_log_table(db_name, table_name)
+      }.to raise_error(TreasureData::AlreadyExistsError, /#{err_msg}/)
+    end
+  end
+
   describe "'list_tables' API" do
     it 'should list the tables in a Hash whose values include type, count, created_at, updated_at, schema, ...' do
       tables = [
@@ -179,6 +232,31 @@ describe 'Table API' do
     end
   end
 
+  describe 'handle include_v' do
+    it 'should set/unset include_v flag' do
+      stub_api_request(:get, '/v3/table/list/db').
+        to_return(:body => {'tables' => [
+          {'name' => 'table', 'type' => 'log', 'include_v' => true},
+        ]}.to_json)
+
+      table = client.table('db', 'table')
+      expect(table.include_v).to eq true
+
+      stub_api_request(:get, '/v3/table/list/db').
+        to_return(:body => {'tables' => [
+          {'name' => 'table', 'type' => 'log', 'include_v' => false},
+        ]}.to_json)
+
+      stub_api_request(:post, '/v3/table/update/db/table').
+        with(:body => {'include_v' => "false"}).
+        to_return(:body => {"database"=>"db","table"=>"table","type"=>"log"}.to_json)
+      api.update_table('db', 'table', include_v: "false")
+
+      table = client.table('db', 'table')
+      expect(table.include_v).to eq false
+    end
+  end
+
   describe 'tail' do
     let :packed do
       s = StringIO.new
@@ -223,4 +301,43 @@ describe 'Table API' do
       expect(r.read).to eq(%Q(parameter "to" and "from" no longer work\n))
     end
   end
+
+  describe 'change_database' do
+    it 'should change the database belonging to' do
+      stub_api_request(:post, "/v3/table/change_database/src_db/table").
+        with(:body => {'dest_database_name' => 'dst_db'}).
+        to_return(:body => {'database' => 'dst_db', 'table' => 'table', 'type' => 'log'}.to_json)
+      expect(api.change_database('src_db', 'table', 'dst_db')).to be true
+    end
+
+    it 'should return 403 error if dest database is inaccessible' do
+      err_msg = 'Access denied for the destination'
+      stub_api_request(:post, "/v3/table/change_database/src_db/table").
+        with(:body => {'dest_database_name' => 'inaccessible_db'}).
+        to_return(:status => 403, :body => {'message' => err_msg}.to_json)
+      expect {
+        api.change_database('src_db', 'table', 'inaccessible_db')
+      }.to raise_error(TreasureData::ForbiddenError, /#{err_msg}/)
+    end
+
+    it 'should return 403 error if there is a same name table in the dest database' do
+      err_msg = 'Table table already exists in the destination'
+      stub_api_request(:post, "/v3/table/change_database/src_db/table").
+        with(:body => {'dest_database_name' => 'dst_db'}).
+        to_return(:status => 403, :body => {'message' => err_msg}.to_json)
+      expect {
+        api.change_database('src_db', 'table', 'dst_db')
+      }.to raise_error(TreasureData::ForbiddenError, /#{err_msg}/)
+    end
+
+    it 'should return 404 error if the dest database does not exist' do
+      err_msg = 'Destination database is not found'
+      stub_api_request(:post, "/v3/table/change_database/src_db/table").
+        with(:body => {'dest_database_name' => 'notexist_db'}).
+        to_return(:status => 404, :body => {'message' => err_msg}.to_json)
+      expect {
+        api.change_database('src_db', 'table', 'notexist_db')
+      }.to raise_error(TreasureData::NotFoundError, /#{err_msg}/)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.8
 platform: ruby
 authors:
 - Treasure Data, Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Treasure Data API library for Ruby
 email: support@treasure-data.com
 executables: []
@@ -138,7 +152,6 @@ files:
 - lib/td-client.rb
 - lib/td/client.rb
 - lib/td/client/api.rb
-- lib/td/client/api/access_control.rb
 - lib/td/client/api/account.rb
 - lib/td/client/api/bulk_import.rb
 - lib/td/client/api/bulk_load.rb
@@ -158,7 +171,6 @@ files:
 - lib/td/client/version.rb
 - lib/td/core_ext/openssl/ssl/sslcontext/set_params.rb
 - 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
@@ -182,9 +194,10 @@ files:
 - spec/td/client_sched_spec.rb
 - spec/td/client_spec.rb
 homepage: http://treasuredata.com/
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,31 +212,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 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_spec.rb
+- spec/td/client_sched_spec.rb
+- spec/td/client/partial_delete_api_spec.rb
 - spec/td/client/api_spec.rb
-- spec/td/client/api_ssl_connection_spec.rb
-- spec/td/client/bulk_import_spec.rb
-- spec/td/client/bulk_load_spec.rb
 - spec/td/client/db_api_spec.rb
+- spec/td/client/result_api_spec.rb
 - spec/td/client/export_api_spec.rb
-- spec/td/client/import_api_spec.rb
-- spec/td/client/job_api_spec.rb
-- spec/td/client/model_job_spec.rb
-- spec/td/client/model_schedule_spec.rb
 - spec/td/client/model_schema_spec.rb
-- spec/td/client/partial_delete_api_spec.rb
-- spec/td/client/result_api_spec.rb
+- spec/td/client/api_error_spec.rb
 - spec/td/client/sched_api_spec.rb
-- spec/td/client/server_status_api_spec.rb
 - spec/td/client/table_api_spec.rb
+- spec/td/client/bulk_load_spec.rb
+- spec/td/client/api_ssl_connection_spec.rb
+- spec/td/client/job_api_spec.rb
+- spec/td/client/account_api_spec.rb
 - spec/td/client/user_api_spec.rb
-- spec/td/client_sched_spec.rb
-- spec/td/client_spec.rb
+- spec/td/client/bulk_import_spec.rb
+- spec/td/client/model_schedule_spec.rb
+- spec/td/client/import_api_spec.rb
+- spec/td/client/server_status_api_spec.rb
+- spec/td/client/model_job_spec.rb

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

@@ -1,74 +0,0 @@
-class TreasureData::API
-module AccessControl
-
-  ####
-  ## Access Control API
-  ##
-
-  # @param [String] subject
-  # @param [String] action
-  # @param [String] scope
-  # @param [Array] grant_option
-  # @return [true]
-  def grant_access_control(subject, action, scope, grant_option)
-    params = {'subject'=>subject, 'action'=>action, 'scope'=>scope, 'grant_option'=>grant_option.to_s}
-    code, body, res = post("/v3/acl/grant", params)
-    if code != "200"
-      raise_error("Granting access control failed", res)
-    end
-    return true
-  end
-
-  # @param [String] subject
-  # @param [String] action
-  # @param [String] scope
-  # @return [true]
-  def revoke_access_control(subject, action, scope)
-    params = {'subject'=>subject, 'action'=>action, 'scope'=>scope}
-    code, body, res = post("/v3/acl/revoke", params)
-    if code != "200"
-      raise_error("Revoking access control failed", res)
-    end
-    return true
-  end
-
-  # @param [String] user
-  # @param [String] action
-  # @param [String] scope
-  # @return [Array]
-  def test_access_control(user, action, scope)
-    params = {'user'=>user, 'action'=>action, 'scope'=>scope}
-    code, body, res = get("/v3/acl/test", params)
-    if code != "200"
-      raise_error("Testing access control failed", res)
-    end
-    js = checked_json(body, %w[permission access_controls])
-    perm = js["permission"]
-    acl = js["access_controls"].map {|roleinfo|
-      subject = roleinfo['subject']
-      action = roleinfo['action']
-      scope = roleinfo['scope']
-      [name, action, scope]
-    }
-    return perm, acl
-  end
-
-  # @return [Array]
-  def list_access_controls
-    code, body, res = get("/v3/acl/list")
-    if code != "200"
-      raise_error("Listing access control failed", res)
-    end
-    js = checked_json(body, %w[access_controls])
-    acl = js["access_controls"].map {|roleinfo|
-      subject = roleinfo['subject']
-      action = roleinfo['action']
-      scope = roleinfo['scope']
-      grant_option = roleinfo['grant_option']
-      [subject, action, scope, grant_option]
-    }
-    return acl
-  end
-
-end
-end

data/spec/td/client/access_control_api_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-require 'td/client/spec_resources'
-require 'json'
-
-describe 'Access Control API' do
-  include_context 'spec symbols'
-  include_context 'common helper'
-
-  let :api do
-    # no retry for GET
-    API.new(nil, {:max_cumul_retry_delay => -1})
-  end
-
-  describe 'all apis' do
-    it 'is deprecated' do
-      stub_api_request(:post, "/v3/acl/grant").to_return(:status => 500)
-      expect {
-        api.grant_access_control('subject', 'action', 'scope', [])
-      }.to raise_error(TreasureData::APIError)
-
-      stub_api_request(:post, "/v3/acl/revoke").to_return(:status => 500)
-      expect {
-        api.revoke_access_control('subject', 'action', 'scope')
-      }.to raise_error(TreasureData::APIError)
-
-      stub_api_request(:get, "/v3/acl/test", :query => {'user' => 'user', 'action' => 'action', 'scope' => 'scope'}).to_return(:status => 422)
-      expect {
-        api.test_access_control('user', 'action', 'scope')
-      }.to raise_error(TreasureData::APIError)
-
-      stub_api_request(:get, "/v3/acl/list").to_return(:status => 500)
-      expect {
-        api.list_access_controls
-      }.to raise_error(TreasureData::APIError)
-    end
-  end
-end