twb 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 812d81d15bb4830be9ebb74ff7542bec21ba2fd3e2a4ecf6326ed1cc8be8c523
-  data.tar.gz: 6802c24ee1c8477c718b248c3e81a5d46edcabcaa23f5051eec303efd7bbe24c
+  metadata.gz: 8330ec06a3076b01a2e2f6958b630ae2312c74d1fd0fdb6a575d2271ffdb745d
+  data.tar.gz: 7db555e49b52c9f0bc218aff47ab4a1af2b6a03064d5ce5f8fe04ee7323d3b4f
 SHA512:
-  metadata.gz: 6277f3d28b0b4810e0ac370fbd282048a6278bb71415bd40a6426ce4f47187a0feead4d85280f752e080fe4355127bfa651233d087ac9eeb04a8190382f854d1
-  data.tar.gz: 7b56029d3fee19cb4549d1433ff55201e3cf787abaecc40c9cf3d5b6cbbcda6cd49e8fcf2316f7543705b598a3d148270d94890fe3f92b93ac645fa477f00eac
+  metadata.gz: 801ed0a3f287f170f1d6f477641fa9c8ee761eb879a317ec779be9a9c4886a1f4dd78145b26b9e7dec9534d353ad583a3e4ceaaf8d9cf3f0781be657c364c19c
+  data.tar.gz: 22e0fc10a913f1fe27a0aac56c2230d35d8483dfeeea7ee8a8d28d1d8b67c05073eb1f925b5abda8e3dd8de98d1c704b0b1b93f242b3ad73b1aafaaf7987a9b9

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.1'
+  VERSION = '4.4.2'
 end

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

@@ -82,10 +82,11 @@ module Analysis
 DOTHEADER
 
       def initialize(**args)
+          @args = args
           @csvAdd  = args[:csvMode] == :add
           @csvMode = @csvAdd ? 'a' : 'w'
-          emit true, "@csvAdd : #{@csvAdd}" 
-          emit true, "@csvMode: #{@csvMode}" 
+          # emit true, "@csvAdd : #{@csvAdd}" 
+          # emit true, "@csvMode: #{@csvMode}" 
           init
           @funcdoc = {:class=>self.class, :blurb=>'Analyze Calculated Fields', :description=>'Calculated fields can be complex, this tool provides robust coverage.',}
           #-- CSV records collectors

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

@@ -24,30 +24,14 @@ module CalculatedFields
 
     attr_reader :docFileName
 
-    def initialize
+    def initialize(**args)
+      @args = args
       init
+      puts "RECORD DOC: "
       @funcdoc = {:class=>self.class, :blurb=>'Create  Markdown files (one per Workbook) documenting Calculated Fields', :description=>'Create  Markdown files (one per Workbook) documenting Calculated Fields' }
       @metrics = {}
     end
 
-    def kramdownAvailable
-      gem_name, *gem_ver_reqs = 'kramdown', '~> 1.17.0'
-      gdep = Gem::Dependency.new(gem_name, *gem_ver_reqs)
-      # find latest that satisifies
-      found_gspec = gdep.matching_specs.max_by(&:version)
-      # instead of using Gem::Dependency, you can also do:
-      # Gem::Specification.find_all_by_name(gem_name, *gem_ver_reqs)
-          # if found_gspec
-          #   puts "Requirement '#{gdep}' already satisfied by #{found_gspec.name}-#{found_gspec.version}"
-          # else
-          #   puts "Requirement '#{gdep}' not satisfied; could be installing..."
-          #   # reqs_string will be in the format: "> 1.0, < 1.2"
-          #   # reqs_string = gdep.requirements_list.join(', ')
-          #   # multi-arg is safer, to avoid injection attacks
-          #   # system('gem', 'install', gem_name, '-v', reqs_string)
-          # end
-    end
-
     def processTWB twb
       # twb = File.basename(twb)
       @twb = twb #Twb::Workbook.new twb
@@ -103,6 +87,26 @@ module CalculatedFields
       finis
     end    # def processTwb twb
 
