twb 4.9.4 → 5.2.1

data/lib/twb/fieldcalculation.rb

@@ -16,6 +16,7 @@
 require 'nokogiri'
 require 'digest/md5'
 require 'csv'
+require 'pry'
 
 module Twb
 
@@ -35,7 +36,7 @@ module Twb
     attr_reader :is_tableCalc
     attr_reader :is_lod,   :lodCodePos
     attr_reader :class,    :scopeIsolation
-    attr_reader :fields,   :remoteFields,  :calcFields
+    attr_reader :fields,   :remoteFields, :referencedFields
     attr_reader :comments, :uuid
 
     # attr_accessor :ttlogfile
@@ -120,59 +121,33 @@ module Twb
     end
 
     def formulaResolved
-      @formulaResolved ||= @formulaResolved = resolveFormula
+      @formulaResolved ||= resolveFormula
     end
     
     def resolveFormula
-      # puts "\ndef resolveFormula:\n--\n#{@formula}"
-      formula = @formula
-      parseFormFields # - extracts the fields from the formula; as persisted they're the internal names
-      @calcFields.each do |calcField|
-        if calcField.techUIdiff
-         # puts ":::: #{calcField.techCode}  //  #{calcField.uiCode}"
-          formula = formula.gsub(calcField.techCode,calcField.uiCode)
-         # puts ":--: #{formula}"
-        end
+      # emit "\ndef resolveFormula:\n--\n#{@formula}"
+      resolved = @formula
+      # emit "\t formula:#{resolved}:"
+      # parseFormFields # - extracts the fields from the formula; as persisted they're the internal names
+      referencedFields.each do |refField|
+        # emit "\t refField: "
+        resolved.gsub!(refField.techCode,refField.uiCode)
+        #   if calcField.techUIdiff
+        #    # puts ":::: #{calcField.techCode}  //  #{calcField.uiCode}"
+        #     formula = formula.gsub(calcField.techCode,calcField.uiCode)
+        #    # puts ":--: #{formula}"
+        #   end
       end
-      return formula
+      # emit "\t formula:#{resolved}:"
+      return resolved
     end
 
-    def calcFields
-      @calcFields ||= parseFormFields
+    def referencedFields
+      @referencedFields ||= parseFormFields
     end
 
-    def parseFormFields
-      # puts "--parseFormFields"
-      @fields     = Set.new    
-      @calcFields = Set.new
-      formula = @formulaFlat
-      if !formula.nil? && formula.include?('[') && formula.include?(']')
-          fields   = Set.new
-          # noSqLits =  formula.gsub( /'[\[\.\]]+'/, ' ')
-          quotes   =  formula.gsub('"',"'")
-          noSqLits =   quotes.gsub( /'[\[\.\]]+'/, ' ')
-          flatForm = noSqLits.gsub( /\n/, ' ')
-          stripFrt = flatForm.gsub( /^[^\[]*[\[]/    , '['      )
-          stripBck = stripFrt.gsub( /\][^\]]+$/      , ']'      )
-          stripMid = stripBck.gsub( /\][^\]]{2,}\[/  , ']]..[[' )
-          stripCom = stripMid.gsub( /\][ ]*,[ ]*\[/  , ']]..[[' )
-          stripFns = stripMid.gsub( /\][ ]*[\*\/+\-><,=][ ]*\[/  , ']]..[[' )
-          fields   = stripFns.split(']..[')
-          emit "::self::: #{self} :: #{__LINE__} :: fields:'#{fields.inspect}'" 
-          fields.each do |field|
-            emit "::self::: #{self} :: #{__LINE__} :: field:'#{field}'" 
-            cf = CalculationField.new( field.gsub(/^\[|\]$/, ''), @dataSource )
-            @calcFields.add cf
-            @fields.add field.gsub(/^\[|\]$/, '')
-          end
-      end
-      return @calcFields
-    end
 
     def formulaResolvedLines
-      # puts "\ndef formulaResolvedLines\n--\n#{formulaResolved}"
-      # puts "--\n#{formulaResolved.split(/\n|\r\n/)}"
-      # puts "--\n#{formulaResolved.split(/\n|\r\n/)}"
       formulaResolved.split(/\n|\r\n/)
     end
 
@@ -212,11 +187,149 @@ module Twb
       return comments.strip
     end
 
