td-client 0.9.0dev2 → 1.0.0

data/spec/td/client/api_ssl_connection_spec.rb

@@ -31,7 +31,7 @@ describe 'API SSL connection' do
   DIR = File.dirname(File.expand_path(__FILE__))
 
   after :each do
-    @server && @server.shutdown
+    @server.shutdown if @server
   end
 
   it 'should fail to connect SSLv3 only server' do

data/spec/td/client/bulk_import_spec.rb

@@ -14,25 +14,24 @@ describe 'BulkImport API' do
 
   let :packed do
     s = StringIO.new
-    pk = MessagePack::Packer.new(s)
-    pk.write([1, '2', 3.0])
-    pk.write([4, '5', 6.0])
-    pk.write([7, '8', 9.0])
-    pk.flush
-    s.rewind
-    out = StringIO.new
-    Zlib::GzipWriter.wrap(out) do |f|
-      f.write s.read
-    end
-    out.string
+    Zlib::GzipWriter.wrap(s) do |f|
+      pk = MessagePack::Packer.new(f)
+      pk.write([1, '2', 3.0])
+      pk.write([4, '5', 6.0])
+      pk.write([7, '8', 9.0])
+      pk.flush
+    end
+    s.string
   end
 
+  let(:endpoint_domain) { TreasureData::API::DEFAULT_IMPORT_ENDPOINT }
+
   describe 'create_bulk_import' do
     it 'should create a new bulk_import' do
       stub_api_request(:post, "/v3/bulk_import/create/#{e(bi_name)}/#{e(db_name)}/#{e(table_name)}").
         to_return(:body => {'bulk_import' => bi_name}.to_json)
 
-      api.create_bulk_import(bi_name, db_name, table_name).should be_nil
+      expect(api.create_bulk_import(bi_name, db_name, table_name)).to be_nil
     end
 
     it 'should return 422 error with invalid name' do
@@ -73,7 +72,7 @@ describe 'BulkImport API' do
     it 'runs' do
       stub_api_request(:post, '/v3/bulk_import/delete/name').
         with(:body => 'foo=bar')
-      api.delete_bulk_import('name', 'foo' => 'bar').should == nil
+      expect(api.delete_bulk_import('name', 'foo' => 'bar')).to eq(nil)
     end
   end
 
@@ -81,7 +80,7 @@ describe 'BulkImport API' do
     it 'runs' do
       stub_api_request(:get, '/v3/bulk_import/show/name').
         to_return(:body => {'status' => 'status', 'other' => 'other'}.to_json)
-      api.show_bulk_import('name')['status'].should == 'status'
+      expect(api.show_bulk_import('name')['status']).to eq('status')
     end
   end
 
@@ -90,7 +89,7 @@ describe 'BulkImport API' do
       stub_api_request(:get, '/v3/bulk_import/list').
         with(:query => 'foo=bar').
         to_return(:body => {'bulk_imports' => %w(1 2 3)}.to_json)
-      api.list_bulk_imports('foo' => 'bar').should == %w(1 2 3)
+      expect(api.list_bulk_imports('foo' => 'bar')).to eq(%w(1 2 3))
     end
   end
 
@@ -99,7 +98,7 @@ describe 'BulkImport API' do
       stub_api_request(:get, '/v3/bulk_import/list_parts/name').
         with(:query => 'foo=bar').
         to_return(:body => {'parts' => %w(1 2 3)}.to_json)
-      api.list_bulk_import_parts('name', 'foo' => 'bar').should == %w(1 2 3)
+      expect(api.list_bulk_import_parts('name', 'foo' => 'bar')).to eq(%w(1 2 3))
     end
   end
 
@@ -109,10 +108,10 @@ describe 'BulkImport API' do
       File.open(t.path, 'w') do |f|
         f << '12345'
       end
-      stub_request(:put, 'http://api.treasure-data.com/v3/bulk_import/upload_part/name/part').
+      stub_request(:put, "https://#{TreasureData::API::DEFAULT_ENDPOINT}/v3/bulk_import/upload_part/name/part").
         with(:body => '12345')
       File.open(t.path) do |f|
-        api.bulk_import_upload_part('name', 'part', f, 5).should == nil
+        expect(api.bulk_import_upload_part('name', 'part', f, 5)).to eq(nil)
       end
     end
 
@@ -122,10 +121,10 @@ describe 'BulkImport API' do
         File.open(t.path, 'w') do |f|
           f << '12345'
         end
-        stub_request(:put, 'http://api.treasure-data.com/v3/bulk_import/upload_part/name/' + CGI.escape('日本語(Japanese)'.encode('UTF-8'))).
+        stub_request(:put, "https://#{TreasureData::API::DEFAULT_ENDPOINT}/v3/bulk_import/upload_part/name/" + CGI.escape('日本語(Japanese)'.encode('UTF-8'))).
           with(:body => '12345')
         File.open(t.path) do |f|
-          api.bulk_import_upload_part('name', '日本語(Japanese)'.encode('Windows-31J'), f, 5).should == nil
+          expect(api.bulk_import_upload_part('name', '日本語(Japanese)'.encode('Windows-31J'), f, 5)).to eq(nil)
         end
       end
     end
@@ -134,21 +133,21 @@ describe 'BulkImport API' do
   describe 'bulk_import_delete_part' do
     it 'runs' do
       stub_api_request(:post, '/v3/bulk_import/delete_part/name/part')
-      api.bulk_import_delete_part('name', 'part').should == nil
+      expect(api.bulk_import_delete_part('name', 'part')).to eq(nil)
     end
   end
 
   describe 'freeze_bulk_import' do
     it 'runs' do
       stub_api_request(:post, '/v3/bulk_import/freeze/name')
-      api.freeze_bulk_import('name').should == nil
+      expect(api.freeze_bulk_import('name')).to eq(nil)
     end
   end
 
   describe 'unfreeze_bulk_import' do
     it 'runs' do
       stub_api_request(:post, '/v3/bulk_import/unfreeze/name')
-      api.unfreeze_bulk_import('name').should == nil
+      expect(api.unfreeze_bulk_import('name')).to eq(nil)
     end
   end
 
@@ -156,7 +155,7 @@ describe 'BulkImport API' do
     it 'runs' do
       stub_api_request(:post, '/v3/bulk_import/perform/name').
         to_return(:body => {'job_id' => 12345}.to_json)
-      api.perform_bulk_import('name').should == '12345'
+      expect(api.perform_bulk_import('name')).to eq('12345')
     end
   end
 
@@ -164,7 +163,7 @@ describe 'BulkImport API' do
     it 'runs' do
       stub_api_request(:post, '/v3/bulk_import/commit/name').
         to_return(:body => {'job_id' => 12345}.to_json)
-      api.commit_bulk_import('name').should == nil
+      expect(api.commit_bulk_import('name')).to eq(nil)
     end
   end
 
@@ -172,19 +171,19 @@ describe 'BulkImport API' do
     it 'returns [] on empty' do
       stub_api_request(:get, '/v3/bulk_import/error_records/name').
         to_return(:body => '')
-      api.bulk_import_error_records('name').should == []
+      expect(api.bulk_import_error_records('name')).to eq([])
     end
 
     it 'returns nil on empty if block given' do
       stub_api_request(:get, '/v3/bulk_import/error_records/name').
         to_return(:body => '')
-      api.bulk_import_error_records('name'){}.should == nil
+      expect(api.bulk_import_error_records('name'){}).to eq(nil)
     end
 
     it 'returns unpacked result' do
       stub_api_request(:get, '/v3/bulk_import/error_records/name').
         to_return(:body => packed)
-      api.bulk_import_error_records('name').should == [[1, '2', 3.0], [4, '5', 6.0], [7, '8', 9.0]]
+      expect(api.bulk_import_error_records('name')).to eq([[1, '2', 3.0], [4, '5', 6.0], [7, '8', 9.0]])
     end
 
     it 'yields unpacked result if block given' do
@@ -194,7 +193,7 @@ describe 'BulkImport API' do
       api.bulk_import_error_records('name') do |row|
         result << row
       end
-      result.should == [[1, '2', 3.0], [4, '5', 6.0], [7, '8', 9.0]]
+      expect(result).to eq([[1, '2', 3.0], [4, '5', 6.0], [7, '8', 9.0]])
     end
   end
 end

data/spec/td/client/bulk_load_spec.rb

@@ -113,9 +113,9 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads/guess').
         with(:body => original_config.to_json).
         to_return(:body => guessed_config.to_json)
-      api.bulk_load_guess(
+      expect(api.bulk_load_guess(
         original_config
-      ).should == guessed_config
+      )).to eq(guessed_config)
     end
 
     it 'raises an error' do
@@ -134,23 +134,23 @@ describe 'BulkImport API' do
         with(:body => original_config.to_json).
         to_return(:status => 500, :body => guessed_config.to_json)
       begin
-        retry_api.bulk_load_guess(
+        expect(retry_api.bulk_load_guess(
           original_config
-        ).should != nil
+        )).to != nil
       rescue TreasureData::APIError => e
-        e.message.should =~ /^500: BulkLoad configuration guess failed/
+        expect(e.message).to match(/^500: BulkLoad configuration guess failed/)
       end
     end
 
     it 'perform retries on connection failure' do
       api = retry_api
-      api.instance_eval { @api }.stub(:post).and_raise(SocketError.new('>>'))
+      allow(api.instance_eval { @api }).to receive(:post).and_raise(SocketError.new('>>'))
       begin
         retry_api.bulk_load_guess(
           original_config
         )
       rescue SocketError => e
-        e.message.should == '>> (Retried 1 times in 1 seconds)'
+        expect(e.message).to eq('>> (Retried 1 times in 1 seconds)')
       end
     end
   end
@@ -160,9 +160,9 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads/guess').
         with(:body => original_config.to_json).
         to_return(:body => guessed_config.to_json)
-      api.bulk_load_guess(
+      expect(api.bulk_load_guess(
         original_config
-      ).should == guessed_config
+      )).to eq(guessed_config)
     end
 
     it 'raises an error' do
@@ -181,23 +181,23 @@ describe 'BulkImport API' do
         with(:body => original_config.to_json).
         to_return(:status => 500, :body => guessed_config.to_json)
       begin
-        retry_api.bulk_load_guess(
+        expect(retry_api.bulk_load_guess(
           original_config
-        ).should != nil
+        )).to != nil
       rescue TreasureData::APIError => e
-        e.message.should =~ /^500: BulkLoad configuration guess failed/
+        expect(e.message).to match(/^500: BulkLoad configuration guess failed/)
       end
     end
 
     it 'perform retries on connection failure' do
       api = retry_api
-      api.instance_eval { @api }.stub(:post).and_raise(SocketError.new('>>'))
+      allow(api.instance_eval { @api }).to receive(:post).and_raise(SocketError.new('>>'))
       begin
         retry_api.bulk_load_guess(
           original_config
         )
       rescue SocketError => e
-        e.message.should == '>> (Retried 1 times in 1 seconds)'
+        expect(e.message).to eq('>> (Retried 1 times in 1 seconds)')
       end
     end
   end
@@ -207,9 +207,9 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads/preview').
         with(:body => guessed_config.to_json).
         to_return(:body => preview_result.to_json)
-      api.bulk_load_preview(
+      expect(api.bulk_load_preview(
         guessed_config
-      ).should == preview_result
+      )).to eq(preview_result)
     end
 
     it 'raises an error' do
@@ -232,11 +232,11 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/job/issue/bulkload/database').
         with(:body => expected_request.to_json).
         to_return(:body => {'job_id' => 12345}.to_json)
-      api.bulk_load_issue(
+      expect(api.bulk_load_issue(
         'database',
         'table',
         guessed_config
-      ).should == '12345'
+      )).to eq('12345')
     end
   end
 
@@ -245,14 +245,14 @@ describe 'BulkImport API' do
       stub_api_request(:get, '/v3/bulk_loads').
         to_return(:body => [bulk_load_session, bulk_load_session].to_json)
       result = api.bulk_load_list
-      result.size.should == 2
-      result.first.should == bulk_load_session
+      expect(result.size).to eq(2)
+      expect(result.first).to eq(bulk_load_session)
     end
 
     it 'returns empty' do
       stub_api_request(:get, '/v3/bulk_loads').
         to_return(:body => [].to_json)
-      api.bulk_load_list.size.should == 0
+      expect(api.bulk_load_list.size).to eq(0)
     end
   end
 
@@ -268,7 +268,7 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads').
         with(:body => expected_request.to_json).
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_create(
+      expect(api.bulk_load_create(
         'nahi_test_1',
         'database',
         'table',
@@ -278,7 +278,7 @@ describe 'BulkImport API' do
           timezone: 'Asia/Tokyo',
           delay: 3600
         }
-      ).should == bulk_load_session
+      )).to eq(bulk_load_session)
     end
 
     it 'accepts empty option' do
@@ -289,12 +289,12 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads').
         with(:body => expected_request.to_json).
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_create(
+      expect(api.bulk_load_create(
         'nahi_test_1',
         'database',
         'table',
         guessed_config
-      ).should == bulk_load_session
+      )).to eq(bulk_load_session)
     end
 
     it 'accepts time_column option' do
@@ -306,7 +306,7 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads').
         with(:body => expected_request.to_json).
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_create(
+      expect(api.bulk_load_create(
         'nahi_test_1',
         'database',
         'table',
@@ -314,7 +314,7 @@ describe 'BulkImport API' do
         {
           time_column: 'c0'
         }
-      ).should == bulk_load_session
+      )).to eq(bulk_load_session)
     end
   end
 
@@ -322,7 +322,7 @@ describe 'BulkImport API' do
     it 'returns bulk_load_session' do
       stub_api_request(:get, '/v3/bulk_loads/nahi_test_1').
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_show('nahi_test_1').should == bulk_load_session
+      expect(api.bulk_load_show('nahi_test_1')).to eq(bulk_load_session)
     end
   end
 
