twb 0.5.0 → 0.5.1

data/lib/twb/metadatafield.rb

@@ -21,7 +21,8 @@ module Twb
 
   class MetadataField
 
-    attr_reader :node, :aggregation, :containsnull, :localname, :localtype, :ordinal, :parentname, :precision, :remotealias, :remotename, :remotetype, :width, :name
+    attr_reader :node, :aggregation, :containsnull, :localname, :localtype, :ordinal
+    attr_reader :parentname, :precision, :remotealias, :remotename, :remotetype, :width, :name
 
     def initialize fieldNode
       @node              = fieldNode
@@ -42,7 +43,7 @@ module Twb
 
     def load nodeName
       node = @node.at_xpath(nodeName)
-      val  = if node.nil? then  node else node.text end
+      val  = if node.nil? then  node else node.text.strip end
       # puts "==== MD node:'#{nodeName}' \t nil?'#{node.nil?}' \t == val:#{val} \t = '#{node}' "
       return val
     end

data/lib/twb/util/twbDashSheetDataDotBuilder.rb

@@ -142,8 +142,8 @@ module Util
 
     def processOrphans
       pairs = []
-      @datasources.each { |dsn| pairs << [@workbook.name,dsn] }
-      @worksheets.each  { |wsn| pairs << [@workbook.name,wsn] }
+      #@datasources.each { |dsn| pairs << [@workbook.name,dsn] }
+      #@worksheets.each  { |wsn| pairs << [@workbook.name,wsn] }
       return pairs
     end
 

data/lib/twb/util/twbDashesSheetDataDotBuilder.rb

@@ -41,22 +41,17 @@ module Util
     }
     DOTFOOTER
 
-    attr_reader :workbook, :dotFile, :dotFileName, :dashCount, :sheetCount, :dataSourceCount
+    attr_reader :workbook, :dashesDotFiles, :dotFileName, :dashCount, :sheetCount, :dataSourceCount
 
     def initialize twb
       @workbook = if twb.instance_of?(Twb::Workbook)
                   then twb
                   else Twb::Workbook.new(twb)
                   end
-      @dashCount       = @workbook.dashboards.length
-      @worksheets      = @workbook.worksheetNames
-      @sheetCount      = @worksheets.length
-      @datasources     = @workbook.datasourceUINames
-      @dataSourceCount = @datasources.length
-      pairs  = processDashboards
-      pairs += processWorksheets
-      pairs += processOrphans
-      initDot
+      @dashboards =  @workbook.dashboards
+      @dashboards.each do |dash|
+        initDot
+      end
       buildBody(pairs)
       sameRank([@workbook.name]           )
       sameRank( @workbook.dashboardNames  )

data/lib/twb/workbook.rb

@@ -34,9 +34,9 @@ module Twb
     #
     def initialize twbWithDir
       @valid = false
-      if File.file?(twbWithDir) then 
+      if File.file?(twbWithDir) then
         @name    = File.basename(twbWithDir)
-        @dir     = File.dirname(File.expand_path(twbWithDir)) 
+        @dir     = File.dirname(File.expand_path(twbWithDir))
         @modtime = File.new(twbWithDir).mtime.strftime("%Y-%m-%d %H:%M:%S")
         case File.extname(twbWithDir)
           when '.twb'  then processTWB(twbWithDir)
@@ -44,7 +44,7 @@ module Twb
         end
       end
     end
-    
+
     def processTWBX(twbxWithDir)
       Zip::File.open(twbxWithDir) do |zip_file|
         twb   = zip_file.glob('*.twb').first
@@ -57,7 +57,7 @@ module Twb
       @ndoc    = Nokogiri::XML(open(twbFile))
       processDoc
     end
-    
+
     def processDoc
       @workbooknode  = @ndoc.at_xpath('//workbook')
       @version = @ndoc.xpath('/workbook/@version')
@@ -120,7 +120,6 @@ module Twb
       end
     end
 
-
     def datasources
       @datasources.values
     end
@@ -129,6 +128,10 @@ module Twb
       @dashboards.values
     end
 
+    def dashboardNames
+      @dashboards.keys
+    end
+
     def storyboards
       @storyboards.values
     end

data/lib/twb.rb

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

metadata

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