write_xlsx 0.64.1 → 0.65.0

data/test/helper.rb

@@ -19,7 +19,7 @@ class Writexlsx::Workbook
   # Set the default index for each format. This is mainly used for testing.
   #
   def set_default_xf_indices #:nodoc:
-    @formats.each { |format| format.get_xf_index }
+    @formats.formats.each { |format| format.get_xf_index }
   end
 end
 

data/test/package/styles/test_styles_01.rb

@@ -9,16 +9,7 @@ class TestStyles01 < Test::Unit::TestCase
     workbook.__send__('prepare_format_properties')
 
     @style = Writexlsx::Package::Styles.new
-    @style.set_style_properties(
-      workbook.xf_formats,
-      workbook.palette,
-      workbook.font_count,
-      workbook.num_format_count,
-      workbook.border_count,
-      workbook.fill_count,
-      workbook.custom_colors,
-      workbook.dxf_formats
-    )
+    @style.set_style_properties(*workbook.style_properties)
     @style.assemble_xml_file
     result = got_to_array(@style.xml_str)
     expected = expected_to_array(<<EOS

data/test/package/styles/test_styles_02.rb

@@ -16,16 +16,7 @@ class TestStyles02 < Test::Unit::TestCase
     workbook.__send__('prepare_format_properties')
 
     @style = Writexlsx::Package::Styles.new
-    @style.set_style_properties(
-      workbook.xf_formats,
-      workbook.palette,
-      workbook.font_count,
-      workbook.num_format_count,
-      workbook.border_count,
-      workbook.fill_count,
-      workbook.custom_colors,
-      workbook.dxf_formats
-    )
+    @style.set_style_properties(*workbook.style_properties)
     @style.assemble_xml_file
     result = got_to_array(@style.xml_str)
     expected = expected_to_array(<<EOS

data/test/package/styles/test_styles_03.rb

@@ -16,16 +16,7 @@ class TestStyles03 < Test::Unit::TestCase
     workbook.__send__('prepare_format_properties')
 
     @style = Writexlsx::Package::Styles.new
-    @style.set_style_properties(
-      workbook.xf_formats,
-      workbook.palette,
-      workbook.font_count,
-      workbook.num_format_count,
-      workbook.border_count,
-      workbook.fill_count,
-      workbook.custom_colors,
-      workbook.dxf_formats
-    )
+    @style.set_style_properties(*workbook.style_properties)
     @style.assemble_xml_file
     result = got_to_array(@style.xml_str)
     expected = expected_to_array(<<EOS

data/test/package/styles/test_styles_04.rb

@@ -26,16 +26,7 @@ class TestStyles04 < Test::Unit::TestCase
     workbook.__send__('prepare_format_properties')
 
     @style = Writexlsx::Package::Styles.new
-    @style.set_style_properties(
-      workbook.xf_formats,
-      workbook.palette,
-      workbook.font_count,
-      workbook.num_format_count,
-      workbook.border_count,
-      workbook.fill_count,
-      workbook.custom_colors,
-      workbook.dxf_formats
-    )
+    @style.set_style_properties(*workbook.style_properties)
     @style.assemble_xml_file
     result = got_to_array(@style.xml_str)
     expected = expected_to_array(<<EOS

data/test/package/styles/test_styles_05.rb

@@ -20,16 +20,7 @@ class TestStyles05 < Test::Unit::TestCase
     workbook.__send__('prepare_format_properties')
 
     @style = Writexlsx::Package::Styles.new
-    @style.set_style_properties(
-      workbook.xf_formats,
-      workbook.palette,
-      workbook.font_count,
-      workbook.num_format_count,
-      workbook.border_count,
-      workbook.fill_count,
-      workbook.custom_colors,
-      workbook.dxf_formats
-    )
+    @style.set_style_properties(*workbook.style_properties)
     @style.assemble_xml_file
     result = got_to_array(@style.xml_str)
     expected = expected_to_array(<<EOS

data/test/package/styles/test_styles_06.rb

@@ -26,16 +26,7 @@ class TestStyles06 < Test::Unit::TestCase
     workbook.__send__('prepare_format_properties')
 
     @style = Writexlsx::Package::Styles.new
-    @style.set_style_properties(
-      workbook.xf_formats,
-      workbook.palette,
-      workbook.font_count,
-      workbook.num_format_count,
-      workbook.border_count,
-      workbook.fill_count,
-      workbook.custom_colors,
-      workbook.dxf_formats
-    )
+    @style.set_style_properties(*workbook.style_properties)
     @style.assemble_xml_file
     result = got_to_array(@style.xml_str)
     expected = expected_to_array(<<EOS

data/test/package/styles/test_styles_07.rb

@@ -17,16 +17,7 @@ class TestStyles07 < Test::Unit::TestCase
     workbook.__send__('prepare_format_properties')
 
     @style = Writexlsx::Package::Styles.new
-    @style.set_style_properties(
-      workbook.xf_formats,
-      workbook.palette,
-      workbook.font_count,
-      workbook.num_format_count,
-      workbook.border_count,
-      workbook.fill_count,
-      workbook.custom_colors,
-      workbook.dxf_formats
-    )
+    @style.set_style_properties(*workbook.style_properties)
     @style.assemble_xml_file
     result = got_to_array(@style.xml_str)
     expected = expected_to_array(<<EOS

data/test/package/styles/test_styles_08.rb

@@ -16,16 +16,7 @@ class TestStyles08 < Test::Unit::TestCase
     workbook.__send__('prepare_format_properties')
 
     @style = Writexlsx::Package::Styles.new
-    @style.set_style_properties(
-      workbook.xf_formats,
-      workbook.palette,
-      workbook.font_count,
-      workbook.num_format_count,
-      workbook.border_count,
-      workbook.fill_count,
-      workbook.custom_colors,
-      workbook.dxf_formats
-    )
+    @style.set_style_properties(*workbook.style_properties)
     @style.assemble_xml_file
     result = got_to_array(@style.xml_str)
     expected = expected_to_array(<<EOS

data/test/package/styles/test_styles_09.rb

@@ -22,16 +22,7 @@ class TestStyles09 < Test::Unit::TestCase
     workbook.__send__('prepare_format_properties')
 
     @style = Writexlsx::Package::Styles.new
-    @style.set_style_properties(
-      workbook.xf_formats,
-      workbook.palette,
-      workbook.font_count,
-      workbook.num_format_count,
-      workbook.border_count,
-      workbook.fill_count,
-      workbook.custom_colors,
-      workbook.dxf_formats
-    )
+    @style.set_style_properties(*workbook.style_properties)
     @style.assemble_xml_file
     result = got_to_array(@style.xml_str)
     expected = expected_to_array(<<EOS

data/test/regression/test_chart_gap01.rb

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartGap01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_gap01
+    @xlsx = 'chart_gap01.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'column', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [45438848, 45470464])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$B$1:$B$5',
+                     :overlap    => 5,
+                     :gap        => 157
+                     )
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$C$1:$C$5'
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_chart_gap02.rb

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartGap02 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_gap02
+    @xlsx = 'chart_gap02.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'column', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [45470464, 45472000])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$B$1:$B$5',
+                     :overlap    => -100,
+                     :gap        => 0
+                     )
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$C$1:$C$5'
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_chart_gap03.rb

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartGap03 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_gap03
+    @xlsx = 'chart_gap03.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'column', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [45470464, 45472000])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$B$1:$B$5',
+                     :overlap    => 100,
+                     :gap        => 500
+                     )
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$C$1:$C$5'
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_format05.rb

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionFormat05 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_format05
+    @xlsx = 'format05.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    wrap      = workbook.add_format(:text_wrap => 1)
+
+    worksheet.set_row(0, 45)
+
+    worksheet.write('A1', "Foo\nBar", wrap)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_rich_string12.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionRichString12 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_rich_string12
+    @xlsx = 'rich_string12.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.set_column('A:A', 30)
+    worksheet.set_row(2, 60)
+
+    bold   = workbook.add_format(:bold      => 1)
+    italic = workbook.add_format(:italic    => 1)
+    wrap   = workbook.add_format(:text_wrap => 1)
+
+    worksheet.write('A1', 'Foo', bold)
+    worksheet.write('A2', 'Bar', italic)
+    worksheet.write_rich_string('A3', "This is\n", bold, "bold\n", "and this is\n", italic, 'italic', wrap)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end