td-client 0.8.55 → 0.8.56

data/ChangeLog

@@ -1,3 +1,9 @@
+== 2013-11-14 version 0.8.56
+
+* Remove organization, role and ip_limit subcommands
+* Change item_table parameter
+* Now accept :header option to set custom header
+
 == 2013-09-13 version 0.8.55
 
 * Use httpclient gem for import and bulk_import upload

data/lib/td/client.rb

@@ -77,8 +77,8 @@ class Client
   end
 
   # => true
-  def create_item_table(db_name, table_name)
-    @api.create_item_table(db_name, table_name)
+  def create_item_table(db_name, table_name, primary_key, primary_key_type)
+    @api.create_item_table(db_name, table_name, primary_key, primary_key_type)
   end
 
   # => true
@@ -310,52 +310,6 @@ class Client
     @api.delete_result(name)
   end
 
-  # => [Organization]
-  def organizations
-    list = @api.list_organizations
-    list.map {|name|
-      Organization.new(self, name)
-    }
-  end
-
-  # => true
-  def create_organization(organization)
-    @api.create_organization(organization)
-  end
-
-  # => true
-  def delete_organization(organization)
-    @api.delete_organization(organization)
-  end
-
-  # => [Role]
-  def roles
-    list = @api.list_roles
-    list.map {|name,org,users|
-      Role.new(self, name, org, users)
-    }
-  end
-
-  # => true
-  def create_role(role, org)
-    @api.create_role(role, org)
-  end
-
-  # => true
-  def delete_role(role)
-    @api.delete_role(role)
-  end
-
-  # => true
-  def grant_role(role, user)
-    @api.grant_role(role, user)
-  end
-
-  # => true
-  def revoke_role(role, user)
-    @api.revoke_role(role, user)
-  end
-
   # => [User]
   def users
     list = @api.list_users
@@ -427,21 +381,6 @@ class Client
     @api.test_access_control(user, action, scope)
   end
 
-  def ip_limits
-    ips = @api.list_ip_limits
-    ips.map { |org, ipaddr, mask|
-      IpLimit.new(self, org, ipaddr, mask)
-    }
-  end
-
-  def set_ip_limit(org, ip_ranges)
-    @api.set_ip_limit(org, ip_ranges.to_json)
-  end
-
-  def delete_ip_limit(org)
-    @api.delete_ip_limit(org)
-  end
-
   # => [AggregationSchema]
   def aggregation_schemas
     list = @api.list_aggregation_schema

data/lib/td/client/api.rb

@@ -80,6 +80,8 @@ class API
     else
       @http_class = Net::HTTP
     end
+
+    @headers = opts[:headers] || {}
   end
 
   # TODO error check & raise appropriate errors
@@ -169,6 +171,15 @@ class API
     end
   end
 
+  # for fluent-plugin-td / td command to check table existence with import onlt user
+  def self.create_empty_gz_data
+    require 'zlib'
+    require 'stringio'
+
+    io = StringIO.new
+    Zlib::GzipWriter.new(io).close
+    io.string
+  end
 
   ####
   ## Account API
@@ -224,8 +235,7 @@ class API
       count = m['count']
       created_at = m['created_at']
       updated_at = m['updated_at']
-      organization = m['organization']
-      result[name] = [count, created_at, updated_at, organization]
+      result[name] = [count, created_at, updated_at, nil] # set nil to org for API compatibiilty
     }
     return result
   end
@@ -293,13 +303,14 @@ class API
   end
 
   # => true
-  def create_item_table(db, table)
-    create_table(db, table, :item)
+  def create_item_table(db, table, primary_key, primary_key_type)
+    params = {'primary_key' => primary_key, 'primary_key_type' => primary_key_type}
+    create_table(db, table, :item, params)
   end
 
-  def create_table(db, table, type)
+  def create_table(db, table, type, params={})
     schema = schema.to_s
-    code, body, res = post("/v3/table/create/#{e db}/#{e table}/#{type}")
+    code, body, res = post("/v3/table/create/#{e db}/#{e table}/#{type}", params)
     if code != "200"
       raise_error("Create #{type} table failed", res)
     end
@@ -395,8 +406,7 @@ class API
       result_url = m['result']
       priority = m['priority']
       retry_limit = m['retry_limit']
-      organization = m['organization']
-      result << [job_id, type, status, query, start_at, end_at, result_url, priority, retry_limit, organization, database]
+      result << [job_id, type, status, query, start_at, end_at, result_url, priority, retry_limit, nil, database] # same as database
     }
     return result
   end
@@ -427,8 +437,7 @@ class API
     end
     priority = js['priority']
     retry_limit = js['retry_limit']
-    organization = js['organization']
-    return [type, query, status, url, debug, start_at, end_at, result, hive_result_schema, priority, retry_limit, organization, database]
+    return [type, query, status, url, debug, start_at, end_at, result, hive_result_schema, priority, retry_limit, nil, database] # same as above
   end
 
   def job_status(job_id)
@@ -749,8 +758,7 @@ class API
       next_time = m['next_time']
       priority = m['priority']
       retry_limit = m['retry_limit']
-      organization = m['organization']
-      result << [name, cron, query, database, result_url, timezone, delay, next_time, priority, retry_limit, organization]
+      result << [name, cron, query, database, result_url, timezone, delay, next_time, priority, retry_limit, nil] # same as database
     }
     return result
   end
@@ -844,7 +852,7 @@ class API
     js = checked_json(body, %w[results])
     result = []
     js['results'].map {|m|
-      result << [m['name'], m['url'], m['organization']]
+      result << [m['name'], m['url'], nil] # same as database
     }
     return result
   end
@@ -999,101 +1007,6 @@ class API
   end
 
 
-  ####
-  ## Organization API
-  ##
-
-  # => [name:String]
-  def list_organizations
-    code, body, res = get("/v3/organization/list")
-    if code != "200"
-      raise_error("List organizations failed", res)
-    end
-    js = checked_json(body, %w[organizations])
-    result = js["organizations"].map {|orginfo|
-      name = orginfo['name'].to_s
-      name
-    }
-    return result
-  end
-
-  # => true
-  def create_organization(org)
-    code, body, res = post("/v3/organization/create/#{e org}")
-    if code != "200"
-      raise_error("Creating organization failed", res)
-    end
-    return true
-  end
-
-  # => true
-  def delete_organization(org)
-    code, body, res = post("/v3/organization/delete/#{e org}")
-    if code != "200"
-      raise_error("Deleting organization failed", res)
-    end
-    return true
-  end
-
-
-  ####
-  ## Role API
-  ##
-
-  # => [[name:String,organization:String,[user:String]]]
-  def list_roles
-    code, body, res = get("/v3/role/list")
-    if code != "200"
-      raise_error("List roles failed", res)
-    end
-    js = checked_json(body, %w[roles])
-    result = js["roles"].map {|roleinfo|
-      name = roleinfo['name']
-      organization = roleinfo['organization']
-      users = roleinfo['users']
-      [name, organization, users]
-    }
-    return result
-  end
-
-  # => true
-  def create_role(role, org)
-    params = {'organization'=>org}
-    code, body, res = post("/v3/role/create/#{e role}", params)
-    if code != "200"
-      raise_error("Creating role failed", res)
-    end
-    return true
-  end
-
-  # => true
-  def delete_role(role)
-    code, body, res = post("/v3/role/delete/#{e role}")
-    if code != "200"
-      raise_error("Creating role failed", res)
-    end
-    return true
-  end
-
-  # => true
-  def grant_role(role, user)
-    code, body, res = post("/v3/role/grant/#{e role}/#{e user}")
-    if code != "200"
-      raise_error("Granting role failed", res)
-    end
-    return true
-  end
-
-  # => true
-  def revoke_role(role, user)
-    code, body, res = post("/v3/role/revoke/#{e role}/#{e user}")
-    if code != "200"
-      raise_error("Revoking role failed", res)
-    end
-    return true
-  end
-
-
   ####
   ## User API
   ##
@@ -1122,10 +1035,8 @@ class API
     js = checked_json(body, %w[users])
     result = js["users"].map {|roleinfo|
       name = roleinfo['name']
-      organization = roleinfo['organization']
-      roles = roleinfo['roles']
       email = roleinfo['email']
-      [name, organization, roles, email]
+      [name, nil, nil, email] # set nil to org and role for API compatibiilty
     }
     return result
   end
@@ -1266,43 +1177,6 @@ class API
     return acl
   end
 
-  ####
-  ## IP Range Limit API
-  ##
-
-  def list_ip_limits
-    code, body, res = get("/v3/ip_limit/list")
-    if code != "200"
-      raise_error("Listing IP limitations failed", res)
-    end
-    js = checked_json(body, %w[ip_limits])
-    lists = js["ip_limits"].map { |ip_limit|
-      organization = ip_limit['organization']
-      address = ip_limit['address']
-      mask = ip_limit['mask']
-      [organization, address, mask]
-    }
-    return lists
-  end
-
-  def set_ip_limit(organization, ip_ranges)
-    params = {'organization' => organization, 'ip_ranges' => ip_ranges}
-    code, body, res = post("/v3/ip_limit/set", params)
-    if code != "200"
-      raise_error("Setting IP limitation failed", res)
-    end
-    return true
-  end
-
-  def delete_ip_limit(organization)
-    params = {'organization' => organization}
-    code, body, res = post("/v3/ip_limit/delete", params)
-    if code != "200"
-      raise_error("Deleting IP range limitation failed", res)
-    end
-    return true
-  end
-
   ####
   ## Server Status API
   ##
@@ -1453,6 +1327,8 @@ class API
     header['Date'] = Time.now.rfc2822
     header['User-Agent'] = @user_agent
 
+    header.merge!(@headers)
+
     return http, header
   end
 
@@ -1471,15 +1347,17 @@ class API
     end
     header['Date'] = Time.now.rfc2822
 
+    header.merge!(@headers)
+
     return client, header
   end
 
   def raise_error(msg, res, klass=nil)
     begin
+      status_code = res.code.to_s
       js = JSON.load(res.body)
       msg = js['message']
       error_code = js['error_code']
-      status_code = res.code.to_s
 
       if klass
         raise klass, "#{error_code}: #{msg}"

data/lib/td/client/model.rb

@@ -48,7 +48,6 @@ class Database < Model
     @count = count
     @created_at = created_at
     @updated_at = updated_at
-    @org_name = org_name
   end
 
   attr_reader :org_name
@@ -251,7 +250,6 @@ class Job < Model
     @hive_result_schema = hive_result_schema
     @priority = priority
     @retry_limit = retry_limit
-    @org_name = org_name
     @db_name = db_name
   end
 
@@ -361,7 +359,6 @@ class Job < Model
     @hive_result_schema = hive_result_schema
     @priority = priority
     @retry_limit = retry_limit
-    @org_name = org_name
     @db_name = db_name
     self
   end
@@ -393,7 +390,6 @@ class Schedule < Model
     @next_time = next_time
     @priority = priority
     @retry_limit = retry_limit
-    @org_name = org_name
   end
 
   attr_reader :name, :cron, :query, :database, :result_url, :timezone, :delay, :priority, :retry_limit, :org_name
@@ -413,7 +409,6 @@ class Result < Model
     super(client)
     @name = name
     @url = url
-    @org_name = org_name
   end
 
   attr_reader :name, :url, :org_name
@@ -433,7 +428,6 @@ class BulkImport < Model
     @error_records = data['error_records']
     @valid_parts = data['valid_parts']
     @error_parts = data['error_parts']
-    @org_name = data['organization']
   end
 
   attr_reader :name
@@ -453,34 +447,10 @@ class BulkImport < Model
 end
 
 
-class Organization < Model
-  def initialize(client, name)
-    super(client)
-    @name = name
-  end
-
-  attr_reader :client, :name
-end
-
-
-class Role < Model
-  def initialize(client, name, org_name, user_names)
-    super(client)
-    @name = name
-    @org_name = org_name
-    @user_names = user_names
-  end
-
-  attr_reader :client, :name, :org_name, :user_names
-end
-
-
 class User < Model
   def initialize(client, name, org_name, role_names, email)
     super(client)
     @name = name
-    @org_name = org_name
-    @role_names = role_names
     @email = email
   end
 
@@ -501,22 +471,6 @@ class AccessControl < Model
 end
 
 
-class IpLimit < Model
-  def initialize(client, org, address, mask)
-    super(client)
-    @org = org
-    @address = address
-    @mask = mask
-  end
-
-  def ip_range
-    "#{address}/#{mask}"
-  end
-
-  attr_reader :org, :address, :mask
-end
-
-
 class AggregationSchema < Model
   def initialize(client, name, relation_key, logs=nil, attributes=nil, timezone=nil)
     super(client)

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '0.8.55'
+    VERSION = '0.8.56'
   end
 end

metadata

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