tableau_server_client 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca3fe6a2aff070d8bbc67bdc771ab4d168fa765a500dbcc8dd3787b9b204f096
-  data.tar.gz: 793536c50f60edf8830647fba4d18f165aeee90cf5b3ceb1bb7cd563d950b2bf
+  metadata.gz: 734741cd0b6670c84e0a939d810883395e6bf07aa013553f66249ec48838d07a
+  data.tar.gz: '0275874925061bdc41d42ee3c24e4d59dcae5e4a1763fecb233d072c0306087d'
 SHA512:
-  metadata.gz: 668fd26c2c076e960c3d003f42ccb5ef0985b98337859e4457573fa3b64c91f145019c11362b1e59c197195b9c1cd4ac193b020aad6795718ab09e092e4c9ec6
-  data.tar.gz: 21a2575491df82eef1c046e902175002d2a47d0b94b6b3843c0437d35e0016312baa780deb8555b1403e9e6184b20427b4d190b9868b9a2be773ef65d3c3969d
+  metadata.gz: 2d61bb79088e3b5c7f2f320bf01befbd91c20284df3709318befae7220b7b2d19204245d7ac4244b32bc5b30215b43da09ffc20b723cabb2da6753c12c849f49
+  data.tar.gz: d4abcb481f157a035d7989eb3b3fd7ba8239412d64e1efcb715da8e9699a8528a60d847a17deb6bda14f9bbff67412737224ede8e5920de9d53ab52c1e4accd2

data/lib/tableau_server_client/client.rb

@@ -21,7 +21,7 @@ module TableauServerClient
       @site_name = site_name
       @api_version = api_version
       @token_lifetime = token_lifetime
-      @logger
+      @logger = logger
     end
 
     attr_reader :site_name, :username, :api_version, :token_lifetime, :logger
@@ -46,7 +46,14 @@ module TableauServerClient
       resource_location.klass.from_response(self, resource_location.path, xml)
     end
 
-    def create(resource)
+    def create(resource, path: nil, request: nil)
+      path = path || resource.path
+      request = request || resource.to_request
+      response = session.post do |req|
+        req.url request_url(path).to_s
+        req.body = request
+      end
+      Nokogiri::XML(response.body).xpath("//xmlns:tsResponse").children.first
     end
 
     def download(resource_location)
@@ -124,8 +131,7 @@ module TableauServerClient
     def faraday
       @faraday ||= Faraday.new(request: {params_encoder: EmptyEncoder.new}, headers: {'Content-Type' => 'application/xml'}) do |f|
         f.response :raise_error
-        #TODO Cannot set log level (always print debug log)
-        #f.response :logger, logger
+        f.response :logger, logger
         f.adapter Faraday.default_adapter
       end
     end

data/lib/tableau_server_client/resources/extract_refresh.rb

@@ -0,0 +1,55 @@
+require 'tableau_server_client/resources/resource'
+require 'tableau_server_client/resources/connection'
+require 'tableau_server_client/resources/job'
+
+module TableauServerClient
+  module Resources
+
+    class ExtractRefresh < Resource
+
+      attr_reader :id, :priority, :consecutive_failed_count, :type
+
+      def self.from_response(client, path, xml)
+        attrs = extract_attributes(xml)
+        attrs['schedule_id'] = xml.xpath("xmlns:schedule/@id").first.value
+        attrs['workbook_id'] = xml.xpath("xmlns:workbook/@id").first&.value
+        attrs['datasource_id'] = xml.xpath("xmlns:datasource/@id").first&.value
+        new(client, path, attrs)
+      end
+
+      def self.from_collection_response(client, path, xml)
+        xml.xpath("//xmlns:tasks/xmlns:task/xmlns:extractRefresh").each do |s|
+          id = s.xpath("@id").first.value
+          yield from_response(client, "#{path}/#{id}", s)
+        end
+      end
+
+      def self.plural_resource_name
+        "extractRefreshes"
+      end
+
+      def schedule_id
+        @schedule_id
+      end
+
+      def workbook_id
+        @workbook_id
+      end
+
+      def datasource_id
+        @datasource_id
+      end
+
+      def schedule
+        @client.get_collection(Resources::Schedule.location(nil)).first {|s| s.id == schedule_id }
+      end
+
+      def run_now
+        resp = @client.create(self, path: "#{path}/runNow", request: build_request {})
+        job_id = resp.xpath("//xmlns:job/@id").first.value
+        Job.from_response(@client, Job.location(site_path, id = job_id).path, resp)
+      end
+
+    end
+  end
+end

data/lib/tableau_server_client/resources/job.rb

@@ -0,0 +1,17 @@
+require 'tableau_server_client/resources/resource'
+
+module TableauServerClient
+  module Resources
+
+    class Job < Resource
+
+      attr_reader :id, :mode, :type
+
+      def self.from_response(client, path, xml)
+        attrs = extract_attributes(xml)
+        new(client, path, attrs)
+      end
+
+    end
+  end
+end

data/lib/tableau_server_client/resources/resource.rb

@@ -21,11 +21,15 @@ module TableauServerClient
       end
 
       def self.resource_name
-        self.name.split("::").last.downcase
+        self.name.split("::").last.sub(/./){ $&.downcase }
+      end
+
+      def self.plural_resource_name
+        "#{self.resource_name}s"
       end
 
       def self.location(prefix, id=nil, filter: [])
-        path = [prefix, "#{resource_name}s", id].compact.join("/")
+        path = [prefix, plural_resource_name, id].compact.join("/")
         Location.new(self, path, filter.empty? ? {} : {filter: filter.join(',')})
       end
 

data/lib/tableau_server_client/resources/schedule.rb

@@ -14,11 +14,19 @@ module TableauServerClient
 
       def self.from_collection_response(client, path, xml)
         xml.xpath("//xmlns:schedules/xmlns:schedule").each do |s|
-          id = s.xpath("//xmlns:schedule/@id")[0].value
-          yield from_response(client, path, s)
+          id = s.xpath("@id").first.value
+          yield from_response(client, "#{path}/#{id}", s)
         end
       end
 
+      def tasks(site)
+        site.extract_refreshes.select {|t| t.schedule_id == id }
+      end
+
+      def run_now(site)
+        tasks(site).map {|t| t.run_now }
+      end
+
     end
   end
 end

data/lib/tableau_server_client/resources/site.rb

@@ -3,6 +3,7 @@ require 'tableau_server_client/resources/datasource'
 require 'tableau_server_client/resources/workbook'
 require 'tableau_server_client/resources/user'
 require 'tableau_server_client/resources/subscription'
+require 'tableau_server_client/resources/extract_refresh'
 
 module TableauServerClient
   module Resources
@@ -63,6 +64,10 @@ module TableauServerClient
         subscriptions.find {|s| s.id = id }
       end
 
+      def extract_refreshes
+        @client.get_collection ExtractRefresh.location("#{path}/tasks")
+      end
+
     end
   end
 end

data/lib/tableau_server_client/server.rb

@@ -7,9 +7,10 @@ module TableauServerClient
   class Server
 
     def initialize(server_url, username, password,
-                   site_name: "default", api_version: "2.8", token_lifetime: 240)
+                   site_name: "default", api_version: "3.1", token_lifetime: 240,
+                   log_level: :info)
       @logger = ::Logger.new(STDOUT)
-      @logger.level = ::Logger::INFO
+      @logger.level = ::Logger.const_get(log_level.upcase.to_sym)
       @client = Client.new(server_url, username, password, site_name, api_version, token_lifetime, @logger)
     end
 

data/lib/tableau_server_client/version.rb

@@ -1,3 +1,3 @@
 module TableauServerClient
-  VERSION = "0.0.10"
+  VERSION = "0.0.12"
 end

data/tableau_server_client.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug"
 
-  spec.add_dependency 'faraday', '>= 0.14.0'
+  spec.add_dependency 'faraday', '>= 0.15.3'
   spec.add_dependency 'nokogiri', '>= 1.8.2'
   spec.add_dependency 'pry', '>= 0.11.3'
   spec.add_dependency 'rubyzip', '>= 1.2.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tableau_server_client
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - shimpeko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-24 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +142,8 @@ files:
 - lib/tableau_server_client/request_url.rb
 - lib/tableau_server_client/resources/connection.rb
 - lib/tableau_server_client/resources/datasource.rb
+- lib/tableau_server_client/resources/extract_refresh.rb
+- lib/tableau_server_client/resources/job.rb
 - lib/tableau_server_client/resources/project.rb
 - lib/tableau_server_client/resources/resource.rb
 - lib/tableau_server_client/resources/schedule.rb
@@ -173,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Tableau Server REST API Client