twb 4.5.5 → 4.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7049c47a51982f0de1d215e3d2091e559b56346f1e9f1c74b7cbe2464dfcf0c9
-  data.tar.gz: d7f01f024dea265c8405dc141be50171ac5883d952f38f6128980f949c45cd72
+  metadata.gz: 7eb9fb34a75d4869a2ba63a575e532e3fa0c0a9595e454d33574685bd0083ab6
+  data.tar.gz: ac54f86e1b09b352dcb6052010ba0486a26860aa74ea294ea8872475a05cd509
 SHA512:
-  metadata.gz: 8b56aa09e7dcf6e2d3cfc2e063929066584c5c213dca405d73ccd11862831ce4a69e37e302b8cd41811254bd060e871a4b423b35d0904d84c5cf95a2e87ceaef
-  data.tar.gz: abfd00faf2f0727ff5839f7662be0a3499fbcd6a315d1670701071720e305eeb68feb9fd4aff9699a9cce7c6410012f43849f94b46cf114bc7f0f0e81828e78d
+  metadata.gz: e1d3ee029ca7dc00e9bef48f80fa6b14e52a9ccf5877fa42ae1be1990f8140dc57a819eb84695b580f1564d6cd3e53b76d5a373ad0103feaec138147ac0844e7
+  data.tar.gz: 0037410ebe36ae0a2f77f671e7d33d004240b486a2999a8ce118c2876e6665e9d9bd267f14b2fe4bdaee981e1b435d808ff7f7af54cc4b71b2355d2ae03f6ec7

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

@@ -0,0 +1,42 @@
+#  calculatedfieldsanalyzer.rb - this Ruby script Copyright 2017, 2018 Christopher 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'
+
+module Twb
+module Analysis
+
+
+  class CalculatedFieldsAnalyzer
+
+      include TabTool  
+
+      def initialize(**args)
+      end
+
+      def processTWB workbook
+      end
+
+      def metrics
+        Array.new
+      end
+
+      #-- private methods begin here, to end of class
+
+ 
+  end #  class
+
+end   # module Analysis
+end   # module Twb

data/lib/twb/tabtool.rb

@@ -112,7 +112,7 @@ module TabTool
   end
 
   def docfiles
-    @docfiles ||= @docfiles = []
+    @docfiles ||= @docfiles = {}
   end
 
   def addDocFile file, name, description
@@ -121,15 +121,17 @@ module TabTool
   end
 
   def closeDocFiles
-    emit true, "Closing doc files"
-    @docfiles.each do |dfh|
-      docfile  = dfh[:file]
-      fileName = dfh[:name]
-      emit "  -- #{dfh}"
-      # system     "ls -l '#{fileName}'"
-      docfile.close unless docfile.nil?
-      # system     "ls -l '#{fileName}'"
-      # emit true, "  -- #{dfh[:name]}"
+    emit "Closing doc files"
+    unless @docfiles.nil?
+      @docfiles.each do |dfh|
+        docfile  = dfh[:file]
+        fileName = dfh[:name]
+        emit "  -- #{dfh}"
+        # system     "ls -l '#{fileName}'"
+        docfile.close unless docfile.nil?
+        # system     "ls -l '#{fileName}'"
+        # emit true, "  -- #{dfh[:name]}"
+      end
     end
     emit "-----------------"
   end

data/lib/twb.rb

@@ -52,6 +52,7 @@ require_relative 'twb/util/docprep'
 require_relative 'twb/analysis/documentedfieldsmarkdownemitter'
 require_relative 'twb/analysis/annotatedfieldscsvemitter'
 require_relative 'twb/analysis/workbooksummaryanalyzer'
+require_relative 'twb/analysis/calculatedfields/calculatedfieldsanalyzer'
 require_relative 'twb/analysis/calculatedfields/groupfieldsanalyzer'
 require_relative 'twb/analysis/calculatedfields/markdownemitter'
 require_relative 'twb/analysis/calculatedfields/csvemitter'
@@ -66,11 +67,9 @@ require_relative 'twb/analysis/sheets/sheetfiltersanalyzer'
 require_relative 'twb/analysis/sheets/sheetfieldsanalyzer'
 require_relative 'twb/analysis/sheets/dashsheetsanalyzer'
 
-# require_relative 'twb/analysis/calculatedfields/calculatedfieldsanalyzer'
-
 
 # Represents Tableau Workbooks, their contents, and classes that analyze and manipulate them.
 #
 module Twb
-  VERSION = '4.5.5'
+  VERSION = '4.5.7'
 end

data/t.rb

@@ -1,71 +1,24 @@
+system 'cls'
+
 def checkfile fileName
-    # puts "--"
-    qfn    = "./lib/#{fileName}.rb"
-    exists = File.exists? qfn
+    exists = File.exists? fileName
     hasCap = !!(fileName =~ /[A-Z]/)
-    qfn_tmp = "#{qfn.downcase}.tmp"
-    qfn_lc  = qfn.downcase
-    puts " %-6s   %-13s   %-s  " % [' '   , ' '   , fileName]
-    puts " %-6s   %-7s   %-s  " % [exists, hasCap, qfn]
-    puts " %-6s   %-7s   %-s  " % [exists, hasCap, qfn_tmp]
-    puts " %-6s   %-7s   %-s  " % ['-'   , '-'   , qfn_lc]
-    puts " "
-    File.rename qfn,     qfn_tmp
-    File.rename qfn_tmp, qfn_lc
+    isTest = !!(fileName =~ /test/i)
+    if hasCap && !isTest
+        fn_tmp = "#{fileName}.tmp"
+        fn_lc  = fileName.downcase
+        puts "-- #{fileName}"
+        puts " %-6s   t? %-6s   %-7s   %-s  "  % [' '   , isTest, ' '   , fileName]
+        puts " %-6s      %-6s   %-7s   %-s  "  % [exists, ' ',    hasCap, fileName]
+        puts " %-6s      %-6s   %-7s   %-s  "  % [exists, ' ',    hasCap, fn_tmp]
+        puts " %-6s      %-6s   %-7s   %-s  "  % ['-'   , '-',    '-'   , fn_lc]
+        # File.rename fileName,  fn_tmp
+        # File.rename fn_tmp,    fn_lc
+        puts " "
+    end
 end
 
 
-checkfile  'twb/tabclass'
-checkfile  'twb/tabtool'
-checkfile  'twb/dashboard'
-checkfile  'twb/datasource'
-checkfile  'twb/connection'
-checkfile  'twb/docdashboard'
-checkfile  'twb/dbfield'
-checkfile  'twb/localfield'
-checkfile  'twb/metadatafield'
-checkfile  'twb/storyboard'
-checkfile  'twb/window'
-checkfile  'twb/workbook'
-checkfile  'twb/worksheet'
-checkfile  'twb/parameter'
-checkfile  'twb/action'
-checkfile  'twb/columnfield'
-checkfile  'twb/calculatedfield'
-checkfile  'twb/codedfield'
-checkfile  'twb/groupfield'
-checkfile  'twb/fieldcalculation'
-checkfile  'twb/quickfilter'
-checkfile  'twb/docdashboardimagevert'
-checkfile  'twb/docdashboardwebvert'
-checkfile  'twb/util/twbDashSheetDataDotBuilder'
-checkfile  'twb/util/dotFileRenderer'
-checkfile  'twb/util/htmllistcollapsible'
-checkfile  'twb/util/xraydashboards'
-checkfile  'twb/util/graph'
-checkfile  'twb/util/graphnode'
-checkfile  'twb/util/graphedge'
-checkfile  'twb/util/graphedges'
-checkfile  'twb/util/gml'
-checkfile  'twb/util/cypher'
-checkfile  'twb/util/cypherpython'
-checkfile  'twb/util/fielddomainloader'
-checkfile  'twb/util/docprep'
-checkfile  'twb/analysis/documentedfieldsmarkdownemitter'
-checkfile  'twb/analysis/annotatedfieldscsvemitter'
-checkfile  'twb/analysis/WorkbookSummaryAnalyzer'
-checkfile  'twb/analysis/calculatedfields/calculatedfieldsanalyzer'
-checkfile  'twb/analysis/calculatedfields/groupfieldsanalyzer'
-checkfile  'twb/analysis/calculatedfields/markdownemitter'
-checkfile  'twb/analysis/calculatedfields/csvemitter'
-checkfile  'twb/analysis/datasources/DataSourceFieldsCSVEmitter'
-checkfile  'twb/analysis/datasources/DataSourceTableFieldsCSVEmitter'
-checkfile  'twb/analysis/datasources/categoricalColorCodingAnalyzer'
-checkfile  'twb/analysis/datasources/googlesheetdatasourcesanalyzer'
-checkfile  'twb/analysis/datasources/parametersanalyzer'
-checkfile  'twb/analysis/datasources/DataSourceOriginsAnalyzer'
-checkfile  'twb/analysis/Sheets/WorksheetDataStructureCSVEmitter'
-checkfile  'twb/analysis/Sheets/sheetfiltersanalyzer'
-checkfile  'twb/analysis/Sheets/sheetfieldsanalyzer'
-checkfile  'twb/analysis/Sheets/dashsheetsanalyzer'
+Dir.glob('**/*.rb') { |file| puts file if file =~ /[A-Z]/ }
+
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twb
 version: !ruby/object:Gem::Version
-  version: 4.5.5
+  version: 4.5.7
 platform: ruby
 authors:
 - Chris Gerrard
@@ -59,29 +59,28 @@ extra_rdoc_files: []
 files:
 - lib/t.rb
 - lib/twb.rb
-- lib/twb/TwbTest.rb
 - lib/twb/action.rb
-- lib/twb/analysis/CalculatedFields/calculatedfieldsanalyzer.rb
-- lib/twb/analysis/CalculatedFields/csvemitter.rb
-- lib/twb/analysis/CalculatedFields/groupfieldsanalyzer.rb
-- lib/twb/analysis/CalculatedFields/markdownemitter.rb
-- lib/twb/analysis/DataSources/categoricalcolorcodinganalyzer.rb
-- lib/twb/analysis/DataSources/dataSourcesLocationsAnalyzer.rb
-- lib/twb/analysis/DataSources/datasourcefieldscsvemitter.rb
-- lib/twb/analysis/DataSources/datasourceoriginsanalyzer.rb
-- lib/twb/analysis/DataSources/datasourcetablefieldscsvemitter.rb
-- lib/twb/analysis/DataSources/googlesheetdatasourcesanalyzer.rb
-- lib/twb/analysis/DataSources/parametersanalyzer.rb
-- lib/twb/analysis/DocumentedFieldsCSVEmitter.rb
-- lib/twb/analysis/Sheets/analyzeDashboardSheets.rb
-- lib/twb/analysis/Sheets/dashsheetsanalyzer.rb
-- lib/twb/analysis/Sheets/sheetfieldsanalyzer.rb
-- lib/twb/analysis/Sheets/sheetfiltersanalyzer.rb
-- lib/twb/analysis/Sheets/sheetfiltersanalyzerA.rb
-- lib/twb/analysis/Sheets/sheetsourcesanalyzer.rb
-- lib/twb/analysis/Sheets/worksheetdatastructurecsvemitter.rb
 - lib/twb/analysis/annotatedfieldscsvemitter.rb
+- lib/twb/analysis/calculatedfields/calculatedfieldsanalyzer.rb
+- lib/twb/analysis/calculatedfields/csvemitter.rb
+- lib/twb/analysis/calculatedfields/groupfieldsanalyzer.rb
+- lib/twb/analysis/calculatedfields/markdownemitter.rb
+- lib/twb/analysis/datasources/categoricalcolorcodinganalyzer.rb
+- lib/twb/analysis/datasources/datasourcefieldscsvemitter.rb
+- lib/twb/analysis/datasources/datasourceoriginsanalyzer.rb
+- lib/twb/analysis/datasources/datasourceslocationsanalyzer.rb
+- lib/twb/analysis/datasources/datasourcetablefieldscsvemitter.rb
+- lib/twb/analysis/datasources/googlesheetdatasourcesanalyzer.rb
+- lib/twb/analysis/datasources/parametersanalyzer.rb
+- lib/twb/analysis/documentedfieldscsvemitter.rb
 - lib/twb/analysis/documentedfieldsmarkdownemitter.rb
+- lib/twb/analysis/sheets/analyzedashboardsheets.rb
+- lib/twb/analysis/sheets/dashsheetsanalyzer.rb
+- lib/twb/analysis/sheets/sheetfieldsanalyzer.rb
+- lib/twb/analysis/sheets/sheetfiltersanalyzer.rb
+- lib/twb/analysis/sheets/sheetfiltersanalyzera.rb
+- lib/twb/analysis/sheets/sheetsourcesanalyzer.rb
+- lib/twb/analysis/sheets/worksheetdatastructurecsvemitter.rb
 - lib/twb/analysis/workbooksummaryanalyzer.rb
 - lib/twb/calculatedfield.rb
 - lib/twb/codedfield.rb
@@ -95,14 +94,14 @@ files:
 - lib/twb/docdashboardwebvert.rb
 - lib/twb/field.rb
 - lib/twb/fieldcalculation.rb
-- lib/twb/findDSFields.rb
+- lib/twb/finddsfields.rb
 - lib/twb/graph.rb
 - lib/twb/graphedges.rb
 - lib/twb/graphnode.rb
 - lib/twb/groupfield.rb
 - lib/twb/hashtohtml.rb
 - lib/twb/htmllistcollapsible.rb
-- lib/twb/identifyFields.rb
+- lib/twb/identifyfields.rb
 - lib/twb/localfield.rb
 - lib/twb/mappedfield.rb
 - lib/twb/metadatafield.rb
@@ -114,12 +113,13 @@ files:
 - lib/twb/tabtool.rb
 - lib/twb/there.rb
 - lib/twb/twbcodedfield.rb
+- lib/twb/twbtest.rb
 - lib/twb/util/cypher.rb
 - lib/twb/util/cypherpython.rb
 - lib/twb/util/docprep.rb
 - lib/twb/util/dotfilerenderer.rb
 - lib/twb/util/fielddomainloader.rb
-- lib/twb/util/ftpPublisher.rb
+- lib/twb/util/ftppublisher.rb
 - lib/twb/util/gml.rb
 - lib/twb/util/gmledge.rb
 - lib/twb/util/graph.rb
@@ -128,11 +128,11 @@ files:
 - lib/twb/util/graphnode.rb
 - lib/twb/util/hashtohtml.rb
 - lib/twb/util/htmllistcollapsible.rb
-- lib/twb/util/joinUtilities.rb
+- lib/twb/util/joinutilities.rb
 - lib/twb/util/tabgraph.rb
-- lib/twb/util/twbDashSheetDataDotRenderer.rb
-- lib/twb/util/twbDashesSheetDataDotBuilder.rb
+- lib/twb/util/twbdashessheetdatadotbuilder.rb
 - lib/twb/util/twbdashsheetdatadotbuilder.rb
+- lib/twb/util/twbdashsheetdatadotrenderer.rb
 - lib/twb/util/xraydashboards.rb
 - lib/twb/window.rb
 - lib/twb/workbook.rb

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

@@ -1,524 +0,0 @@
-#  calculatedfieldsanalyzer.rb - this Ruby script Copyright 2017, 2018 Christopher 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 'nokogiri'
-# require 'twb'
-# require 'set'
-require 'csv'
-
-module Twb
-module Analysis
-
-  class CalculatedFieldsAnalyzer
-
-      include TabTool
-      include Graph
-
-      attr_reader   :calculatedFieldsCount, :referencedFieldsCount, :metrics
-      attr_accessor :ttdocdir
-
-      @@ttlogfile     = 'CalculatedFieldsAnalyzer.ttlog'
-      @@gvDotLocation = 'C:\\tech\\graphviz\\Graphviz2.38\\bin\\dot.exe'
-      @@processName   = '.CalculatedFields'
-
-      @@calcFieldsCSVFileName   = 'CalculatedFields.csv'
-      @@calcFieldsCSVFileHeader = ['Record #',
-                                   'Workbook',
-                                   'Workbook Modified',
-                                   'Data Source',   'Data Source Caption', 'Data Source Name (tech)',
-                                   'Field Name',    'Field Caption',       'Field Name (tech)',
-                                   'Data Source + Field Name (tech)',
-                                   'Data Type',     'Role',  'Type',
-                                   'Class',
-                                   'Scope Isolation',
-                                   'Formula Length',
-                                   'Formula',
-                                   'Formula (tech)',
-                                   'Formula Comments',
-                                   'Formula LOD?'
-                                  ]
-
-      @@calcLinesCSVFileName    = 'CalculatedFieldsFormulaLines.csv'
-      @@calcLinesCSVFileHeader  = ['Record #',
-                                   'Workbook',
-                                   'Workbook Modified',
-                                   'Data Source',   'Data Source Caption', 'Data Source Name (tech)',
-                                   'Field Name',    'Field Caption',       'Field Name (tech)',
-                                   'Formula',       'Formula Line #',      'Formula Line'
-                                  ]
-
-      @@formFieldsCSVFileName   = 'CalculatedFieldsReferenced.csv'
-      @@formFieldsCSVFileHeader = ['Record #',
-                                   'Workbook',
-                                   'Workbook Modified',
-                                   'Data Source',
-                                   'Field - Calculated',
-                                   'Formula (tech)',
-                                   'Formula',
-                                   'Field - Referenced (tech)',
-                                   'Field - Referenced',
-                                   'Data Source + Field - Referenced',
-                                   'Table'
-                                ]
-
-      @techUINames = {}
-      @fieldTables = {}
-
-
-      @@dotHeader = <<DOTHEADER
-  digraph g {
-      graph [rankdir="LR" splines=line];
-      node  [shape="box"  width="2"];
-
-DOTHEADER
-
-      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=>'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
-          #-- Counters setup --
-          @twbCount              = 0
-          @dataSourcesCount      = 0
-          @calculatedFieldsCount = 0
-          @referencedFieldsCount = 0
-          #--
-          @referencedFields     = SortedSet.new
-          #--
-          twbdirLabel = @recordDir.nil? ? nil : 'Workbook Dir'
-          @csvCF   = initCSV(@@calcFieldsCSVFileName, 'Calculated fields and their formulas.',                      @@calcFieldsCSVFileHeader )
-          @csvCFLs = initCSV(@@calcLinesCSVFileName,  "Calculated fields and their formulas' individual lines.",    @@calcLinesCSVFileHeader  )
-          @csvFF   = initCSV(@@formFieldsCSVFileName, 'Calculated fields and the fields their formulas reference.', @@formFieldsCSVFileHeader )
-          # TODO migrate addition of 'Workbook Dir' to CSV header to TabTool
-          #--
-          @localEmit  = false
-          @imageFiles = Array.new
-          #--
-          @doGraph = config(:dograph)
-      end
-
-      def processTWB workbook
-        @twb = workbook.is_a?(String) ? Twb::Workbook.new(workbook) : workbook
-        throw Exception unless @twb.is_a? Twb::Workbook
-        emit  "- Workbook: #{workbook}"
-        emit  "   version: #{@twb.version}"
-        @twbDir   = @twb.dir #File.dirname(File.expand_path(workbook))
-        @modTime  = @twb.modtime
-        @edges    = Set.new
-        #-- processing
-        dss = @twb.datasources
-        # puts "    # data sources: #{dss.length}"
-        @twbRootFields = Set.new
-        @twbFields = Hash.new { |h,k| h[k] = [] }
-        @nodes     = Set.new
-        dss.each do |ds|
-          @dataSourcesCount += 1
-          # puts "\t\t - #{ds.uiname}  \t\t #{ds.calculatedFields.length}"
-          next if ds.Parameters?  # don't process the Parameters data source - Parameters' fields aren't Calculated fields for our purposes
-          # dataSourceNode = Twb::Util::Graphnode.new(name: ds.uiname, id: ds.id, type: ds, properties: {workbook: workbook})
-          # @nodes.add dataSourceNode
-          # ds.calculatedFields.each do |calcField|
-          # end
-          processDataSource ds
-        end
-        mapTwb
-        emitGml
-        @twbCount += 1
-        finis
-      end
-
-      def metrics
-        @metrics ||= loadMetrics
-      end
-
-      def loadMetrics
-        @metrics = {
-                     '# of Workbooks'         => @twbCount,
-                     '# of Data Sources'      => @dataSourcesCount,
-                     '# of Calculated Fields' => @calculatedFieldsCount,
-                     '# of Referenced Fields' => @referencedFieldsCount,
-                   }
-      end
-
-      #-- private methods begin here, to end of class
-
-      private
-
-          def emitGml
-            gml = Twb::Util::GML.new
-            gml.fileName = @twb.name
-            gml.nodes = @nodes
-            gml.edges = @edges
-            gml.render
-          end
-
-          def processDataSource ds
-            emit   "=======    DATA SOURCE: #{ds.uiname}    ====== "
-            dsNodes               = Set.new
-            dsEdges               = Set.new
-            dsFields              = {}
-            @twbFields[ds.uiname] = dsFields
-            calculatedFields      = SortedSet.new
-            fieldFormulaLines     = Array.new
-            referencedFields      = SortedSet.new
-            # if @doGraph
-              dataSourceNode = Twb::Util::Graphnode.new(name: ds.uiname, id: ds.id, type: ds, properties: {workbook: @twb.name})
-              @nodes.add dataSourceNode
-            # end
-            #-- process Calculatred Fields
-            ds.calculatedFields.each do |calcField|
-              emit "Calculated Field: #{calcField}"
-              calculatedFields.add calcField.id
-              dsFields[calcField.uiname] = calcField
-              # if @doGraph
-                calcFieldNode    = Twb::Util::Graphnode.new(name: calcField.uiname, id: calcField.id, type: calcField, properties: {:DataSource => ds.uiname})
-                @nodes.add calcFieldNode
-                dsFieldEdge     = Twb::Util::Graphedge.new(from: dataSourceNode, to: calcFieldNode, relationship: 'contains')
-                @edges.add dsFieldEdge
-              # end
-              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
-                                            ]
-                  #-- collect individual formula lines
-                  flnum = 0
-                  emit "@@ calcField.uiname: #{calcField.uiname}"
-                  calculation.formulaResolvedLines.each do |fl|
-                    emit "@@ resolved line::   => '#{fl}'"
-                    fieldFormulaLines << [ @calculatedFieldsCount,        # 'Calc Field #',
-                                           @twb.name,                     # 'Workbook',
-                                           @modTime,      
-                                           ds.uiname,                     # 'Data Source',   
-                                           ds.caption,                    # 'Data Source Caption', 
-                                           ds.name,                       # 'Data Source Name (tech)',
-                                           calcField.uiname,              # 'Field Name',    
-                                           calcField.caption,             # 'Field Caption',       
-                                           calcField.name,                # 'Field Name (tech)',
-                                           calcField.calculation.formulaFlatResolved, # 'Formula'
-                                           flnum += 1,                    # 'Formula Line #',
-                                           fl.start_with?(" ") ? "'#{fl}" : fl # 'Formula Line' - THIS IS A STUPID HACK NEEDED BECAUSE TABLEAU STRIPS LEADING BLANKS FROM CSV VALUES
-                                         ]
-                  end
-                  #-- collect fields referenced in formula
-                  emit "# Calculated Fields: #{calculation.calcFields.length}"
-                  calculation.calcFields.each do |rf|
-                    emit "  referenced field       ::'#{rf}'"
-                    emit "  referenced field.name  ::'#{rf.name.nil?}'  :: '#{rf.name}'"
-                    emit "  referenced field.uiname::'#{rf.uiname}'"
-                    # if @doGraph
-                    unless rf.uiname.nil?
-                      properties = {'DataSource' => ds.uiname, 'DataSourceReference' => 'local', :source => rf}
-                      refFieldNode  = Twb::Util::Graphnode.new(name: rf.uiname, id: rf.id,   type: rf.type, properties: properties)
-                      @nodes.add refFieldNode
-                      fieldFieldEdge = Twb::Util::Graphedge.new(from: calcFieldNode,  to: refFieldNode, relationship: 'references')
-                      @edges.add fieldFieldEdge
-                    end
-                    # end
-                    referencedFields.add rf.id
-                    refFieldTable = ds.fieldTable(rf.name)
-                    emit "refFieldTable.nil? : #{refFieldTable.nil?}"
-                    unless refFieldTable.nil?
-                      tableID        = refFieldTable + ':::' + ds.uiname
-                      tableName      = "||#{refFieldTable}||"
-                      # if @doGraph
-                        tableNode      = Twb::Util::Graphnode.new(name: tableName,      id: tableID,   type: :DBTable, properties: properties)
-                        @nodes.add tableNode
-                        fieldFieldEdge = Twb::Util::Graphedge.new(from: refFieldNode,  to: tableNode, relationship: 'is a field in')
-                        @edges.add fieldFieldEdge
-                      # end
-                      # fldToDsNode    = tableNode
-                    end
-                    @csvFormulaFields <<  [ 
-                                            @referencedFieldsCount += 1,
-                                            @twb.name,
-                                            @modTime,
-                                            ds.uiname,
-                                            calcField.uiname,
-                                            calculation.formulaFlat,
-                                            calculation.formulaFlatResolved,
-                                            rf.name,
-                                            rf.uiname,
-                                            rf.id,
-                                            refFieldTable
-                                          ]
-                  end # resolvedFields.each do
-              end # if calculation.has_formula
-            end # ds.calculatedFields.each 
-
-            dsRootFields = calculatedFields - referencedFields
-            @referencedFields.merge referencedFields
-            @twbRootFields.merge dsRootFields
-            if @doGraph
-              cypher     @twb.name
-              cypherPy   @twb.name
-            end
-            emit "#######################"
-            #--
-            #-- record calculated fields
-            twbDirCSV = @recordDir.nil? ? nil : @twbDir  
-            emit "@@ record calculated fields  ds: #{ds.uiname}"
-            @csvCalculatedFields.each do |r| 
-              @csvCF << r
-            end
-            #-- record individual formula lines 
-            emit "@@ individual formula lines  ds: #{ds.uiname}"
-            fieldFormulaLines.each do |ffl|
-              @csvCFLs << ffl
-            end
-            #-- record formula-referenced fields 
-            emit "@@ formula-referenced fields ds: #{ds.uiname}"
-            @csvFormulaFields.each do |r| 
-              @csvFF << r
-            end
-            #--
-            return @imageFiles
-          end # def processDataSource
-
-          def emitCalcfield calcField
-            emit "\t FIELD    cap :: #{calcField.caption} "
-            emit "\t         tname:: #{calcField.name}"
-            emit "\t        uiname:: #{calcField.uiname}"
-            emit "\t       formula:: #{calculation.formulaFlat}"
-          end
-
-          def mapTwb 
-            twb        = @twb.name
-            rootFields = @twbRootFields
-            dotStuff    = initDot twb
-            dotFile     = dotStuff[:file]
-            dotFileName = dotStuff[:name]
-            dotFile.puts "\n //  subgraph cluster_1 {"
-            dotFile.puts "   //    color= grey;"
-            dotFile.puts ""
-            edgesAsStrings = SortedSet.new
-            # this two step process coalesces the edges into a unique set, avoiding duplicating the dot
-            # file entries, and can be shrunk when graph edges expose the bits necessary for management by Set
-            emit "\n========================\nLoading Edges\n========================\n  From DC?  Referenced?  Edge \n  %s  %s  %s" % ['--------', '-----------', '-'*45]
-            @edges.each do |e|
-              # don't want to emit edge which is from a Data Connection to a
-              # Calculated Field which is also referenced by another calculated field
-              isFromDC   = e.from.type == :TwbDataConnection
-              isRefField = @referencedFields.include?(e.to.id)
-              edgesAsStrings.add(e.dot) unless isFromDC && isRefField
-              # emit "   ES        #{e.dot}"
-              # emit "   ES  from  #{e.from}"
-              # emit "   ES    to  #{e.to}"
-            end
-            emit "------------------------\n "
-            edgesAsStrings.each do |es|
-              dotFile.puts "        #{es}"
-            end
-            emit "========================\n "
-            dotFile.puts ""
-            dotFile.puts "   // }"
-            dotFile.puts "\n\n  //  4 NODES --------------------------------------------------------------------"
-            @nodes.each do |n|
-              dotFile.puts n.dotLabel
-            end
-            dotFile.puts "\n\n  //  5--------------------------------------------------------------------"
-            emitTypes(      dotFile )
-            closeDot(       dotFile, twb )
-            emit "Rendering DOT file - #{twb}"
-            renderDot(twb,dotFileName,'pdf')
-            renderDot(twb,dotFileName,'png')
-            renderDot(twb,dotFileName,'svg')
-            # emitEdges
-          end
-
-          def cypher twbName
-            if @doGraph
-              cypher = Twb::Util::Cypher.new
-              cypher.fileName = "#{twbName}.calcFields"
-              cypher.nodes = @nodes
-              cypher.edges = @edges
-              cypher.render
-            end
-          end
-
-          def cypherPy twbName
-            if @doGraph
-              cypher = Twb::Util::CypherPython.new
-              cypher.fileName = "#{twbName}.calcFields"
-              cypher.nodes = @nodes
-              cypher.edges = @edges
-              cypher.render
-            end
-          end
-
-          # def graphEdges twb
-            #   # graphFile = File.new(twb + '.cypher', 'w')
-            #   # # graphFile.puts "OKEY DOKE, graphing away"
-            #   # cypherCode = Set.new
-            #   # @edges.each do |edge|
-            #   #   cypherCode.add edge.from.cypherCreate
-            #   #   cypherCode.add edge.to.cypherCreate
-            #   #   cypherCode.add edge.cypherCreate
-            #   # end
-            #   # cypherCode.each do |cc|
-            #   #   graphFile.puts cc
-            #   # end
-            #   # graphFile.puts "\nreturn *"
-            #   # graphFile.close unless graphFile.nil?
-            #   # @imageFiles << File.basename(graphFile)
-          # end
-
-          def emitEdges
-            emit  "  %-15s    %s" % ['type', 'Edge']
-            emit  "  %-15s    %s" % ['-'*15, '-'*35]
-            @edges.each do |edge|
-              emit  "  %-15s    %s" % [edge.from.type, edge.from]
-              emit  "  %-15s    %s" % [edge.to.type,   edge.to]
-              emit  "\n "
-            end
-          end
-
-          def emitTypes dotFile
-            typedNodes = {}
-            dotFile.puts "\n\n  //  2--------------------------------------------------------------------"
-            @edges.each do |edge|
-              emit  "   EDGE  :: #{edge}"
-              loadNodeType typedNodes, edge.from
-              loadNodeType typedNodes, edge.to
-            end
-            typedNodes.each do |type, nodes|
-              # emit  "+++++++++ typedNodes of '#{type}''  "
-              # nodes.each do |node|
-              #   emit  "           -n- #{node}"
-              # end
-              rankSame(dotFile, type, nodes) unless type.eql? 'CalculatedField' # == :CalculatedField
-            end
-            # labelTypes dotFile, edges
-          end
-
-          def loadNodeType set, node
-            type = node.type
-            set[type] = Set.new unless set.include? type
-            set[type].add node
-          end
-
-          @@unrankedTypes = ['CalculationField']
-          def rankSame dotFile, type, nodes
-            return if @@unrankedTypes.include? type.to_s
-            @lines = SortedSet.new
-            nodes.each do |node|
-              @lines << node.id
-            end
-            dotFile.puts "\n  // '#{type}' --------------------------------------------------------------------"
-            dotFile.puts "\n  {rank=same "
-            @lines.each do |line|
-              dotFile.puts "     \"#{line}\""
-            end
-            dotFile.puts "  }"
-          end
-
-          def rankRootFields dotFile, dsRootFields
-            dotFile.puts "\n  // Unreferenced (root) Calculated Fields -----------------------------------------"
-            dotFile.puts "\n  {rank=same "
-            dsRootFields.each do |rf|
-              emit "ROOT FIELD: #{rf.class}  :: #{rf}"
-              dotFile.puts "     \"#{rf}\""
-            end
-            dotFile.puts "  }"
-          end
-
-          def labelTypes dotFile
-            fromTos = Set.new
-            @edges.each do |edge|
-              # fromTos.add "\"Alien Data Source\"  -> \"Alien Data Source\""
-              fromTos.add "\"#{edge.from.type}\""
-              fromTos.add "\"#{edge.to.type}\""
-            end
-            return if fromTos.empty?
-            dotFile.puts "\n  //  3--------------------------------------------------------------------"
-            dotFile.puts '   subgraph cluster_0 {'
-            dotFile.puts '     color=white;'
-            dotFile.puts '     node [shape="box3d"  style="filled" ];'
-            fromTos.each do |ft|
-              dotFile.puts "    #{ft}"
-            end
-            dotFile.puts '   }'
-          end
-
-          def initDot twb
-            dotFileName = docFile("#{twb}#{@@processName}.dot")
-            dotFile = File.open(dotFileName,'w')
-            dotFile.puts @@dotHeader
-            return {:file => dotFile, :name => dotFileName}
-          end
-
-          def closeDot dotFile, twb
-            dotFile.puts ' '
-            dotFile.puts '// -------------------------------------------------------------'
-            dotFile.puts ' '
-            dotFile.puts '   subgraph cluster_1 {'
-            # dotFile.puts '     color=white;'
-            dotFile.puts '     style=invis;'
-            # dotFile.puts '     border=0;'
-            dotFile.puts '     node [border=blue];'
-            dotFile.puts ' '
-            dotFile.puts '     "" [style=invis]'
-            dotFile.puts "     \"Tableau Tools\\nCalculated Fields Map\\nWorkbook '#{twb}'\\n#{Time.new.ctime}\"  [penwidth=0]"
-            # dotFile.puts "     \"Tableau Tools Workbook  Calculated Fields Map\\n#{Time.new.ctime}\"  -> \"\"  [style=invis]"
-            dotFile.puts ' '
-            dotFile.puts '   }'
-            dotFile.puts ' '
-            dotFile.puts '}'
-            dotFile.close
-          end
-
-
-          def renderDot twb, dot, format
-            imageType = '-T' + format
-            imageFile  = './ttdoc/' + twb + @@processName + 'Graph.' + format
-            imageParam = '-o"' + imageFile + '"'
-            emit  "system  #{@@gvDotLocation} #{imageType} #{imageParam} \"#{dot}\""
-                   system "#{@@gvDotLocation} #{imageType} #{imageParam} \"#{dot}\""
-            emit  "           - #{imageFile}"
-            @imageFiles << imageFile
-            return imageFile
-          end
-
-  end #  class
-
-end   # module Analysis
-end   # module Twb