tableau_server_client 0.0.20 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78810d795bb6f32ec40ba5ad9236263bcd10bf2ef112af789ba1815b106fde11
-  data.tar.gz: a35aa637bb4cacf18f12755d3e5561ee57b8dbf0ce3b736f86da94535c9a4730
+  metadata.gz: f7e98729c6fc455003c9f478a0156a647484c1fe5de1598cea8310ff74d458e4
+  data.tar.gz: 6972d7428b5daa841db35d8bf586479d1700deeafb18fab46fe086637680a53d
 SHA512:
-  metadata.gz: 0affb6c80c2ec2af64d9a49e72e5d63d7711444a7983165cc59e2ea4cea8ba72efdc1e3bc2ef7473481741e678806db0e7e8090049586aa6958e813584742e38
-  data.tar.gz: 9fd19bb7a5df41908737b511c298a396c955efcd724f650b449b12322e49238d58d8f450f56a3a07a6ef35a9845b52eeb792f19252c6219ffc53afc94236a7a0
+  metadata.gz: 8a607ff48e5158ac2a9a221a9f34c016f357fb459e40ab5a99384fd0ef7357ed34642720e815c367deb513e184764c633b5f468630d5ba19ac40ef2732b9c458
+  data.tar.gz: a88351042ba9d7fae2fabbb4f59c09f5300af75aa709f6775edff607800ac228d4a271c164001012578a1507dd130d068c5079b6f1fcf4749a85f93264a16ec3

data/lib/tableau_server_client/client.rb

@@ -14,18 +14,18 @@ module TableauServerClient
   class Client
     include RequestBuilder
 
-    def initialize(server_url, username, password, site_name, api_version, token_lifetime, logger, impersonation_user_id)
+    def initialize(server_url, username, password, content_url, api_version, token_lifetime, logger, impersonation_user_id)
       @server_url = server_url
       @username = username
       @password = password
-      @site_name = site_name
+      @content_url = content_url
       @api_version = api_version
       @token_lifetime = token_lifetime
       @logger = logger
       @impersonation_user_id = impersonation_user_id
     end
 
-    attr_reader :site_name, :username, :api_version, :token_lifetime, :logger, :impersonation_user_id
+    attr_reader :content_url, :username, :api_version, :token_lifetime, :logger, :impersonation_user_id
 
     def server_url
       @_server_url ||= URI(@server_url.chomp("/"))
@@ -72,7 +72,7 @@ module TableauServerClient
       if file_path
         File.write(file_path, response.body)
       end
-      return response
+      return response.body
     end
 
     def update(resource)
@@ -125,10 +125,6 @@ module TableauServerClient
       @token = TableauServerClient::Token.parse(res.body, token_lifetime)
     end
 
-    def content_url
-      site_name == 'default' ? "" : site_name
-    end
-
     def faraday
       @faraday ||= Faraday.new(request: {params_encoder: EmptyEncoder.new}, headers: {'Content-Type' => 'application/xml'}) do |f|
         f.response :raise_error

data/lib/tableau_server_client/resources/project.rb

@@ -1,4 +1,5 @@
 require 'tableau_server_client/resources/resource'
+require 'tableau_server_client/resources/workbook'
 
 module TableauServerClient
   module Resources
@@ -59,6 +60,12 @@ module TableauServerClient
         @hierarchy ||= (parent_projects << self).map {|p| p.name }.join('/')
       end
 
+      def workbooks
+        @client.get_collection(Workbook.location(site_path, filter: [])).select {|w|
+          w.project_id == id
+        }
+      end
+
       def extract_values_in_description
         @values_in_description ||=\
           description.lines.map { |l|/^(.*):\s*(.*)$/.match(l) }.reject { |m| m.nil? }.map { |m| m[1,2] }.to_h

data/lib/tableau_server_client/resources/resource.rb

@@ -61,6 +61,14 @@ module TableauServerClient
         self.class.extract_site_path(path)
       end
 
+      def site_id
+        site_path.split('/')[1]
+      end
+
+      def server_url
+        @client.server_url
+      end
+
       def delete!
         @client.delete self
       end

data/lib/tableau_server_client/resources/site.rb

@@ -45,6 +45,10 @@ module TableauServerClient
         @client.get_collection View.location(path, filter: filter)
       end
 
+      def view(id)
+        @client.get View.location(path, id)
+      end
+
       def users(filter: [])
         @client.get_collection User.location(path, filter: filter)
       end

data/lib/tableau_server_client/resources/view.rb

@@ -27,10 +27,13 @@ module TableauServerClient
       end
 
       def webpage_url
-        webpage_path = content_url.gsub('/sheets/', '/')
         "#{server_url}#{content}/#/views/#{webpage_path}"
       end
 
+      def webpage_path
+        content_url.gsub('/sheets/', '/')
+      end
+
       def image(query_params: {}, file_path: nil)
         return @image if @iamge
         @image = client.download_image(location(query_params: query_params), file_path: file_path)

data/lib/tableau_server_client/resources/workbook.rb

@@ -3,6 +3,7 @@ require 'tableau_server_client/resources/project'
 require 'tableau_server_client/resources/connection'
 require 'tableau_server_client/resources/downloadable'
 require 'tableau_server_client/resources/datasource'
+require 'tableau_server_client/resources/view'
 
 module TableauServerClient
   module Resources
@@ -10,7 +11,7 @@ module TableauServerClient
     class Workbook < Resource
       include Downloadable
 
-      attr_reader :id, :name, :webpage_url, :content_url, :show_tabs, :size, :created_at, :updated_at
+      attr_reader :id, :name, :webpage_url, :content_url, :show_tabs, :size, :created_at, :updated_at, :project_id, :owner_id
       attr_writer :owner
 
       def self.from_response(client, path, xml)
@@ -32,13 +33,17 @@ module TableauServerClient
       end
 
       def project
-        @project ||= @client.get_collection(Project.location(site_path)).find {|p| p.id == @project_id }
+        @project ||= @client.get_collection(Project.location(site_path)).find {|p| p.id == project_id }
       end
 
       def owner
         @owner ||= @client.get User.location(site_path, @owner_id)
       end
 
+      def views
+        @views ||= @client.get_collection(View.location(site_path)).select {|v| v.workbook_id == id }
+      end
+
       def to_request
         request = build_request {|b|
           b.workbook {|w|

data/lib/tableau_server_client/server.rb

@@ -7,13 +7,16 @@ require 'logger'
 module TableauServerClient
   class Server
 
+    #Implement for_token
+    #def for_token(token)
+
     def initialize(server_url, username, password,
-                   site_name: "default", api_version: "3.1", token_lifetime: 240,
+                   content_url: "", api_version: "3.1", token_lifetime: 240,
                    log_level: :info, impersonation_username: nil)
       @server_url = server_url
       @username = username
       @password = password
-      @site_name = site_name
+      @content_url = content_url
       @api_version = api_version
       @token_lifetime = token_lifetime
       @logger = ::Logger.new(STDOUT)
@@ -21,14 +24,20 @@ module TableauServerClient
       @impersonation_username = impersonation_username
     end
 
-    attr_reader :server_url, :username, :site_name, :api_version, :token_lifetime, :logger, :impersonation_username
+    attr_reader :server_url, :username, :content_url, :api_version, :token_lifetime, :logger, :impersonation_username
 
     def sites
-      client.get_collection Resources::Site.location(path)
+      client.get_collection(Resources::Site.location(path)).map {|s|
+        client_for_site(s.content_url).get_collection(Resources::Site.location(path)).select {|x| x.id == s.id }.first
+      }
     end
 
     def site(id)
-      client.get Resources::Site.location(path, id)
+      sites.select { |s| s.id == id }.first
+    end
+
+    def full_site(id)
+      client_for_site(client.get(Resources::Site.location(path, id)).content_url).get Resources::Site.location(path, id)
     end
 
     def schedules
@@ -39,27 +48,36 @@ module TableauServerClient
       nil
     end
 
-    def client
-      @client ||= Client.new(server_url, username, password, site_name, api_version, token_lifetime, @logger, user_id(impersonation_username))
-    end
-
     private
 
     attr_reader :password
 
-    def user_id(username)
-      return nil unless username
+    def client
+      @client ||= client_for_site(content_url)
+    end
+
+    def client_for_site(_content_url)
+      Client.new(server_url, username, password, _content_url, api_version, token_lifetime, @logger, impersonation_user_id)
+    end
+
+    def site_id
       admin_client.get_collection(Resources::Site.location(path)).each do |site|
-        user = site.users(filter: ["name:eq:#{username}"]).first
-        if user
-          return user.id
+        if site.content_url == content_url
+          return site.id
         end
       end
+    end
+
+    def impersonation_user_id
+      return @impersonation_user_id if @impersonation_user_id
+      return nil unless impersonation_username
+      user = admin_client.get(Resources::Site.location(path, site_id)).users(filter: ["name:eq:#{impersonation_username}"]).first
+      return @impersonation_user_id = user.id if user
       raise TableauServerClientError.new("User '#{username}' not found.")
     end
 
     def admin_client
-      @admin_client ||= Client.new(server_url, username, password, site_name, api_version, token_lifetime, @logger, nil)
+      @admin_client ||= Client.new(server_url, username, password, content_url, api_version, token_lifetime, @logger, nil)
     end
 
   end

data/lib/tableau_server_client/version.rb

@@ -1,3 +1,3 @@
 module TableauServerClient
-  VERSION = "0.0.20"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tableau_server_client
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.1.0
 platform: ruby
 authors:
 - shimpeko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler