update readme / version for pre-release

3 files changed, 60 insertions, 61 deletions

diff --git a/README.md b/README.md
index 8d2b6e91..e89ee38b 100644
--- a/README.md
+++ b/README.md
@@ -14,13 +14,13 @@ Axlsx: Office Open XML Spreadsheet Generation
 
 **License**: MIT License
 
-**Latest Version**: 1.1.0
+**Latest Version**: 1.1.1
 
 **Ruby Version**: 1.8.7, 1.9.2, 1.9.3
 
 **JRuby Version**: 1.6.7
 
-**Release Date**: April 3st 2012
+**Release Date**: April ?? 2012
 
 Synopsis
 --------
@@ -469,6 +469,7 @@ This gem has 100% test coverage using test/unit. To execute tests for this gem,
 ---------
 - ** April.?.12**: 1.1.1 release
    - bugfix for autowidth calculations across multiple rows
+   - bugfix for dimension calculations with nil cells.
    - REMOVED RMAGICK dependency WOOT!
 - ** April.3.12**: 1.1.0 release
    - bugfix patch name_to_indecies to properly handle extended ranges.
diff --git a/examples/real_example.rb b/examples/real_example.rb
index 62b80cca..0274ebe9 100644
--- a/examples/real_example.rb
+++ b/examples/real_example.rb
@@ -2,64 +2,62 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 
 require 'axlsx'
 
-p = Axlsx::Package.new
-wb = p.workbook
-wb.add_worksheet do |sheet|
-  styles = wb.styles
-  page_header = styles.add_style :bg_color => "DD", :sz => 16, :b => true, :alignment => {:horizontal => :center}
-  table_title = styles.add_style :b => true, :alignment => { :horizontal => :center }
-  indented_col_header  = styles.add_style :bg_color => "FFDFDEDF", :b => true, :alignment => {:indent => 1}
-  col_header  = styles.add_style :bg_color => "FFDFDEDF", :b => true, :alignment => { :horizontal => :center }
-  label       = styles.add_style :alignment => { :indent => 1 }
-  # This is the format id for currency.  When using predetermined a format id you dont need to specify the format code.
-  # See in the NumFmt class documentation for a list of format id.
-  money       = styles.add_style :num_fmt => 5
-  total       = styles.add_style :b => true,:bg_color => "FFDFDEDF"
-  total_money = styles.add_style :b => true, :num_fmt => 5,:bg_color => "FFDFDEDF"
+Axlsx::Package.new do |p|
+  p.workbook do |wb|
+    styles = wb.styles
+    header = styles.add_style :bg_color => "DD", :sz => 16, :b => true, :alignment => {:horizontal => :center}
+    tbl_header = styles.add_style :b => true, :alignment => { :horizontal => :center }
+    ind_header = styles.add_style :bg_color => "FFDFDEDF", :b => true, :alignment => {:indent => 1}
+    col_header  = styles.add_style :bg_color => "FFDFDEDF", :b => true, :alignment => { :horizontal => :center }
+    label       = styles.add_style :alignment => { :indent => 1 }
+    money       = styles.add_style :num_fmt => 5
+    t_label       = styles.add_style :b => true, :bg_color => "FFDFDEDF"
+    t_money = styles.add_style :b => true, :num_fmt => 5, :bg_color => "FFDFDEDF"
 
-  sheet.add_row
-  # we use an array here because we do not want to style the first cell, only the second.
-  sheet.add_row [nil, "College Budget"], :style => [nil, page_header]
-  sheet.add_row
-
-  sheet.add_row [nil, "What's coming in this month.", nil, nil, "How am I doing"], :style => table_title
-  sheet.add_row [nil, "Item", "Amount", nil, "Item", "Amount"], :style => [nil, indented_col_header, col_header, nil, indented_col_header, col_header]
-  sheet.add_row [nil, "Estimated monthly net income", 500, nil, "Monthly income", "=C9"], :style => [nil, label, money, nil, label, money]
-  sheet.add_row [nil, "Financial aid", 100, nil, "Monthly expenses", "=C27"], :style =>  [nil, label, money, nil, label, money]
-  sheet.add_row [nil, "Allowance from mom & dad", 20000, nil, "Semester expenses", "=F19"], :style =>  [nil, label, money, nil, label, money]
-  sheet.add_row [nil, "Total", "=SUM(C6:C8)", nil, "Difference", "=F6 - SUM(F7:F8)"], :style => [nil, total, total_money, nil, total, total_money]
-  sheet.add_row
-
-  sheet.add_row [nil, "What's going out this month.", nil, nil, "Semester Costs"], :style => table_title
-  sheet.add_row [nil, "Item", "Amount", nil, "Item", "Amount"], :style => [nil, indented_col_header, col_header, nil, indented_col_header, col_header]
-  sheet.add_row [nil, "Rent", 650, nil, "Tuition", 200], :style =>  [nil, label, money, nil, label, money]
-  sheet.add_row [nil, "Utilities", 120, nil, "Lab fees", 50], :style =>  [nil, label, money, nil, label, money]
-  sheet.add_row [nil, "Cell phone", 100, nil, "Other fees", 10], :style =>  [nil, label, money, nil, label, money]
-  sheet.add_row [nil, "Groceries", 75, nil, "Books", 150], :style =>  [nil, label, money, nil, label, money]
-  sheet.add_row [nil, "Auto expenses", 0, nil, "Deposits", 0], :style =>  [nil, label, money, nil, label, money]
-  sheet.add_row [nil, "Student loans", 0, nil, "Transportation", 30], :style =>  [nil, label, money, nil, label, money]
-  sheet.add_row [nil, "Other loans", 350, nil, "Total", "=SUM(F13:F18)"], :style => [nil, label, money, nil, total, total_money]
-  sheet.add_row [nil, "Credit cards", 450], :style => [nil, label, money]
-  sheet.add_row [nil, "Insurance", 0], :style => [nil, label, money]
-  sheet.add_row [nil, "Laundry", 10], :style => [nil, label, money]
-  sheet.add_row [nil, "Haircuts", 0], :style => [nil, label, money]
-  sheet.add_row [nil, "Medical expenses", 0], :style => [nil, label, money]
-  sheet.add_row [nil, "Entertainment", 500], :style => [nil, label, money]
-  sheet.add_row [nil, "Miscellaneous", 0], :style => [nil, label, money]
-  sheet.add_row [nil, "Total", "=SUM(C13:C26)"], :style => [nil, total, total_money]
-  sheet.add_chart(Axlsx::Pie3DChart) do |chart|
-    chart.title = sheet["B11"]
-    chart.add_series :data => sheet["C13:C26"], :labels => sheet["B13:B26"]
-    chart.start_at 7, 2
-    chart.end_at 12, 15
-  end
-  sheet.add_chart(Axlsx::Bar3DChart, :barDir => :col) do |chart|
-    chart.title = sheet["E11"]
-    chart.add_series :labels => sheet["E13:E18"], :data => sheet["F13:F18"]
-    chart.start_at 7, 16
-    chart.end_at 12, 31
+    wb.add_worksheet do |sheet|
+      sheet.add_row
+      sheet.add_row [nil, "College Budget"], :style => [nil, header]
+      sheet.add_row
+      sheet.add_row [nil, "What's coming in this month.", nil, nil, "How am I doing"], :style => tbl_header
+      sheet.add_row [nil, "Item", "Amount", nil, "Item", "Amount"], :style => [nil, ind_header, col_header, nil, ind_header, col_header]
+      sheet.add_row [nil, "Estimated monthly net income", 500, nil, "Monthly income", "=C9"], :style => [nil, label, money, nil, label, money]
+      sheet.add_row [nil, "Financial aid", 100, nil, "Monthly expenses", "=C27"], :style =>  [nil, label, money, nil, label, money]
+      sheet.add_row [nil, "Allowance from mom & dad", 20000, nil, "Semester expenses", "=F19"], :style =>  [nil, label, money, nil, label, money]
+      sheet.add_row [nil, "Total", "=SUM(C6:C8)", nil, "Difference", "=F6 - SUM(F7:F8)"], :style => [nil, t_label, t_money, nil, t_label, t_money]
+      sheet.add_row
+      sheet.add_row [nil, "What's going out this month.", nil, nil, "Semester Costs"], :style => tbl_header
+      sheet.add_row [nil, "Item", "Amount", nil, "Item", "Amount"], :style => [nil, ind_header, col_header, nil, ind_header, col_header]
+      sheet.add_row [nil, "Rent", 650, nil, "Tuition", 200], :style =>  [nil, label, money, nil, label, money]
+      sheet.add_row [nil, "Utilities", 120, nil, "Lab fees", 50], :style =>  [nil, label, money, nil, label, money]
+      sheet.add_row [nil, "Cell phone", 100, nil, "Other fees", 10], :style =>  [nil, label, money, nil, label, money]
+      sheet.add_row [nil, "Groceries", 75, nil, "Books", 150], :style =>  [nil, label, money, nil, label, money]
+      sheet.add_row [nil, "Auto expenses", 0, nil, "Deposits", 0], :style =>  [nil, label, money, nil, label, money]
+      sheet.add_row [nil, "Student loans", 0, nil, "Transportation", 30], :style =>  [nil, label, money, nil, label, money]
+      sheet.add_row [nil, "Other loans", 350, nil, "Total", "=SUM(F13:F18)"], :style => [nil, label, money, nil, t_label, t_money]
+      sheet.add_row [nil, "Credit cards", 450], :style => [nil, label, money]
+      sheet.add_row [nil, "Insurance", 0], :style => [nil, label, money]
+      sheet.add_row [nil, "Laundry", 10], :style => [nil, label, money]
+      sheet.add_row [nil, "Haircuts", 0], :style => [nil, label, money]
+      sheet.add_row [nil, "Medical expenses", 0], :style => [nil, label, money]
+      sheet.add_row [nil, "Entertainment", 500], :style => [nil, label, money]
+      sheet.add_row [nil, "Miscellaneous", 0], :style => [nil, label, money]
+      sheet.add_row [nil, "Total", "=SUM(C13:C26)"], :style => [nil, t_label, t_money]
+      sheet.add_chart(Axlsx::Pie3DChart) do |chart|
+        chart.title = sheet["B11"]
+        chart.add_series :data => sheet["C13:C26"], :labels => sheet["B13:B26"]
+        chart.start_at 7, 2
+        chart.end_at 12, 15
+      end
+      sheet.add_chart(Axlsx::Bar3DChart, :barDir => :col) do |chart|
+        chart.title = sheet["E11"]
+        chart.add_series :labels => sheet["E13:E18"], :data => sheet["F13:F18"]
+        chart.start_at 7, 16
+        chart.end_at 12, 31
+      end
+      sheet.merged_cells.concat ["B4:C4","E4:F4","B11:C11","E11:F11","B2:F2"]
+      sheet.column_widths 2, nil, nil, 2, nil, nil, 2
+    end
   end
-  sheet.merged_cells.concat ["B4:C4","E4:F4","B11:C11","E11:F11","B2:F2"]
-  sheet.column_widths 2, nil, nil, 2, nil, nil, 2
+  p.use_shared_strings = true
+  p.serialize 'axlsx.xlsx'
 end
-p.serialize 'axlsx.xlsx'
diff --git a/lib/axlsx/version.rb b/lib/axlsx/version.rb
index 4edbc831..8e85c13f 100644
--- a/lib/axlsx/version.rb
+++ b/lib/axlsx/version.rb
@@ -5,6 +5,6 @@ module Axlsx
   # When using bunle exec rake and referencing the gem on github or locally
   # it will use the gemspec, which preloads this constant for the gem's version.
   # We check to make sure that it has not already been loaded
-  VERSION="1.1.0" unless defined? Axlsx::VERSION
+  VERSION="1.1.1" unless defined? Axlsx::VERSION
 
 end