twb 0.5.2 → 0.5.3

data/lib/twb.rb

@@ -33,5 +33,5 @@ require_relative 'twb/util/xraydashboards'
 # Represents Tableau Workbooks and their contents.
 #
 module Twb
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/lib/twb/apps/X-Ray Dashboards.rb

@@ -1,13 +1,26 @@
-# X-Ray Dashboards.rb - this Ruby script Copyright 2013-2015 Christopher Gerrard
+#  Copyright (C) 2014, 2015  Chris 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'
 
 system "cls"
 
 $doctwb      = true
-$replacetwb  = false
+$replacetwb  = false                      # true|false - replace/new name TWB
 $dashdoclbl  = 'dashdoc'
-$localurl    = 'file:///' + Dir.pwd + '/'
+$localurl    = 'file:///' + Dir.pwd + '/' # for Dashboard Web Page objects
 
   def xray twbname
     twb    = Twb::Workbook.new(twbname)
@@ -24,7 +37,7 @@ $localurl    = 'file:///' + Dir.pwd + '/'
     end
     puts "\t    #{cnt} \t       #{twbname}"
   end
-  
+
   def saveHTML(htmlfilename, html)
     begin
       htmlfile = File.open(htmlfilename, 'w')
@@ -35,13 +48,13 @@ $localurl    = 'file:///' + Dir.pwd + '/'
       # invalid file name Characters. or when the name is
       # an invalid file name.
       # Stripping the non-ASCII characters from the Dashboard
-      # name fixes this, in the cases see so far.
+      # name fixes this, in the cases seen so far.
       # This rescue-recursion technique can potentially cause
       # an infite-loop condition. (not seen, but possible)
       saveHTML( sanitize(htmlfilename), html)
     end
   end
-  
+
   def inject(twb, dashboard, htmlfilename)
     vDash = Twb::DocDashboardWebVert.new
     vDash.title=('Doc Dashboard: ' + sanitize(dashboard))
@@ -53,13 +66,15 @@ $localurl    = 'file:///' + Dir.pwd + '/'
       twb.writeAppend($dashdoclbl)
     end
   end
-  
+
   def sanitize(str)
     str.gsub(/[^a-z0-9\-]+/i, ' ')
   end
 
 system 'cls'
-puts "\n\n\t X-raying Dashboards\n\n\t # Dashboards  Workbook\n\t ------------  ----------------------"
+puts "\n\n\t X-raying Dashboards"
+puts "\n\n\t # Dashboards  Workbook"
+puts   "\n\t ------------  ----------------------"
 
 path = if ARGV.empty? then '*.twb' else ARGV[0] end
 Dir.glob(path) {|twb| xray twb }

data/lib/twb/util/xraydashboards.rb

@@ -40,12 +40,18 @@ module Twb
                     'web'          => 'Web Page'
                   }
 
-    @@zoneNamePadText  = '–'
+    @@zoneNamePadText  = ' '  # '–'
 
     @@shapeRadius = 1000
     @@shapeDiam   = 2*@@shapeRadius
 
-    @@htmlTableLead  = '<p style="font: normal 12px Verdana, Calibri, Geneva, sans-serif; color: #000000;">The Dashboard\'s panels, one per row.<br />Mousing over the table highlights the Dashboard\'s panels in the diagram.</p>'
+    @@htmlTableLead  = <<-TABLELEAD
+    <p style="font: normal 12px Verdana, Calibri, Geneva, sans-serif; color: #000000;">
+    The Dashboard\'s panels, one per row.<br />
+    Mousing over the table highlights the<br />
+    Dashboard\'s panels in the diagram.
+    </p>
+     TABLELEAD
     @@htmlTableFNote = <<-TABLEFNOTE
     <p><span style="font: normal 12px Verdana, Calibri, Geneva, sans-serif; color: #000000;">
        Note: the Dashboard\'s \'x\', \'y\', \'w\', and \'h\' values are shown as coded in the<br />Tableau Workbook.
@@ -63,6 +69,7 @@ module Twb
     @htmlHead      = ''
 
     @@htmlTableHead = "<table>\n<tr><th align='left'>Zone Name</th><th align='left'>Type</th><th>x</th><th>y</th><th>w</th><th>h</th><th>ID</th></tr>"
+    @@htmlTableHead = "<table>\n<tr><th align='left'>Zone Name</th><th align='left'>Type</th></tr>"
     @htmlTable      = ''
     @svgHead        = ''
     @svg            = ''