@@ -331,10 +331,35 @@ describe 'BulkImport API' do
       stub_api_request(:put, '/v3/bulk_loads/nahi_test_1').
         with(:body => bulk_load_session.to_json).
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_update(
+      expect(api.bulk_load_update(
         'nahi_test_1',
         bulk_load_session
-      ).should == bulk_load_session
+      )).to eq(bulk_load_session)
+    end
+
+    it 'returns updated bulk_load_session' do
+      updated_bulk_load_session = bulk_load_session.merge({'timezone' => 'America/Los Angeles'})
+      stub_api_request(:put, '/v3/bulk_loads/nahi_test_1').
+        with(:body => updated_bulk_load_session.to_json).
+        to_return(:body => updated_bulk_load_session.to_json)
+      expect(api.bulk_load_update(
+        'nahi_test_1',
+        updated_bulk_load_session
+      )).to eq updated_bulk_load_session
+    end
+
+    it 'can remove the cron schedule ' do
+      updated_bulk_load_session = bulk_load_session.merge({'cron' => ''})
+      # NOTE: currently the API just ignores an empty 'cron' specification update
+      # I am assuming that once fixed, the API will return a nil for cron if unscheduled.
+      expected_bulk_load_session = (bulk_load_session['cron'] = nil)
+      stub_api_request(:put, '/v3/bulk_loads/nahi_test_1').
+        with(:body => updated_bulk_load_session.to_json).
+        to_return(:body => expected_bulk_load_session.to_json)
+      expect(api.bulk_load_update(
+        'nahi_test_1',
+        updated_bulk_load_session
+      )).to eq expected_bulk_load_session
     end
   end
 
@@ -342,7 +367,7 @@ describe 'BulkImport API' do
     it 'returns updated bulk_load_session' do
       stub_api_request(:delete, '/v3/bulk_loads/nahi_test_1').
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_delete('nahi_test_1').should == bulk_load_session
+      expect(api.bulk_load_delete('nahi_test_1')).to eq(bulk_load_session)
     end
   end
 
@@ -351,8 +376,8 @@ describe 'BulkImport API' do
       stub_api_request(:get, '/v3/bulk_loads/nahi_test_1/jobs').
         to_return(:body => [bulk_load_job, bulk_load_job].to_json)
       result = api.bulk_load_history('nahi_test_1')
-      result.size.should == 2
-      result.first.should == bulk_load_job
+      expect(result.size).to eq(2)
+      expect(result.first).to eq(bulk_load_job)
     end
   end
 
@@ -361,7 +386,7 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads/nahi_test_1/jobs').
         with(:body => '{}').
         to_return(:body => {'job_id' => 12345}.to_json)
-      api.bulk_load_run('nahi_test_1').should == '12345'
+      expect(api.bulk_load_run('nahi_test_1')).to eq('12345')
     end
 
     it 'accepts scheduled_time' do
@@ -369,7 +394,7 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads/nahi_test_1/jobs').
         with(:body => {scheduled_time: now.to_s}.to_json).
         to_return(:body => {'job_id' => 12345}.to_json)
-      api.bulk_load_run('nahi_test_1', now).should == '12345'
+      expect(api.bulk_load_run('nahi_test_1', now)).to eq('12345')
     end
   end
 

data/spec/td/client/db_api_spec.rb

@@ -18,7 +18,7 @@ describe 'Database API' do
       stub_api_request(:post, "/v3/database/create/#{e(db_name)}").
         to_return(:body => {'database' => db_name}.to_json)
 
-      api.create_database(db_name).should be true
+      expect(api.create_database(db_name)).to be true
     end
 
     it 'should return 400 error with invalid name' do

data/spec/td/client/export_api_spec.rb

@@ -20,7 +20,7 @@ describe 'Export API' do
       stub_api_request(:post, "/v3/export/run/#{e(db_name)}/#{e(table_name)}").with(:body => params.merge('storage_type' => storage_type)).
         to_return(:body => {'database' => db_name, 'job_id' => '1', 'debug' => {}}.to_json)
 
-      api.export(db_name, table_name, storage_type, params).should == '1'
+      expect(api.export(db_name, table_name, storage_type, params)).to eq('1')
     end
 
     it 'should return 400 error with invalid storage type' do
@@ -37,5 +37,15 @@ describe 'Export API' do
 
     # TODO: Add other parameters spec
   end
+
+  describe 'result_export' do
+    it 'should export result successfully' do
+      params = {'result' => 'mysql://user:pass@host.com/database/table'}
+      stub_api_request(:post, "/v3/job/result_export/100").with(:body => params).
+        to_return(:body => {'job_id' => '101'}.to_json)
+
+      expect(api.result_export(100, params)).to eq('101')
+    end
+  end
 end