twb 0.3.4 → 0.4.0

data/lib/twb/dashboard.rb

@@ -45,7 +45,7 @@ module Twb
     end
 
     def worksheets
-      @sheets
+      @sheets.values
     end
 
     def worksheetNames

data/lib/twb/datasource.rb

@@ -73,13 +73,21 @@ module Twb
     def processFields
       # --
       @localfields    = {}
-      nodes = @node.xpath("./connection/relation/columns/column")
+      @metadatafields = {}
+      return if @connection.nil?
+      ## load local fields
+      connClass    = @node.at_xpath('./connection').attribute('class').text
+      fxpath       = case connClass
+                     when 'dataengine' then './column'
+                     else                   './connection/relation/columns/column'
+                     end
+      nodes = @node.xpath(fxpath)
+      # puts "DATASOURCE ::=>> @node: connClass: '#{connClass.class}' ::: #{connClass.eql?('dataengine')} fxpath: #{fxpath}  :: #{nodes.length}"
       nodes.each do |node|
         field = Twb::LocalField.new(node)
         @localfields[field.name] = field
       end
-      # --
-      @metadatafields = {}
+      ## load metadata fields
       nodes = @node.xpath("./connection/metadata-records/metadata-record[@class='column']")
       # note: there are other nodes "<metadata-record class='capability'>" whose nature is unclear
       #       these nodes have no value for their <name node, so we're not loading them
@@ -91,4 +99,4 @@ module Twb
 
   end
 
-end
+end

data/lib/twb/util/twbDashSheetDataDotBuilder.rb

@@ -59,7 +59,7 @@ module Util
       initDot
       buildBody(pairs)
       sameRank([@workbook.name]           )
-      sameRank( @workbook.dashboards.keys )
+      sameRank( @workbook.dashboardNames  )
       sameRank( @workbook.worksheetNames  )
       sameRank( @workbook.datasourceNames )
       buildHeader
@@ -99,11 +99,11 @@ module Util
      @dotFile.puts '     "Workbook" -> "Dashboard" -> "Worksheet" -> "Data Source"'
      @dotFile.puts '   }'
     end
-    
+
     def labelDataSources
       @dotFile.puts " "
-      dataSources = @workbook.datasources
-      dataSources.each do |name,ds|
+      @workbook.datasources.each do |ds|
+        name = ds.name
         @dotFile.puts "  \"#{name}\" [label=\"#{ds.uiname}\"];"
       end
     end
@@ -117,10 +117,11 @@ module Util
 
     def processDashboards
       pairs = []
-      @workbook.dashboards.each do |dashName,dash|
+      @workbook.dashboards.each do |dash|
+        dashName = dash.name
         pairs          << [@workbook.name,dashName]
-        sheets = dash.worksheets
-        sheets.each do |sheetName,sheet|
+        dash.worksheets.each do |sheet|
+          sheetName = sheet.name
           pairs << [dashName,sheetName]
           @worksheets.delete sheetName
         end
@@ -130,11 +131,11 @@ module Util
 
     def processWorksheets
       pairs = []
-      worksheets  = @workbook.worksheets
-      worksheets.each do |sheetName,sheet|
-        datasources = sheet.datasources
-        datasources.each do |dsName,ds|
-          pairs        << [sheetName,ds.name]
+      @workbook.worksheets.each do |sheet|
+        sheetName   = sheet.name
+        sheet.datasources.each do |ds|
+          dsName = ds.name
+          pairs  << [sheetName,ds.name]
           @datasources.delete ds.uiname
         end
       end

data/lib/twb/workbook.rb

@@ -48,13 +48,12 @@ module Twb
 
     def loaddatasources
       @dataSourcesNode = @ndoc.at_xpath('//workbook/datasources')
-      @datasources = {}
+      @datasources     = {}
       @datasourceNodes = @ndoc.xpath('//workbook/datasources/datasource').to_a
       @datasourceNodes.each do |node|
         datasource = Twb::DataSource.new(node)
         @datasources[datasource.name] = datasource
       end
-      return true
     end
 
     def loadWorksheets
@@ -99,19 +98,19 @@ module Twb
 
 
     def datasources
-      @datasources
+      @datasources.values
     end
 
     def dashboards
-      @dashboards
+      @dashboards.values
     end
 
     def storyboards
-      @storyboards
+      @storyboards.values
     end
 
     def worksheets
-      @worksheets
+      @worksheets.values
     end
 
     def datasourceNames
@@ -151,7 +150,7 @@ module Twb
     def worksheet name
       @worksheets[name]
     end
-    
+
     # Make sure that the TWB has a <dashboards> node.
     # It's possible for a TWB to have no dashboards, and therefore no <dashboards> node.
     def ensureDashboardsNodeExists
@@ -178,9 +177,9 @@ module Twb
       title = getNewDashboardTitle(docDashboard.title)
       docDashboard.title=(title) unless title == docDashboard.title
       @dashesNode.add_child(docDashboard.dashnode)
-      @windowsnode.add_child(docDashboard.winnode)     
+      @windowsnode.add_child(docDashboard.winnode)
     end
- 
+
     def getNewDashboardTitle(t)
       title = t
       if @datasources.include?(title)
@@ -206,7 +205,7 @@ module Twb
       end
       return name
     end
-   
+
     # Write the TWB to a file, appending the base name with the provided string.
     # Intended for use when making adjustments to the TWB without overwriting the original.
     def writeAppend(str)
@@ -216,4 +215,4 @@ module Twb
 
   end
 
-end
+end

data/lib/twb/worksheet.rb

@@ -51,7 +51,11 @@ module Twb
     end
 
     def datasources
-      @datasources
+      @datasources.values
+    end
+
+    def datasource name
+      @datasources[name]
     end
 
     def datasourcenames
@@ -60,4 +64,4 @@ module Twb
 
   end
 
-end
+end

data/lib/twb.rb

@@ -33,6 +33,5 @@ require_relative 'twb/util/xraydashboards'
 # Represents Tableau Workbooks and their contents.
 #
 module Twb
-  VERSION = '0.3.4'
+  VERSION = '0.4.0'
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twb
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors: