tableau_server_client 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 734741cd0b6670c84e0a939d810883395e6bf07aa013553f66249ec48838d07a
-  data.tar.gz: '0275874925061bdc41d42ee3c24e4d59dcae5e4a1763fecb233d072c0306087d'
+  metadata.gz: ac40ff9b18e29df41bff878b7f3ba1f7c5a34ffa20690edb6d23784603afd617
+  data.tar.gz: 5ed21cfe75080d06b2db42b0a383cfb167ef84fde19f877bb22a31fc4fe91621
 SHA512:
-  metadata.gz: 2d61bb79088e3b5c7f2f320bf01befbd91c20284df3709318befae7220b7b2d19204245d7ac4244b32bc5b30215b43da09ffc20b723cabb2da6753c12c849f49
-  data.tar.gz: d4abcb481f157a035d7989eb3b3fd7ba8239412d64e1efcb715da8e9699a8528a60d847a17deb6bda14f9bbff67412737224ede8e5920de9d53ab52c1e4accd2
+  metadata.gz: 4677d14c34c02d7db0da58eaa14758047cd923764d4a8bcc74cc1450b7ea403fa06045251f297427c8a6d129904efe4db9c66eb0247cb1736663135490bb0c38
+  data.tar.gz: 30fb765574a89f51f53d1824e12dd8376603607d8842e2956ffe183c726473878dbab4ce6e53e0ffea887ad321194f22c9dcd4fd954202ac0a8aabfe37a584e0

data/lib/tableau_server_client/client.rb

@@ -56,23 +56,13 @@ module TableauServerClient
       Nokogiri::XML(response.body).xpath("//xmlns:tsResponse").children.first
     end
 
-    def download(resource_location)
+    def download(resource_location, file_path: nil)
       req_url = request_url("#{resource_location.path}/content", resource_location.query_params)
       response = session.get req_url.to_s
-      type, disposition = response.headers.values_at('content-type', 'content-disposition')
-      case type
-      when 'application/xml'
-        return Nokogiri::XML(response.body)
-      when 'application/octet-stream'
-        Zip::InputStream.open(StringIO.new(response.body)) do |io|
-          while entry = io.get_next_entry
-            return Nokogiri::XML(io.read) if entry.name =~ /.*\.(tds|twb)/
-          end
-          raise "TDS or TWB file not found for: #{resource_location.path}"
-        end
-      else
-        raise "Unknown content-type: #{type}"
+      if file_path
+        File.write(file_path, response.body)
       end
+      return response
     end
 
     def update(resource)

data/lib/tableau_server_client/resources/datasource.rb

@@ -1,11 +1,13 @@
 require 'tableau_server_client/resources/resource'
 require 'tableau_server_client/resources/project'
 require 'tableau_server_client/resources/connection'
+require 'tableau_server_client/resources/downloadable'
 
 module TableauServerClient
   module Resources
 
     class Datasource < Resource
+      include Downloadable
 
       attr_reader :id, :name, :content_url, :type, :created_at, :updated_at, :is_certified
       attr_writer :owner
@@ -49,7 +51,6 @@ module TableauServerClient
         @client.update self
       end
 
-
     end
   end
 end

data/lib/tableau_server_client/resources/downloadable.rb

@@ -0,0 +1,26 @@
+module TableauServerClient
+  module Resources
+
+      module Downloadable
+
+        def download(file_path: nil)
+          response = client.download(location(query_params: {"includeExtract": "False"}), file_path: file_path)
+          type, disposition = response.headers.values_at('content-type', 'content-disposition')
+          case type
+          when 'application/xml'
+            return Nokogiri::XML(response.body)
+          when 'application/octet-stream'
+            Zip::InputStream.open(StringIO.new(response.body)) do |io|
+              while entry = io.get_next_entry
+                return Nokogiri::XML(io.read) if entry.name =~ /.*\.(tds|twb)/
+              end
+              raise "TDS or TWB file not found for: #{location.path}"
+            end
+          else
+            raise "Unknown content-type: #{type}"
+          end
+        end
+    end
+
+  end
+end

data/lib/tableau_server_client/resources/resource.rb

@@ -86,6 +86,12 @@ module TableauServerClient
 
       end
 
+      private
+
+      def client
+        @client
+      end
+
     end
 
   end

data/lib/tableau_server_client/resources/workbook.rb

@@ -1,11 +1,13 @@
 require 'tableau_server_client/resources/resource'
 require 'tableau_server_client/resources/project'
 require 'tableau_server_client/resources/connection'
+require 'tableau_server_client/resources/downloadable'
 
 module TableauServerClient
   module Resources
 
     class Workbook < Resource
+      include Downloadable
 
       attr_reader :id, :name, :content_url, :show_tabs, :size, :created_at, :updated_at
       attr_writer :owner
@@ -79,10 +81,6 @@ module TableauServerClient
         end
       end
 
-      def download
-        @twb ||= @client.download location(query_params: {"includeExtract": "False"})
-      end
-
       def relations
         download.xpath('//datasources//datasource//relation')
       end

data/lib/tableau_server_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tableau_server_client
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - shimpeko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +142,7 @@ 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/downloadable.rb
 - lib/tableau_server_client/resources/extract_refresh.rb
 - lib/tableau_server_client/resources/job.rb
 - lib/tableau_server_client/resources/project.rb