@@ -226,7 +233,7 @@ end
         #     <zones>
         #       <zone
         zoneHead  = @@zoneNamePadText * zoneRelDepth
-        name = zoneHead + '|' + name
+        name = zoneHead + '|' + '&nbsp;' + name + '&nbsp;'
         return name
     end
 
@@ -294,10 +301,10 @@ end
         @htmlHead << "\n#LeftColumn  {font: Verdana, Calibri, Geneva, sans-serif; font-size:1em; float:left; margin: 0 5px 0 0;   vertical-align:top; text-align:left;}"
         @htmlHead << "\n#RightColumn {font: Verdana, Calibri, Geneva, sans-serif; font-size:1em; float:left; margin: 0 0   0 10px; vertical-align:top;}"
 
-        @htmlHead << "\ntable              { font-family: Verdana, Calibri, Geneva, sans-serif; font-size:.9em; border-collapse:collapse;padding:5 15 5 10; text-align:right;}"
-        @htmlHead << "\ntable td, table th { font-family: Verdana, Calibri, Geneva, sans-serif; font-size:.9em; border:3px solid #B0C4DE; padding:0 0 0 0; }"
-        @htmlHead << "\ntable th           { font-family: Verdana, Calibri, Geneva, sans-serif; font-size:.9em; font-size:.8em; background-color:lightgrey; color:black; }"
-        @htmlHead << "\ntable tr.alt td    { font-family: Verdana, Calibri, Geneva, sans-serif; font-size:.9em; border:1px solid #B0C4DE; color:#000; background-color:#EAF2D3; }"
+        @htmlHead << "\ntable              { font-family: Verdana, Calibri, Geneva, sans-serif; font-size:.9em; border-collapse:collapse; padding: 0px 10px 0px 10px; text-align:left;}"
+        @htmlHead << "\ntable td, table th { font-family: Verdana, Calibri, Geneva, sans-serif; font-size:.9em; border:3px solid #B0C4DE; padding: 0px 10px 0px 10px; text-align: left; }"
+        @htmlHead << "\ntable th           { font-family: Verdana, Calibri, Geneva, sans-serif; font-size:.9em; font-size:.8em;           padding: 0px 10px 0px 10px; background-color:lightgrey; color:black; }"
+        @htmlHead << "\ntable tr.alt td    { font-family: Verdana, Calibri, Geneva, sans-serif; font-size:.9em; border:1px solid #B0C4DE; padding: 0px 10px 0px 10px; background-color:#EAF2D3;   color:#000; text-align: left;}"
 
         @htmlHead << "\n</style>"
         @htmlHead << "\n<script>\n"
@@ -363,7 +370,7 @@ end
           dhtml <<  @@htmlTableHead
           dhtml <<  @htmlTable
           dhtml << ('</table>')
-          dhtml <<  @@htmlTableFNote
+          # dhtml <<  @@htmlTableFNote
           dhtml <<  '</div>'
         end
         dhtml << ('</BODY>')
@@ -462,13 +469,13 @@ end
           end
           @svg += "\n</g>\n"
           @htmlTable += "\n<tr style=\"cursor: pointer;\" onMouseOver=\"highlightDashComponent('#{id}-:-#{thcnt}')\" onMouseOut=\"resetDashComponent('#{id}-:-#{thcnt}')\">"
-          @htmlTable += "    <td style='text-align: left;'>#{zoneName}</td>"
-          @htmlTable += "    <td style='text-align: left;'>#{type}</td>"
-          @htmlTable += "    <td>#{x.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse}</td>"
-          @htmlTable += "    <td>#{y.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse}</td>"
-          @htmlTable += "    <td>#{w.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse}</td>"
-          @htmlTable += "    <td>#{h.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse}</td>"
-          @htmlTable += "    <td>#{id.gsub('-:-','.')}.#{thcnt}</td>"
+          @htmlTable += "    <td>#{zoneName}</td>"
+          @htmlTable += "    <td>#{type}</td>"
+        # @htmlTable += "    <td>#{x.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse}</td>"
+        # @htmlTable += "    <td>#{y.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse}</td>"
+        # @htmlTable += "    <td>#{w.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse}</td>"
+        # @htmlTable += "    <td>#{h.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse}</td>"
+        # @htmlTable += "    <td>#{id.gsub('-:-','.')}.#{thcnt}</td>"
           @htmlTable += "</tr>"
           return @htmlTable
     end # def recordZone
@@ -565,5 +572,5 @@ end
     end
 
   end
-  
-end  
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twb
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors: