Merge pull request #3 from TraxTechnologies/v9

Changes to support Tableau 9

Author: Rob Race

README.md

@@ -93,6 +93,7 @@ end
 ``` ruby
 
 @workbooks = client.workbooks.all(site_id: 'site-id')
+@workbooks = client.workbooks.all(site_id: 'site-id', is_owner: boolean, page_size: 'page-size', page_number: 'page-number')
 
 @workbook = client.workbooks.find(id: 'workbook-id', site_id: 'site-id', include_views: true)
 

lib/tableau_ruby/client.rb

@@ -66,7 +66,7 @@ def sign_in(user=nil)
         xml.tsRequest do
           xml.credentials(name: @admin_name, password: @admin_password) do
             xml.user(name: user) if user
-            xml.site
+            xml.site(contentUrl: @site_name)
           end
         end
       end

lib/tableau_ruby/version.rb

@@ -1,5 +1,5 @@
 module TableauRuby
-  VERSION = '0.0.1' unless defined?(self::VERSION)
+  VERSION = '0.1.0' unless defined?(self::VERSION)
 
   def self.version
     VERSION

lib/tableau_ruby/workbook.rb

@@ -13,6 +13,9 @@ def all(params={})
 
       resp = @client.conn.get "/api/2.0/sites/#{params[:site_id]}/users/#{params[:user_id]}/workbooks" do |req|
         req.params['getThumbnails'] = params[:include_images] if params[:include_images]
+        req.params['isOwner'] = params[:is_owner] if params[:is_owner]
+        req.params['page-size'] = params[:page_size] if params[:page_size]
+        req.params['page-number'] = params[:page_number] if params[:page_number]
         req.headers['X-Tableau-Auth'] = @client.token if @client.token
       end
 
@@ -26,7 +29,7 @@ def all(params={})
       end
 
       doc.css("workbook").each do |w|
-        workbook = {id: w["id"], name: w["name"]}
+        workbook = {id: w["id"], name: w["name"], content_url: w["contentUrl"]}
 
         if params[:include_images]
           resp = @client.conn.get("/api/2.0/sites/#{params[:site_id]}/workbooks/#{w['id']}/previewImage") do |req|
@@ -62,7 +65,7 @@ def find(workbook)
       data = {workbook: {}}
       Nokogiri::XML(resp.body).css("workbook").each do |w|
 
-        wkbk = {id: w["id"], name: w["name"], description: w['description']}
+        wkbk = {id: w["id"], name: w["name"], content_url: w['contentUrl']}
 
         if workbook[:include_views]
           wkbk[:views] = include_views(site_id: workbook[:site_id], id: workbook[:id])
@@ -76,7 +79,7 @@ def find(workbook)
 
     # TODO: Refactor this is duplicate in all method. Also, there are many, many places that are begging to be DRYer.
     def preview_image(workbook)
-      resp = @client.conn.get("/api/2.0/sites/#{params[:site_id]}/workbooks/#{workbook[:id]}/previewImage") do |req|
+      resp = @client.conn.get("/api/2.0/sites/#{@client.site_id}/workbooks/#{workbook[:id]}/previewImage") do |req|
         req.headers['X-Tableau-Auth'] = @client.token if @client.token
       end
 
@@ -90,15 +93,18 @@ def preview_image(workbook)
     private
 
     def include_views(params)
+
       resp = @client.conn.get("/api/2.0/sites/#{params[:site_id]}/workbooks/#{params[:id]}/views") do |req|
         req.headers['X-Tableau-Auth'] = @client.token if @client.token
       end
 
+      views = []
+
       Nokogiri::XML(resp.body).css("view").each do |v|
-        (@views ||= []) << {id: v['id'], name: v['name']}
+        views << {id: v['id'], name: v['name'], content_url: v['contentUrl']}
       end
 
-      @views
+      views
     end
 
   end