td-client 0.8.25 → 0.8.26

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2012-09-13 version 0.8.26
+
+* Added Account model and Table#esetimated_storage_size method
+* Name length limit is changed from 32 characters to 256 characters
+
+
 == 2012-09-04 version 0.8.25
 
 * Added Client#change_my_password(old_password, password)

data/lib/td/client.rb

@@ -41,6 +41,12 @@ class Client
     @api.delete_database(db_name)
   end
 
+  # => Account
+  def account
+    plan, storage = @api.show_account
+    return Account.new(self, plan, storage)
+  end
+
   # => [Database]
   def databases
     m = @api.list_databases
@@ -83,9 +89,9 @@ class Client
   # => [Table]
   def tables(db_name)
     m = @api.list_tables(db_name)
-    m.map {|table_name,(type,schema,count,created_at,updated_at)|
+    m.map {|table_name,(type,schema,count,created_at,updated_at,estimated_storage_size)|
       schema = Schema.new.from_json(schema)
-      Table.new(self, db_name, table_name, type, schema, count, created_at, updated_at)
+      Table.new(self, db_name, table_name, type, schema, count, created_at, updated_at, estimated_storage_size)
     }
   end
 

data/lib/td/client/api.rb

@@ -77,8 +77,8 @@ class API
     if name.empty?
       raise "Empty name is not allowed"
     end
-    if name.length < 3 || 32 < name.length
-      raise "Name must be 3 to 32 characters, got #{name.length} characters."
+    if name.length < 3 || 256 < name.length
+      raise "Name must be 3 to 256 characters, got #{name.length} characters."
     end
     unless name =~ /^([a-z0-9_]+)$/
       raise "Name must consist only of lower-case alphabets, numbers and '_'."
@@ -99,8 +99,8 @@ class API
     if name.empty?
       raise "Empty column name is not allowed"
     end
-    if 32 < name.length
-      raise "Column name must be to 32 characters, got #{name.length} characters."
+    if 256 < name.length
+      raise "Column name must be to 256 characters, got #{name.length} characters."
     end
     unless name =~ /^([a-z0-9_]+)$/
       raise "Column name must consist only of alphabets, numbers, '_'."
@@ -145,6 +145,24 @@ class API
     end
   end
 
+
+  ####
+  ## Account API
+  ##
+
+  def show_account
+    code, body, res = get("/v3/account/show")
+    if code != "200"
+      raise_error("Show account failed", res)
+    end
+    js = checked_json(body, %w[account])
+    a = js["account"]
+    plan = a['plan'].to_i
+    storage_size = a['storage_size'].to_f
+    return [plan, storage_size]
+  end
+
+
   ####
   ## Database API
   ##
@@ -205,8 +223,9 @@ class API
       count = (m['count'] || 0).to_i  # TODO?
       created_at = m['created_at']
       updated_at = m['updated_at']
+      estimated_storage_size = m['estimated_storage_size']
       schema = JSON.parse(m['schema'] || '[]')
-      result[name] = [type, schema, count, created_at, updated_at]
+      result[name] = [type, schema, count, created_at, updated_at, estimated_storage_size]
     }
     return result
   end

data/lib/td/client/model.rb

@@ -10,6 +10,28 @@ class Model
   attr_reader :client
 end
 
+class Account < Model
+  def initialize(client, plan, storage_size=nil)
+    super(client)
+    @plan = plan
+    @storage_size = storage_size
+  end
+
+  attr_reader :plan, :storage_size
+
+  def storage_size_string
+    s = "%.1f GB" % (@storage_size / (1024*1024*1024))
+    if s == "0.0 GB"
+      if @storage_size <= 1024*1024
+        return "0.0 GB"
+      end
+      return "0.01 GB"
+    else
+      return s
+    end
+  end
+end
+
 class Database < Model
   def initialize(client, db_name, tables=nil, count=nil, created_at=nil, updated_at=nil, org_name=nil)
     super(client)
@@ -68,7 +90,7 @@ class Database < Model
 end
 
 class Table < Model
-  def initialize(client, db_name, table_name, type, schema, count, created_at=nil, updated_at=nil)
+  def initialize(client, db_name, table_name, type, schema, count, created_at=nil, updated_at=nil, estimated_storage_size=nil)
     super(client)
     @db_name = db_name
     @table_name = table_name
@@ -77,9 +99,10 @@ class Table < Model
     @count = count
     @created_at = created_at
     @updated_at = updated_at
+    @estimated_storage_size = estimated_storage_size
   end
 
-  attr_reader :type, :db_name, :table_name, :schema, :count
+  attr_reader :type, :db_name, :table_name, :schema, :count, :estimated_storage_size
 
   alias database_name db_name
   alias name table_name

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.25'
+VERSION = '0.8.26'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.25
+  version: 0.8.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack