twb 0.0.25 → 0.0.26

data/lib/twb.rb

@@ -1,6 +1,9 @@
 require_relative 'twb/workbook'
+require_relative 'twb/dashboard'
+require_relative 'twb/worksheet'
 require_relative 'twb/datasource'
 
+
 module Twb
   VERSION = '0.0.1'
 end

data/lib/twb/dashboard.rb

@@ -25,24 +25,21 @@ module Twb
     attr_reader :node, :name, :sheets
 
     def initialize dashboardNode
-      puts "Dashboard initialize"
       @node    = dashboardNode
-      @name    = @node.attr('name').text
+      @name    = @node.attr('name')
       loadSheets
       return self
     end
 
     def loadSheets
-      puts "$$$ in loadSheets"
       @sheets = []
-      @ndoc.xpath('.//zone[@name]').to_a.each do |sheetNode|
+      dsheets = @node.xpath('.//zone[@name]').to_a
+      dsheets.each do |sheetNode|
         sheet = Twb::Worksheet.new sheetNode
-        puts "### :: #{sheet.nil?} :: '#{sheet}'"
-        @dashboards.push sheet unless sheet.name == '' || sheet.name.nil?
+        @sheets.push sheet unless sheet.name == '' || sheet.name.nil?
       end
-
     end
 
   end
 
-end
+end

data/lib/twb/workbook.rb

@@ -13,9 +13,10 @@
 #  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 'nokogiri'
+
 module Twb
 
-  require 'nokogiri'
 
   class Workbook
 
@@ -29,6 +30,7 @@ module Twb
       @ndoc = Nokogiri::XML(open(twbWithDir))
       @version = @ndoc.xpath('/workbook/@version')
       @build   = @ndoc.xpath('/workbook/comment()').text.gsub(/^[^0-9]+/,'').strip
+      loadDashboards
       loadDataSources
       return self
     end
@@ -52,27 +54,6 @@ module Twb
       @ndoc.xpath('//workbook/datasources/datasource').to_a
     end
 
-    def dataSources
-      sources = []
-      dataSourceNodes.each do |dsn|
-        sources.push Twb::DataSource.new(dsn)
-      end
-      return sources
-    end
-
-    def dashboardNodes
-      @ndoc.xpath('//workbook/datasources/datasource').to_a
-    end
-
-    def dashboards
-      sources = []
-      dataSourceNodes.each do |dsn|
-        puts "adding dashboard"
-        sources.push Twb::Dashboard.new(dsn)
-      end
-      return sources
-    end
-
   end
 
 end

data/lib/twb/worksheet.rb

@@ -25,9 +25,8 @@ module Twb
     attr_reader :node, :name
 
     def initialize sheetNode
-      puts "Worksheet initialize"
       @node    = sheetNode
-      @name    = @node.attr('name').text
+      @name    = @node.attr('name')
       return self
     end
 

data/testTwbGem.rb

@@ -17,6 +17,9 @@ def processTWB twbWithDir
   puts "\n  Dashboards ...."
   twb.dashboards.each do |dsh|
     puts "\t    n\t-#{dsh.name} "
+    dsh.sheets.each do |sheet|
+      puts "\t    n\t  -#{sheet.name} "
+    end
   end
 end
 
@@ -26,6 +29,6 @@ end
 
 puts "START"
 
-Dir.glob("**/variety.twb") {|twb| processTWB twb }
+Dir.glob("**/TwoDashboards.twb") {|twb| processTWB twb }
 
 $f.close unless $f.nil?

data/twb.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name        = 'twb'
   s.summary     = "Classes for accessing Tableau Workbooks and their contents - summary."
   s.description = "Classes for accessing Tableau Workbooks and their contents - description"
-  s.version     = '0.0.25'
+  s.version     = '0.0.26'
   s.date        = "2015-03-14"
   s.author      = "Chris Gerrard"
   s.email       = "Chris@Gerrard.net"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twb
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -36,6 +36,7 @@ files:
 - twb-0.0.22.gem
 - twb-0.0.23.gem
 - twb-0.0.24.gem
+- twb-0.0.25.gem
 - twb.gemspec
 homepage: http://rubygems.org/gems/twb
 licenses: