updated examples to create all example worksheets in the same workbook

1 files changed, 88 insertions, 121 deletions

diff --git a/examples/example.rb b/examples/example.rb
index b92fbb29..45f30566 100644
--- a/examples/example.rb
+++ b/examples/example.rb
@@ -3,115 +3,43 @@
 # require 'rubygems' if that is how you do it!
 require 'axlsx'
 
+     p = Axlsx::Package.new
 
 #A Simple Workbook
 if ARGV.size == 0 || ARGV.include?("1")
-      p = Axlsx::Package.new
-      p.workbook.add_worksheet do |sheet|
+      p.workbook.add_worksheet(:name=>"Basic Worksheet") do |sheet|
         sheet.add_row ["First Column", "Second", "Third"]
         sheet.add_row [1, 2, 3]
       end
-      #p.workbook.date1904 = true
-      p.validate.each { |e| puts e.message }
-      p.serialize("example1.xlsx")
-end
-#Generating A Bar Chart
-if ARGV.size==0 || ARGV.include?("2")
-
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
-       sheet.add_row ["A Simple Bar Chart"]
-       sheet.add_row ["First", "Second", "Third"]
-       sheet.add_row [1, 2, 3]
-       sheet.add_chart(Axlsx::Bar3DChart, :start_at => "A4", :end_at => "F17", :title=>sheet["A1"]) do |chart|
-         chart.add_series :data => sheet["A3:C3"], :labels => sheet["A2:C2"]
-       end
-     end  
-     p.serialize("example2.xlsx")
-
-end
-#Generating A Pie Chart
-if ARGV.size==0 || ARGV.include?("3")
-
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
-       sheet.add_row ["First", "Second", "Third", "Fourth"]
-       sheet.add_row [1, 2, 3, "=PRODUCT(A2:C2)"]
-       sheet.add_chart(Axlsx::Pie3DChart, :start_at => [0,2], :end_at => [5, 15], :title=>"example 3: Pie Chart") do |chart|
-         chart.add_series :data => sheet["A2:D2"], :labels => sheet["A1:D1"]
-       end
-     end  
-     p.serialize("example3.xlsx")
-
 end
 
 #Using Custom Styles
-if ARGV.size==0 || ARGV.include?("4")
-
-     p = Axlsx::Package.new
+if ARGV.size==0 || ARGV.include?("2")
      wb = p.workbook
      black_cell = wb.styles.add_style :bg_color => "00", :fg_color => "FF", :sz=>14, :alignment => { :horizontal=> :center }
      blue_cell = wb.styles.add_style  :bg_color => "0000FF", :fg_color => "FF", :sz=>14, :alignment => { :horizontal=> :center }
-     wb.add_worksheet do |sheet|
+     wb.add_worksheet(:name=>"Custom Styles") do |sheet|
        sheet.add_row ["Text Autowidth", "Second", "Third"], :style => [black_cell, blue_cell, black_cell]
        sheet.add_row [1, 2, 3], :style => Axlsx::STYLE_THIN_BORDER
      end
-     p.serialize("example4.xlsx")
 
 end
 #Using Custom Formatting and date1904
-if ARGV.size==0 || ARGV.include?("5")
-
-     p = Axlsx::Package.new
+if ARGV.size==0 || ARGV.include?("3")
      wb = p.workbook
      date = wb.styles.add_style :format_code=>"yyyy-mm-dd", :border => Axlsx::STYLE_THIN_BORDER
      padded = wb.styles.add_style :format_code=>"00#", :border => Axlsx::STYLE_THIN_BORDER
      percent = wb.styles.add_style :format_code=>"0%", :border => Axlsx::STYLE_THIN_BORDER
      wb.date1904 = true # required for generation on mac
-     wb.add_worksheet do |sheet|
+     wb.add_worksheet(:name=>"Formatting Data") do |sheet|
        sheet.add_row ["Custom Formatted Date", "Percent Formatted Float", "Padded Numbers"], :style => Axlsx::STYLE_THIN_BORDER
        sheet.add_row [Time.now, 0.2, 32], :style => [date, percent, padded]
      end
