td-client 0.8.57 → 0.8.58

data/lib/td/client.rb

@@ -104,10 +104,10 @@ class Client
   # => [Table]
   def tables(db_name)
     m = @api.list_tables(db_name)
-    m.map {|table_name,(type,schema,count,created_at,updated_at,estimated_storage_size, last_import, last_log_timestamp, expire_days)|
+    m.map {|table_name, (type, schema, count, created_at, updated_at, estimated_storage_size, last_import, last_log_timestamp, expire_days, primary_key, primary_key_type)|
       schema = Schema.new.from_json(schema)
       Table.new(self, db_name, table_name, type, schema, count, created_at, updated_at,
-        estimated_storage_size, last_import, last_log_timestamp, expire_days)
+        estimated_storage_size, last_import, last_log_timestamp, expire_days, primary_key, primary_key_type)
     }
   end
 

data/lib/td/client/api.rb

@@ -20,6 +20,9 @@ class API
   DEFAULT_ENDPOINT = 'api.treasure-data.com'
   DEFAULT_IMPORT_ENDPOINT = 'api-import.treasure-data.com'
 
+  NEW_DEFAULT_ENDPOINT = 'api.treasuredata.com'
+  NEW_DEFAULT_IMPORT_ENDPOINT = 'api-import.treasuredata.com'
+
   def initialize(apikey, opts={})
     require 'json'
     require 'time'
@@ -283,7 +286,9 @@ class API
       estimated_storage_size = m['estimated_storage_size'].to_i
       schema = JSON.parse(m['schema'] || '[]')
       expire_days = m['expire_days']
-      result[name] = [type, schema, count, created_at, updated_at, estimated_storage_size, last_import, last_log_timestamp, expire_days]
+      primary_key = m['primary_key']
+      primary_key_type = m['primary_key_type']
+      result[name] = [type, schema, count, created_at, updated_at, estimated_storage_size, last_import, last_log_timestamp, expire_days, primary_key, primary_key_type]
     }
     return result
   end
@@ -342,7 +347,7 @@ class API
       raise_error("Update table expiration failed", res)
     end
     return true
-  end  
+  end
 
   # => type:Symbol
   def delete_table(db, table)
@@ -839,6 +844,8 @@ class API
     opts = {}
     if @host == DEFAULT_ENDPOINT
       opts[:host] = DEFAULT_IMPORT_ENDPOINT
+    elsif @host == NEW_DEFAULT_ENDPOINT
+      opts[:host] = NEW_DEFAULT_IMPORT_ENDPOINT
     end
     code, body, res = put(path, stream, size, opts)
     if code[0] != ?2
@@ -1113,6 +1120,13 @@ class API
     header['Accept-Encoding'] = 'deflate, gzip'
     request = Net::HTTP::Get.new(path, header)
 
+    unless ENV['TD_CLIENT_DEBUG'].nil?
+      puts "DEBUG: REST GET call:"
+      puts "DEBUG:   header: " + header.to_s
+      puts "DEBUG:   path:   " + path.to_s
+      puts "DEBUG:   params: " + params.to_s
+    end
+
     if block
       response = http.request(request) do |res|
         if ce = res.header['Content-Encoding']
@@ -1153,6 +1167,13 @@ class API
 
     path = @base_path + url
 
+    unless ENV['TD_CLIENT_DEBUG'].nil?
+      puts "DEBUG: REST POST call:"
+      puts "DEBUG:   header: " + header.to_s
+      puts "DEBUG:   path:   " + path.to_s
+      puts "DEBUG:   params: " + params.to_s
+    end
+
     if params && !params.empty?
       request = Net::HTTP::Post.new(path, header)
       request.set_form_data(params)
@@ -1179,6 +1200,14 @@ class API
              stream
            end
     target = build_endpoint(url, opts[:host] || @host)
+
+    unless ENV['TD_CLIENT_DEBUG'].nil?
+      puts "DEBUG: REST PUT call:"
+      puts "DEBUG:   header: " + header.to_s
+      puts "DEBUG:   target: " + target.to_s
+      puts "DEBUG:   body:   " + body.to_s
+    end
+
     response = client.put(target, body, header)
     return [response.code.to_s, response.body, response]
   end
@@ -1237,31 +1266,34 @@ class API
   end
 
   def raise_error(msg, res, klass=nil)
+    status_code = res.code.to_s
     begin
-      status_code = res.code.to_s
       js = JSON.load(res.body)
-      msg = js['message']
-      error_code = js['error_code']
+      error_msg = js['message'] || js['error']
 
       if klass
-        raise klass, "#{error_code}: #{msg}"
+        raise klass, "#{status_code}: #{msg}: #{error_msg}"
       elsif status_code == "404"
-        raise NotFoundError, "#{error_code}: #{msg}"
+        raise NotFoundError, "#{msg}: #{error_msg}"
       elsif status_code == "409"
-        raise AlreadyExistsError, "#{error_code}: #{msg}"
+        raise AlreadyExistsError, "#{msg}: #{error_msg}"
+      elsif status_code == "401"
+        raise AuthError, "#{msg}: #{error_msg}"
       else
-        raise APIError, "#{error_code}: #{msg}"
+        raise APIError, "#{status_code}: #{msg}: #{error_msg}"
       end
 
-    rescue
+    rescue JSON::ParserError
       if klass
-        raise klass, "#{error_code}: #{msg}"
+        raise klass, "#{status_code}: #{msg}: #{res.body}"
       elsif status_code == "404"
         raise NotFoundError, "#{msg}: #{res.body}"
       elsif status_code == "409"
         raise AlreadyExistsError, "#{msg}: #{res.body}"
+      elsif status_code == "401"
+        raise AuthError, "#{msg}: #{res.body}"
       else
-        raise APIError, "#{msg}: #{res.body}"
+        raise APIError, "#{status_code}: #{msg}: #{res.body}"
       end
     end
     # TODO error

data/lib/td/client/model.rb

@@ -97,7 +97,7 @@ class Database < Model
 end
 
 class Table < Model
-  def initialize(client, db_name, table_name, type, schema, count, created_at=nil, updated_at=nil, estimated_storage_size=nil, last_import=nil, last_log_timestamp=nil, expire_days=nil)
+  def initialize(client, db_name, table_name, type, schema, count, created_at=nil, updated_at=nil, estimated_storage_size=nil, last_import=nil, last_log_timestamp=nil, expire_days=nil, primary_key=nil, primary_key_type=nil)
     super(client)
     @db_name = db_name
     @table_name = table_name
@@ -110,9 +110,11 @@ class Table < Model
     @last_import = last_import
     @last_log_timestamp = last_log_timestamp
     @expire_days = expire_days
+    @primary_key = primary_key
+    @primary_key_type = primary_key_type
   end
 
-  attr_reader :type, :db_name, :table_name, :schema, :count, :estimated_storage_size
+  attr_reader :type, :db_name, :table_name, :schema, :count, :estimated_storage_size, :primary_key, :primary_key_type
 
   alias database_name db_name
   alias name table_name
@@ -318,7 +320,7 @@ class Job < Model
 
   def finished?
     update_progress! unless @status
-    if FINISHED_STATUS.include?(@status)      
+    if FINISHED_STATUS.include?(@status)
       return true
     else
       return false

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '0.8.57'
+    VERSION = '0.8.58'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.57
+  version: 0.8.58
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -137,6 +137,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.4
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Treasure Data API library for Ruby
 email: support@treasure-data.com
 executables: []
@@ -173,12 +189,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4425539738292282351
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4425539738292282351
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -195,4 +217,3 @@ test_files:
 - spec/td/client/partial_delete_api_spec.rb
 - spec/td/client/result_api_spec.rb
 - spec/td/client/sched_api_spec.rb
-has_rdoc: false