tableau_server_client 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e6ce1d25e6ffb58815264ba9d7125c32baebe660
-  data.tar.gz: 732cb0edba74b33f5a451dd974d9c1a2a633b075
+SHA256:
+  metadata.gz: 2b8a666b653ed10385210a2d5fafd96e14c80f0442841f998c30bd5d379cb671
+  data.tar.gz: f35e189ebd0f4e4b35022ce3f1ba9f2d17c6504320a2b24eed0d39737f78c407
 SHA512:
-  metadata.gz: 0bb3c1ee409e558b2fae12c31aa9b5fd33d345e0503377f149f4e5b5728c6613b652328533ce98ad41cee4b742210a1a8fc5fc28bf4d4618ad11bc6e5707ec63
-  data.tar.gz: a6f00ab07320e75aa87af5122dfe5f639b0d5500df544b77703f7a4d60e8f4fc568d43e9cfbc1e591fddeaaf47aac8521e676b6326aa82b9c61f3f88a734f0e4
+  metadata.gz: 66c31722e7302062da98b6d655b493b268b2ab3a33c7be6edef9d6e814eaa62ef639b2b4b8902661147103466cf2cd6acd766ba02f6d665c0c498717a6f4751e
+  data.tar.gz: f8c22234d123f2d1cb5f8e1dbe9d94dd66ac93fdc8e5768f9f2cbd0b0df5dcb517d9309ab2a402e465b6ac1031afca4ca61b16a5cfaa2ca2d5dd30592460d88f

data/lib/tableau_server_client/client.rb

@@ -39,7 +39,8 @@ module TableauServerClient
     def get(resource_location)
       req_url = request_url(resource_location.path)
       response = session.get req_url.to_s
-      resource_location.klass.from_response(self, resource_location.path, Nokogiri::XML(response.body))
+      xml =  Nokogiri::XML(response.body).xpath("//xmlns:tsResponse").children.first
+      resource_location.klass.from_response(self, resource_location.path, xml)
     end
 
     def create(resource)

data/lib/tableau_server_client/resources/datasource.rb

@@ -7,14 +7,13 @@ module TableauServerClient
 
     class Datasource < Resource
 
-      attr_reader :id, :name, :content_url, :type, :created_at, :updated_at, :is_certified, :project, :owner
+      attr_reader :id, :name, :content_url, :type, :created_at, :updated_at, :is_certified
+      attr_writer :owner
 
       def self.from_response(client, path, xml)
         attrs = extract_attributes(xml)
-        project = xml.xpath("xmlns:project")[0]
-        site_path = extract_site_path(path)
-        project_path = "#{site_path}/projects/#{project['id']}"
-        attrs['project'] = Project.from_response(client, project_path, project)
+        attrs['project_id'] = xml.xpath("xmlns:project")[0]['id']
+        attrs['owner_id']   = xml.xpath("xmlns:owner")[0]['id']
         #TODO add owner
         new(client, path, attrs)
       end
@@ -30,6 +29,27 @@ module TableauServerClient
         @client.get_collection Connection.location(path)
       end
 
+      def project
+        @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 to_request
+        request = build_request {|b|
+          b.datasource {|w|
+            w.owner(id: owner.id)
+          }
+        }
+      end
+
+      def update!
+        @client.update self
+      end
+
+
     end
   end
 end

data/lib/tableau_server_client/resources/project.rb

@@ -5,7 +5,7 @@ module TableauServerClient
 
     class Project < Resource
 
-      attr_reader :id, :name, :description, :content_permissions
+      attr_reader :id, :name, :description, :parent_project_id
 
       def self.from_response(client, path, xml)
         attrs = extract_attributes(xml)
@@ -30,6 +30,44 @@ module TableauServerClient
         end
       end
 
+      def root_project?
+        self.parent_project_id.nil?
+      end
+
+      def root_project
+        parent_projects[0] || self
+      end
+
+      def parent_projects
+        return @parent_projects if @parent_projects
+        @parent_projects = []
+        curr_pj = self
+        pjs = @client.get_collection Project.location(site_path)
+        while ! curr_pj.root_project?
+          pjs.each do |pj|
+            if pj.id == curr_pj.parent_project_id
+              @parent_projects.unshift pj
+              curr_pj = pj
+              break
+            end
+          end
+        end
+        return @parent_projects
+      end
+
+      def hierarchy
+        (parent_projects << self).map {|p| p.name }.join('/')
+      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
+      end
+
+      def extract_value_in_description(key)
+        extract_values_in_description[key]
+      end
+
     end
   end
 end

data/lib/tableau_server_client/resources/site.rb

@@ -1,6 +1,7 @@
 require 'tableau_server_client/resources/resource'
 require 'tableau_server_client/resources/datasource'
 require 'tableau_server_client/resources/workbook'
+require 'tableau_server_client/resources/user'
 
 module TableauServerClient
   module Resources
@@ -37,6 +38,22 @@ module TableauServerClient
         @client.get Workbook.location(path, id)
       end
 
+      def users(filter: [])
+        @client.get_collection User.location(path, filter: filter)
+      end
+
+      def user(id)
+        @client.get User.location(path, id)
+      end
+
+      def projects(filter: [])
+        @client.get_collection Project.location(path, filter: filter)
+      end
+
+      def project(id)
+        projects.find { |p| p.id == id }
+      end
+
     end
   end
 end

data/lib/tableau_server_client/resources/user.rb

@@ -0,0 +1,44 @@
+require 'tableau_server_client/resources/resource'
+
+module TableauServerClient
+  module Resources
+
+    class User < Resource
+
+      attr_reader :id, :name, :site_role, :last_login, :external_auth_user_id, :full_name
+
+      def self.from_response(client, path, xml)
+        attrs = extract_attributes(xml)
+        new(client, path, attrs)
+      end
+
+      def self.from_collection_response(client, path, xml)
+        xml.xpath("//xmlns:users/xmlns:user").each do |s|
+          id = s['id']
+          yield from_response(client, "#{path}/#{id}", s)
+        end
+      end
+
+      def reload
+        @client.get User.location(site_path, id)
+      end
+
+      def full_name
+        @full_name ||= self.reload.full_name
+      end
+
+      def workbooks
+        @client.get_collection(Workbook.location(site_path, filter: ["ownerName:eq:#{full_name}"])).select do |w|
+          w.owner.id == id
+        end
+      end
+
+      def datasources
+        @client.get_collection(Datasource.location(site_path, filter: ["ownerName:eq:#{full_name}"])).select do |d|
+          d.owner.id == id
+        end
+      end
+
+    end
+  end
+end

data/lib/tableau_server_client/resources/workbook.rb

@@ -7,15 +7,13 @@ module TableauServerClient
 
     class Workbook < Resource
 
-      attr_reader :id, :name, :content_url, :show_tabs, :size, :created_at, :updated_at, :project, :owner
+      attr_reader :id, :name, :content_url, :show_tabs, :size, :created_at, :updated_at
+      attr_writer :owner
 
       def self.from_response(client, path, xml)
         attrs = extract_attributes(xml)
-        project = xml.xpath("xmlns:project")[0]
-        site_path = extract_site_path(path)
-        project_path = "#{site_path}/projects/#{project['id']}"
-        attrs['project'] = Project.from_response(client, project_path, project)
-        #TODO add owner
+        attrs['project_id'] = xml.xpath("xmlns:project")[0]['id']
+        attrs['owner_id']   = xml.xpath("xmlns:owner")[0]['id']
         new(client, path, attrs)
       end
 
@@ -30,6 +28,27 @@ module TableauServerClient
         @client.get_collection Connection.location(path)
       end
 
+      def project
+        @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 to_request
+        request = build_request {|b|
+          b.workbook {|w|
+            w.owner(id: owner.id)
+          }
+        }
+        request
+      end
+
+      def update!
+        @client.update self
+      end
+
     end
   end
 end

data/lib/tableau_server_client/version.rb

@@ -1,3 +1,3 @@
 module TableauServerClient
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tableau_server_client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - shimpeko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - lib/tableau_server_client/resources/resource.rb
 - lib/tableau_server_client/resources/schedule.rb
 - lib/tableau_server_client/resources/site.rb
+- lib/tableau_server_client/resources/user.rb
 - lib/tableau_server_client/resources/workbook.rb
 - lib/tableau_server_client/server.rb
 - lib/tableau_server_client/token.rb
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Tableau Server REST API Client