+    private
+
+    def kramdownAvailable
+      gem_name, *gem_ver_reqs = 'kramdown', '~> 1.17.0'
+      gdep = Gem::Dependency.new(gem_name, *gem_ver_reqs)
+      # find latest that satisifies
+      found_gspec = gdep.matching_specs.max_by(&:version)
+      # instead of using Gem::Dependency, you can also do:
+      # Gem::Specification.find_all_by_name(gem_name, *gem_ver_reqs)
+          # if found_gspec
+          #   puts "Requirement '#{gdep}' already satisfied by #{found_gspec.name}-#{found_gspec.version}"
+          # else
+          #   puts "Requirement '#{gdep}' not satisfied; could be installing..."
+          #   # reqs_string will be in the format: "> 1.0, < 1.2"
+          #   # reqs_string = gdep.requirements_list.join(', ')
+          #   # multi-arg is safer, to avoid injection attacks
+          #   # system('gem', 'install', gem_name, '-v', reqs_string)
+          # end
+    end
+
   end # class MarkdownEmitter
 
 end   # nodule CalculatedFields

data/lib/twb/analysis/DataSources/dataSourceOriginsAnalyzer.rb

@@ -28,11 +28,12 @@ module Analysis
     attr_accessor :localEmit
 
     def initialize(**args)
+      @args = args
       #-- TODO move @csvAdd * #csvMode resolution to TabTool
       @csvAdd  = args[:csvMode] == :add
       @csvMode = @csvAdd ? 'a' : 'w'
-      emit "@csvAdd : #{@csvAdd}" 
-      emit "@csvMode: #{@csvMode}" 
+      # emit "@csvAdd : #{@csvAdd}" 
+      # emit "@csvMode: #{@csvMode}" 
       #--
       init
       @funcdoc    = {:class=>self.class, :blurb=>'Analyze Data Source Origins, i.e. where the data comes from', :description=>nil,}

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

@@ -28,6 +28,7 @@ module Analysis
     attr_reader   :twbname, :twbcount
 
     def initialize(**args)
+      @args = args
       #-- TODO move @csvAdd * #csvMode resolution to TabTool
       @csvAdd  = args[:csvMode] == :add
       @csvMode = @csvAdd ? 'a' : 'w'

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

@@ -27,10 +27,11 @@ module Analysis
 
     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}" 
+      # emit "@csvAdd : #{@csvAdd}" 
+      # emit "@csvMode: #{@csvMode}" 
       #--
       init
       @funcdoc     = {:class=>self.class, :blurb=>'Analyze Dashboard Worksheets', :description=>'Identifies the Worksheets present in Dashboards.',}

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

@@ -25,34 +25,42 @@ module Analysis
 
     @@fieldTypeCodes = { 'DB ref'  => 'Db',
                          'color'   => 'Clr',
-                         'filter'  => 'F',
-                         'lod'     => 'L',
-                         'page'    => 'Pg',
-                         'path'    => 'Pt',
-                         'shape'   => 'Sh',
-                         'size'    => 'Sz',
-                         'text'    => 'Tx',
-                         'tooltip' => 'Tt',
-                         :column   => 'Cm',
-                         :row      => 'R',
+                         'filter'  => 'Flt',
+                         'lod'     => 'LoD',
+                         'page'    => 'Pge',
+                         'path'    => 'Pth',
+                         'shape'   => 'Shp',
+                         'size'    => 'Siz',
+                         'text'    => 'Tex',
+                         'tooltip' => 'TTp',
+                         :column   => 'Clm',
+                         :row      => 'Row',
+                         'slice'   => 'Slc',
                        }
 
 
     attr_accessor :localEmit
 
     def initialize(**args)
-      @csvAdd  = args[:csvMode] == :add
-      @csvMode = @csvAdd ? 'a' : 'w'
-      emit true, "@csvAdd : #{@csvAdd}" 
-      emit true, "@csvMode: #{@csvMode}" 
-      
+      @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}" 
       init
       @funcdoc    = {:class=>self.class, :blurb=>'Analyze Worksheet Fields', :description=>nil,}
       #--
       docFileName = docFile('WorksheetFields.csv')
       @sheetFieldsCSV  = CSV.open(docFileName,'w')
       unless @csvAdd
-        @sheetFieldsCSV  << ['Rec #', 'Workbook','Worksheet','Data Source','Data Source (tech)','Field','Field (tech)','Usage','Usage - code']
+        if @recordDir
+          @sheetFieldsCSV  << ['Rec #', 'Workbook','Worksheet','Data Source','Data Source (tech)','Field','Field (tech)','Usage','Usage - code','Workbook Dir']
+        else
+          @sheetFieldsCSV  << ['Rec #', 'Workbook','Worksheet','Data Source','Data Source (tech)','Field','Field (tech)','Usage','Usage - code'               ]
+        end
       end
       addDocFile @sheetFieldsCSV, docFileName, "Workbooks, Worksheets, and the Sheets' Data Sources and Fields"
       #--
@@ -92,37 +100,65 @@ module Analysis
     end
 
     def showFields sheet
-      showDBFields  sheet
-      showRCFields  sheet.rowFields, :row
-      showRCFields  sheet.colFields, :column
-      showEncodedFields sheet
-      showFilterFields  sheet
-      showPageFields    sheet
+      recordDBFields       sheet
+      recordRCFields       sheet.rowFields, :row
+      recordRCFields       sheet.colFields, :column
+      recordEncodedFields  sheet
+      recordFilterFields   sheet
+      recordPageFields     sheet
+      recordSlicesFields   sheet
+      recordDSFilterFields sheet
     end
 
-    def showPageFields sheet
+    def recordPageFields sheet
       sheet.pageFields.each do |pfield|
         ds = @twb.datasource pfield.dataSource
-        fuiname = ds.fieldUIName pfield.name 
-        @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, ds.uiname, ds.name, fuiname, pfield.name, 'page', ftc('filter')]
+        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 showFilterFields sheet
+    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:'#{}'"
-        @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, dsUIName, dsName, filter.uiname, filter.name, 'filter', ftc('filter')]
+        # 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 showDBFields sheet
+    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
+    end
+
+    def recordDBFields sheet
       fields = sheet.datasourceFields
-      emit "def showDBFields sheet: #{sheet.name} #FIELDS: #{fields.length}"
+      emit "def recordDBFields sheet: #{sheet.name} #FIELDS: #{fields.length}"
       if fields.nil?
-        @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, nil, nil, nil, nil, 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
@@ -134,16 +170,18 @@ 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')]
+           # @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}"
         end
       end
     end
 
-    def showRCFields fields, usage
-      emit "def showRCFields #fields: #{fields.length}  \t #{fields}"
+    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]
+        # @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}"
@@ -155,23 +193,46 @@ module Analysis
           emit "      ds: #{dsName}"
           emit "        - #{ds.uiname}"
           emit "        : #{ds.class}"
-          @sheetFieldsCSV  << [@recNum+=1, @twb.name, @sheet, ds.uiname, dsName, fuiName, fldName, usage, ftc(usage)]
+          # @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
       end
     end
 
-    def showEncodedFields sheet
+    def recordEncodedFields sheet
       unless sheet.encodedFields.nil?
         sheet.encodedFields.each do |type,fields|
           fields.each do |field|
             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)]
+            # @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)]
           end
         end
       end
-    end #def showEncodedFields
+    end #def recordEncodedFields
+
+    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')]
+        end
+      end
+    end
+
+    def recordCSV record
+      numberedRec = [@recNum+=1] + record
+      if @recordDir
+        @sheetFieldsCSV  << numberedRec.push(@twb.dir)
+      else
+        @sheetFieldsCSV  << numberedRec
+      end
+    end
 
     def ftc type   # ftc : abbr for fieldTypeCode, for brevity
       @@fieldTypeCodes[type].nil? ? type : @@fieldTypeCodes[type]

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

@@ -26,22 +26,29 @@ module Analysis
     attr_accessor :localEmit
 
     def initialize(**args)
