td-client 0.8.21 → 0.8.22

data/ChangeLog

@@ -1,4 +1,9 @@
 
+== 2012-08-20 version 0.8.22
+
+* Top-level resource models support org_name parameter
+
+
 == 2012-08-06 version 0.8.21
 
 * Added multiuser features: organizations, users, roles

data/lib/td/client.rb

@@ -44,17 +44,17 @@ class Client
   # => [Database]
   def databases
     m = @api.list_databases
-    m.map {|db_name,(count,created_at,updated_at)|
-      Database.new(self, db_name, nil, count, created_at, updated_at)
+    m.map {|db_name,(count,created_at,updated_at,org)|
+      Database.new(self, db_name, nil, count, created_at, updated_at, org)
     }
   end
 
   # => Database
   def database(db_name)
     m = @api.list_databases
-    m.each {|name,(count,created_at,updated_at)|
+    m.each {|name,(count,created_at,updated_at,org)|
       if name == db_name
-        return Database.new(self, name, nil, count, created_at, updated_at)
+        return Database.new(self, name, nil, count, created_at, updated_at, org)
       end
     }
     raise NotFoundError, "Database '#{db_name}' does not exist"
@@ -112,22 +112,22 @@ class Client
   # => [Job]
   def jobs(from=nil, to=nil, status=nil)
     result = @api.list_jobs(from, to, status)
-    result.map {|job_id,type,status,query,start_at,end_at,result_url,priority|
-      Job.new(self, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url, nil, priority)
+    result.map {|job_id,type,status,query,start_at,end_at,result_url,priority,org|
+      Job.new(self, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url, nil, priority, org)
     }
   end
 
   # => Job
   def job(job_id)
     job_id = job_id.to_s
-    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority = @api.show_job(job_id)
-    Job.new(self, job_id, type, query, status, url, debug, start_at, end_at, nil, result_url, hive_result_schema, priority)
+    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org = @api.show_job(job_id)
+    Job.new(self, job_id, type, query, status, url, debug, start_at, end_at, nil, result_url, hive_result_schema, priority, org)
   end
 
   # => type:Symbol, url:String
   def job_status(job_id)
-    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority = @api.show_job(job_id)
-    return query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority
+    type, query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org = @api.show_job(job_id)
+    return query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org
   end
 
   # => result:[{column:String=>value:Object]
@@ -235,8 +235,8 @@ class Client
   # [Schedule]
   def schedules
     result = @api.list_schedules
-    result.map {|name,cron,query,database,result_url,timezone,delay,next_time,priority|
-      Schedule.new(self, name, cron, query, database, result_url, timezone, delay, next_time, priority)
+    result.map {|name,cron,query,database,result_url,timezone,delay,next_time,priority,org_name|
+      Schedule.new(self, name, cron, query, database, result_url, timezone, delay, next_time, priority, org_name)
     }
   end
 
@@ -249,6 +249,7 @@ class Client
   def history(name, from=nil, to=nil)
     result = @api.history(name, from, to)
     result.map {|scheduled_at,job_id,type,status,query,start_at,end_at,result_url,priority|
+      # TODO org
       ScheduledJob.new(self, scheduled_at, job_id, type, query, status, nil, nil, start_at, end_at, nil, result_url, nil, priority)
     }
   end
@@ -269,8 +270,8 @@ class Client
   # => [Result]
   def results
     results = @api.list_result
-    rs = results.map {|name,url|
-      Result.new(self, name, url)
+    rs = results.map {|name,url,organizations|
+      Result.new(self, name, url, organizations)
     }
     return rs
   end

data/lib/td/client/api.rb

@@ -146,7 +146,8 @@ class API
       count = m['count']
       created_at = m['created_at']
       updated_at = m['updated_at']
-      result[name] = [count, created_at, updated_at]
+      organization = m['organization']
+      result[name] = [count, created_at, updated_at, organization]
     }
     return result
   end
@@ -291,7 +292,8 @@ class API
       end_at = m['end_at']
       result_url = m['result']
       priority = m['priority']
-      result << [job_id, type, status, query, start_at, end_at, result_url, priority]
+      organization = m['organization']
+      result << [job_id, type, status, query, start_at, end_at, result_url, priority, organization]
     }
     return result
   end
@@ -319,7 +321,8 @@ class API
       hive_result_schema = JSON.parse(hive_result_schema)
     end
     priority = js['priority']
-    return [type, query, status, url, debug, start_at, end_at, result, hive_result_schema, priority]
+    organization = js['organization']
+    return [type, query, status, url, debug, start_at, end_at, result, hive_result_schema, priority, organization]
   end
 
   def job_result(job_id)
@@ -614,7 +617,8 @@ class API
       delay = m['delay']
       next_time = m['next_time']
       priority = m['priority']
-      result << [name, cron, query, database, result_url, timezone, delay, next_time, priority]
+      organization = m['organization']
+      result << [name, cron, query, database, result_url, timezone, delay, next_time, priority, organization]
     }
     return result
   end
@@ -698,7 +702,7 @@ class API
     js = checked_json(body, %w[results])
     result = []
     js['results'].map {|m|
-      result << [m['name'], m['url']]
+      result << [m['name'], m['url'], m['organization']]
     }
     return result
   end

data/lib/td/client/model.rb

@@ -11,15 +11,18 @@ class Model
 end
 
 class Database < Model
-  def initialize(client, db_name, tables=nil, count=nil, created_at=nil, updated_at=nil)
+  def initialize(client, db_name, tables=nil, count=nil, created_at=nil, updated_at=nil, org_name=nil)
     super(client)
     @db_name = db_name
     @tables = tables
     @count = count
     @created_at = created_at
     @updated_at = updated_at
+    @org_name = org_name
   end
 
+  attr_reader :org_name
+
   def name
     @db_name
   end
@@ -175,7 +178,7 @@ class Job < Model
   STATUS_KILLED = "killed"
   FINISHED_STATUS = [STATUS_SUCCESS, STATUS_ERROR, STATUS_KILLED]
 
-  def initialize(client, job_id, type, query, status=nil, url=nil, debug=nil, start_at=nil, end_at=nil, result=nil, result_url=nil, hive_result_schema=nil, priority=nil)
+  def initialize(client, job_id, type, query, status=nil, url=nil, debug=nil, start_at=nil, end_at=nil, result=nil, result_url=nil, hive_result_schema=nil, priority=nil, org_name=nil)
     super(client)
     @job_id = job_id
     @type = type
@@ -189,10 +192,11 @@ class Job < Model
     @result_url = result_url
     @hive_result_schema = hive_result_schema
     @priority = priority
+    @org_name = org_name
   end
 
   attr_reader :job_id, :type, :result_url
-  attr_reader :hive_result_schema, :priority
+  attr_reader :hive_result_schema, :priority, :org_name
 
   def wait(timeout=nil)
     # TODO
@@ -283,7 +287,7 @@ class Job < Model
   end
 
   def update_status!
-    query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority = @client.job_status(@job_id)
+    query, status, url, debug, start_at, end_at, result_url, hive_result_schema, priority, org_name = @client.job_status(@job_id)
     @query = query
     @status = status
     @url = url
@@ -291,6 +295,7 @@ class Job < Model
     @start_at = start_at
     @end_at = end_at
     @hive_result_schema = hive_result_schema
+    @org_name = org_name
     self
   end
 end
@@ -309,7 +314,7 @@ end
 
 
 class Schedule < Model
-  def initialize(client, name, cron, query, database=nil, result_url=nil, timezone=nil, delay=nil, next_time=nil, priority=nil)
+  def initialize(client, name, cron, query, database=nil, result_url=nil, timezone=nil, delay=nil, next_time=nil, priority=nil, org_name=nil)
     super(client)
     @name = name
     @cron = cron
@@ -320,9 +325,10 @@ class Schedule < Model
     @delay = delay
     @next_time = next_time
     @priority = priority
+    @org_name = org_name
   end
 
-  attr_reader :name, :cron, :query, :database, :result_url, :timezone, :delay, :priority
+  attr_reader :name, :cron, :query, :database, :result_url, :timezone, :delay, :priority, :org_name
 
   def next_time
     @next_time ? Time.parse(@next_time) : nil
@@ -335,13 +341,14 @@ end
 
 
 class Result < Model
-  def initialize(client, name, url)
+  def initialize(client, name, url, org_name)
     super(client)
     @name = name
     @url = url
+    @org_name = org_name
   end
 
-  attr_reader :name, :url
+  attr_reader :name, :url, :org_name
 end
 
 
@@ -358,6 +365,7 @@ 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
@@ -369,6 +377,7 @@ class BulkImport < Model
   attr_reader :error_records
   attr_reader :valid_parts
   attr_reader :error_parts
+  attr_reader :org_name
 
   def upload_frozen?
     @upload_frozen

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
 
-VERSION = '0.8.21'
+VERSION = '0.8.22'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 0.8.21
+  version: 0.8.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack