td-client 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a5a7d5958d73f2f32f21250831184d6da0f4ea2
-  data.tar.gz: '049a6d49493d8fdee00e30b6c28fef7c3657ea81'
+  metadata.gz: 62d7b67418193055ae96afc611d3d60498dc31f2
+  data.tar.gz: 435833ca652ee44eb037425f6f4b5429d7bc770e
 SHA512:
-  metadata.gz: eb17173daa47cd38d36555a4d4a5f05e92642d6eaec7724dd45e17ac3890c860f58bf62e907a7628e6ecf8a765b9f68807f1e19c5bae625376c4aa1b8b266f95
-  data.tar.gz: cbd7a86745ae12a10112556418013a74b4734d2e17b44a7661933b5fb7f81db5c2701ab55bbdd865cec0fe62e4af475f3336315eb1c2bb4a3d5835ee73b96e98
+  metadata.gz: 60fa14a70c5f1c4692482a9aea14355ddd7ace29da1caadced59b07fa076cd85bff27dbd4e008d3d90bf84c2d2511e497a29c25c7825a4c9afb57423b28799fc
+  data.tar.gz: 5a50764649b21f4f29a98e527d50c9bf6c7fa7f4887b95e4a14bb7dfb9d304ca52f89aa664c2142033cd34c67a97b2f0b08dc50f471c4c3841170ea3a6e6a4e8

data/lib/td/client.rb

@@ -534,39 +534,6 @@ class Client
     @api.change_my_password(old_password, password)
   end
 
-  # @return [Array<AccessControl>]
-  def access_controls
-    list = @api.list_access_controls
-    list.map {|subject,action,scope,grant_option|
-      AccessControl.new(self, subject, action, scope, grant_option)
-    }
-  end
-
-  # @param [String] subject
-  # @param [String] action
-  # @param [String] scope
-  # @param [Array] grant_option
-  # @return [true]
-  def grant_access_control(subject, action, scope, grant_option)
-    @api.grant_access_control(subject, action, scope, grant_option)
-  end
-
-  # @param [String] subject
-  # @param [String] action
-  # @param [String] scope
-  # @return [true]
-  def revoke_access_control(subject, action, scope)
-    @api.revoke_access_control(subject, action, scope)
-  end
-
-  # @param [String] user
-  # @param [String] action
-  # @param [String] scope
-  # @return [Array]
-  def test_access_control(user, action, scope)
-    @api.test_access_control(user, action, scope)
-  end
-
   # => BulkLoad::Job
   def bulk_load_guess(job)
     @api.bulk_load_guess(job)

data/lib/td/client/api.rb

@@ -1,6 +1,5 @@
 require 'td/client/api_error'
 require 'td/client/version'
-require 'td/client/api/access_control'
 require 'td/client/api/account'
 require 'td/client/api/bulk_import'
 require 'td/client/api/bulk_load'
@@ -21,7 +20,6 @@ require 'td/core_ext/openssl/ssl/sslcontext/set_params'
 module TreasureData
 
 class API
-  include API::AccessControl
   include API::Account
   include API::BulkImport
   include API::BulkLoad

data/lib/td/client/api/export.rb

@@ -28,7 +28,7 @@ module Export
   # @return [String] job_id
   def result_export(target_job_id, opts={})
     code, body, res = post("/v3/job/result_export/#{target_job_id}", opts)
-    if code != "200"
+    if code[0] != ?2
       raise_error("Result Export failed", res)
     end
     js = checked_json(body, %w[job_id])

data/lib/td/client/api/job.rb

@@ -67,6 +67,8 @@ module Job
     num_records = js['num_records']
     duration = js['duration']
     result = js['result'] # result target URL
+    linked_result_export_job_id = js['linked_result_export_job_id']
+    result_export_target_job_id = js['result_export_target_job_id']
     hive_result_schema = (js['hive_result_schema'] || '')
     if hive_result_schema.empty?
       hive_result_schema = nil
@@ -100,7 +102,8 @@ module Job
     priority = js['priority']
     retry_limit = js['retry_limit']
     return [type, query, status, url, debug, start_at, end_at, cpu_time,
-            result_size, result, hive_result_schema, priority, retry_limit, nil, database, duration, num_records]
+            result_size, result, hive_result_schema, priority, retry_limit, nil, database, duration, num_records,
+            linked_result_export_job_id, result_export_target_job_id]
   end
 
   # @param [String] job_id

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '1.0.5'
+    VERSION = '1.0.6'
   end
 end

data/spec/td/client/job_api_spec.rb

@@ -31,7 +31,7 @@ describe 'Job API' do
         jobs = api.list_jobs
         jobs[i..i].map {|job_id, type, status, query, start_at, end_at, cpu_time,
                       result_size, result_url, priority, retry_limit, org, db,
-                      duration, num_records|
+                      duration, num_records, linked_result_export_job_id, result_export_target_job_id|
           expect(job_id).to eq(job['job_id'])
           expect(type).to eq(job['type'])
           expect(status).to eq(job['status'])
@@ -47,6 +47,8 @@ describe 'Job API' do
           expect(db).to eq(job['database'])
           expect(duration).to eq(job['duration'])
           expect(num_records).to eq(job['num_records'])
+          expect(linked_result_export_job_id).to eq(job['linked_result_export_job_id'])
+          expect(result_export_target_job_id).to eq(job['result_export_target_job_id'])
         }
       end
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -138,7 +138,6 @@ files:
 - lib/td-client.rb
 - lib/td/client.rb
 - lib/td/client/api.rb
-- lib/td/client/api/access_control.rb
 - lib/td/client/api/account.rb
 - lib/td/client/api/bulk_import.rb
 - lib/td/client/api/bulk_load.rb
@@ -158,7 +157,6 @@ files:
 - lib/td/client/version.rb
 - lib/td/core_ext/openssl/ssl/sslcontext/set_params.rb
 - spec/spec_helper.rb
-- spec/td/client/access_control_api_spec.rb
 - spec/td/client/account_api_spec.rb
 - spec/td/client/api_error_spec.rb
 - spec/td/client/api_spec.rb
@@ -182,7 +180,8 @@ files:
 - spec/td/client_sched_spec.rb
 - spec/td/client_spec.rb
 homepage: http://treasuredata.com/
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -205,7 +204,6 @@ signing_key:
 specification_version: 4
 summary: Treasure Data API library for Ruby
 test_files:
-- spec/td/client/access_control_api_spec.rb
 - spec/td/client/account_api_spec.rb
 - spec/td/client/api_error_spec.rb
 - spec/td/client/api_spec.rb

data/lib/td/client/api/access_control.rb

@@ -1,74 +0,0 @@
-class TreasureData::API
-module AccessControl
-
-  ####
-  ## Access Control API
-  ##
-
-  # @param [String] subject
-  # @param [String] action
-  # @param [String] scope
-  # @param [Array] grant_option
-  # @return [true]
-  def grant_access_control(subject, action, scope, grant_option)
-    params = {'subject'=>subject, 'action'=>action, 'scope'=>scope, 'grant_option'=>grant_option.to_s}
-    code, body, res = post("/v3/acl/grant", params)
-    if code != "200"
-      raise_error("Granting access control failed", res)
-    end
-    return true
-  end
-
-  # @param [String] subject
-  # @param [String] action
-  # @param [String] scope
-  # @return [true]
-  def revoke_access_control(subject, action, scope)
-    params = {'subject'=>subject, 'action'=>action, 'scope'=>scope}
-    code, body, res = post("/v3/acl/revoke", params)
-    if code != "200"
-      raise_error("Revoking access control failed", res)
-    end
-    return true
-  end
-
-  # @param [String] user
-  # @param [String] action
-  # @param [String] scope
-  # @return [Array]
-  def test_access_control(user, action, scope)
-    params = {'user'=>user, 'action'=>action, 'scope'=>scope}
-    code, body, res = get("/v3/acl/test", params)
-    if code != "200"
-      raise_error("Testing access control failed", res)
-    end
-    js = checked_json(body, %w[permission access_controls])
-    perm = js["permission"]
-    acl = js["access_controls"].map {|roleinfo|
-      subject = roleinfo['subject']
-      action = roleinfo['action']
-      scope = roleinfo['scope']
-      [name, action, scope]
-    }
-    return perm, acl
-  end
-
-  # @return [Array]
-  def list_access_controls
-    code, body, res = get("/v3/acl/list")
-    if code != "200"
-      raise_error("Listing access control failed", res)
-    end
-    js = checked_json(body, %w[access_controls])
-    acl = js["access_controls"].map {|roleinfo|
-      subject = roleinfo['subject']
-      action = roleinfo['action']
-      scope = roleinfo['scope']
-      grant_option = roleinfo['grant_option']
-      [subject, action, scope, grant_option]
-    }
-    return acl
-  end
-
-end
-end

data/spec/td/client/access_control_api_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-require 'td/client/spec_resources'
-require 'json'
-
-describe 'Access Control API' do
-  include_context 'spec symbols'
-  include_context 'common helper'
-
-  let :api do
-    # no retry for GET
-    API.new(nil, {:max_cumul_retry_delay => -1})
-  end
-
-  describe 'all apis' do
-    it 'is deprecated' do
-      stub_api_request(:post, "/v3/acl/grant").to_return(:status => 500)
-      expect {
-        api.grant_access_control('subject', 'action', 'scope', [])
-      }.to raise_error(TreasureData::APIError)
-
-      stub_api_request(:post, "/v3/acl/revoke").to_return(:status => 500)
-      expect {
-        api.revoke_access_control('subject', 'action', 'scope')
-      }.to raise_error(TreasureData::APIError)
-
-      stub_api_request(:get, "/v3/acl/test", :query => {'user' => 'user', 'action' => 'action', 'scope' => 'scope'}).to_return(:status => 422)
-      expect {
-        api.test_access_control('user', 'action', 'scope')
-      }.to raise_error(TreasureData::APIError)
-
-      stub_api_request(:get, "/v3/acl/list").to_return(:status => 500)
-      expect {
-        api.list_access_controls
-      }.to raise_error(TreasureData::APIError)
-    end
-  end
-end