td-client 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa8466ceb0e2dc014d9222e5bb295d7f9102951828531d993f9d92eb6592457
-  data.tar.gz: 8521a0ec4855d3d266fceabe8bbb7a42fcf52c38bdf4f6d8e8af96cae97add7f
+  metadata.gz: 8650b4fe6267d1edb91dad045ac0b31f77d0d0e37d776ea5433ec88debfe4b81
+  data.tar.gz: baf35bbd09b187c8f76ee48f68328f23ac09721ddb31641154a97900dc4ac93b
 SHA512:
-  metadata.gz: 477518baf02db8ec6f126f847d54b2b9fe5885a4bb3c5d6d07dfb4a8110d997ca4288541260932abd0e69dc56c50dd0ed1d62b5fbd9884cc6be10b31329b8440
-  data.tar.gz: f13066abdba694a7dd28f3fe67efac2c598f25b67f1fa7948dc85b4cdd6d9c476ea12eddd63b3229cb275ba193cb397f3a803a2c6ccc56cf7c08e56498d93e34
+  metadata.gz: 643dc4c3d7ec6e5e73b506f3b18750a7aeaf73e915890c68ccd7b590f8d539a1fb047f5adbb4652bb0a732f2e8466658be112384d9d57aae1cb72b902b8a4b46
+  data.tar.gz: fbf3228a704dd954299becd06462920f72934674d8cae49ba1db91d169441fe4a079348e33ec8f2e3b08c986b5383fbf476f7161de8711a3677583da1b4b3169

data/lib/td/client/api.rb

@@ -636,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/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_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/version.rb

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

data/spec/td/client/api_ssl_connection_spec.rb

@@ -39,7 +39,11 @@ 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
 
@@ -52,13 +56,13 @@ describe 'API SSL connection' do
     }.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/model_job_spec.rb

@@ -140,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Treasure Data, Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-04 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: []
@@ -183,7 +197,7 @@ homepage: http://treasuredata.com/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,29 +212,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0.beta3
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Treasure Data API library for Ruby
 test_files:
-- 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