twb 4.6.3 → 4.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29ec473a3ccc02db6111d652d70245be94d4dc3f70b949efddfa2bf34ab992d1
-  data.tar.gz: ffc10036c2e17663a6626cdb7cbc525da061971321c11ed09939e87cbe8f3000
+  metadata.gz: 9ba8a4bcf6b220aaf9d3b94a91a903ec055a1637d7d78c063a58a5def3027844
+  data.tar.gz: a7f76a9e0fb057cf7aee2c38c82b974e0a59575eb955bd41636e79a38a251f65
 SHA512:
-  metadata.gz: f1078e523985681ed1ce0a209cec2c5826733c3147f8c418d576b8844e58df9adf87eed923289047f8fac037d212b4adffdd3f6316fa93f4e172c6119b86c0ce
-  data.tar.gz: 325066960bf31e5fc0b0cc90bbad7affc5128481e864e388408b78cf1e534b515f629eddc87e89478bdc309be2a29e5731342cec8c7b83526629ef41baad6990
+  metadata.gz: 685229ff4ae9181176c42fb85cf9900e64823fa2cbcf4a8ef49a48b0ebbfa96ecf491e27e88c545478a2e4ccad0ba314f648baa28406964032d39e3daefe0904
+  data.tar.gz: 86eb832a11d3bb87a66835f29d5eb312477f55421e007dea39c8178568573d39f0ff5d529ab22dfbfe53128b6a1b1145948b5f92bd785cc780b57c3df76d7137

data/lib/twb.rb

@@ -57,6 +57,7 @@ require_relative 'twb/analysis/calculatedfields/groupfieldsanalyzer'
 require_relative 'twb/analysis/calculatedfields/markdownemitter'
 require_relative 'twb/analysis/calculatedfields/csvemitter'
 # require_relative 'twb/analysis/datasources/datasourcefieldscsvemitter'
+require_relative 'twb/analysis/datasources/datasourcesenumerator.rb'
 require_relative 'twb/analysis/datasources/datasourcefieldsanalyzer'
 require_relative 'twb/analysis/datasources/datasourcetablefieldscsvemitter'
 require_relative 'twb/analysis/datasources/categoricalcolorcodinganalyzer'
@@ -67,10 +68,11 @@ require_relative 'twb/analysis/sheets/worksheetdatastructurecsvemitter'
 require_relative 'twb/analysis/sheets/sheetfiltersanalyzer'
 require_relative 'twb/analysis/sheets/sheetfieldsanalyzer'
 require_relative 'twb/analysis/sheets/dashsheetsanalyzer'
+require_relative 'twb/analysis/sheets/sheetsintooltipanalyzer'
 
 
 # Represents Tableau Workbooks, their contents, and classes that analyze and manipulate them.
 #
 module Twb
-  VERSION = '4.6.3'
+  VERSION = '4.7.1'
 end

data/lib/twb/analysis/calculatedfields/calculatedfieldsanalyzer.rb

@@ -43,7 +43,8 @@ module Analysis
                                    'Data Type',     'Role',  'Type',
                                    'Class',
                                    'Scope Isolation',
-                                   'Formula Length',
+                                   'Formula # Chars',
+                                   'Formula # Lines',
                                    'Formula',
                                    'Formula (tech)',
                                    'Formula Comments',
@@ -51,7 +52,7 @@ module Analysis
                                   ]
 
       @@calcLinesCSVFileName    = 'CalculatedFieldsFormulaLines.csv'
-      @@calcLinesCSVFileHeader  = ['Record #',
+      @@calcLinesCSVFileHeader  = ['Calc Field #',
                                    'Workbook',
                                    # 'Workbook Modified',
                                    'Data Source',   'Data Source Caption', 'Data Source Name (tech)',
@@ -94,9 +95,8 @@ DOTHEADER
           init
           @funcdoc = {:class=>self.class, :blurb=>'Analyze Calculated Fields', :description=>'Calculated fields can be complex, this tool provides robust coverage.',}
           #-- CSV records collectors
-          @csvCalculatedFields = Array.new
-          @csvFormulaFields    = Array.new
-          @csvFormulaLines     = Array.new
+          @csvFormulaFields    = Set.new
+          @csvFormulaLines     = Set.new
           #-- Counters setup --
           @twbCount              = 0
           @dataSourcesCount      = 0
@@ -153,7 +153,6 @@ DOTHEADER
 
       def loadMetrics
         @metrics = {
-                     '# of Workbooks'         => @twbCount,
                      '# of Data Sources'      => @dataSourcesCount,
                      '# of Calculated Fields' => @calculatedFieldsCount,
                      '# of Referenced Fields' => @referencedFieldsCount,
@@ -166,7 +165,7 @@ DOTHEADER
 
           def emitGml
             gml = Twb::Util::GML.new
-            gml.fileName = @twb.name  
+            gml.fileName = "#{@twb.name}.calculatedFields"  
             gml.nodes = @nodes
             gml.edges = @edges
             gmlFile = gml.render # resets gml.fileName in preparing it for output
@@ -182,6 +181,8 @@ DOTHEADER
             calculatedFields      = SortedSet.new
             fieldFormulaLines     = Array.new
             referencedFields      = SortedSet.new
+            @csvCalculatedFields  = Set.new
+
             # if @doGraph
               dataSourceNode = Twb::Util::Graphnode.new(name: ds.uiname, id: ds.id, type: ds, properties: {workbook: @twb.name})
               @nodes.add dataSourceNode
@@ -200,28 +201,32 @@ DOTHEADER
               calculation     = calcField.calculation
               if calculation.has_formula
                   #-- collect field formulas as single lines
-                  @csvCalculatedFields.push [
-                                              @calculatedFieldsCount += 1,
-                                              @twb.name,
-                                              # @modTime,            
-                                              ds.uiname,
-                                              ds.caption,
-                                              ds.name,
-                                              calcField.uiname,
-                                              calcField.caption,
-                                              calcField.name,
-                                              ds.name + '::' + calcField.name,
-                                              calcField.datatype,
-                                              calcField.role,
-                                              calcField.type,
-                                              calculation.class,     
-                                              calculation.scopeIsolation,
-                                              calculation.formulaFlat.length, 
-                                              calculation.formulaFlatResolved,    
-                                              calculation.formulaFlat,
-                                              calculation.comments,
-                                              calculation.is_lod
-                                            ]
+                  csvRec =  [
+                              @calculatedFieldsCount += 1,
+                              @twb.name,
+                              # @modTime,            
+                              ds.uiname,
+                              ds.caption,
+                              ds.name,
+                              calcField.uiname,
+                              calcField.caption,
+                              calcField.name,
+                              ds.name + '::' + calcField.name,
+                              calcField.datatype,
+                              calcField.role,
+                              calcField.type,
+                              calculation.class,     
+                              calculation.scopeIsolation,
+                              calculation.formulaFlat.length, 
+                              calculation.formulaLinesCount, 
+                              calculation.formulaFlatResolved,    
+                              calculation.formulaFlat.strip,
+                              calculation.comments,
+                              calculation.is_lod
+                            ]
+                  # puts csvRec.to_s
+                  # puts "incl? #{@csvCalculatedFields.include?(csvRec)}" 
+                  @csvCalculatedFields << csvRec
                   #-- collect individual formula lines
                   flnum = 0
                   emit "@@ calcField.uiname: #{calcField.uiname}"

data/lib/twb/analysis/calculatedfields/groupfieldsanalyzer.rb

@@ -42,7 +42,7 @@ module Analysis
 
     def metrics
       {
-        '# of Workbooks'           => @twbCount,
+        # '# of Workbooks'           => @twbCount,
         '# of Data Sources'        => @dsCount,
         '# of Group Fields'        => @gfCount,
         '# of Group Field Members' => @gfmCount

data/lib/twb/analysis/datasources/categoricalcolorcodinganalyzer.rb

@@ -41,7 +41,7 @@ module Analysis
 
     def metrics
       {
-        '# of Workbooks'         => @twbcount,
+        # '# of Workbooks'         => @twbcount,
         '# of data sources'      => @dscnt,
         '# of Worksheet Fields'  => @fieldsCnt
       }

data/lib/twb/analysis/datasources/datasourcefieldsanalyzer.rb

@@ -49,6 +49,7 @@ module DataSources
                     'Workbook',
                     'Data Source',
                     'Field',
+                    'Field - tech',
                     'Field - source',
                     'Field - class',
                     'Field - path',
@@ -56,21 +57,31 @@ module DataSources
                     'Property - Value'
                    ]
 
-    # @@techFileType = 'TwbDataSourceFieldsTech'
-    # @@techFileName = @@techFileType + '.csv'
-    # @@techHeader = ['Field #',
-    #                 'Workbook',           
-    #                 'Workbook Dir',
-    #                 'Data Source',
-    #                 'Field',
-    #                 'Field Type',
-    #                 'Property - Name',
-    #                 'Property - Value'
-    #                ]
+    @@colsFileType = 'DataSourceFields'
+    @@colsFileName = @@colsFileType + '.csv'
+    @@colsHeader   = [  
+                      'Field #',
+                      'Workbook',
+                      'Data Source',
+                      'Field - tech',
+                      'Caption',
+                      'Field',
+                      'Alias',
+                      'Datatype',
+                      'Datatype-customized',
+                      'Default Format',
+                      'Param-domain-type',
+                      'Role',
+                      'Type',
+                      'Calculated?',
+                      'Value',
+                      'Hidden',
+                      'Path'
+                     ]
 
     def initialize(**args)
+      emit "DataSourceFieldsAnalyzer initialize(**args) args: #{args}"
       @args      = args
-      # puts "@args: #{@args}"
       @recordDir = !@args.nil? && @args[:recordDir] == true
       @ttdocdir  = @args[:ttdocdir]
       @csvAdd    = args[:csvMode] == :add
@@ -78,36 +89,28 @@ module DataSources
       init
       @funcdoc   = {:class=>self.class, :blurb=>'Analyze Data Source Fields', :description=>'Documents Data Source fields, with (some) technical information.',}
       #--
-      docFileName = docFile(@@fullFileName)
-      @csvFile    = CSV.open( docFileName,@csvMode)
+      detailsFileName = docFile(@@fullFileName)
+      @csvFile        = CSV.open( detailsFileName,@csvMode )
+      #--
+      colsFileName    = docFile(@@colsFileName)
+      @colsFile       = CSV.open( colsFileName,   @csvMode )
+      
+      #--
       unless @csvAdd
         if @recordDir
           @csvFile  << @@fullHeader + ['Workbook Dir']
+          @colsFile << @@colsHeader + ['Workbook Dir']
         else
           @csvFile  << @@fullHeader
+          @colsFile << @@colsHeader
         end
       end
-      addDocFile @csvFile, docFileName, "Workbooks, Data Sources, and Fields."
+      addDocFile @csvFile,  detailsFileName, "Workbooks, Data Sources, and Fields' details (technical use)."
+      addDocFile @colsFile, colsFileName,    "Workbooks, Data Sources, and Column Fields."
       #--
-      # --
       @dsCount     = 0
       @recNum      = 0
-    end
-
-    def initializeX
-      # @csvFile     = CSV.open(@@csvFileName,'w')
-      # @csvFile     << @@csvHeader
-      # @csvRecords  = Set.new
-      # puts "Opened: #{!@csvFile.nil?} - #{@@csvFileName}"
-      # --
-      @csvFileFull = CSV.open(@@fullFileName,'w')
-      @csvFileFull << @@fullHeader
-      puts "Opened: #{!@csvFileFull.nil?} - #{@@fullFileName} "
-      # --
-      # @csvFileTech = CSV.open(@@techFileName,'w')
-      # @csvFileTech << @@techHeader
-      # puts "Opened: #{!@csvFileTech.nil?} - #{@@techFileName}"
-      # --
+      @colFldNum   = 0
     end
 
     def self.csvHeader
@@ -126,12 +129,15 @@ module DataSources
       @twb = nil
       @twb         = twb                    if twb.instance_of? Twb::Workbook
       @twb         = Twb::Workbook.new(twb) if twb.instance_of? String
+      @twbName     = @twb.name
+      @twbDir      = @twb.dir
       raise ArgumentError.new("ERROR in Workbok processing: '#{twb}' must be a Workbook (class) or the name of a Workbook (String), is a #{twb.class} \n ") unless @twb.is_a? Twb::Workbook
       # --
       dss = @twb.datasources
       @fieldCnt = 0
       dss.each do |ds|
         @dsname = ds.uiname
+        processColumnFields ds
         # puts "\n    -- #{ds.uiname} "
         # tables = Set.new
         # fields = {}
@@ -178,6 +184,44 @@ module DataSources
       end
     end # def processTwb twb
 
+    def processColumnFields ds
+      deepFields     = {}
+      recordedFields = {}
+      ds.columnFields.each do |field|
+        if field.pathbare.eql? '/workbook/datasources/datasource/column'
+          recordColField field
+          recordedFields[field.name] = field
+          # print '.'
+        else
+          deepFields[field.name] = field
+          # print '-'
+        end
+      end
+      deepFields.each do |name,field|
+        unless recordedFields.has_key? name
+          recordColField(field) 
+          recordedFields[field.name] = field
+          # print ':'
+        end
+      end
+    end
+
+    # @@colsHeader = ['Field #',
+    #                 'Workbook',
+    #                 'Data Source',
+    #                 'Field - tech',
+    #                 'caption',
+    #                 'uiname',
+    #                 'alias',
+    #                 'datatype',
+    #                 'datatype-customized',
+    #                 'default-format',
+    #                 'param-domain-type',
+    #                 'role',
+    #                 'type',
+    #                 'value'
+    #                ]
+
     def metrics
       {
         '# of Data Sources'        => @dsCount,
@@ -185,8 +229,47 @@ module DataSources
       }
     end
 
+
+
     private
 
+      # def recordCSV record
+      #   numberedRec = [@recNum+=1] + record
+      #   if @recordDir
+      #     @csvFile  << numberedRec.push(@twb.dir)
+      #   else
+      #     @csvFile  << numberedRec
+      #   end
+      # end
+
+    def recordColField field
+      numberedRec = [
+                       @colFldNum +=1, 
+                       @twbName,         
+                       @dsname,      
+                       field.name,    
+                       field.caption, 
+                       field.uiname,  
+                       field.alias,   
+                       field.dataType,   
+                       field.datatypeCustomized, 
+                       field.defaultFormat,   
+                       field.paramDomainType,  
+                       field.role,              
+                       field.type,
+                      !field.calcField.nil?,
+                       field.value,
+                       field.hidden,
+                       field.pathbare
+                    ]
+      #--
+      if @recordDir
+        @colsFile  << numberedRec.push(@twb.dir)
+      else
+        @colsFile  << numberedRec
+      end
+    end
+
     def recordFieldFull field, source
       # print field.properties.nil? ? '-' : ":#{field.properties.length}"
       # puts field.properties
@@ -198,13 +281,14 @@ module DataSources
                    # @twb.dir,
                    @dsname,
                    field.uiname,
+                   field.name,
                    source,
                    field.class,
                    field.node.path.to_s.gsub(/[0-9]/,'').gsub('[]',''),
                    name,
                    value
                  ]
-        csvRec << @twb.dir if @recordDir
+        csvRec   << @twb.dir if @recordDir
         @csvFile << csvRec
       end
     end

data/lib/twb/analysis/datasources/datasourceoriginsanalyzer.rb

@@ -51,7 +51,7 @@ module Analysis
 
     def metrics
       {
-        '# of Workbooks'    => @twbcount,
+        # '# of Workbooks'    => @twbcount,
         '# of Data Sources' => @dsCnt,
       }
     end

data/lib/twb/analysis/datasources/datasourcesenumerator.rb

@@ -0,0 +1,103 @@
+#  WorksheetFields.rb Copyright (C) 2017, 2018  Chris Gerrard
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.  
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'twb'
+require 'csv'
+
+module Twb
+module Analysis
+module DataSources
+
+
+  class DataSourcesEnumerator
+
+    include TabTool
+
+    attr_accessor :localEmit
+
+    def initialize(**args)
+      @args      = args
+      @recordDir = !@args.nil? && @args[:recordDir] == true
+      @ttdocdir  = @args[:ttdocdir]
+      @csvAdd    = args[:csvMode] == :add
+      @csvMode   = @csvAdd ? 'a' : 'w'
+      init
+      @funcdoc   = {:class=>self.class, :blurb=>"Enumerate Workbooks' Data Sources", :description=>'Documents Data Sources, recoring their names.',}
+      #--
+      docFileName      = docFile('DataSources.csv')
+      @sheetFieldsCSV  = CSV.open( docFileName,@csvMode)
+      unless @csvAdd
+        if @recordDir
+          @sheetFieldsCSV  << ['Rec #','Workbook','Data Source','Data Source (tech)','Class','Extract?','# Connections','# Fields','Published?', '# Tables', '# Aliases', '# Groups', 'Workbook Dir']
+        else
+          @sheetFieldsCSV  << ['Rec #','Workbook','Data Source','Data Source (tech)','Class','Extract?','# Connections','# Fields','Published?', '# Tables', '# Aliases', '# Groups']
+        end
+      end
+      addDocFile @sheetFieldsCSV, docFileName, "Workbooks and the Data Sources they contain."
+      #--
+      @dsCount  = 0
+      @recNum   = 0
+    end
+
+    def metrics
+      {
+        '# of Data Sources'        => @dsCount,
+      }
+    end
+
+    def processTWB twb
+       @twb     = twb
+       @twbName = @twb.name
+       @twbDir  = @twb.dir
+       emit "   -- #{@twbName}"
+       parseDataSources
+    end
+
+    def parseDataSources
+      @dataSources  = @twb.datasources
+      @dataSources.each do |ds|
+        @dsCount += 1
+        recordCSV [ @twbName, 
+                    ds.uiname, 
+                    ds.name, 
+                    ds.dsclass, 
+                    ds.isExtract, 
+                    ds.connections.length,
+                    ds.allFields.length, 
+                    ds.isPublished, 
+                    ds.tables.length, 
+                    ds.aliases.length, 
+                    ds.groups.length 
+                  ]
+        # [@twbName, @modTime, sheet.name, filter.type, filter.inexclude, filter.dataSource.uiname, filter.uiname, nil,   nil,    nil,  filter.inexMode, filter.includeNull, filter.kind]
+      end
+    end
+
+    private
+
+      def recordCSV record
+        numberedRec = [@recNum+=1] + record
+        if @recordDir
+          @sheetFieldsCSV  << numberedRec.push(@twbDir)
+        else
+          @sheetFieldsCSV  << numberedRec
+        end
+      end
+
+end # class DataSourcesEnumeratorA
+
+end # module DataSources
+end # module Analysis
+end # module Twb

data/lib/twb/analysis/datasources/datasourceslocationsanalyzer.rb

@@ -41,7 +41,7 @@ module Analysis
 
     def metrics
       {
-        '# of Workbooks'         => @twbcount,
+        # '# of Workbooks'         => @twbcount,
         '# of Worksheets'        => @sheetCnt,
         '# of Worksheet Fields'  => @fieldsCnt
       }

data/lib/twb/analysis/datasources/googlesheetdatasourcesanalyzer.rb

@@ -93,7 +93,7 @@ module Analysis
 
     def metrics
       {
-        '# of Workbooks'    => @twbcount,
+        # '# of Workbooks'    => @twbcount,
         '# of Data Sources' => @dscount,
         '# of Google Docs'  => @filecount,
         '# of Worksheets'   => @sheetcount

data/lib/twb/analysis/sheets/dashsheetsanalyzer.rb

@@ -38,9 +38,9 @@ module Analysis
       @dashSheetsCSV  = CSV.open(docFileName,@csvMode)
       unless @csvAdd
         if @recordDir
-          @dashSheetsCSV  << ['Rec #','Workbook','Workbook Modified','Workbook Modified','Dashboard','Worksheet','Hidden','Visible', 'Workbook Dir']
+          @dashSheetsCSV  << ['Rec #','Workbook','Dashboard','Worksheet','Hidden','Visible', 'Workbook Dir']
         else
-          @dashSheetsCSV  << ['Rec #','Workbook','Workbook Modified','Dashboard','Worksheet','Hidden','Visible'                ]
+          @dashSheetsCSV  << ['Rec #','Workbook','Dashboard','Worksheet','Hidden','Visible'                ]
         end
       end
       addDocFile @dashSheetsCSV, docFileName, "Workbooks, Dashboards, and their Worksheets"
@@ -53,7 +53,7 @@ module Analysis
 
     def metrics
       {
-        '# of Workbooks'  => @twbCount,
+        # '# of Workbooks'  => @twbCount,
         '# of Dashboards' => @dashCount,
         '# of Worksheets' => @sheetCount
       }
@@ -77,8 +77,9 @@ module Analysis
         @dashCount += 1
         dash.worksheets.each do |sheet|
           @sheetCount += 1
-          emit "SHEET: #{sheet.name}"
-          recordCSV [@twbName, @modTime, dash.name, sheet.name, sheet.hidden, sheet.visible ]
+          # puts "SHEET: #{sheet} -> #{sheet.name}"
+          recordCSV [@twbName, dash.name, sheet.name, sheet.hidden, sheet.visible ]
+          # recordCSV [@twbName, @modTime, dash.name, sheet.name, sheet.hidden, sheet.visible ]
         end
       end
     end

data/lib/twb/analysis/sheets/sheetfieldsanalyzer.rb

@@ -47,6 +47,7 @@ module Analysis
       @ttdocdir  = @args[:ttdocdir]
       @csvAdd    = args[:csvMode] == :add
       @csvMode   = @csvAdd ? 'a' : 'w'
+      # @localEmit = true
       init
       @funcdoc   = {:class=>self.class, :blurb=>'Analyze Worksheet Fields', :description=>nil,}
       #--
@@ -69,7 +70,7 @@ module Analysis
 
     def metrics
       {
-        '# of Workbooks'         => @twbcount,
+        # '# of Workbooks'         => @twbcount,
         '# of Worksheets'        => @sheetCnt,
         '# of Worksheet Fields'  => @fieldsCnt
       }

data/lib/twb/analysis/sheets/sheetsintooltipanalyzer.rb

@@ -0,0 +1,114 @@
+#  sheetfieldsanalyzer.rb Copyright (C) 2019  Chris Gerrard
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.  
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'twb'
+require 'csv'
+
+module Twb
+module Analysis
+
+  class SheetsInTooltipAnalyzer
+
+    include TabTool
+
+    def initialize(**args)
+      @args      = args
+      @recordDir = !@args.nil? && @args[:recordDir] == true
+      @ttdocdir  = @args[:ttdocdir]
+      @csvAdd    = !@args.nil? && args[:csvMode] == :add
+      @csvMode   = @csvAdd ? 'a' : 'w'
+      init
+      @funcdoc   = {:class=>self.class, :blurb=>'Tooltip Vizzes', :description=>'Identifies the vizzes used in tooltips.',}
+      #--
+      docFileName     = docFile('SheetsInTooltips.csv')
+      @csvFile  = CSV.open(docFileName,@csvMode)
+      unless @csvAdd
+        if @recordDir
+          @csvFile  << ['Rec #','Workbook','Worksheet - Host','Worksheet - Toolip viz','Max Width','Max Height', 'Workbook Dir']
+        else
+          @csvFile  << ['Rec #','Workbook','Worksheet - Host','Worksheet - Toolip viz','Max Height','Max Width']
+        end
+      end
+      addDocFile @csvFile, docFileName, "Workbooks, Worksheets with Vizzes in their Tooltips"
+      #--
+      @twbCount    = 0
+      @sheetCount  = 0
+      @ttvizCount  = 0
+      @recNum      = 0
+    end
+
+    def metrics
+      {
+        # '# of Workbooks'  => @twbCount,
+        '# of Worksheets' => @sheetCount,
+        '# of Worksheets in Tooltips' => @ttvizCount
+      }
+    end
+
+    def processTWB twb
+       @twb     = twb
+       @twbName = @twb.name
+       @twbDir  = @twb.dir
+       @modTime = @twb.modtime
+       emit "   -- #{@twbName}"
+       @twbCount += 1
+       parseSheets
+       finis
+    end
+
+    def parseSheets
+      @sheets      = @twb.worksheets
+      puts " #Sheets: #{@sheets.length}"
+      @sheetCount += @sheets.length
+      @sheets.each do |sheet|
+        puts "SHEET:: #{sheet.name}"
+        # @dashCount += 1
+        ttip = sheet.tooltip
+        runs = ttip.xpath('.//run')
+        runs.each do |run|
+          # puts run.text
+          text = run.text
+          isViz = text =~ /.*<Sheet[ ]+name=.*>.*/
+          puts "\t   #{text}"
+          if isViz
+            vizCode = text.gsub(/^[^<]*/,'').gsub(/[^>]*$/,'')
+            vizNode = Nokogiri::XML(vizCode).at_xpath('./Sheet')
+            puts "\t   #{vizCode}"
+            puts "\t   #{vizNode.class}  \t #{vizNode}"
+            recordCSV [@twbName, sheet.name, vizNode['name'], vizNode['maxwidth'], vizNode['maxheight']]
+          end
+          
+          # @sheetCount += 1
+          # recordCSV [@twbName, dash.name, sheet.name, sheet.hidden, sheet.visible ]
+        end
+      end
+    end
+
+    private
+
+      def recordCSV record
+        numberedRec = [@recNum+=1] + record
+        if @recordDir
+          @csvFile  << numberedRec.push(@twbDir)
+        else
+          @csvFile  << numberedRec
+        end
+      end
+
+
+  end #class SheetFieldsAnalyzer
+
+end # module Analysis
+end # module Twb

data/lib/twb/analysis/sheets/sheetsourcesanalyzer.rb

@@ -41,7 +41,7 @@ module Analysis
 
     def metrics
       {
-        '# of Workbooks'         => @twbcount,
+        # '# of Workbooks'         => @twbcount,
         '# of Worksheets'        => @sheetCnt,
         '# of Worksheet Fields'  => @fieldsCnt
       }

data/lib/twb/analysis/workbooksummaryanalyzer.rb

@@ -54,7 +54,7 @@ module Analysis
 
     def metrics
       {
-        '# of Workbooks'    => @twbCount,
+        # '# of Workbooks'    => @twbCount,
         '# of Data Sources' => @dsCount,
         '# of Dashboards'   => @dashCount,
         '# of Worksheets'   => @sheetCount

data/lib/twb/columnfield.rb

@@ -21,6 +21,16 @@ module Twb
 
     include Comparable
 
+    @@dataTypeRoleMap = {
+                          'date'     => :dimension,
+                          'datetime' => :dimension, 
+                          'boolean'  => :dimension,
+                          'integer'  => :measure,
+                          'float'    => :measure,
+                          'real'     => :measure,
+                          'string'   => :dimension,
+                        }
+
     # XML Attributes known to exist in TWB xml
     # ---------------------------------------- 
     # aggregation
@@ -48,15 +58,15 @@ module Twb
     # visual-totals
 
     attr_reader :node,       :properties
-    attr_reader :name,       :caption,       :uiname
+    attr_reader :name,       :caption,       :uiname,   :alias
     attr_reader :dataType,   :defaultFormat, :paramDomainType
     attr_reader :role,       :type,          :value
     attr_reader :alias,      :semanticRole,  :aggregation
     attr_reader :autoColumn, :hidden,        :datatypeCustomized
     attr_reader :calcField
+    attr_reader :path
     attr_reader :aliases
 
-
     def initialize(fieldNode, datasource=nil)
       @datasource         = datasource
       @node               = fieldNode
@@ -67,16 +77,14 @@ module Twb
       @userDataType       = load 'user-datatype'
       @defaultFormat      = load 'default-format'
       @paramDomainType    = load 'param-domain-type'
-      @role               = load 'role'
       @type               = load 'type'
       @value              = load 'value'
       @alias              = load 'alias'
       @semanticRole       = load 'semantic-role'
       @aggregation        = load 'aggregation'
       @autoColumn         = load 'auto-column'
-      @hidden             = load 'hidden'
       @datatypeCustomized = load 'datatype-customized'
-      @calcField          = loadCalcField
+      # @calcField          = loadCalcField
     end
 
     def id
@@ -89,10 +97,26 @@ module Twb
       return val
     end
 
+    def role
+      @role ||= loadRole
+    end
+
+    def loadRole
+      role = @node['role']
+      if role.nil? 
+        role = @@dataTypeRoleMap[@dataType].nil? ? @dataType : @@dataTypeRoleMap[@dataType]
+      end
+      return role
+    end
+
     def  calcField
       @calcField ||= loadCalcField
     end
 
+    def hidden
+      @hidden ||= load('hidden').nil? ? false : true
+    end
+
     def loadCalcField
       if !@node.at_xpath('./calculation').nil?
         @calcField = Twb::CalculatedField.new @node, @datasource
@@ -101,6 +125,14 @@ module Twb
       end
     end
 
+    def path
+      @path ||= @node.path.gsub(/\[[0-9]+\]/,'[]')
+    end
+
+    def pathbare
+      @pathbare ||= path().gsub(/\[\]/,'')
+    end
+
     def comment
       @commentLines ||= loadComment
     end

data/lib/twb/datasource.rb

@@ -69,7 +69,7 @@ module Twb
       @caption  = @node.attr('caption')
       @uiname   = @caption.nil? ? @name : @caption
       # puts "DATASOURCE: #{@uiname}" 
-      processConnection
+      # processConnection
       # processFilters
       loadTableFields
       loadFieldUINames
@@ -111,41 +111,44 @@ module Twb
     end
 
     def processConnections
-      processConnection ds, './/connection'
-      processConnection ds, './/named-connection'
+      @connections = Array.new
+      processConnection './/connection'
+      processConnection './/named-connection'
+      return @connections
     end
 
     def processConnection path
         conns = @node.xpath(path)
         conns.each do |connNode|
-            connClass = @dsclass
-            cpath     = conn.path
-            connPath  = cpath.gsub(/\[[0-9]+\]/,'')
-            connPNum  = /(\d+)/.match(cpath)
-            # puts cpath, connPath
-            # puts "CPATH: #{cpath}"
-            conn.attributes.each do |name,value|
-                # puts  "\n\t\t - %-15s -> %-s" % [name, value]
-                $csvFile << [ $recCount += 1,
-                              $twbName,  $dir,     $build,    $version,
-                              $dsName,   $dstype,  $dsuiname, connClass, 
-                              connPath,  connPNum,
-                              name,      value.value
-                            ]
-            end
+          @connections << connNode
+            # connClass = @dsclass
+            # cpath     = connNode.path
+            # connPath  = cpath.gsub(/\[[0-9]+\]/,'')
+            # connPNum  = /(\d+)/.match(cpath)
+            # # puts cpath, connPath
+            # # puts "CPATH: #{cpath}"
+            # conn.attributes.each do |name,value|
+            #     # puts  "\n\t\t - %-15s -> %-s" % [name, value]
+            #     $csvFile << [ $recCount += 1,
+            #                   $twbName,  $dir,     $build,    $version,
+            #                   $dsName,   $dstype,  $dsuiname, connClass, 
+            #                   connPath,  connPNum,
+            #                   name,      value.value
+            #                 ]
+            # end
         end
     end
 
-    def processConnection
-      @connection  = @node.at_xpath('./connection')
-      @dsclass     = @name  # handles 'Parameters' data source, which has no connection element (& others if so)  
-      unless @connection.nil?
-        @dsclass = @connection.attribute('class').text
-        # note: must use "dsclass" as "class" would override Rubys ".class" Kernel method
-        setConnectionHash
-        loadTables @connection
-      end
-    end
+    # def processConnection
+    #   @connection  = @node.at_xpath('./connection')
+    #   @dsclass     = @name  # handles 'Parameters' data source, which has no connection element (& others if so)  
+    #   unless @connection.nil?
+    #     @dsclass = @connection.attribute('class').text
+    #     # note: must use "dsclass" as "class" would override Rubys ".class" Kernel method
+    #     setConnectionHash
+    #     loadTables @connection
+    #   end
+    # end
 
     # Notes:
     #      - TODO: need to determine which, if any, of the connection attributes should be
@@ -174,12 +177,19 @@ module Twb
       @isPublished = !node.at_xpath('./repository-location').nil?
     end
 
-    def loadTables connection
+    def tables
+      @tables ||= loadTables
+    end
+
+    def loadTables
       @tables = {}
-      nodes = connection.xpath(".//relation[@type='table']")
-      nodes.each do |node|
-        @tables[node.attr('name')] = node.attr('table')
+      connections.each do |conn|
+        nodes = conn.xpath(".//relation[@type='table']")
+        nodes.each do |node|
+          @tables[node.attr('name')] = node.attr('table')
+        end
       end
+      return @tables
     end
 
     def joinPairs
@@ -237,7 +247,7 @@ module Twb
     def loadColumnFields
       @columnFields    = Set.new
       @columnFieldsMap = {}
-      nodes = @node.xpath('./column')
+      nodes = @node.xpath('.//column')
       nodes.each do |n|
         field = Twb::ColumnField.new n, self
         @columnFields << field
@@ -467,7 +477,7 @@ module Twb
     def loadAllFields
       @allFields = SortedSet.new
       dbf = dbFields
-      @allFields << dbf.keys
+      @allFields << dbf
       @allFields << calculatedFieldNames
     end
 

data/lib/twb/fieldcalculation.rb

@@ -31,7 +31,7 @@ module Twb
     attr_reader :formulaResolved
     attr_reader :formulaFlat 
     attr_reader :formulaFlatResolved
-    attr_reader :formulaLines, :formulaResolvedLines 
+    attr_reader :formulaLines, :formulaResolvedLines, :formulaLinesCount 
     attr_reader :is_tableCalc
     attr_reader :is_lod,   :lodCodePos
     attr_reader :class,    :scopeIsolation
@@ -176,6 +176,10 @@ module Twb
       formulaResolved.split(/\n|\r\n/)
     end
 
+    def formulaLinesCount
+      @formulaLinesCount ||= formulaLines.length
+    end
+
     def enlineResolvedFormula
     end 
 
@@ -194,7 +198,7 @@ module Twb
           # line.strip
           formula += ' ' + line.gsub(/\/\/.*/, '') # unless line =~ /^[ ]*\/\//
       end
-      return formula # .strip
+      return formula.strip
     end
 
      

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twb
 version: !ruby/object:Gem::Version
-  version: 4.6.3
+  version: 4.7.1
 platform: ruby
 authors:
 - Chris Gerrard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: creek
@@ -69,6 +69,7 @@ files:
 - lib/twb/analysis/datasources/datasourcefieldsanalyzer.rb
 - lib/twb/analysis/datasources/datasourcefieldscsvemitter.rb
 - lib/twb/analysis/datasources/datasourceoriginsanalyzer.rb
+- lib/twb/analysis/datasources/datasourcesenumerator.rb
 - lib/twb/analysis/datasources/datasourceslocationsanalyzer.rb
 - lib/twb/analysis/datasources/datasourcetablefieldscsvemitter.rb
 - lib/twb/analysis/datasources/googlesheetdatasourcesanalyzer.rb
@@ -80,6 +81,7 @@ files:
 - lib/twb/analysis/sheets/sheetfieldsanalyzer.rb
 - lib/twb/analysis/sheets/sheetfiltersanalyzer.rb
 - lib/twb/analysis/sheets/sheetfiltersanalyzera.rb
+- lib/twb/analysis/sheets/sheetsintooltipanalyzer.rb
 - lib/twb/analysis/sheets/sheetsourcesanalyzer.rb
 - lib/twb/analysis/sheets/worksheetdatastructurecsvemitter.rb
 - lib/twb/analysis/workbooksummaryanalyzer.rb