twb 4.4.2 → 4.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8330ec06a3076b01a2e2f6958b630ae2312c74d1fd0fdb6a575d2271ffdb745d
-  data.tar.gz: 7db555e49b52c9f0bc218aff47ab4a1af2b6a03064d5ce5f8fe04ee7323d3b4f
+  metadata.gz: a2c59fcc8781f04283fe5fbbdec7804483082a9bfabf792b29846c60ad7fe5b2
+  data.tar.gz: 1567f77448271fde58e8db2e8c49ab6beb6b52c23068ef543d2a3c24ec6aecd0
 SHA512:
-  metadata.gz: 801ed0a3f287f170f1d6f477641fa9c8ee761eb879a317ec779be9a9c4886a1f4dd78145b26b9e7dec9534d353ad583a3e4ceaaf8d9cf3f0781be657c364c19c
-  data.tar.gz: 22e0fc10a913f1fe27a0aac56c2230d35d8483dfeeea7ee8a8d28d1d8b67c05073eb1f925b5abda8e3dd8de98d1c704b0b1b93f242b3ad73b1aafaaf7987a9b9
+  metadata.gz: d96aae6accabaffe7abf3986c2e195b630a0fbd236efd51a7c0b1460c67863e84a3b2c6b657ab7d0b1e723fb51db8df533f5c4619353925a7a9207b3f6fac37b
+  data.tar.gz: 48e7fefd8c1ac5529a7bcae218c735bfb4eb86201014d88463840f045b842c5952cf151f449f0931014f4da304b12f2c878a94fd19b171c3332378e92fcb411f

data/lib/twb.rb

@@ -70,5 +70,5 @@ require_relative 'twb/analysis/Sheets/dashsheetsanalyzer'
 # Represents Tableau Workbooks, their contents, and classes that analyze and manipulate them.
 #
 module Twb
-  VERSION = '4.4.2'
+  VERSION = '4.4.4'
 end

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

@@ -26,26 +26,28 @@ module Analysis
     attr_accessor :localEmit
 
     def initialize(**args)
-      #-- TODO move @csvAdd * #csvMode resolution to TabTool
-      @args = args
-      @csvAdd  = args[:csvMode] == :add
-      @csvMode = @csvAdd ? 'a' : 'w'
-      # emit "@csvAdd : #{@csvAdd}" 
-      # emit "@csvMode: #{@csvMode}" 
-      #--
+      @args      = args
+      @recordDir = !@args.nil? && @args[:recordDir] == true
+      @csvAdd    = args[:csvMode] == :add
+      @csvMode   = @csvAdd ? 'a' : 'w'
       init
-      @funcdoc     = {:class=>self.class, :blurb=>'Analyze Dashboard Worksheets', :description=>'Identifies the Worksheets present in Dashboards.',}
+      @funcdoc   = {:class=>self.class, :blurb=>'Analyze Dashboard Worksheets', :description=>'Identifies the Worksheets present in Dashboards.',}
       #--
       docFileName     = docFile('DashboardSheets.csv')
       @dashSheetsCSV  = CSV.open(docFileName,@csvMode)
       unless @csvAdd
-        @dashSheetsCSV  << ['Workbook','Workbook Dir','Modified','Dashboard','Worksheet','Hidden','Visible']
+        if @recordDir
+          @dashSheetsCSV  << ['Workbook','Modified','Dashboard','Worksheet','Hidden','Visible', 'Workbook Dir']
+        else
+          @dashSheetsCSV  << ['Workbook','Modified','Dashboard','Worksheet','Hidden','Visible'                ]
+        end
       end
       addDocFile @dashSheetsCSV, docFileName, "Workbooks, Dashboards, and their Worksheets"
       #--
       @twbCount    = 0
       @dashCount   = 0
       @sheetCount  = 0
+      @recNum      = 0
     end
 
     def metrics
@@ -75,11 +77,22 @@ module Analysis
         dash.worksheets.each do |sheet|
           @sheetCount += 1
           emit "SHEET: #{sheet.name}"
-          @dashSheetsCSV  << [@twbName, @twbDir, @modTime, dash.name, sheet.name, sheet.hidden, sheet.visible ]
+          recordCSV [@twbName, @twbDir, @modTime, dash.name, sheet.name, sheet.hidden, sheet.visible ]
         end
       end
     end
 
+    private
+
+      def recordCSV record
+        numberedRec = [@recNum+=1] + record
+        if @recordDir
+          @dashSheetsCSV  << numberedRec.push(@twbDir)
+        else
+          @dashSheetsCSV  << numberedRec
+        end
+      end
+
   end #class SheetFieldsAnalyzer
 
 end # module Analysis

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

@@ -43,18 +43,14 @@ module Analysis
 
     def initialize(**args)
       @args      = args
-      @csvAdd    = args[:csvMode] == :add
       @recordDir = !@args.nil? && @args[:recordDir] == true
-      # puts "        args: #{@args}"
-      # puts "  @recordDir: #{@recordDir}"
-      # @csvMode = @csvAdd ? 'a' : 'w'
-      # emit true, "@csvAdd : #{@csvAdd}" 
-      # emit true, "@csvMode: #{@csvMode}" 
+      @csvAdd    = args[:csvMode] == :add
+      @csvMode   = @csvAdd ? 'a' : 'w'
       init
-      @funcdoc    = {:class=>self.class, :blurb=>'Analyze Worksheet Fields', :description=>nil,}
+      @funcdoc   = {:class=>self.class, :blurb=>'Analyze Worksheet Fields', :description=>nil,}
       #--
-      docFileName = docFile('WorksheetFields.csv')
-      @sheetFieldsCSV  = CSV.open(docFileName,'w')
+      docFileName      = docFile('WorksheetFields.csv')
+      @sheetFieldsCSV  = CSV.open(docFileName,@csvMode)
       unless @csvAdd
         if @recordDir
           @sheetFieldsCSV  << ['Rec #', 'Workbook','Worksheet','Data Source','Data Source (tech)','Field','Field (tech)','Usage','Usage - code','Workbook Dir']
@@ -92,74 +88,30 @@ module Analysis
     def parseSheets
       @worksheets  = @twb.worksheets
       @worksheets.each do |sheet|
-        @sheet     = sheet.name
-        @sheetCnt += 1
-        emit "SHEET: #{@sheet}"
+        @sheetName  = sheet.name
+        @sheetCnt  += 1
+        emit "SHEET: #{@sheetName}"
         showFields sheet unless sheet.datasourceFields.nil?
       end
     end
 
     def showFields sheet
+      @sheetFields = Hash.new { |ds,fields| ds[fields] = Set.new }
+      # recordCSV [@twb.name, @sheetName, nil, nil, nil, nil, nil]
+      puts "Sheet: #{@sheetName}"
       recordDBFields       sheet
       recordRCFields       sheet.rowFields, :row
       recordRCFields       sheet.colFields, :column
       recordEncodedFields  sheet
       recordFilterFields   sheet
       recordPageFields     sheet
-      recordSlicesFields   sheet
       recordDSFilterFields sheet
-    end
-
-    def recordPageFields sheet
-      sheet.pageFields.each do |pfield|
-        ds = @twb.datasource pfield.dataSource
-        fuiname = ds.fieldUIName pfield.name
-        # if @recordDir
-        #   @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, ds.uiname, ds.name, fuiname, pfield.name, 'page', ftc('filter'), @twb.dir]
-        # else
-        #   @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, ds.uiname, ds.name, fuiname, pfield.name, 'page', ftc('filter')          ]
-        # end
-        recordCSV [@twb.name, @sheet, ds.uiname, ds.name, fuiname, pfield.name, 'page', ftc('page')]
-      end
-    end
-
-    def recordFilterFields sheet
-      filters = sheet.filters
-      filters.each do |filter|
-        dsName   = filter.dataSource.name
-        dsUIName = filter.dataSource.uiname
-        # puts "Filter field: #{filter.dataSource.name}  ui:'#{}'"
-        # if @recordDir
-        #   @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, dsUIName, dsName, filter.uiname, filter.name, 'filter', ftc('filter'), @twb.dir]
-        # else
-        #   @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, dsUIName, dsName, filter.uiname, filter.name, 'filter', ftc('filter')          ]
-        # end
-        recordCSV [@twb.name, @sheet, dsUIName, dsName, filter.uiname, filter.name, 'filter', ftc('filter')]
-      end
-    end
-
-    def recordDSFilterFields sheet
-      sheet.slicesFields.each do |field|
-          dsName   = field.dataSource
-          ds       = @twb.datasource dsName
-          dsUIName = ds.uiname
-          ds.filters.each do |filter|
-            recordCSV [@twb.name, @sheet, dsUIName, dsName, filter.uiname, filter.name, 'dsfilter', ftc('dsfilter')]
-          end
-      end
+      recordSlicesFields   sheet
     end
 
     def recordDBFields sheet
       fields = sheet.datasourceFields
       emit "def recordDBFields sheet: #{sheet.name} #FIELDS: #{fields.length}"
-      if fields.nil?
-        # if @recordDir
-        #   @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, nil, nil, nil, nil, nil, @twb.dir]
-        # else
-        #   @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, nil, nil, nil, nil, nil]
-        # end
-        recordCSV [@twb.name, @sheet, nil, nil, nil, nil, nil]
-      end
       fields.each do |dsName, dsfields|
         ds = @twb.datasource dsName
         emit "      ds: #{dsName}"
@@ -170,32 +122,24 @@ module Analysis
            emit "       f: #{sheetField}"
            emit "       c: #{sheetField.class}"
            fuiName = ds.fieldUIName sheetField #Fields[sheetField]
-           # @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, ds.uiname, dsName, sheetField.uiname, sheetField.name, 'DB ref', ftc('DB ref')]
-           recordCSV [@twb.name, @sheet, ds.uiname, dsName, sheetField.uiname, sheetField.name, 'DB ref', ftc('DB ref')]
-           # emit true, "        : #{dsFields[field].class}"
+           recordCSV [@twb.name, @sheetName, ds.uiname, dsName, sheetField.uiname, sheetField.name, 'DB ref', ftc('DB ref')]
         end
       end
     end
 
     def recordRCFields fields, usage
       emit "def recordRCFields #fields: #{fields.length}  \t #{fields}"
-      if fields.nil?
-        # @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, nil, nil, nil, nil, nil]
-        recordCSV [@twb.name, @sheet, nil, nil, nil, nil, nil]
-      else
-        fields.each do |cf|
-          emit "coded field: #{cf}"
-          fldName = cf.name
-          dsName  = cf.dataSource
-          ds      = @twb.datasource dsName
-          emit "DATASOURCE : #{ds.class} "  #{ }" #{ds}"
-          fuiName = ds.fieldUIName cf.name
-          emit "      ds: #{dsName}"
-          emit "        - #{ds.uiname}"
-          emit "        : #{ds.class}"
-          # @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, ds.uiname, dsName, fuiName, fldName, usage, ftc(usage)]
-          recordCSV [@twb.name, @sheet, ds.uiname, dsName, fuiName, fldName, usage, ftc(usage)]
-        end
+      fields.each do |cf|
+        emit "coded field: #{cf}"
+        fldName = cf.name
+        dsName  = cf.dataSource
+        ds      = @twb.datasource dsName
+        emit "DATASOURCE : #{ds.class} "  #{ }" #{ds}"
+        fuiName = ds.fieldUIName cf.name
+        emit "      ds: #{dsName}"
+        emit "        - #{ds.uiname}"
+        emit "        : #{ds.class}"
+        recordCSV [@twb.name, @sheetName, ds.uiname, dsName, fuiName, fldName, usage, ftc(usage)]
       end
     end
 
@@ -206,23 +150,56 @@ module Analysis
             dsName  = field.dataSource
             ds      = @twb.datasource dsName
             fuiName = ds.fieldUIName field.name
-            # @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, ds.uiname, dsName, fuiName, field.name, type, ftc(type)]
-            recordCSV [@twb.name, @sheet, ds.uiname, dsName, fuiName, field.name, type, ftc(type)]
+            recordCSV [@twb.name, @sheetName, ds.uiname, dsName, fuiName, field.name, type, ftc(type)]
           end
         end
       end
     end #def recordEncodedFields
 
+    def recordFilterFields sheet
+      filters = sheet.filters
+      filters.each do |filter|
+        dsName   = filter.dataSource.name
+        dsUIName = filter.dataSource.uiname
+        recordCSV [@twb.name, @sheetName, dsUIName, dsName, filter.uiname, filter.name, 'filter', ftc('filter')]
+      end
+    end
+
+    def recordPageFields sheet
+      sheet.pageFields.each do |pfield|
+        ds = @twb.datasource pfield.dataSource
+        fuiname = ds.fieldUIName pfield.name
+        recordCSV [@twb.name, @sheetName, ds.uiname, ds.name, fuiname, pfield.name, 'page', ftc('page')]
+      end
+    end
+
+    def recordDSFilterFields sheet
+      sheet.slicesFields.each do |field|
+          dsName   = field.dataSource
+          ds       = @twb.datasource dsName
+          dsUIName = ds.uiname
+          ds.filters.each do |filter|
+            recordCSV [@twb.name, @sheetName, dsUIName, dsName, filter.uiname, filter.name, 'dsfilter', ftc('dsfilter')]
+          end
+      end
+    end
+
     def recordSlicesFields sheet
-      # puts "recordSlicesFields"
-      unless sheet.slicesFields.nil?
-        sheet.slicesFields.each do |field|
-          dsName  = field.dataSource
-          ds      = @twb.datasource dsName
-          fuiName = ds.fieldUIName field.name
-          recordCSV [@twb.name, @sheet, ds.uiname, dsName, fuiName, field.name, 'slice', ftc('slice')]
+      sheet.slicesFields.each do |field|
+        dsName   = field.dataSource
+        ds       = @twb.datasource dsName
+        dsuiname = ds.uiname
+        fuiName  = ds.fieldUIName field.name
+        recorded = @sheetFields.key?(dsuiname) && @sheetFields[dsuiname].include?(fuiName)
+        puts "      # #{@sheetFields.inspect}"
+        puts "      - %-6s  %-25s  -> %-s" % [recorded, dsuiname, fuiName]
+        unless recorded
+          recordCSV [@twb.name, @sheetName, dsuiname, dsName, fuiName, field.name, 'slice', ftc('slice')]
+          puts "      - recorded"
         end
+        puts "--"
       end
+      puts "\n "
     end
 
     def recordCSV record
@@ -232,6 +209,7 @@ module Analysis
       else
         @sheetFieldsCSV  << numberedRec
       end
+      @sheetFields[record[2]] << record[4]
     end
 
     def ftc type   # ftc : abbr for fieldTypeCode, for brevity

data/lib/twb/analysis/Sheets/sheetfiltersanalyzer.rb

@@ -29,14 +29,12 @@ module Analysis
       @args      = args
       @recordDir = !@args.nil? && @args[:recordDir] == true
       @csvAdd    = args[:csvMode] == :add
-      # @csvMode   = @csvAdd ? 'a' : 'w'
-      # emit "@csvAdd : #{@csvAdd}" 
-      # emit "@csvMode: #{@csvMode}" 
+      @csvMode   = @csvAdd ? 'a' : 'w'
       init
-      @funcdoc     = {:class=>self.class, :blurb=>'Analyze Worksheet Filters', :description=>'Documents Quick Filters and the values they employ, if any. Work in progess.',}
+      @funcdoc   = {:class=>self.class, :blurb=>'Analyze Worksheet Filters', :description=>'Documents Quick Filters and the values they employ, if any. Work in progess.',}
       #--
-      docFileName  = docFile('WorksheetFilters.csv')
-      @sheetFieldsCSV  = CSV.open( docFileName  ,'w')
+      docFileName      = docFile('WorksheetFilters.csv')
+      @sheetFieldsCSV  = CSV.open( docFileName,@csvMode)
       unless @csvAdd
         if @recordDir
           @sheetFieldsCSV  << ['Rec #','Workbook','Worksheet','Filter Type','Operation','Data Source','Field','Value','Alias', 'Alias?','Operation Mode','Include Null?','Kind','Workbook Dir']
@@ -91,14 +89,14 @@ module Analysis
 
     private
 
-    def recordCSV record
-      numberedRec = [@recNum+=1] + record
-      if @recordDir
-        @sheetFieldsCSV  << numberedRec.push(@twbDir)
-      else
-        @sheetFieldsCSV  << numberedRec
+      def recordCSV record
+        numberedRec = [@recNum+=1] + record
+        if @recordDir
+          @sheetFieldsCSV  << numberedRec.push(@twbDir)
+        else
+          @sheetFieldsCSV  << numberedRec
+        end
       end
-    end
 
 end # class SheetFiltersAnalyzerA
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twb
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  version: 4.4.4
 platform: ruby
 authors:
 - Chris Gerrard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: creek