-      @csvAdd  = args[:csvMode] == :add
-      @csvMode = @csvAdd ? 'a' : 'w'
-      emit true, "@csvAdd : #{@csvAdd}" 
-      emit true, "@csvMode: #{@csvMode}" 
+      @args      = args
+      @recordDir = !@args.nil? && @args[:recordDir] == true
+      @csvAdd    = args[:csvMode] == :add
+      # @csvMode   = @csvAdd ? 'a' : 'w'
+      # emit "@csvAdd : #{@csvAdd}" 
+      # emit "@csvMode: #{@csvMode}" 
       init
       @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')
+      @sheetFieldsCSV  = CSV.open( docFileName  ,'w')
       unless @csvAdd
-        $sheetFieldsCSV  << ['Workbook','Workbook Dir','Worksheet','Filter Type','Operation','Data Source','Field','Value','Alias', 'Alias?','Operation Mode','Include Null?','Kind']
+        if @recordDir
+          @sheetFieldsCSV  << ['Rec #','Workbook','Worksheet','Filter Type','Operation','Data Source','Field','Value','Alias', 'Alias?','Operation Mode','Include Null?','Kind','Workbook Dir']
+        else
+          @sheetFieldsCSV  << ['Rec #','Workbook','Worksheet','Filter Type','Operation','Data Source','Field','Value','Alias', 'Alias?','Operation Mode','Include Null?','Kind']
+        end
       end
-      addDocFile $sheetFieldsCSV, docFileName, "Workbooks, Worksheets and the sheets' Quick Filters"
+      addDocFile @sheetFieldsCSV, docFileName, "Workbooks, Worksheets and the sheets' Quick Filters"
       #--
       @sheetCount  = 0
       @filterCount = 0
+      @recNum      = 0
     end
 
     def metrics
@@ -68,20 +75,31 @@ module Analysis
         filters.each do |filter|
           filter.emit "-----------------------------\nWORKSHEET:: #{sheet.name}\n-----------------------------"
           if filter.values.empty?
-          # $sheetFieldsCSV  << ['Workbook','Worksheet','Filter Type','Operation'     ,'Data Source','Field','Value','Alias', 'Alias?']
-            $sheetFieldsCSV  << [@twbName, @twbDir, sheet.name, filter.type  ,filter.inexclude, filter.dataSource.uiname, filter.uiname,nil,nil,nil,filter.inexMode,filter.includeNull,filter.kind]
+          # @sheetFieldsCSV  << ['Workbook','Worksheet','Filter Type','Operation'     ,'Data Source','Field','Value','Alias', 'Alias?']
+            recordCSV [@twbName, sheet.name, filter.type, filter.inexclude, filter.dataSource.uiname, filter.uiname, nil,   nil,    nil,  filter.inexMode, filter.includeNull, filter.kind]
           end
           filter.values.each do |valueMap|
             value  = valueMap[:value]
             valias = valueMap[:alias]
             same   = value.eql? valias
             emit "RECORDING FILTER VALUES:  %-35s  --  %-25s  same? %s " % [value,valias,same]
-            $sheetFieldsCSV  << [@twbName, @twbDir, sheet.name, filter.type  ,filter.inexclude, filter.dataSource.uiname, filter.uiname, value, valias, same,filter.inexMode,filter.includeNull,filter.kind]
+            recordCSV [@twbName, sheet.name, filter.type, filter.inexclude, filter.dataSource.uiname, filter.uiname, value, valias, same, filter.inexMode, filter.includeNull, filter.kind]
           end
         end
       end
     end
 
+    private
+
+    def recordCSV record
+      numberedRec = [@recNum+=1] + record
+      if @recordDir
+        @sheetFieldsCSV  << numberedRec.push(@twbDir)
+      else
+        @sheetFieldsCSV  << numberedRec
+      end
+    end
+
 end # class SheetFiltersAnalyzerA
 
 end # module Twb

data/lib/twb/codedfield.rb

@@ -27,10 +27,10 @@ module Twb
     attr_reader :name, :techCode, :function, :rawCode 
 
     def initialize code
-     #puts "\n\nCodedField ::  #{code}"
+      # puts "...CodedField :: #{code}"
       @rawCode = code
-      trimmed  = code.gsub(/^['"]|['"]$/,'').gsub(/^\[|\]$/,'')
-      # puts "trimmed: #{trimmed}"
+      trimmed  = code.gsub(/^['"]|['"]$/,'').gsub(/^\[|\]$/,'').gsub(/:[0-9]+$/,'')
+      # puts "      trimmed :: #{trimmed}"
       parts    = trimmed.split('].[')
      #puts "Field: #{code}  parts: #{parts.length} - #{parts.inspect}"
      #puts "   p1: #{parts[0]}"

data/lib/twb/datasource.rb

@@ -70,7 +70,7 @@ module Twb
       @uiname   = @caption.nil? ? @name : @caption
       # puts "DATASOURCE: #{@uiname}" 
       processConnection
-      processFilters
+      # processFilters
       loadTableFields
       loadFieldUINames
       return self
@@ -503,10 +503,16 @@ module Twb
       end
     end
 
+    def filters
+      @filters ||= loadFilters
+    end
+
     def groups
       @groups ||= loadGroups
     end
 
+    private
+
     def loadGroups
       @groups = []
       groupNodes = @node.xpath('.//group')
@@ -517,25 +523,37 @@ module Twb
       return @groups
     end
 
-    def processFilters
-      if @filters.nil?
-        @filters = {}
-        fnodes = @node.xpath('./filter')
-        fnodes.each do |fn|
-          columnN = fn.attribute('column')
-          unless columnN.nil?
-            memberNodes = fn.xpath('.//groupfilter/@member')
-            unless memberNodes.nil?
-              members = []
-              memberNodes.each do |m|
-                members.push m.text
-              end
-              @filters[columnN.text] = members
-            end
-          end 
-        end
+    # def processFilters
+    def loadFilters
+      @filters = []
+      sharedFilters = @workbook.node.xpath('./shared-views/shared-view[@name="excel.41269.481293159719"]//filter')
+      sharedFilters.each do |sf|
+        filter = QuickFilter.new(sf,@workbook)
+        @filters << filter
       end
-    end
+      return @filters
+    end
+
+    #     @filters << 
+    #   if @filters.nil?
+    #     @filters = {}
+    #     fnodes = @node.xpath('./filter')
+    #     fnodes.each do |fn|
+    #       columnN = fn.attribute('column')
+    #       unless columnN.nil?
+    #         memberNodes = fn.xpath('.//groupfilter/@member')
+    #         unless memberNodes.nil?
+    #           members = []
+    #           memberNodes.each do |m|
+    #             members.push m.text
+    #           end
+    #           @filters[columnN.text] = members
+    #         end
+    #       end 
+    #     end
+    #   end
+    # end
+
 
   end # class DataSource
 

data/lib/twb/quickfilter.rb

@@ -86,6 +86,10 @@ module Twb
       end
     end # def initialize
 
+    def context?
+      @iscontext ||= @node['context']
+    end
+
     def to_s
         "%s => %s" % [uiname, values]
     end

data/lib/twb/worksheet.rb

@@ -28,7 +28,7 @@ module Twb
 
     attr_reader   :node,   :name,      :datasourcenames, :datasources
     attr_reader   :panesCount
-    attr_reader   :fields, :rowFields, :colFields, :paneFields, :datasourceFields, :pageFields, :encodedFields
+    attr_reader   :fields, :rowFields, :colFields, :paneFields, :datasourceFields, :pageFields, :encodedFields, :slicesFields
     attr_reader   :filters
     attr_reader   :tooltip
     attr_accessor :hidden, :visible
@@ -38,8 +38,7 @@ module Twb
       @node = sheetNode
       @name = @node['name']
       emit "########################## Worksheet initialize name: #{@name}"
-      
-      loadDataSourceNames
+      loadDataSources
       loadFields
       return self
     end
@@ -48,15 +47,6 @@ module Twb
         @id ||= @name.hash
     end
 
-    def loadDataSourceNames
-      @datasources = {}
-      dsNodes = @node.xpath('.//datasource')
-      dsNodes.each do |dsn|
-        ds = WorksheetDataSource.new dsn
-        @datasources[ds.name] = ds
-      end
-    end
-
     def workbook
       @workbook ||= @node.at_xpath('/').root
     end
@@ -78,6 +68,10 @@ module Twb
       # @fields.nil? ? loadFields : @fields
     end
 
+    def slicesFields
+      @slicesFields ||= loadSlicesFields
+    end
+
     def filters
       @filters ||= loadFilters
     end
@@ -94,6 +88,36 @@ module Twb
       @visible ||= !hidden
     end
 
+    def addDSFields fields, usage
+      fields.each do  
+      end
+    end
+
+    def panesCount
+      @panesCount ||= @node.xpath('.//panes/pane').length
+    end
+
+    def paneFields
+      @paneFields ||= loadPaneFields
+    end
+
+    def pageFields
+      @pageFields ||= loadpageFields
+    end
+
+    def datasourcenames
+      @datasources.keys
+    end
+
+    private
+
+    # def resolveHidden
+    #   xpath = "//windows/window[@name=\"#{@name}\"]"
+    #   emit true, "resolveHidden: #{xpath}"
+    #   windowNode = @node.at_xpath(xpath)
+    #   @hidden    = !windowNode.nil? && 'true' == windowNode['hidden']
+    # end
+
     def loadFields
       # puts "WORKSHEET loadFields"
       @fields = {}
@@ -117,43 +141,29 @@ module Twb
       loadFieldEncodings
     end
 
-    def loadFieldEncodings
-      @encodedFields = Hash.new { |h,k| h[k] = [] }
-      enodes = @node.xpath('.//table/panes/pane/encodings')
-      enodes.each do |enode|
-        enode.children.each do |child|
-          unless child['column'].nil?
-            @encodedFields[child.name] << CodedField.new(child['column'])
-          end
-        end
-      end
-      @encodedFields.each do |type, fields|
-        @fields[type] = fields
-      end
+    def loadPaneFields
+      @paneFields = Set.new
+      panes = @node.xpath('.//pane')
     end
 
-    # def loadFieldEncodings node
-    #   $encodedFields = Hash.new { |h,k| h[k] = [] }
-    #   enodes = node.xpath('.//table/panes/pane/encodings')
-    #   enodes.each do |enode|
-    #     enode.children.each do |child|
-    #       unless child['column'].nil?
-    #         $encodedFields[child.name] << CodedField.new(child['column'])
-    #       end
-    #     end
-    #   end
-    #   $encodedFields.each do |type, fields|
-    #     $fields[type] = fields
-    #   end
-    # end
-
-    def addDSFields fields, usage
-      fields.each do  
+    def loadFilters
+      emit ""########################## loadFilters"
+      @filters    = []
+      filterNodes = @node.xpath('./table/view//filter[@column]')
+      filterNodes.each do |fnode|
+        filter = QuickFilter.new(fnode,@twb)
+        @filters << filter
       end
+      return @filters
     end
 
-    def panesCount
-      @panesCount ||= @node.xpath('.//panes/pane').length
+    def loadDataSources
+      @datasources = {}
+      dsNodes = @node.xpath('.//datasource')
+      dsNodes.each do |dsn|
+        ds = WorksheetDataSource.new dsn
+        @datasources[ds.name] = ds
+      end
     end
 
     def loadRowColFields(type)
@@ -174,17 +184,8 @@ module Twb
       return fields
     end
 
-    def paneFields
-      @paneFields ||= loadPaneFields
-    end
-
-    def loadPaneFields
-      @paneFields = Set.new
-      panes = @node.xpath('.//pane')
-    end
-
-    def pageFields
-      @pageFields ||= loadpageFields
+    def loadTooltip
+      @tooltip = @node.xpath('./table/panes/pane/customized-tooltip')
     end
 
     def loadpageFields 
@@ -196,33 +197,47 @@ module Twb
       return @pageFields
     end
 
-    def datasourcenames
-      @datasources.keys
+    def loadSlicesFields
+      @slicesFields = []
+      nodes = @node.xpath('./table/view/slices//column')
+      nodes.each do |node|
+        # puts "Slice field: #{node.text}"
+        @slicesFields << CodedField.new(node.text)
+      end
+      return @slicesFields
     end
 
-    private
+    def loadFieldEncodings
+      @encodedFields = Hash.new { |h,k| h[k] = [] }
+      enodes = @node.xpath('.//table/panes/pane/encodings')
+      enodes.each do |enode|
+        enode.children.each do |child|
+          unless child['column'].nil?
+            @encodedFields[child.name] << CodedField.new(child['column'])
+          end
+        end
+      end
+      @encodedFields.each do |type, fields|
+        @fields[type] = fields
+      end
+    end
 
-    # def resolveHidden
-    #   xpath = "//windows/window[@name=\"#{@name}\"]"
-    #   emit true, "resolveHidden: #{xpath}"
-    #   windowNode = @node.at_xpath(xpath)
-    #   @hidden    = !windowNode.nil? && 'true' == windowNode['hidden']
+    # def loadFieldEncodings node
+    #   $encodedFields = Hash.new { |h,k| h[k] = [] }
+    #   enodes = node.xpath('.//table/panes/pane/encodings')
+    #   enodes.each do |enode|
+    #     enode.children.each do |child|
+    #       unless child['column'].nil?
+    #         $encodedFields[child.name] << CodedField.new(child['column'])
+    #       end
+    #     end
+    #   end
+    #   $encodedFields.each do |type, fields|
+    #     $fields[type] = fields
+    #   end
     # end
 
-    def loadFilters
-      emit ""########################## loadFilters"
-      @filters    = []
-      filterNodes = @node.xpath('./table/view//filter[@column]')
-      filterNodes.each do |fnode|
-        filter = QuickFilter.new(fnode,@twb)
-        @filters << filter
-      end
-      return @filters
-    end
 
-    def loadTooltip
-      @tooltip = @node.xpath('./table/panes/pane/customized-tooltip')
-    end
   
   end # class Worksheet
 
@@ -273,65 +288,4 @@ module Twb
   end # class RowsColsSplitter
 
 
-
-  class CodedField
-
-    include Comparable
-
-    attr_reader :code, :dataSource, :prefix, :name, :suffix
-
-    def initialize incode
-      # puts "CF: #{incode}"
-      @code       = incode
-      trimCode    = code.gsub(/^\[/,'').gsub(/\]$/,'')
-      # puts "  : '#{trimCode}'"
-      @dataSource = nil
-      dsFldBits = trimCode.split('].[')
-      if dsFldBits.length == 2
-        @dataSource = dsFldBits[0]
-        fieldCode   = dsFldBits[1]
-      else
-        fieldCode   = dsFldBits[0]
-      end
-      # puts "fc: #{fieldCode}"
-      parts = fieldCode.split(':')
-      bits = 
-      if ':Measure Names'.eql?(fieldCode)
-          {:prefix => nil, :name => fieldCode, :suffix => nil }
-      else 
-          case parts.length
-          when 1
-              bits = {:prefix => nil, :name => parts[0], :suffix => nil}
-          when 3
-              bits = {:prefix => parts[0], :name => parts[1], :suffix => parts[2]}
-          when 4
-              if parts[-1].match(/^(\d)+$/)
-                  bits = {:prefix => parts[0], :name => parts[1], :suffix => "#{parts[2]}:#{parts[3]}"}
-              else
-                  bits = {:prefix => "#{parts[0]}:#{parts[1]}", :name => parts[2], :suffix => parts[3]}
-              end
-          when 5
-              bits = {:prefix => "#{parts[0]}:#{parts[1]}", :name => parts[2], :suffix => "#{parts[3]}:#{parts[4]}"}
-          else
-              bits = {:prefix => "OOPS #{parts.inspect}", :name => '', :suffix => '' }
-          end
-      end
-      @prefix = bits[:prefix]
-      @name   = bits[:name]
-      @suffix = bits[:suffix]
-      # puts "       l: #{parts.length}   == #{bits}"
-      # bits.each { |k,v| puts "       l: %-7s %s" % [k,v] }
-    end
-    # --
-    def to_s
-      @code
-    end
-
-    def <=>(other)
-      @code <=> other.code
-    end
-
-  end #class CodedField
-
-
 end # module Twb

metadata

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