tableau_server_client 0.0.20 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78810d795bb6f32ec40ba5ad9236263bcd10bf2ef112af789ba1815b106fde11
-  data.tar.gz: a35aa637bb4cacf18f12755d3e5561ee57b8dbf0ce3b736f86da94535c9a4730
+  metadata.gz: 35fe6156b11af4ea242ffbb03b812e1f6daeca88516321619b6c418282c70b77
+  data.tar.gz: ca2686320084f80b99781158d37d4adbb46f1438a55743d1669cc888649659e2
 SHA512:
-  metadata.gz: 0affb6c80c2ec2af64d9a49e72e5d63d7711444a7983165cc59e2ea4cea8ba72efdc1e3bc2ef7473481741e678806db0e7e8090049586aa6958e813584742e38
-  data.tar.gz: 9fd19bb7a5df41908737b511c298a396c955efcd724f650b449b12322e49238d58d8f450f56a3a07a6ef35a9845b52eeb792f19252c6219ffc53afc94236a7a0
+  metadata.gz: d73c29623a3fb523ce9790ac8a3b191131fbdd87a8507b711992f3474e175bb8ee5c2bb14c69feee22b668a44d29d5511ca9a3b2a2e150959da5aea27af017ba
+  data.tar.gz: 81cc65d3a7a8073b3217cbfc4d4cc44fbc9e1e98258a8fa376e75fbb71a90b496e7ee634f9456975cfdc575366fd06ef75955543f87292aead5f180cf52ac7cb

data/README.md

@@ -11,3 +11,9 @@ $ bundle exec console
 > site.workbooks.first.name
 => "My Workbook"
 ```
+
+## Release new version
+
+```
+$ rake release
+```

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,18 +72,21 @@ module TableauServerClient
       if file_path
         File.write(file_path, response.body)
       end
-      return response
+      return response.body
     end
 
-    def update(resource)
+    def update(resource, path: nil, request: nil)
+      path = path || resource.path
+      request = request || resource.to_request
       session.put do |req|
-        req.url request_url(resource.path).to_s
-        req.body = resource.to_request
+        req.url request_url(path).to_s
+        req.body = request
       end
     end
 
-    def delete(resource)
-      session.delete request_url(resource.path).to_s
+    def delete(resource, path: nil)
+      path = path || resource.path
+      session.delete request_url(path).to_s
     end
 
     def session
@@ -125,10 +128,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/request_url.rb

@@ -23,7 +23,7 @@ module TableauServerClient
 
     def query_params
       return "" if params.empty?
-      params.keys.map {|k| URI.encode("#{k}=#{params[k]}") }.join("&")
+      params.keys.map {|k| URI.encode_www_form({k => params[k]}) }.join("&")
     end
   end
 end

data/lib/tableau_server_client/resources/extract_refresh.rb

@@ -58,6 +58,10 @@ module TableauServerClient
         Job.from_response(@client, Job.location(site_path, id = job_id).path, resp)
       end
 
+      def delete!
+        resp = @client.delete(self)
+      end
+
     end
   end
 end

data/lib/tableau_server_client/resources/group.rb

@@ -0,0 +1,31 @@
+require 'tableau_server_client/resources/resource'
+
+module TableauServerClient
+  module Resources
+
+    class Group < Resource
+
+      attr_reader :id, :name, :site_role
+
+      def self.from_response(client, path, xml)
+        attrs = extract_attributes(xml)
+        if xml.xpath("xmlns:import")[0]
+          attrs['site_role'] = xml.xpath("xmlns:import")[0]['siteRole']
+        end
+        new(client, path, attrs)
+      end
+
+      def self.from_collection_response(client, path, xml)
+        xml.xpath("//xmlns:groups/xmlns:group").each do |s|
+          id = s['id']
+          yield from_response(client, "#{path}/#{id}", s)
+        end
+      end
+
+      def users
+        @client.get_collection(User.location(path))
+      end
+
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ require 'tableau_server_client/resources/user'
 require 'tableau_server_client/resources/subscription'
 require 'tableau_server_client/resources/extract_refresh'
 require 'tableau_server_client/resources/view'
+require 'tableau_server_client/resources/group'
 
 module TableauServerClient
   module Resources
@@ -45,6 +46,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
@@ -73,6 +78,11 @@ module TableauServerClient
         @client.get_collection ExtractRefresh.location("#{path}/tasks")
       end
 
+      def groups(filter: [])
+        @client.get_collection Group.location(path, filter: filter)
+      end
+
+
     end
   end
 end

data/lib/tableau_server_client/resources/user.rb

@@ -20,7 +20,7 @@ module TableauServerClient
       end
 
       def reload
-        @client.get User.location(site_path, id)
+        @client.get location
       end
 
       def full_name
@@ -39,6 +39,23 @@ module TableauServerClient
         end
       end
 
+      def to_request
+        request = build_request {|b|
+          b.user(siteRole: site_role)
+        }
+      end
+
+      def update_site_role!(role)
+        @site_role = role
+        # Using location to get corretct path
+        # When initialized from Group path will be groups/group_id/users/user_id
+        @client.update(self, path: location.path)
+      end
+
+      def location
+        User.location(site_path, id)
+      end
+
     end
   end
 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,13 +11,14 @@ 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, :tags
       attr_writer :owner
 
       def self.from_response(client, path, xml)
         attrs = extract_attributes(xml)
         attrs['project_id'] = xml.xpath("xmlns:project")[0]['id']
-        attrs['owner_id']   = xml.xpath("xmlns:owner")[0]['id']
+        attrs['owner_id'] = xml.xpath("xmlns:owner")[0]['id']
+        attrs['tags'] = xml.xpath("xmlns:tags/xmlns:tag").map {|t| t['label'] }
         new(client, path, attrs)
       end
 
@@ -32,13 +34,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|
@@ -52,6 +58,21 @@ module TableauServerClient
         @client.update self
       end
 
+      def add_tags!(tags)
+        request = build_request {|b|
+          b.tags {
+            tags.each do |t|
+              b.tag(label: t)
+            end
+          }
+        }
+        resp = @client.update(self, path: "#{path}/tags", request: request)
+      end
+
+      def delete_tag!(tag)
+        @client.delete(self, path: "#{path}/tags/#{tag}")
+      end
+
       def embedded_datasources
         download.xpath('//datasources//datasource').map do |ds|
           Datasource::DatasourceContent.new(ds)

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,24 @@ 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 site_by_name(site_name)
+      sites.select { |s| s.name == site_name }.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 +52,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.4.3"
 end

data/tableau_server_client.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = ["console"]
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tableau_server_client
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.4.3
 platform: ruby
 authors:
 - shimpeko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +145,7 @@ files:
 - lib/tableau_server_client/resources/datasource.rb
 - lib/tableau_server_client/resources/downloadable.rb
 - lib/tableau_server_client/resources/extract_refresh.rb
+- lib/tableau_server_client/resources/group.rb
 - lib/tableau_server_client/resources/job.rb
 - lib/tableau_server_client/resources/project.rb
 - lib/tableau_server_client/resources/resource.rb
@@ -177,8 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Tableau Server REST API Client