-     p.serialize("example5.xlsx")
-end
-#Validation
-if ARGV.size==0 || ARGV.include?("6")
-
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
-       sheet.add_row ["First", "Second", "Third"]
-       sheet.add_row [1, 2, 3]
-     end
-
-     p.validate.each do |error|
-       puts error.inspect
-     end
-
-end      
-#Generating A Line Chart
-if ARGV.size==0 || ARGV.include?("7")
-
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
-       sheet.add_row ["First", 1, 5, 7, 9]
-       sheet.add_row ["Second", 5, 2, 14, 9]
-       sheet.add_chart(Axlsx::Line3DChart, :title=>"example 6: Line Chart") do |chart|
-         chart.start_at 0, 2
-         chart.end_at 10, 15
-         chart.add_series :data=>["B1:E1"], :title=> sheet["A1"]
-         chart.add_series :data=>sheet.rows.last.cells[(1..-1)], :title=> sheet.rows.last.cells.first
-       end
-       
-     end  
-     p.serialize("example7.xlsx")
-
 end
 
 #Add an Image
-if ARGV.size==0 || ARGV.include?("8")
-
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
+if ARGV.size==0 || ARGV.include?("4")
+     p.workbook.add_worksheet(:name => "Images") do |sheet|
        img = File.expand_path('examples/image1.jpeg') 
        sheet.add_image(:image_src => img, :noSelect=>true, :noMove=>true) do |image|
          image.width=720
@@ -119,103 +47,142 @@ if ARGV.size==0 || ARGV.include?("8")
          image.start_at 2, 2
        end
      end  
-     p.serialize("example8.xlsx")
 
 end
 
 #Asian Language Support
-if ARGV.size==0 || ARGV.include?("9")
-
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
+if ARGV.size==0 || ARGV.include?("4")
+     p.workbook.add_worksheet(:name=>"Unicode Support") do |sheet|
        sheet.add_row ["日本語"]
        sheet.add_row ["华语/華語"]
        sheet.add_row ["한국어/조선말"]
      end  
-     p.serialize("example9.xlsx")
 
 end
 
 
 #Styling Columns
-if ARGV.size==0 || ARGV.include?("10")
-
-     p = Axlsx::Package.new
+if ARGV.size==0 || ARGV.include?("5")
      percent = p.workbook.styles.add_style :num_fmt => 9
-     p.workbook.add_worksheet do |sheet|
+     p.workbook.add_worksheet(:name => "Styling Columns") do |sheet|
        sheet.add_row ['col 1', 'col 2', 'col 3', 'col 4']
        sheet.add_row [1, 2, 0.3, 4]
        sheet.add_row [1, 2, 0.2, 4]
        sheet.add_row [1, 2, 0.1, 4]
+       sheet.col_style 2, percent, :row_offset=>1
      end
-     p.workbook.worksheets.first.col_style 2, percent, :row_offset=>1
-     p.serialize("example10.xlsx")
-
 end
 
 #Styling Rows
-if ARGV.size==0 || ARGV.include?("11")
-
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
+if ARGV.size==0 || ARGV.include?("6")
+     p.workbook.add_worksheet(:name => "Styling Rows") do |sheet|
        sheet.add_row ['col 1', 'col 2', 'col 3', 'col 4']
        sheet.add_row [1, 2, 0.3, 4]
        sheet.add_row [1, 2, 0.2, 4]
        sheet.add_row [1, 2, 0.1, 4]
+       head = p.workbook.styles.add_style :bg_color => "00", :fg_color=>"FF"
+       percent = p.workbook.styles.add_style :num_fmt => 9
+       sheet.col_style 2, percent, :row_offset=>1
+       sheet.row_style 0, head
      end
-     head = p.workbook.styles.add_style :bg_color => "00", :fg_color=>"FF"
-     percent = p.workbook.styles.add_style :num_fmt => 9
-     p.workbook.worksheets.first.col_style 2, percent, :row_offset=>1
-     p.workbook.worksheets.first.row_style 0, head
-     p.serialize("example11.xlsx")
 
 end
 
 #Using formula
-if ARGV.size==0 || ARGV.include?("12")
-
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
+if ARGV.size==0 || ARGV.include?("7")
+     p.workbook.add_worksheet(:name => "Using Formulas") do |sheet|
        sheet.add_row ['col 1', 'col 2', 'col 3', 'col 4']
        sheet.add_row [1, 2, 3, "=SUM(A2:C2)"]
      end
-     p.serialize("example12.xlsx")
 
 end
 
 
 #Using cell specific styling and range / name based access
-if ARGV.size==0 || ARGV.include?("13")
-
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet(:name=>'My Worksheet') do |sheet|
+if ARGV.size==0 || ARGV.include?("8")
+     p.workbook.add_worksheet(:name=>"Cell Level Style Overrides") do |sheet|
          # cell level style overides when adding cells
          sheet.add_row ['col 1', 'col 2', 'col 3', 'col 4'], :sz => 16
          sheet.add_row [1, 2, 3, "=SUM(A2:C2)"]
          # cell level style overrides via sheet range
          sheet["A1:D1"].each { |c| c.color = "FF0000"}
