twb 5.2.3 → 5.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebe8daee637317b5fb8024b346e2eed50883e00839a0d21a031672a55e116f44
-  data.tar.gz: 509985403a45d56d8b3fc3690d3d14c934700fe6879d356de9579cd3df6792bc
+  metadata.gz: 237d9d602af5e7c253e3c0df732483ecacb58d7453f88ae2037251be7ae56b52
+  data.tar.gz: 84da2fc81295bf1a61e6699907cf78e404b7b2f8fa6c3ce5149388608547d818
 SHA512:
-  metadata.gz: da4d761cceb4011cdd9442ef2ce959a3d74e9b2d1cdc004ef484c6418bfa7bc6d48e1848950a11d73d3af403de7ded1c8a3b4b07b8262b881ac9f2cab0c3c05e
-  data.tar.gz: 50fab8909339cb928ed2d717409b66a965c1588b96c47100842e8f667c7a85bdf9c680f66482ca6244ccd23437998b623c4885f2970a8e5a00539a2254560d1d
+  metadata.gz: f940edb531e4a001aa55ffeec2de8df038f7c14a34eca5eb23780cc12da1c4c7876fe61d3e4edb0c2640ee9e653dcd67073040689b39edcd424184182c6f9334
+  data.tar.gz: e76e453f09bf238643a8b1f12cb93390d0068450e520b7cdd3711d2cf9b9aaa217771081280d0b7ad8ad2499fdf8aa46fabfaf6059360ef1b67fd63a5e86347d

data/lib/twb.rb

@@ -81,5 +81,5 @@ require_relative 'twb/analysis/sheets/sheetsintooltipanalyzer'
 # Represents Tableau Workbooks, their contents, and classes that analyze and manipulate them.
 #
 module Twb
-  VERSION = '5.2.3'
+  VERSION = '5.2.5'
 end

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

@@ -34,6 +34,10 @@ module CalculatedFields
       @imageFiles = Array.new
     end
 
+    def encode str
+      str.gsub('"', '\"')
+    end
+
     def processTWB twb
       # twb = File.basename(twb)
       @twb         = twb #Twb::Workbook.new twb
@@ -50,10 +54,11 @@ module CalculatedFields
           ds.calculatedFields.each do |cf|
             @cfCnt += 1
             calcFields << cf.uiname
-            edges            << " \"#{ds.uiname}\" -> \"#{cf.uiname}\"  [tailport=e, headport=w] "
+            edges            << " \"#{encode(ds.uiname)}\" -> \"#{encode(cf.uiname)}\"  [tailport=e, headport=w] "
+            puts " \"#{encode(ds.uiname)}\" -> \"#{encode(cf.uiname)}\"  [tailport=e, headport=w] "
             cf.referencedFields.each do |rf|
               refFields << rf.uiname
-              edges            << " \"#{cf.uiname}\" -> \"#{rf.uiname}\" [tailport=e, headport=w] "
+              edges            << " \"#{encode(cf.uiname)}\" -> \"#{encode(rf.uiname)}\" [tailport=e, headport=w] "
             end
           end # ds.calculatedFields.each
           # "federated.17h7owt0rsacke17cql8o0w2ittk"  ->  "New AO Actuals Query in PP+ (AO Variance Data)::vs Prior Year [YTD]"
@@ -64,7 +69,7 @@ module CalculatedFields
           @dotFile.puts " "
           allFields = calcFields + refFields
           allFields.each do |f|
-            @dotFile.puts "\t \"#{f}\" [label=\"#{f}\"]"
+            @dotFile.puts "\t \"#{encode(f)}\" [label=\"#{encode(f)}\"]"
           end
           endPointFields = allFields - calcFields
           rankSame(endPointFields) unless endPointFields.nil? || endPointFields.empty?

data/lib/twb/columnfield.rb

@@ -72,7 +72,7 @@ module Twb
     def initialize(fieldNode, datasource=nil)
       @datasource         = datasource
       @node               = fieldNode
-      @name               = load 'name'
+      @name               = load('name').sub(/^\[/,'').sub(/\]$/,'')
       @caption            = load 'caption'
       @uiname             = @caption.nil? ? @name : @caption
       @dataType           = load 'datatype'
@@ -227,6 +227,14 @@ module Twb
       @name <=> other.name
     end
 
+    def eql?(other)
+      @name == other.name
+    end
+
+     def hash
+      @name.hash
+    end    
+
   end  # class ColumnField
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twb
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.2.5
 platform: ruby
 authors:
 - Chris Gerrard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: creek