-  end  # class FieldCalculation
+    private
 
 
+    def pullString chars
+      delim1 = chars.shift
+      delim2 = delim1+delim1
+      field  = delim1
+      done   = false
+      until done | chars.empty?
+        s01 = chars[0..1].join
+        if !delim1.eql? chars[0]
+          field += chars.shift
+        else
+          case s01
+          when delim2
+            field += delim2
+            chars.shift(2)
+          when delim1
+            field += delim1
+            chars.shift
+            done = true
+          else
+            field += delim1
+            chars.shift
+            done = true
+          end
+        end
+      end
+    end
+
+    def pullField chars
+      # chars = str.split ''
+      done  = false
+      ds    = ''
+      field = ''
+      until done
+        s01 = chars[0..1].join
+        s02 = chars[0..2].join
+        if ']'.eql? chars[0]
+          case s01
+          when ']]'
+            field += ']]'
+            chars.shift(2)
+          when ']'
+            field += chars.shift
+            done = true
+          else
+            if '].['.eql?(s02)
+              ds = field + ']'
+              chars.shift(2)
+              # fldstr   = chars.join
+              field    = pullField(chars)[:field]
+              done     = true
+            else
+              field += ']'
+              chars.shift
+              done = true
+            end
+          end
+        else
+          field += chars[0]
+          chars.shift
+        end
+      end
+      # puts "field: '#{field}' \t\t ds: #{ds}"
+      return {:field => field.sub(/\[/,'').sub(/\]$/,''), :ds => ds.sub(/\[/,'').sub(/\]$/,'') }
+    end
 
-  class CalculationField
+    def parseFormFields # formula
+      @referencedFields = Array.new
+      rawFields         = Array.new
+      if !@formula.nil? && @formula.include?('[') && @formula.include?(']')
+      chars  = formula.split('')
+      until chars.empty?
+        char0 = chars[0]
+        case char0
+        when '"', "'"
+          pullString(chars)
+        when '['
+          rawFields << pullField(chars)
+        else
+          unless chars.nil? | chars.empty?
+            chars.shift
+          end
+        end
+      end
+      rawFields.each do |rf|
+        ds = rf[:ds]
+        dataSource = if ''.eql? ds
+                       @dataSource
+                     else 
+                       @dataSource.workbook.datasource(ds)
+                     end
+        # fieldUIName = dataSource.fieldUIName(rf[:field])
+        refField    = ReferencedField.new(rf[:field], dataSource)
+        @referencedFields << refField
+        end
+      end
+      return @referencedFields
+    end
+
+    def parseFormFieldsx # formula
+      rawFields = Set.new
+      if !@formula.nil? && @formula.include?('[') && @formula.include?(']')
+        noComms   = @formula.gsub(/\/\/.*\r\n/,' ')
+        formBase  = noComms.gsub(/\r\n/,' ')
+        formLen   = formBase.length
+        formChars = formBase.split '' 
+        until formChars.empty?
+          c = formChars.shift
+          case c
+            when '"', "'"  
+              pullString(formChars, c)
+            when '['       
+              rawFields << pullField(formChars, ']', @referencedFields)
+          end
+        end
+      end
+      @referencedFields = Set.new
+      rawFields.each do |rf|
+        # @referencedFields << rf
+        dataSource = if ''.eql? rf[:ds]
+                       @dataSource
+                     else 
+                       @dataSource.workbook.datasource(rf[:ds])
+                     end
+        # if dataSource.nil?
+        #   binding.pry
+        # end
+        fieldUIName = dataSource.fieldUIName(rf[:field])
+        # binding.pry
+        refField = ReferencedField.new(rf[:field], dataSource)
+        # binding.pry
+        @referencedFields << refField
+      end
+      return @referencedFields
+    end
+
+  end  # class FieldCalculation
+
+
+  # class CalculationField
+  class ReferencedField
     # is a field used in a calculation, resolved into its human-meaningful form
 
     include Comparable
@@ -228,65 +341,29 @@ module Twb
     attr_reader :fqName,     :type
     attr_reader :techUIdiff
 
-    def initialize code, datasource
-      # puts "\n\nCalculationField ::  %-25s  |  %s  " % [datasource.uiname, code]
+    def initialize name, datasource
+      # puts "\n\nReferencedField ::  ds: %-25s  |  n: %s  " % [datasource, name]
+      @name             = name
       @dataSource       = datasource
-      @dataSourceName   = datasource.uiname
+      @dataSourceName   = datasource.nil? ? nil : datasource.uiname
       @dataSourceRef    = :local
       @dataSourceExists = true
