td-client 0.8.26 → 0.8.27

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-09-17 version 0.8.27
+
+* Added Table#estimated_storage_size_string
+
+
 == 2012-09-13 version 0.8.26
 
 * Added Account model and Table#esetimated_storage_size method

data/lib/td/client/api.rb

@@ -158,7 +158,7 @@ class API
     js = checked_json(body, %w[account])
     a = js["account"]
     plan = a['plan'].to_i
-    storage_size = a['storage_size'].to_f
+    storage_size = a['storage_size'].to_i
     return [plan, storage_size]
   end
 
@@ -223,7 +223,7 @@ 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']
+      estimated_storage_size = m['estimated_storage_size'].to_i
       schema = JSON.parse(m['schema'] || '[]')
       result[name] = [type, schema, count, created_at, updated_at, estimated_storage_size]
     }

data/lib/td/client/model.rb

@@ -20,14 +20,14 @@ class Account < Model
   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
+    if @storage_size <= 1024*1024
+      return "0.0 GB"
+    elsif @storage_size <= 60*1024*1024
       return "0.01 GB"
+    elsif @storage_size <= 10*1024*1024*1024
+      "%.1f GB" % (@storage_size.to_f / (1024*1024*1024))
     else
-      return s
+      "%d GB" % (@storage_size.to_f / (1024*1024*1024)).to_i
     end
   end
 end
@@ -138,6 +138,18 @@ class Table < Model
   def export(storage_type, opts={})
     @client.export(@db_name, @table_name, storage_type, opts)
   end
+
+  def estimated_storage_size_string
+    if @estimated_storage_size <= 1024*1024
+      return "0.0 GB"
+    elsif @estimated_storage_size <= 60*1024*1024
+      return "0.01 GB"
+    elsif @estimated_storage_size <= 10*1024*1024*1024
+      "%.1f GB" % (@estimated_storage_size.to_f / (1024*1024*1024))
+    else
+      "%d GB" % (@estimated_storage_size.to_f / (1024*1024*1024)).to_i
+    end
+  end
 end
 
 class Schema

data/lib/td/client/version.rb

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

metadata

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