td-client 1.0.8 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8650b4fe6267d1edb91dad045ac0b31f77d0d0e37d776ea5433ec88debfe4b81
-  data.tar.gz: baf35bbd09b187c8f76ee48f68328f23ac09721ddb31641154a97900dc4ac93b
+  metadata.gz: a815afcaf4e457f68fa81175e3359b29b4054454d817cafdccc12d2921d88bb6
+  data.tar.gz: 49b578a5af81fa21262ebc1c0a5974ac8dab57901513318f408afeeeeb58f082
 SHA512:
-  metadata.gz: 643dc4c3d7ec6e5e73b506f3b18750a7aeaf73e915890c68ccd7b590f8d539a1fb047f5adbb4652bb0a732f2e8466658be112384d9d57aae1cb72b902b8a4b46
-  data.tar.gz: fbf3228a704dd954299becd06462920f72934674d8cae49ba1db91d169441fe4a079348e33ec8f2e3b08c986b5383fbf476f7161de8711a3677583da1b4b3169
+  metadata.gz: b2183a16af8bca14b53503444322b4fea765c1a9ef374c15a4549f349fcd3874f234df85202cef2c7e428d2e6481c570e3589a34116935da71a8bcf853f8dabc
+  data.tar.gz: b0290f67090890cb71579bf2dc58a4aa7cd76448e8847fe6a3514e4bd6b871d3528625559856640155c980d44433183ab5c08985b36725eb39ef5593633afc67

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

@@ -22,24 +22,5 @@ module Account
     return [account_id, plan, storage_size, guaranteed_cores, maximum_cores, created_at]
   end
 
-  # @param [Fixnum] from
-  # @param [Fixnum] to
-  # @return [Array]
-  def account_core_utilization(from, to)
-    params = { }
-    params['from'] = from.to_s if from
-    params['to'] = to.to_s if to
-    code, body, res = get("/v3/account/core_utilization", params)
-    if code != "200"
-      raise_error("Show account failed", res)
-    end
-    js = checked_json(body, %w[from to interval history])
-    from = Time.parse(js['from']).utc
-    to = Time.parse(js['to']).utc
-    interval = js['interval'].to_i
-    history = js['history']
-    return [from, to, interval, history]
-  end
-
 end
 end

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

@@ -126,7 +126,7 @@ module Job
     job_result_download(job_id) do |chunk|
       unpacker.feed_each(chunk) do |row|
         result << row
-      end
+      end unless chunk.empty?
     end
     return result
   end
@@ -163,7 +163,7 @@ module Job
     upkr = MessagePack::Unpacker.new
     # default to decompressing the response since format is fixed to 'msgpack'
     job_result_download(job_id) do |chunk|
-      upkr.feed_each(chunk, &block)
+      upkr.feed_each(chunk, &block) unless chunk.empty?
     end
     nil
   end
@@ -177,9 +177,9 @@ module Job
     upkr = MessagePack::Unpacker.new
     # default to decompressing the response since format is fixed to 'msgpack'
     job_result_download(job_id) do |chunk, total|
-      upkr.feed_each(chunk) {|unpacked|
+      upkr.feed_each(chunk) do |unpacked|
         yield unpacked, total if block_given?
-      }
+      end unless chunk.empty?
     end
     nil
   end

data/lib/td/client/api.rb

@@ -7,7 +7,6 @@ require 'td/client/api/database'
 require 'td/client/api/export'
 require 'td/client/api/import'
 require 'td/client/api/job'
-require 'td/client/api/partial_delete'
 require 'td/client/api/result'
 require 'td/client/api/schedule'
 require 'td/client/api/server_status'
@@ -27,7 +26,6 @@ class API
   include API::Export
   include API::Import
   include API::Job
-  include API::PartialDelete
   include API::Result
   include API::Schedule
   include API::ServerStatus
@@ -74,6 +72,7 @@ class API
     @retry_post_requests = opts[:retry_post_requests] || false
     @retry_delay = opts[:retry_delay] || 5
     @max_cumul_retry_delay = opts[:max_cumul_retry_delay] || 600
+    @verify = opts[:verify]
 
     case uri.scheme
     when 'http', 'https'
@@ -526,6 +525,14 @@ private
       client.ssl_config.options |= OpenSSL::SSL::OP_NO_SSLv3
     end
 
+    # allow users to use their own custom ca
+    # or disable verification
+    if @verify == false
+      client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    elsif @verify.is_a? String
+      client.ssl_config.add_trust_ca(@verify)
+    end
+
     header = {}
     if @apikey
       header['Authorization'] = "TD1 #{apikey}"

data/lib/td/client/version.rb

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

data/lib/td/client.rb

@@ -60,14 +60,6 @@ class Client
     return Account.new(self, account_id, plan, storage, guaranteed_cores, maximum_cores, created_at)
   end
 
-  # @param [Fixnum] from
-  # @param [Fixnum] to
-  # @return [Array] from, to, interval, history
-  def core_utilization(from, to)
-    from, to, interval, history = @api.account_core_utilization(from, to)
-    return from, to, interval, history
-  end
-
   # @return [Array] databases
   def databases
     m = @api.list_databases
@@ -191,7 +183,7 @@ class Client
   def query(db_name, q, result_url=nil, priority=nil, retry_limit=nil, opts={})
     # for compatibility, assume type is hive unless specifically specified
     type = opts[:type] || opts['type'] || :hive
-    raise ArgumentError, "The specified query type is not supported: #{type}" unless [:hive, :pig, :impala, :presto].include?(type)
+    raise ArgumentError, "The specified query type is not supported: #{type}" unless [:hive, :pig, :impala, :presto, :trino].include?(type)
     job_id = @api.query(q, type, db_name, result_url, priority, retry_limit, opts)
     Job.new(self, job_id, type, q)
   end
@@ -285,17 +277,6 @@ class Client
     Job.new(self, job_id, :result_export, nil)
   end
 
-  # @param [String] db_name
-  # @param [String] table_name
-  # @param [Fixnum] to
-  # @param [Fixnum] from
-  # @param [Hash] opts
-  # @return [Job]
-  def partial_delete(db_name, table_name, to, from, opts={})
-    job_id = @api.partial_delete(db_name, table_name, to, from, opts)
-    Job.new(self, job_id, :partialdelete, nil)
-  end
-
   # @param [String] name
   # @param [String] database
   # @param [String] table

data/spec/td/client/account_api_spec.rb

@@ -18,17 +18,4 @@ describe 'Account API' do
     end
   end
 
-  describe 'account_core_utilization' do
-    it 'returns core utilization' do
-      from = '2014-12-01T00:00:00+0900'
-      to = '2015-01-01T00:00:00+0900'
-      stub_api_request(:get, "/v3/account/core_utilization", :query => {'from' => from, 'to' => to}).
-        to_return(:body => {'from' => from, 'to' => to, 'interval' => 1, 'history' => ['dummy']}.to_json)
-      r = api.account_core_utilization(from, to)
-      expect(r[0]).to eq(Time.parse(from))
-      expect(r[1]).to eq(Time.parse(to))
-      expect(r[2]).to eq(1)
-      expect(r[3]).to eq(['dummy'])
-    end
-  end
 end

data/spec/td/client/api_ssl_connection_spec.rb

@@ -37,7 +37,7 @@ describe 'API SSL connection' do
   it 'should fail to connect SSLv3 only server' do
     @server = setup_server(:SSLv3)
     api = API.new(nil, :endpoint => "https://localhost:#{@serverport}", :retry_post_requests => false)
-    api.ssl_ca_file = File.join(DIR, 'ca-all.cert')
+    api.ssl_ca_file = File.join(DIR, 'testRootCA.crt')
     expect {
       begin
         api.delete_database('no_such_database')
@@ -47,10 +47,26 @@ describe 'API SSL connection' do
     }.to raise_error OpenSSL::SSL::SSLError
   end
 
-  it 'should success to connect TLSv1 only server' do
-    @server = setup_server(:TLSv1)
+  it 'should succeed to access to the server with verify false option' do
+    @server = setup_server(:TLSv1_2)
+    api = API.new(nil, :endpoint => "https://localhost:#{@serverport}", :retry_post_requests => false, :verify => false)
+    expect {
+        api.delete_database('no_such_database')
+    }.to raise_error TreasureData::NotFoundError
+  end
+
+  it 'should succeed to access to the server with self signed certificate' do
+    @server = setup_server(:TLSv1_2)
+    api = API.new(nil, :endpoint => "https://localhost:#{@serverport}", :retry_post_requests => false, :verify => File.join(DIR, 'testRootCA.crt'))
+    expect {
+        api.delete_database('no_such_database') 
+    }.to raise_error TreasureData::NotFoundError
+  end
+
+  it 'should success to connect TLSv1_2 only server' do
+    @server = setup_server(:TLSv1_2)
     api = API.new(nil, :endpoint => "https://localhost:#{@serverport}", :retry_post_requests => false)
-    api.ssl_ca_file = File.join(DIR, 'ca-all.cert')
+    api.ssl_ca_file = File.join(DIR, 'testRootCA.crt')
     expect {
       api.delete_database('no_such_database')
     }.to raise_error TreasureData::NotFoundError
@@ -66,9 +82,9 @@ describe 'API SSL connection' do
       :AccessLog => [],
       :DocumentRoot => '.',
       :SSLEnable => true,
-      :SSLCACertificateFile => File.join(DIR, 'ca.cert'),
-      :SSLCertificate => cert('server.cert'),
-      :SSLPrivateKey => key('server.key')
+      :SSLCACertificateFile => File.join(DIR, 'testRootCA.crt'),
+      :SSLCertificate => cert('testServer.crt'),
+      :SSLPrivateKey => key('testServer.key')
     )
     @serverport = @server.config[:Port]
     @server.mount(

data/spec/td/client/spec_resources.rb

@@ -57,8 +57,7 @@ shared_context 'job resources' do
     [
       ['HiveJob', 'hive'],
       ['ExportJob', 'export'],
-      ['BulkImportJob', 'bulk_import'],
-      ['PartialDeleteJob', 'partialdelete']
+      ['BulkImportJob', 'bulk_import']
     ]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 3.0.0
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2025-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -59,7 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -78,28 +78,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 3.25.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 3.25.1
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  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'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.21.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +173,6 @@ files:
 - lib/td/client/api/export.rb
 - lib/td/client/api/import.rb
 - lib/td/client/api/job.rb
-- lib/td/client/api/partial_delete.rb
 - lib/td/client/api/result.rb
 - lib/td/client/api/schedule.rb
 - lib/td/client/api/server_status.rb
@@ -184,7 +197,6 @@ files:
 - 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/sched_api_spec.rb
 - spec/td/client/server_status_api_spec.rb
@@ -212,29 +224,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Treasure Data API library for Ruby
 test_files:
-- spec/td/client_spec.rb
-- spec/td/client_sched_spec.rb
-- spec/td/client/partial_delete_api_spec.rb
+- spec/td/client/account_api_spec.rb
+- spec/td/client/api_error_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/api_error_spec.rb
+- spec/td/client/result_api_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/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
+- spec/td/client_sched_spec.rb
+- spec/td/client_spec.rb

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

@@ -1,27 +0,0 @@
-class TreasureData::API
-module PartialDelete
-
-  ####
-  ## Partial delete API
-  ##
-
-  # @param [String] db
-  # @param [String] table
-  # @param [Fixnum] to
-  # @param [Fixnum] from
-  # @param [Hash] opts
-  # @return [String]
-  def partial_delete(db, table, to, from, opts={})
-    params = opts.dup
-    params['to'] = to.to_s
-    params['from'] = from.to_s
-    code, body, res = post("/v3/table/partialdelete/#{e db}/#{e table}", params)
-    if code != "200"
-      raise_error("Partial delete failed", res)
-    end
-    js = checked_json(body, %w[job_id])
-    return js['job_id'].to_s
-  end
-
-end
-end

data/spec/td/client/partial_delete_api_spec.rb

@@ -1,58 +0,0 @@
-require 'spec_helper'
-require 'td/client/spec_resources'
-
-describe 'PartialDelete API' do
-  include_context 'spec symbols'
-  include_context 'common helper'
-
-  let :api do
-    API.new(nil)
-  end
-
-  describe 'partialdelete' do
-    let :from do
-      0
-    end
-
-    let :to do
-      3600 * 10
-    end
-
-    let :from_to do
-      {'from' => from.to_s, 'to' => to.to_s}
-    end
-
-    it 'should partial_delete successfully' do
-      # TODO: Use correnty values
-      stub_api_request(:post, "/v3/table/partialdelete/#{e(db_name)}/#{e(table_name)}").with(:body => from_to).
-        to_return(:body => {'database' => db_name, 'table' => table_name, 'job_id' => '1'}.to_json)
-
-      expect(api.partial_delete(db_name, table_name, to, from)).to eq('1')
-    end
-
-    it 'should return 404 error with non exist database name' do
-      db = 'no_such_db'
-      err_msg = "Couldn't find UserDatabase with name = #{db}"
-      stub_api_request(:post, "/v3/table/partialdelete/#{e(db)}/#{e(table_name)}").with(:body => from_to).
-        to_return(:status => 404, :body => {'message' => err_msg}.to_json)
-
-      expect {
-        api.partial_delete(db, table_name, to, from)
-      }.to raise_error(TreasureData::APIError, /#{err_msg}/)
-    end
-
-    it 'should return 404 error with non exist table name' do
-      table = 'no_such_table'
-      err_msg = "Unknown table: #{table}"
-      stub_api_request(:post, "/v3/table/partialdelete/#{e(db_name)}/#{e(table)}").with(:body => from_to).
-        to_return(:status => 404, :body => {'message' => err_msg}.to_json)
-
-      expect {
-        api.partial_delete(db_name, table, to, from)
-      }.to raise_error(TreasureData::APIError, /#{err_msg}/)
-    end
-
-    # TODO: Add from / to parameters spec
-  end
-end
-