+      @techCode         = "[#{name}]"
       @techUIdiff       = false
-      @uiname           = ''
-      rawCode  = code.gsub(/^\[|\]$/,'')
-      parts    = rawCode.split('].[')
-      #puts "Field: #{code}  \t parts: #{parts.length} - #{parts.inspect}"
-      if parts.length == 1
-        @name = parts[0]
-        @techCode = "[#{parts[0]}]"
-        #puts "@name: #{@name}"
-        if datasource.nil?
-          # puts 'a'
-          @uiname = @name
-          @uiCode = @techCode
-          @techUIdiff = false
-        else # !datasource.nil?
-          # puts 'b'
-          #puts "b - found uiname for '#{@name}'?: #{!datasource.fieldUIName(@name).nil?} \t is:#{datasource.fieldUIName(@name)} "
-          @uiname = datasource.fieldUIName(@name).nil? ? @name : datasource.fieldUIName(@name) 
-          @uiCode = @uiname.nil? ? @techCode :  "[#{@uiname}]"
-          @techUIdiff = !@techCode.eql?(@uiCode)
-          # puts ":b #{datasource.fieldUIName(@name).nil?}  ... #{@name}  ... #{@uiname}"
-          # puts "CalculationField ::       uin: %-25s | @name:%-s" % [@uiname,@name]
-        end
-      else # parts.length <> 1
-        # puts 'c'
-        rdstech   = parts[0]
-        calcField = parts[1]
-        @uiname   = calcField
-        @dataSourceName = rdstech
-        @dataSourceRef  = :remote
-        @techCode = "[#{rdstech}].[#{calcField}]"
-        workbook  = datasource.workbook
-        @dataSource  = workbook.nil? ? nil : workbook.datasource(rdstech)
-       # puts "\t  twb: #{workbook.class}  /  remoteds: #{remoteds.class}  : #{remoteds.nil? ? "<<NOT FOUND:#{rdstech}:>>" : remoteds.uiname} "
-        #--
-        if @dataSource.nil? || @dataSource.fieldUIName(calcField).nil?
-          # puts 'd'
-          @uiname     = calcField
-          @uiCode     = "[<<NOT FOUND>>#{rdstech}].[#{calcField}]"
-          @techUIdiff = true
-          @dataSourceExists = false
-        else  # !remoteds.nil?
-          # puts 'e'
-          @dataSourceName = @dataSource.uiname
-          @uiname         = @dataSource.fieldUIName(calcField)
-          @uiCode         = "[#{@dataSourceName}].[#{@uiname}]"
-          @techUIdiff     = !@techCode.eql?(@uiCode)
-          @dataSourceExists = true
-        end
+      if dataSource.nil?
+        # puts 'a'
+        @uiname = @name
+        @uiCode = @techCode
+        @techUIdiff = false
+      else # !datasource.nil?
+        # puts 'b'
+        # puts "b - found uiname for '#{@name}'?: #{!datasource.fieldUIName(@name).nil?} \t is:#{datasource.fieldUIName(@name)} "
+        @uiname = datasource.fieldUIName(@name).nil? ? @name : datasource.fieldUIName(@name) 
+        @uiCode = @uiname.nil? ? @techCode :  "[#{@uiname}]"
+        @techUIdiff = !@techCode.eql?(@uiCode)
+        # puts ":b #{datasource.fieldUIName(@name).nil?}  ... #{@name}  ... #{@uiname}"
+        # puts "CalculationField ::       uin: %-25s | @name:%-s" % [@uiname,@name]
       end
-      # puts "\t     dsName: #{@dataSourceName}"
-      # puts "\t   @name: #{@name}"
-      # puts "\t     uiname: #{@uiname}"
       @fqName = "#{@dataSourceName}::#{@uiname}"
       @type   = if @dataSource.nil?
                    :CalculatedField
@@ -308,6 +385,6 @@ module Twb
       @fqName <=> other.fqName
     end
 
-  end # class CalculationField
+  end # class ReferencedField
 
 end  # module Twb

data/lib/twb/util/cypher.rb

@@ -48,7 +48,7 @@ module Util
     end
 
     def renderNodes
-      puts "Cypher def renderNodes @nodes:#{@nodes}"
+      puts "Cypher def renderNodes @nodes:#{@nodes.to_s}"
       csv = CSV.open(docFile("#{@fileName}.nodes.csv"),'w')
       csv << ['Type','Name','UUID']
       nodesCSV = Set.new

data/lib/twb/util/gml.rb

@@ -77,7 +77,7 @@ GMLHEADER
 
     def renderNodes file
       nodes = Set.new
-      puts 'def renderNodes'
+      # puts 'def renderNodes'
       @nodes.each do |node|
         gmlID   = Digest::MD5.hexdigest(node.id)
         gmlName = node.name.gsub('&','&').gsub('"','"')

data/test/testFieldCalculation.rb

@@ -16,7 +16,9 @@
 require 'nokogiri'
 
 #require 'twb'
-require 'C:\tech\Tableau\tools\Ruby\gems\twb\lib\twb.rb'
+# require 'C:\tech\Tableau\tools\Ruby\gems\twb\lib\twb.rb'
+# require 'C:\tech\Tableau\Tableau Tools\Ruby\gems\twb\lib\twb.rb'
+require 'twb'
 require "test/unit"
 
 system "cls"
@@ -25,10 +27,11 @@ class TestFieldCalculation < Test::Unit::TestCase
 
   def test_fragment1
     doc = Nokogiri::XML::Document.parse <<-EOHTML
-<calculation class='tableau' formula='abc' />
+<calculation class='tableau' name='I am a formular field' formula='abc' datatype='datatype' role='' type='' class='calcfield' />
 EOHTML
-    calcNode = doc.at_xpath('./calculation')
-    calc = Twb::FieldCalculation.new(calcNode)
+    calcNode  = doc.at_xpath('./calculation')
+    calcField = Twb::CalculatedField.new calcNode
+    calc = Twb::FieldCalculation.new(calcField)
     assert(!calc.nil?)
     #puts "node: #{calcNode}"
     #puts "formula: #{calc.formula}"
@@ -41,10 +44,11 @@ EOHTML
 
   def test_fragment2
     doc = Nokogiri::XML::Document.parse <<-EOHTML
-        <calculation class='tableau' formula='// this is the number of days between the order and shipment&#13;&#10;&#13;&#10;datediff(&apos;day&apos;,[Order Date] , [other].[Ship Date])' />
+        <calculation class='tableau' name='Another formula fied' formula='// this is the number of days between the order and shipment&#13;&#10;&#13;&#10;datediff(&apos;day&apos;,[Order Date] , [other].[Ship Date])' />
 EOHTML
     calcNode = doc.at_xpath('./calculation')
-    calc = Twb::FieldCalculation.new(calcNode)
+    calcField = Twb::CalculatedField calcNode
+    calc = Twb::FieldCalculation.new(calcField)
     assert(!calc.nil?)
     #puts "node: #{calcNode}"
     #puts "formula: #{calc.formula}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twb
 version: !ruby/object:Gem::Version
-  version: 4.9.4
+  version: 5.2.1
 platform: ruby
 authors:
 - Chris Gerrard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: creek
@@ -58,14 +58,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/t.rb
+- lib/tfl/Flow.rb
 - lib/twb.rb
 - lib/twb/action.rb
 - lib/twb/analysis/annotatedfieldscsvemitter.rb
 - lib/twb/analysis/calculatedfields/calculatedfieldsanalyzer.rb
 - lib/twb/analysis/calculatedfields/csvemitter.rb
+- lib/twb/analysis/calculatedfields/dotanalyzer.rb
 - lib/twb/analysis/calculatedfields/fieldsaliasesanalyzer.rb
 - lib/twb/analysis/calculatedfields/groupfieldsanalyzer.rb
 - lib/twb/analysis/calculatedfields/markdownemitter.rb
+- lib/twb/analysis/calculatedfields/t.rb
 - lib/twb/analysis/datasources/categoricalcolorcodinganalyzer.rb
 - lib/twb/analysis/datasources/datasourcefieldsanalyzer.rb
 - lib/twb/analysis/datasources/datasourcefieldscsvemitter.rb
@@ -82,6 +85,7 @@ files:
 - lib/twb/analysis/documentedfieldscsvemitter.rb
 - lib/twb/analysis/documentedfieldsmarkdownemitter.rb
 - lib/twb/analysis/sheets/analyzedashboardsheets.rb
+- lib/twb/analysis/sheets/dashboardsummarizer.rb
 - lib/twb/analysis/sheets/dashsheetsanalyzer.rb
 - lib/twb/analysis/sheets/sheetfieldsanalyzer.rb
 - lib/twb/analysis/sheets/sheetfiltersanalyzer.rb