td-client 0.8.62 → 0.8.63

data/spec/td/client/table_api_spec.rb

@@ -0,0 +1,165 @@
+require 'spec_helper'
+require 'td/client/spec_resources'
+
+describe 'Table API' do
+  include_context 'spec symbols'
+  include_context 'common helper'
+
+  let :api do
+    API.new(nil)
+  end
+
+  let :client do
+    Client.new(apikey)
+  end
+
+  describe "'create_log_table' 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 {
+        api.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)
+      api.create_log_table(db_name, table_name).should 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 {
+        api.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 {
+        api.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 = [
+        ["table_1", "item", "[[\"time\",\"long\"],[\"value\",\"string\"]]", 111, "2013-01-21 01:51:41 UTC", "2014-01-21 01:51:41 UTC"],
+        ["table_2", "log",  "[[\"time\",\"long\"],[\"value\",\"long\"]]",   222, "2013-02-22 02:52:42 UTC", "2014-02-22 02:52:42 UTC"],
+        ["table_3", "item", "[[\"time\",\"long\"],[\"value\",\"string\"]]", 333, "2013-03-23 03:53:43 UTC", "2014-03-23 03:53:43 UTC"],
+        ["table_4", "log",  "[[\"time\",\"long\"],[\"value\",\"long\"]]",   444, "2013-04-24 04:54:44 UTC", "2014-04-24 04:54:44 UTC"]
+      ]
+      stub_api_request(:get, "/v3/table/list/#{e db_name}")
+        .to_return(:body => {'tables' => [
+          {'name' => tables[0][0], 'type' => tables[0][1], 'schema' => tables[0][2], 'count' => tables[0][3], 'created_at' => tables[0][4], 'updated_at' => tables[0][5]},
+          {'name' => tables[1][0], 'type' => tables[1][1], 'schema' => tables[1][2], 'count' => tables[1][3], 'created_at' => tables[1][4], 'updated_at' => tables[1][5]},
+          {'name' => tables[2][0], 'type' => tables[2][1], 'schema' => tables[2][2], 'count' => tables[2][3], 'created_at' => tables[2][4], 'updated_at' => tables[2][5]},
+          {'name' => tables[3][0], 'type' => tables[3][1], 'schema' => tables[3][2], 'count' => tables[3][3], 'created_at' => tables[3][4], 'updated_at' => tables[3][5]}
+        ]}.to_json)
+
+      table_list = api.list_tables(db_name)
+      tables.each {|table|
+        expect(table_list[table[0]][0]).to eq(table[1].to_sym)
+        expect(table_list[table[0]][1]).to eq(JSON.parse(table[2]))
+        expect(table_list[table[0]][2]).to eq(table[3])
+        expect(table_list[table[0]][3]).to eq(table[4])
+        expect(table_list[table[0]][4]).to eq(table[5])
+      }
+    end
+  end
+
+  describe "'tables' Client API" do
+    it 'should return an array of Table objects' do
+      tables = [
+        ["table_1", "item", "[[\"time\",\"long\"],[\"value\",\"string\"]]", 111, "2013-01-21 01:51:41 UTC", "2014-01-21 01:51:41 UTC"],
+        ["table_2", "log",  "[[\"time\",\"long\"],[\"value\",\"long\"]]",   222, "2013-02-22 02:52:42 UTC", "2014-02-22 02:52:42 UTC"],
+        ["table_3", "item", "[[\"time\",\"long\"],[\"value\",\"string\"]]", 333, "2013-03-23 03:53:43 UTC", "2014-03-23 03:53:43 UTC"],
+        ["table_4", "log",  "[[\"time\",\"long\"],[\"value\",\"long\"]]",   444, "2013-04-24 04:54:44 UTC", "2014-04-24 04:54:44 UTC"]
+      ]
+      stub_api_request(:get, "/v3/table/list/#{e db_name}")
+        .to_return(:body => {'tables' => [
+          {'name' => tables[0][0], 'type' => tables[0][1], 'schema' => tables[0][2], 'count' => tables[0][3], 'created_at' => tables[0][4], 'updated_at' => tables[0][5]},
+          {'name' => tables[1][0], 'type' => tables[1][1], 'schema' => tables[1][2], 'count' => tables[1][3], 'created_at' => tables[1][4], 'updated_at' => tables[1][5]},
+          {'name' => tables[2][0], 'type' => tables[2][1], 'schema' => tables[2][2], 'count' => tables[2][3], 'created_at' => tables[2][4], 'updated_at' => tables[2][5]},
+          {'name' => tables[3][0], 'type' => tables[3][1], 'schema' => tables[3][2], 'count' => tables[3][3], 'created_at' => tables[3][4], 'updated_at' => tables[3][5]}
+        ]}.to_json)
+
+      table_list = client.tables(db_name)
+
+      db_count = 0
+      tables.each {|table|
+        db_count += table[3]
+      }
+
+      # REST API call to fetch the database permission
+      stub_api_request(:get, "/v3/database/list")
+        .to_return(:body => {'databases' => [
+          {'name' => db_name, 'count' => db_count, 'created_at' => tables[0][4], 'updated_at' => tables[0][5], 'permission' => 'full_access'}
+        ]}.to_json)
+
+      tables.length.times {|i|
+        expect(table_list[i].db_name).to        eq(db_name)
+        expect(table_list[i].name).to           eq(tables[i][0])
+        expect(table_list[i].type).to           eq(tables[i][1].to_sym)
+        expect(table_list[i].schema.to_json).to eq(eval(tables[i][2]).to_json)
+        expect(table_list[i].count).to          eq(tables[i][3])
+        expect(table_list[i].created_at).to     eq(Time.parse(tables[i][4]))
+        expect(table_list[i].updated_at).to     eq(Time.parse(tables[i][5]))
+
+        # REST API call to fetch the database permission
+        stub_api_request(:get, "/v3/database/list")
+          .to_return(:body => {'databases' => [
+            {'name' => db_name, 'count' => db_count, 'created_at' => tables[0][4], 'updated_at' => tables[0][5], 'permission' => 'full_access'}
+          ]}.to_json)
+        expect(table_list[i].permission).to eq(:full_access)
+
+        # set up a trap to check this call never happens
+        # - if it did, the next assertion on the count would fail
+        stub_api_request(:get, "/v3/database/list")
+          .to_return(:body => {'databases' => [
+            {'name' => db_name, 'count' => db_count + 100, 'created_at' => tables[0][4], 'updated_at' => tables[0][5], 'permission' => 'full_access'}
+          ]}.to_json)
+        expect(table_list[i].database.count).to eq(db_count)
+      }
+    end
+  end
+
+  describe "'table' Client API" do
+    it 'should return the Table object corresponding to the name' do
+      tables = [
+        ["table_1", "item", "[[\"time\",\"long\"],[\"value\",\"string\"]]", 111, "2013-01-21 01:51:41 UTC", "2014-01-21 01:51:41 UTC"],
+        ["table_2", "log",  "[[\"time\",\"long\"],[\"value\",\"long\"]]",   222, "2013-02-22 02:52:42 UTC", "2014-02-22 02:52:42 UTC"],
+        ["table_3", "item", "[[\"time\",\"long\"],[\"value\",\"string\"]]", 333, "2013-03-23 03:53:43 UTC", "2014-03-23 03:53:43 UTC"],
+        ["table_4", "log",  "[[\"time\",\"long\"],[\"value\",\"long\"]]",   444, "2013-04-24 04:54:44 UTC", "2014-04-24 04:54:44 UTC"]
+      ]
+      stub_api_request(:get, "/v3/table/list/#{e db_name}")
+        .to_return(:body => {'tables' => [
+          {'name' => tables[0][0], 'type' => tables[0][1], 'schema' => tables[0][2], 'count' => tables[0][3], 'created_at' => tables[0][4], 'updated_at' => tables[0][5]},
+          {'name' => tables[1][0], 'type' => tables[1][1], 'schema' => tables[1][2], 'count' => tables[1][3], 'created_at' => tables[1][4], 'updated_at' => tables[1][5]},
+          {'name' => tables[2][0], 'type' => tables[2][1], 'schema' => tables[2][2], 'count' => tables[2][3], 'created_at' => tables[2][4], 'updated_at' => tables[2][5]},
+          {'name' => tables[3][0], 'type' => tables[3][1], 'schema' => tables[3][2], 'count' => tables[3][3], 'created_at' => tables[3][4], 'updated_at' => tables[3][5]}
+        ]}.to_json)
+
+      i = 1
+      table = client.table(db_name, tables[i][0])
+
+      expect(table.name).to           eq(tables[i][0])
+      expect(table.type).to           eq(tables[i][1].to_sym)
+      expect(table.schema.to_json).to eq(eval(tables[i][2]).to_json)
+      expect(table.count).to          eq(tables[i][3])
+      expect(table.created_at).to     eq(Time.parse(tables[i][4]))
+      expect(table.updated_at).to     eq(Time.parse(tables[i][5]))
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.62
+  version: 0.8.63
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -151,7 +151,6 @@ files:
 - lib/td/client/compat_gzip_reader.rb
 - lib/td/client/model.rb
 - lib/td/client/version.rb
-- spec/api_spec.rb
 - spec/spec_helper.rb
 - spec/td/client/api_spec.rb
 - spec/td/client/bulk_import_spec.rb
@@ -162,6 +161,7 @@ files:
 - spec/td/client/result_api_spec.rb
 - spec/td/client/sched_api_spec.rb
 - spec/td/client/spec_resources.rb
+- spec/td/client/table_api_spec.rb
 homepage: http://treasuredata.com/
 licenses: []
 metadata: {}
@@ -186,7 +186,6 @@ signing_key:
 specification_version: 4
 summary: Treasure Data API library for Ruby
 test_files:
-- spec/api_spec.rb
 - spec/td/client/api_spec.rb
 - spec/td/client/bulk_import_spec.rb
 - spec/td/client/db_api_spec.rb
@@ -195,3 +194,4 @@ test_files:
 - 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/table_api_spec.rb

data/spec/api_spec.rb

@@ -1,72 +0,0 @@
-require 'spec_helper'
-
-describe API do
-  VALID_NAMES = [
-    'abc',
-    'abc_cd',
-    '_abc_cd',
-    '_abc_',
-    'ab0_',
-    'ab0',
-  ]
-
-  INVALID_NAMES = {
-    'a' => 'a__',
-    'a' * 256 => 'a' * 253 + '__',
-    'abcD' => 'abcd',
-    'a-b*' => 'a_b_',
-  }
-
-  it 'normalize_database_name should return normalized data' do
-    INVALID_NAMES.each_pair {|ng,ok|
-      API.normalize_database_name(ng).should == ok
-    }
-    lambda {
-      API.normalize_database_name('')
-    }.should raise_error(RuntimeError)
-  end
-
-  it 'normalize_table_name should return normalized data' do
-    INVALID_NAMES.each_pair {|ng,ok|
-      API.normalize_table_name(ng).should == ok
-    }
-    lambda {
-      API.normalize_table_name('')
-    }.should raise_error(RuntimeError)
-  end
-
-  it 'validate_database_name should raise errors' do
-    INVALID_NAMES.each_pair {|ng,ok|
-      lambda {
-        API.validate_database_name(ng)
-      }.should raise_error(ParameterValidationError)
-    }
-    lambda {
-      API.validate_database_name('')
-    }.should raise_error(ParameterValidationError)
-  end
-
-  it 'validate_table_name should raise errors' do
-    INVALID_NAMES.each_pair {|ng,ok|
-      lambda {
-        API.validate_table_name(ng)
-      }.should raise_error(ParameterValidationError)
-    }
-    lambda {
-      API.validate_table_name('')
-    }.should raise_error(ParameterValidationError)
-  end
-
-  it 'normalize_database_name should return valid data' do
-    VALID_NAMES.each {|ok|
-      API.normalize_database_name(ok).should == ok
-    }
-  end
-
-  it 'validate_database_name should return valid data' do
-    VALID_NAMES.each {|ok|
-      API.validate_database_name(ok)
-    }
-  end
-end
-