twb 0.3.3 → 0.3.4

data/lib/twb.rb

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

data/lib/twb/datasource.rb

@@ -22,7 +22,7 @@ module Twb
 
     @@hasher = Digest::SHA256.new
 
-    attr_reader :node, :name, :caption, :uiname, :connHash, :class, :connection, :tables, :localfields, :metadatafields
+    attr_reader :node, :name, :caption, :uiname, :connHash, :dsclass, :connection, :tables, :localfields, :metadatafields
 
     def initialize dataSourceNode
       @node    = dataSourceNode
@@ -37,7 +37,8 @@ module Twb
     def processConnection
       @connection  = @node.at_xpath('./connection')
       unless @connection.nil?
-        @class       = @connection.attribute('class').text
+        @dsclass = @connection.attribute('class').text
+        # note: must use "dsclass" as "class" would override Rubys ".class" Kernel method
         setConnectionHash
         loadTables @connection
       end
@@ -72,14 +73,16 @@ module Twb
     def processFields
       # --
       @localfields    = {}
-      nodes = @node.xpath("./relation/columns/column")
+      nodes = @node.xpath("./connection/relation/columns/column")
       nodes.each do |node|
         field = Twb::LocalField.new(node)
         @localfields[field.name] = field
       end
       # --
       @metadatafields = {}
-      nodes = @node.xpath("./connection/metadata-records/metadata-record")
+      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
       nodes.each do |node|
         field = Twb::MetadataField.new(node)
         @metadatafields[field.name] = field

data/lib/twb/workbook.rb

@@ -157,14 +157,14 @@ module Twb
     def ensureDashboardsNodeExists
       if @dashesNode.nil?
         @dashesNode = Nokogiri::XML::Node.new "dashboards", @ndoc
-        @dataSourcesNode.add_next_sibling(@dashesNode)
+        # TODO fix this @dataSourcesNode.add_next_sibling(@dashesNode)
       end
     end
 
     def ensureWindowsNodeExists
       if @windowsnode.nil?
         @windowsnode = Nokogiri::XML::Node.new "windows", @ndoc
-        @dataSourcesNode.add_next_sibling(@windowsnode)
+        # TODO fix this @dataSourcesNode.add_next_sibling(@windowsnode)
       end
     end
 

metadata

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