write_xlsx 0.58.0 → 0.59.0

data/test/package/table/test_table01.rb

@@ -13,8 +13,7 @@ class TestTable01 < Test::Unit::TestCase
     # Set the table properties.
     @worksheet.add_table('C3:F13')
 
-    table = Writexlsx::Package::Table.new
-    table.properties = @worksheet.tables[0]
+    table = @worksheet.tables[0]
     table.__send__(:assemble_xml_file)
 
     result = got_to_array(table.instance_variable_get(:@writer).string)

data/test/package/table/test_table02.rb

@@ -13,8 +13,7 @@ class TestTable02 < Test::Unit::TestCase
     # Set the table properties.
     @worksheet.add_table('D4:I15', :style => 'Table Style Light 17')
 
-    table = Writexlsx::Package::Table.new
-    table.properties = @worksheet.tables[0]
+    table = @worksheet.tables[0]
     table.__send__(:assemble_xml_file)
 
     result = got_to_array(table.instance_variable_get(:@writer).string)

data/test/package/table/test_table03.rb

@@ -21,8 +21,7 @@ class TestTable03 < Test::Unit::TestCase
                          }
                          )
 
-    table = Writexlsx::Package::Table.new
-    table.properties = @worksheet.tables[0]
+    table = @worksheet.tables[0]
     table.__send__(:assemble_xml_file)
 
     result = got_to_array(table.instance_variable_get(:@writer).string)

data/test/package/table/test_table04.rb

@@ -18,8 +18,7 @@ class TestTable04 < Test::Unit::TestCase
                          }
                          )
 
-    table = Writexlsx::Package::Table.new
-    table.properties = @worksheet.tables[0]
+    table = @worksheet.tables[0]
     table.__send__(:assemble_xml_file)
 
     result = got_to_array(table.instance_variable_get(:@writer).string)

data/test/package/table/test_table05.rb

@@ -18,8 +18,7 @@ class TestTable05 < Test::Unit::TestCase
                          }
                          )
 
-    table = Writexlsx::Package::Table.new
-    table.properties = @worksheet.tables[0]
+    table = @worksheet.tables[0]
     table.__send__(:assemble_xml_file)
 
     result = got_to_array(table.instance_variable_get(:@writer).string)

data/test/package/table/test_table06.rb

@@ -23,8 +23,7 @@ class TestTable06 < Test::Unit::TestCase
                          }
                          )
 
-    table = Writexlsx::Package::Table.new
-    table.properties = @worksheet.tables[0]
+    table = @worksheet.tables[0]
     table.__send__(:assemble_xml_file)
 
     result = got_to_array(table.instance_variable_get(:@writer).string)

data/test/package/table/test_table07.rb

@@ -18,8 +18,7 @@ class TestTable07 < Test::Unit::TestCase
                          }
                          )
 
-    table = Writexlsx::Package::Table.new
-    table.properties = @worksheet.tables[0]
+    table = @worksheet.tables[0]
     table.__send__(:assemble_xml_file)
 
     result = got_to_array(table.instance_variable_get(:@writer).string)

data/test/package/table/test_table08.rb

@@ -24,8 +24,7 @@ class TestTable08 < Test::Unit::TestCase
                          }
                          )
 
-    table = Writexlsx::Package::Table.new
-    table.properties = @worksheet.tables[0]
+    table = @worksheet.tables[0]
     table.__send__(:assemble_xml_file)
 
     result = got_to_array(table.instance_variable_get(:@writer).string)

data/test/package/table/test_table09.rb

@@ -30,8 +30,7 @@ class TestTable09 < Test::Unit::TestCase
                          }
                          )
 
-    table = Writexlsx::Package::Table.new
-    table.properties = @worksheet.tables[0]
+    table = @worksheet.tables[0]
     table.__send__(:assemble_xml_file)
 
     result = got_to_array(table.instance_variable_get(:@writer).string)

data/test/package/table/test_table10.rb

@@ -16,8 +16,7 @@ class TestTable10 < Test::Unit::TestCase
                          {:name => 'MyTable'}
                          )
 
-    table = Writexlsx::Package::Table.new
-    table.properties = @worksheet.tables[0]
+    table = @worksheet.tables[0]
     table.__send__(:assemble_xml_file)
 
     result = got_to_array(table.instance_variable_get(:@writer).string)

data/test/package/table/test_table11.rb

@@ -29,8 +29,7 @@ class TestTable11 < Test::Unit::TestCase
                          }
                          )
 
-    table = Writexlsx::Package::Table.new
-    table.properties = @worksheet.tables[0]
+    table = @worksheet.tables[0]
     table.__send__(:assemble_xml_file)
 
     result = got_to_array(table.instance_variable_get(:@writer).string)

data/test/package/table/test_table12.rb

@@ -29,8 +29,7 @@ class TestTable12 < Test::Unit::TestCase
                          }
                          )
 
-    table = Writexlsx::Package::Table.new
-    table.properties = @worksheet.tables[0]
+    table = @worksheet.tables[0]
     table.__send__(:assemble_xml_file)
 
     result = got_to_array(table.instance_variable_get(:@writer).string)

data/test/package/table/test_write_auto_filter.rb

@@ -1,13 +1,20 @@
 # -*- coding: utf-8 -*-
 require 'helper'
-require 'write_xlsx/package/table'
+require 'write_xlsx'
+require 'stringio'
 
 class TestTableWriteAutoFilter01 < Test::Unit::TestCase
+  def setup
+    workbook = WriteXLSX.new(StringIO.new)
+    @worksheet = workbook.add_worksheet
+  end
+
   def test_table_write_auto_filter
     expected = '<autoFilter ref="C3:F13"/>'
 
-    table = Writexlsx::Package::Table.new
-    table.instance_variable_get(:@properties)[:_autofilter] = 'C3:F13'
+    table = Writexlsx::Package::Table.new(@worksheet, 0, 1, 1, 2, 2)
+    table.instance_variable_set(:@autofilter, 'C3:F13')
+
     table.__send__(:write_auto_filter)
     result = table.instance_variable_get(:@writer).string
 

data/test/package/table/test_write_table_column.rb

@@ -3,11 +3,18 @@ require 'helper'
 require 'write_xlsx/package/table'
 
 class TestTableWriteTableColumn < Test::Unit::TestCase
+  def setup
+    workbook = WriteXLSX.new(StringIO.new)
+    @worksheet = workbook.add_worksheet
+  end
+
   def test_table_write_table_column
     expected = '<tableColumn id="1" name="Column1"/>'
 
-    table = Writexlsx::Package::Table.new
-    table.__send__(:write_table_column, {:_name => 'Column1', :_id => 1})
+    table = Writexlsx::Package::Table.new(@worksheet, 0, 1, 1, 2, 2)
+    col_data = Writexlsx::Package::Table::ColumnData.new(1)
+
+    table.__send__(:write_table_column, col_data)
     result = table.instance_variable_get(:@writer).string
 
     assert_equal(expected, result)

data/test/package/table/test_write_table_style_info.rb

@@ -3,20 +3,21 @@ require 'helper'
 require 'write_xlsx/package/table'
 
 class TestTableWriteTableStyleInfo < Test::Unit::TestCase
+  def setup
+    workbook = WriteXLSX.new(StringIO.new)
+    @worksheet = workbook.add_worksheet
+  end
+
   def test_table_write_table_style_info
     expected = '<tableStyleInfo name="TableStyleMedium9" showFirstColumn="0" showLastColumn="0" showRowStripes="1" showColumnStripes="0"/>'
 
-    table = Writexlsx::Package::Table.new
-    table.
-      instance_variable_set(:@properties,
-                            {
-                              :_style            => 'TableStyleMedium9',
-                              :_show_first_col   => 0,
-                              :_show_last_col    => 0,
-                              :_show_row_stripes => 1,
-                              :_show_col_stripes => 0
-                            }
-                            )
+    table = Writexlsx::Package::Table.new(@worksheet, 0, 1, 1, 2, 2)
+    table.instance_variable_set(:@style,            'TableStyleMedium9')
+    table.instance_variable_set(:@show_first_col,   0)
+    table.instance_variable_set(:@show_last_col,    0)
+    table.instance_variable_set(:@show_row_stripes, 1)
+    table.instance_variable_set(:@show_col_stripes, 0)
+
     table.__send__(:write_table_style_info)
     result = table.instance_variable_get(:@writer).string
 

data/test/package/table/test_write_xml_declaration.rb

@@ -3,10 +3,15 @@ require 'helper'
 require 'write_xlsx/package/table'
 
 class TestTableWriteXmlDeclaration < Test::Unit::TestCase
+  def setup
+    workbook = WriteXLSX.new(StringIO.new)
+    @worksheet = workbook.add_worksheet
+  end
+
   def test_table_write_xml_declaration
     expected = %Q{<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n}
 
-    table = Writexlsx::Package::Table.new
+    table = Writexlsx::Package::Table.new(@worksheet, 0, 1, 1, 2, 2)
     table.__send__(:write_xml_declaration)
     result = table.instance_variable_get(:@writer).string
 

data/test/regression/test_macro01.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionMacro01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_macro01
+    @xlsx = 'macro01.xlsm'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    workbook.add_vba_project(File.join(
+                                       @regression_output,
+                                       'vbaProject01.bin'
+                                       )
+                             )
+
+    worksheet.write('A1', 123)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/test_example_match.rb

@@ -4837,4 +4837,26 @@ EOS
     workbook.close
     compare_xlsx(File.join(@perl_output, @xlsx), @xlsx)
   end
+
+  def test_add_vba_project
+    @xlsx = 'add_vba_project.xlsm'
+    workbook = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.set_column('A:A', 50)
+
+    # Add the VBA project binary.
+    workbook.add_vba_project(File.join(@test_dir, 'vbaProject.bin'))
+
+    # Show text for the end user.
+    worksheet.write('A1', 'Run the SampleMacro embedded in this file.')
+    worksheet.write('A2', 'You may have to turn on the Excel Developer option first.')
+
+    # Call a user defined function from the VBA project.
+    worksheet.write('A6', 'Result from a user defined function:')
+    worksheet.write('B6', '=MyFunction(7)')
+
+    workbook.close
+    compare_xlsx(File.join(@perl_output, @xlsx), @xlsx)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.58.0
+  version: 0.59.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -39,7 +39,8 @@ description: ! "write_xlsx s a gem to create a new file in the Excel 2007+ XLSX
   in this gem.\n"
 email:
 - cxn03651@msj.biglobe.ne.jp
-executables: []
+executables:
+- extract_vba.rb
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
@@ -52,7 +53,9 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- bin/extract_vba.rb
 - examples/a_simple.rb
+- examples/add_vba_project.rb
 - examples/array_formula.rb
 - examples/autofilter.rb
 - examples/chart_area.rb
@@ -107,6 +110,7 @@ files:
 - examples/stocks.rb
 - examples/tab_colors.rb
 - examples/tables.rb
+- examples/vbaProject.bin
 - lib/write_xlsx.rb
 - lib/write_xlsx/chart.rb
 - lib/write_xlsx/chart/area.rb
@@ -124,6 +128,7 @@ files:
 - lib/write_xlsx/format.rb
 - lib/write_xlsx/package/app.rb
 - lib/write_xlsx/package/comments.rb
+- lib/write_xlsx/package/conditional_format.rb
 - lib/write_xlsx/package/content_types.rb
 - lib/write_xlsx/package/core.rb
 - lib/write_xlsx/package/packager.rb
@@ -254,6 +259,7 @@ files:
 - test/package/vml/test_write_stroke.rb
 - test/package/vml/test_write_textbox.rb
 - test/perl_output/a_simple.xlsx
+- test/perl_output/add_vba_project.xlsm
 - test/perl_output/array_formula.xlsx
 - test/perl_output/autofilter.xlsx
 - test/perl_output/chart_area.xlsx
@@ -533,6 +539,7 @@ files:
 - test/regression/test_image05.rb
 - test/regression/test_image06.rb
 - test/regression/test_image07.rb
+- test/regression/test_macro01.rb
 - test/regression/test_outline01.rb
 - test/regression/test_outline02.rb
 - test/regression/test_outline03.rb
@@ -833,6 +840,7 @@ files:
 - test/regression/xlsx_files/image05.xlsx
 - test/regression/xlsx_files/image06.xlsx
 - test/regression/xlsx_files/image07.xlsx
+- test/regression/xlsx_files/macro01.xlsm
 - test/regression/xlsx_files/outline01.xlsx
 - test/regression/xlsx_files/outline02.xlsx
 - test/regression/xlsx_files/outline03.xlsx
@@ -919,9 +927,11 @@ files:
 - test/regression/xlsx_files/table12.xlsx
 - test/regression/xlsx_files/table13.xlsx
 - test/regression/xlsx_files/table14.xlsx
+- test/regression/xlsx_files/vbaProject01.bin
 - test/test_delete_files.rb
 - test/test_example_match.rb
 - test/test_xml_writer_simple.rb
+- test/vbaProject.bin
 - test/workbook/test_get_chart_range.rb
 - test/workbook/test_sort_defined_names.rb
 - test/workbook/test_workbook_01.rb
@@ -1162,6 +1172,7 @@ test_files:
 - test/package/vml/test_write_stroke.rb
 - test/package/vml/test_write_textbox.rb
 - test/perl_output/a_simple.xlsx
+- test/perl_output/add_vba_project.xlsm
 - test/perl_output/array_formula.xlsx
 - test/perl_output/autofilter.xlsx
 - test/perl_output/chart_area.xlsx
@@ -1441,6 +1452,7 @@ test_files:
 - test/regression/test_image05.rb
 - test/regression/test_image06.rb
 - test/regression/test_image07.rb
+- test/regression/test_macro01.rb
 - test/regression/test_outline01.rb
 - test/regression/test_outline02.rb
 - test/regression/test_outline03.rb
@@ -1741,6 +1753,7 @@ test_files:
 - test/regression/xlsx_files/image05.xlsx
 - test/regression/xlsx_files/image06.xlsx
 - test/regression/xlsx_files/image07.xlsx
+- test/regression/xlsx_files/macro01.xlsm
 - test/regression/xlsx_files/outline01.xlsx
 - test/regression/xlsx_files/outline02.xlsx
 - test/regression/xlsx_files/outline03.xlsx
@@ -1827,9 +1840,11 @@ test_files:
 - test/regression/xlsx_files/table12.xlsx
 - test/regression/xlsx_files/table13.xlsx
 - test/regression/xlsx_files/table14.xlsx
+- test/regression/xlsx_files/vbaProject01.bin
 - test/test_delete_files.rb
 - test/test_example_match.rb
 - test/test_xml_writer_simple.rb
+- test/vbaProject.bin
 - test/workbook/test_get_chart_range.rb
 - test/workbook/test_sort_defined_names.rb
 - test/workbook/test_workbook_01.rb