td-client 0.8.67 → 0.8.68

data/spec/td/client/result_api_spec.rb

@@ -51,4 +51,27 @@ describe 'Result API' do
       }.to raise_error(TreasureData::APIError, /#{err_msg}/)
     end
   end
+
+  describe 'list_result' do
+    it 'should return name and url' do
+      stub_api_request(:get, '/v3/result/list').
+        to_return(:body => {'results' => [{'name' => 'name', 'url' => 'url'}]}.to_json)
+      api.list_result.should == [['name', 'url', nil]]
+    end
+  end
+
+  describe 'delete_result' do
+    it 'should delete the result' do
+      stub_api_request(:post, "/v3/result/delete/#{e(result_name)}")
+      api.delete_result(result_name).should == true
+    end
+
+    it 'should raise error' do
+      stub_api_request(:post, "/v3/result/delete/#{e(result_name)}").
+        to_return(:status => 404)
+      expect {
+        api.delete_result(result_name)
+      }.to raise_error(TreasureData::APIError)
+    end
+  end
 end

data/spec/td/client/sched_api_spec.rb

@@ -36,6 +36,14 @@ describe 'Schedule API' do
     end
   end
 
+  describe 'delete_schedule' do
+    it 'should delete the schedule' do
+      stub_api_request(:post, "/v3/schedule/delete/#{e(sched_name)}").
+        to_return(:body => {'cron' => 'cron', 'query' => 'query'}.to_json)
+      api.delete_schedule(sched_name).should == ['cron', 'query']
+    end
+  end
+
   describe 'update_schedule' do
     let :pig_query do
       "OUT = FOREACH (GROUP plt364 ALL) GENERATE COUNT(plt364);\n" * 200
@@ -65,4 +73,29 @@ describe 'Schedule API' do
       expect(api.list_schedules.first[2]).to eq(pig_query)
     end
   end
+
+  describe 'history' do
+    let :history do
+      ['history', 'job_id', 'type', 'database', 'status', 'query', 'start_at', 'end_at', 'result', 'priority'].inject({}) { |r, e|
+        r[e] = e
+        r
+      }
+    end
+
+    it 'should return history records' do
+      stub_api_request(:get, "/v3/schedule/history/#{e(sched_name)}").
+        with(:query => {'from' => 0, 'to' => 100}).
+        to_return(:body => {'history' => [history]}.to_json)
+        api.history(sched_name, 0, 100).should == [[nil, 'job_id', :type, 'status', 'query', 'start_at', 'end_at', 'result', 'priority', 'database']]
+    end
+  end
+
+  describe 'run_schedule' do
+    it 'should return history records' do
+      stub_api_request(:post, "/v3/schedule/run/#{e(sched_name)}/123456789").
+        with(:body => {'num' => '5'}).
+        to_return(:body => {'jobs' => [{'job_id' => 'job_id', 'scheduled_at' => 'scheduled_at', 'type' => 'type'}]}.to_json)
+        api.run_schedule(sched_name, 123456789, 5).should == [['job_id', :type, 'scheduled_at']]
+    end
+  end
 end

data/spec/td/client/server_status_api_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'td/client/spec_resources'
+
+describe 'ServerStatus API' do
+  include_context 'spec symbols'
+  include_context 'common helper'
+
+  let :api do
+    API.new(nil, {:max_cumul_retry_delay => -1})
+  end
+
+  describe 'server_status' do
+    it 'returns status' do
+      stub_api_request(:get, '/v3/system/server_status').
+        to_return(:body => {'status' => 'OK'}.to_json)
+      api.server_status.should == 'OK'
+    end
+
+    it 'returns error description' do
+      stub_api_request(:get, '/v3/system/server_status').
+        to_return(:status => 500)
+      api.server_status.should == 'Server is down (500)'
+    end
+  end
+end

data/spec/td/client/table_api_spec.rb

@@ -162,4 +162,49 @@ describe 'Table API' do
       expect(table.updated_at).to     eq(Time.parse(tables[i][5]))
     end
   end
+
+  describe 'swap_table' do
+    it 'should swap tables' do
+      stub_api_request(:post, '/v3/table/swap/db/table1/table2')
+      api.swap_table('db', 'table1', 'table2').should == true
+    end
+  end
+
+  describe 'update_expire' do
+    it 'should update expiry days' do
+      stub_api_request(:post, '/v3/table/update/db/table').
+        with(:body => {'expire_days' => '5'}).
+        to_return(:body => {'type' => 'type'}.to_json)
+      api.update_expire('db', 'table', 5).should == true
+    end
+  end
+
+  describe 'tail' do
+    let :packed do
+      s = StringIO.new
+      pk = MessagePack::Packer.new(s)
+      pk.write([1, 2, 3])
+      pk.write([4, 5, 6])
+      pk.flush
+      s.string
+    end
+
+    it 'yields row if block given' do
+      stub_api_request(:get, '/v3/table/tail/db/table').
+        with(:query => {'format' => 'msgpack', 'count' => '10', 'from' => '0', 'to' => '100'}).
+        to_return(:body => packed)
+      result = []
+      api.tail('db', 'table', 10, 100, 0) do |row|
+        result << row
+      end
+      result.should == [[1, 2, 3], [4, 5, 6]]
+    end
+
+    it 'returns rows' do
+      stub_api_request(:get, '/v3/table/tail/db/table').
+        with(:query => {'format' => 'msgpack', 'count' => '10', 'from' => '0', 'to' => '100'}).
+        to_return(:body => packed)
+      api.tail('db', 'table', 10, 100, 0).should == [[1, 2, 3], [4, 5, 6]]
+    end
+  end
 end

data/spec/td/client/user_api_spec.rb

@@ -0,0 +1,118 @@
+require 'spec_helper'
+require 'td/client/spec_resources'
+require 'json'
+
+describe 'User API' do
+  include_context 'spec symbols'
+  include_context 'common helper'
+
+  let :api do
+    API.new(nil)
+  end
+
+  describe 'authenticate' do
+    it 'returns apikey' do
+      stub_api_request(:post, "/v3/user/authenticate").
+        to_return(:body => {'apikey' => 'apikey'}.to_json)
+      api.authenticate('user', 'password').should == 'apikey'
+    end
+
+    it 'raises AuthError for authentication failure' do
+      stub_api_request(:post, "/v3/user/authenticate").
+        to_return(:status => 400, :body => {'apikey' => 'apikey'}.to_json)
+      expect {
+        api.authenticate('user', 'password')
+      }.to raise_error(TreasureData::AuthError)
+    end
+
+    it 'raises APIError for other error' do
+      stub_api_request(:post, "/v3/user/authenticate").
+        to_return(:status => 500, :body => {'apikey' => 'apikey'}.to_json)
+      expect {
+        api.authenticate('user', 'password')
+      }.to raise_error(TreasureData::APIError)
+    end
+  end
+
+  describe 'list_users' do
+    it 'returns users' do
+      stub_api_request(:get, "/v3/user/list").
+        to_return(:body => {'users' => [{'name' => 'name1', 'email' => 'email1'}, {'name' => 'name2', 'email' => 'email2'}]}.to_json)
+      api.list_users.should == [
+        ['name1', nil, nil, 'email1'],
+        ['name2', nil, nil, 'email2'],
+      ]
+    end
+  end
+
+  describe 'add_user' do
+    it 'runs' do
+      stub_api_request(:post, "/v3/user/add/name").to_return(:body => {}.to_json)
+      api.add_user('name', "org", 'name+suffix@example.com', 'password').should == true
+    end
+
+    # TODO
+    it 'does not escape sp but it must be a bug' do
+      stub_api_request(:post, "/v3/user/add/!++++@%23$%25%5E&*()_+%7C~").to_return(:body => {}.to_json)
+      api.add_user('!    @#$%^&*()_+|~', "org", 'name+suffix@example.com', 'password').should == true
+    end
+  end
+
+  describe 'remove_user' do
+    it 'runs' do
+      stub_api_request(:post, "/v3/user/remove/name").to_return(:body => {}.to_json)
+      api.remove_user('name').should == true
+    end
+  end
+
+  describe 'change_email' do
+    it 'runs' do
+      stub_api_request(:post, "/v3/user/email/change/name").
+        with(:body => {'email' => 'new@email.com'}).
+        to_return(:body => {}.to_json)
+      api.change_email('name', 'new@email.com').should == true
+    end
+  end
+
+  describe 'list_apikeys' do
+    it 'runs' do
+      stub_api_request(:get, "/v3/user/apikey/list/name").
+        to_return(:body => {'apikeys' => ['key1', 'key2']}.to_json)
+      api.list_apikeys('name').should == ['key1', 'key2']
+    end
+  end
+
+  describe 'add_apikey' do
+    it 'does not return the generated apikey because you can list apikey afterwards' do
+      stub_api_request(:post, "/v3/user/apikey/add/name").
+        to_return(:body => {'apikey' => 'apikey'}.to_json)
+      api.add_apikey('name').should == true
+    end
+  end
+
+  describe 'remove_apikey' do
+    it 'runs' do
+      stub_api_request(:post, "/v3/user/apikey/remove/name").
+        to_return(:body => {}.to_json)
+      api.remove_apikey('name', 'apikey').should == true
+    end
+  end
+
+  describe 'change password' do
+    it 'runs' do
+      stub_api_request(:post, "/v3/user/password/change/name").
+        with(:body => {'password' => 'password'}).
+        to_return(:body => {}.to_json)
+      api.change_password('name', 'password').should == true
+    end
+  end
+
+  describe 'change my password' do
+    it 'runs' do
+      stub_api_request(:post, "/v3/user/password/change").
+        with(:body => {'old_password' => 'old_password', 'password' => 'password'}).
+        to_return(:body => {}.to_json)
+      api.change_my_password('old_password', 'password').should == true
+    end
+  end
+end

data/spec/td/client_sched_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+require 'td/client/spec_resources'
+
+describe 'Schedule Command' do
+  include_context 'spec symbols'
+  include_context 'common helper'
+
+  let :api do
+    API.new(nil)
+  end
+
+  let :client do
+    client = TreasureData::Client.new('dummy')
+    client.instance_variable_set('@api', api)
+    client
+  end
+
+  describe 'history' do
+    let :opts do
+      {'database' => db_name}
+    end
+
+    let :history do
+      ['history', 'scheduled_at', 'job_id', 'type', 'database', 'status', 'query', 'start_at', 'end_at', 'result', 'priority'].inject({}) { |r, e|
+        r[e] = e
+        r
+      }
+    end
+
+    it 'returns scheduled_job' do
+      h = history; h['scheduled_at'] = '2015-02-17 14:16:00 +0900'
+      stub_api_request(:get, "/v3/schedule/history/#{e(sched_name)}?from=0&to=19").
+        to_return(:body => {'count' => 1, 'history' => [h]}.to_json)
+
+      client.history(sched_name, 0, 19).each do |scheduled_job|
+        scheduled_job.scheduled_at.xmlschema.should == '2015-02-17T14:16:00+09:00'
+        scheduled_job.job_id.should == 'job_id'
+        scheduled_job.status.should == 'status'
+        scheduled_job.priority.should == 'priority'
+        scheduled_job.result_url.should == 'result'
+      end
+    end
+
+    it 'works when scheduled_at == ""' do
+      h = history; h['scheduled_at'] = ''
+      stub_api_request(:get, "/v3/schedule/history/#{e(sched_name)}?from=0&to=19").
+        to_return(:body => {'count' => 1, 'history' => [h]}.to_json)
+
+      client.history(sched_name, 0, 19).each do |scheduled_job|
+        scheduled_job.scheduled_at.should == nil
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.67
+  version: 0.8.68
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -72,16 +72,22 @@ dependencies:
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -144,25 +150,46 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/td/client/api/access_control.rb
+- lib/td/client/api/account.rb
+- lib/td/client/api/bulk_import.rb
+- lib/td/client/api/database.rb
+- 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
+- lib/td/client/api/table.rb
+- lib/td/client/api/user.rb
 - lib/td/client/api.rb
+- lib/td/client/api_error.rb
 - lib/td/client/compat_gzip_reader.rb
 - lib/td/client/model.rb
 - lib/td/client/version.rb
 - lib/td/client.rb
+- lib/td/core_ext/openssl/ssl/sslcontext/set_params.rb
 - lib/td-client.rb
 - data/ca-bundle.crt
 - spec/spec_helper.rb
+- spec/td/client/access_control_api_spec.rb
+- spec/td/client/account_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/db_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/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
 - spec/td/client/spec_resources.rb
 - spec/td/client/table_api_spec.rb
+- spec/td/client/user_api_spec.rb
+- spec/td/client_sched_spec.rb
 homepage: http://treasuredata.com/
 licenses: []
 metadata: {}
@@ -187,13 +214,19 @@ 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_spec.rb
 - spec/td/client/api_ssl_connection_spec.rb
 - spec/td/client/bulk_import_spec.rb
 - spec/td/client/db_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/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
 - spec/td/client/table_api_spec.rb
+- spec/td/client/user_api_spec.rb
+- spec/td/client_sched_spec.rb