+         sheet['A1:D2'].each { |c| c.style = Axlsx::STYLE_THIN_BORDER }
      end     
-     p.workbook['My Worksheet!A1:D2'].each { |c| c.style = Axlsx::STYLE_THIN_BORDER }
-     p.serialize("example13.xlsx")
-
 end
 
 #Merging Cells.
-if ARGV.size==0 || ARGV.include?("14")
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet(:name=>'My Worksheet') do |sheet|
+if ARGV.size==0 || ARGV.include?("9")
+     p.workbook.add_worksheet(:name=>'Merging Cells') do |sheet|
          # cell level style overides when adding cells
-         sheet.add_row ['col 1', 'col 2', 'col 3', 'col 4'], :sz => 16
+         sheet.add_row ["col 1", "col 2", "col 3", "col 4"], :sz => 16
          sheet.add_row [1, 2, 3, "=SUM(A2:C2)"]
          sheet.add_row [2, 3, 4, "=SUM(A3:C3)"]
          sheet.add_row ["total", "", "", "=SUM(D2:D3)"]
-         sheet.merge_cells('A1:B4')
+         sheet.merge_cells("A4:C4")
          sheet["A1:D1"].each { |c| c.color = "FF0000"}
+         sheet["A1:D4"].each { |c| c.style = Axlsx::STYLE_THIN_BORDER }
      end     
-     p.workbook['My Worksheet!A1:D4'].each { |c| c.style = Axlsx::STYLE_THIN_BORDER }
-     p.serialize("example14.xlsx")
+end
+
+#Generating A Bar Chart
+if ARGV.size==0 || ARGV.include?("10")
+     p.workbook.add_worksheet(:name=>"Bar Chart") do |sheet|
+       sheet.add_row ["A Simple Bar Chart"]
+       sheet.add_row ["First", "Second", "Third"]
+       sheet.add_row [1, 2, 3]
+       sheet.add_chart(Axlsx::Bar3DChart, :start_at => "A4", :end_at => "F17") do |chart|
+         chart.add_series :data => sheet["A3:C3"], :labels => sheet["A2:C2"], :title=>sheet["A1"]
+       end
+     end  
 
 end
+#Generating A Pie Chart
+if ARGV.size==0 || ARGV.include?("11")
+     p.workbook.add_worksheet(:name=>"Pie Chart") do |sheet|
+       sheet.add_row ["First", "Second", "Third", "Fourth"]
+       sheet.add_row [1, 2, 3, "=PRODUCT(A2:C2)"]
+       sheet.add_chart(Axlsx::Pie3DChart, :start_at => [0,2], :end_at => [5, 15], :title=>"example 3: Pie Chart") do |chart|
+         chart.add_series :data => sheet["A2:D2"], :labels => sheet["A1:D1"]
+       end
+     end  
+
+end
+
+#Data over time
+if ARGV.size==0 || ARGV.include?("12")
+     p.workbook.add_worksheet(:name=>'Charting Dates') do |sheet|
+         # cell level style overides when adding cells
+         sheet.add_row ['Date', 'Value'], :sz => 16
+         sheet.add_row [Time.now - (7*60*60*24), 3]
+         sheet.add_row [Time.now - (6*60*60*24), 7]
+         sheet.add_row [Time.now - (5*60*60*24), 18]
+         sheet.add_row [Time.now - (4*60*60*24), 1]
+         sheet.add_chart(Axlsx::Bar3DChart) do |chart|
+            chart.start_at "B7"
+            chart.end_at "H27"
+            chart.add_series(:data => sheet["B2:B5"], :labels=>sheet["A2:A5"], :title=>sheet["B1"])           
+         end 
+     end     
+end
+
+#Generating A Line Chart
+if ARGV.size==0 || ARGV.include?("13")
+     p.workbook.add_worksheet(:name => "Line Chart") do |sheet|
+       sheet.add_row ["First", 1, 5, 7, 9]
+       sheet.add_row ["Second", 5, 2, 14, 9]
+       sheet.add_chart(Axlsx::Line3DChart, :title=>"example 6: Line Chart", :rotX=>30, :rotY=>20) do |chart|
+         chart.start_at 0, 2
+         chart.end_at 10, 15
+         chart.add_series :data=>sheet["B1:E1"], :title=> sheet["A1"]
+         chart.add_series :data=>sheet["B2:E2"], :title=> sheet["A2"]         
+       end       
+     end  
+end
+
+
+     #p.validate.each { |e| puts e.message }
+
 
+     p.serialize("example.xlsx")