write_xlsx 0.51.0 → 0.54.0

data/test/package/content_types/test_write_override.rb

@@ -7,7 +7,7 @@ class TestWriteOverride < Test::Unit::TestCase
     @obj = Writexlsx::Package::ContentTypes.new
     @obj.__send__('write_override', '/docProps/core.xml', 'app...')
     result = @obj.xml_str
-    expected = '<Override PartName="/docProps/core.xml" ContentType="app..." />'
+    expected = '<Override PartName="/docProps/core.xml" ContentType="app..."/>'
     assert_equal(expected, result)
   end
 end

data/test/package/table/test_write_auto_filter.rb

@@ -4,7 +4,7 @@ require 'write_xlsx/package/table'
 
 class TestTableWriteAutoFilter01 < Test::Unit::TestCase
   def test_table_write_auto_filter
-    expected = '<autoFilter ref="C3:F13" />'
+    expected = '<autoFilter ref="C3:F13"/>'
 
     table = Writexlsx::Package::Table.new
     table.instance_variable_get(:@properties)[:_autofilter] = 'C3:F13'

data/test/package/table/test_write_table_column.rb

@@ -4,7 +4,7 @@ require 'write_xlsx/package/table'
 
 class TestTableWriteTableColumn < Test::Unit::TestCase
   def test_table_write_table_column
-    expected = '<tableColumn id="1" name="Column1" />'
+    expected = '<tableColumn id="1" name="Column1"/>'
 
     table = Writexlsx::Package::Table.new
     table.__send__(:write_table_column, {:_name => 'Column1', :_id => 1})

data/test/package/table/test_write_table_style_info.rb

@@ -4,7 +4,7 @@ require 'write_xlsx/package/table'
 
 class TestTableWriteTableStyleInfo < Test::Unit::TestCase
   def test_table_write_table_style_info
-    expected = '<tableStyleInfo name="TableStyleMedium9" showFirstColumn="0" showLastColumn="0" showRowStripes="1" showColumnStripes="0" />'
+    expected = '<tableStyleInfo name="TableStyleMedium9" showFirstColumn="0" showLastColumn="0" showRowStripes="1" showColumnStripes="0"/>'
 
     table = Writexlsx::Package::Table.new
     table.

data/test/package/vml/test_write_fill.rb

@@ -8,7 +8,7 @@ class TestWriteFill < Test::Unit::TestCase
     vml = Writexlsx::Package::Vml.new
     vml.__send__('write_fill')
     result = vml.instance_variable_get(:@writer).string
-    expected = '<v:fill color2="#ffffe1" />'
+    expected = '<v:fill color2="#ffffe1"/>'
     assert_equal(expected, result)
   end
 end

data/test/package/vml/test_write_idmap.rb

@@ -8,7 +8,7 @@ class TestWriteIdmap < Test::Unit::TestCase
     vml = Writexlsx::Package::Vml.new
     vml.__send__('write_idmap', 1)
     result = vml.instance_variable_get(:@writer).string
-    expected = '<o:idmap v:ext="edit" data="1" />'
+    expected = '<o:idmap v:ext="edit" data="1"/>'
     assert_equal(expected, result)
   end
 end

data/test/package/vml/test_write_move_with_cells.rb

@@ -8,7 +8,7 @@ class TestWriteMoveWithCells < Test::Unit::TestCase
     vml = Writexlsx::Package::Vml.new
     vml.__send__('write_move_with_cells')
     result = vml.instance_variable_get(:@writer).string
-    expected = '<x:MoveWithCells />'
+    expected = '<x:MoveWithCells/>'
     assert_equal(expected, result)
   end
 end

data/test/package/vml/test_write_path.rb

@@ -8,7 +8,7 @@ class TestWritePath < Test::Unit::TestCase
     vml = Writexlsx::Package::Vml.new
     vml.__send__('write_path', 't', 'rect')
     result = vml.instance_variable_get(:@writer).string
-    expected = '<v:path gradientshapeok="t" o:connecttype="rect" />'
+    expected = '<v:path gradientshapeok="t" o:connecttype="rect"/>'
     assert_equal(expected, result)
   end
 
@@ -16,7 +16,7 @@ class TestWritePath < Test::Unit::TestCase
     vml = Writexlsx::Package::Vml.new
     vml.__send__('write_path', nil, 'none')
     result = vml.instance_variable_get(:@writer).string
-    expected = '<v:path o:connecttype="none" />'
+    expected = '<v:path o:connecttype="none"/>'
     assert_equal(expected, result)
   end
 end

data/test/package/vml/test_write_shadow.rb

@@ -8,7 +8,7 @@ class TestWriteShadow < Test::Unit::TestCase
     vml = Writexlsx::Package::Vml.new
     vml.__send__('write_shadow')
     result = vml.instance_variable_get(:@writer).string
-    expected = '<v:shadow on="t" color="black" obscured="t" />'
+    expected = '<v:shadow on="t" color="black" obscured="t"/>'
     assert_equal(expected, result)
   end
 end

data/test/package/vml/test_write_shapelayout.rb

@@ -8,7 +8,7 @@ class TestWriteShapelayout < Test::Unit::TestCase
     vml = Writexlsx::Package::Vml.new
     vml.__send__('write_shapelayout', 1)
     result = vml.instance_variable_get(:@writer).string
-    expected = '<o:shapelayout v:ext="edit"><o:idmap v:ext="edit" data="1" /></o:shapelayout>'
+    expected = '<o:shapelayout v:ext="edit"><o:idmap v:ext="edit" data="1"/></o:shapelayout>'
     assert_equal(expected, result)
   end
 end

data/test/package/vml/test_write_shapetype.rb

@@ -8,7 +8,7 @@ class TestWriteShapetype < Test::Unit::TestCase
     vml = Writexlsx::Package::Vml.new
     vml.__send__('write_shapetype')
     result = vml.instance_variable_get(:@writer).string
-    expected = '<v:shapetype id="_x0000_t202" coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe"><v:stroke joinstyle="miter" /><v:path gradientshapeok="t" o:connecttype="rect" /></v:shapetype>'
+    expected = '<v:shapetype id="_x0000_t202" coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe"><v:stroke joinstyle="miter"/><v:path gradientshapeok="t" o:connecttype="rect"/></v:shapetype>'
     assert_equal(expected, result)
   end
 end

data/test/package/vml/test_write_size_with_cells.rb

@@ -8,7 +8,7 @@ class TestWriteSizeWithCells < Test::Unit::TestCase
     vml = Writexlsx::Package::Vml.new
     vml.__send__('write_size_with_cells')
     result = vml.instance_variable_get(:@writer).string
-    expected = '<x:SizeWithCells />'
+    expected = '<x:SizeWithCells/>'
     assert_equal(expected, result)
   end
 end

data/test/package/vml/test_write_stroke.rb

@@ -8,7 +8,7 @@ class TestWriteStroke < Test::Unit::TestCase
     vml = Writexlsx::Package::Vml.new
     vml.__send__('write_stroke')
     result = vml.instance_variable_get(:@writer).string
-    expected = '<v:stroke joinstyle="miter" />'
+    expected = '<v:stroke joinstyle="miter"/>'
     assert_equal(expected, result)
   end
 end

data/test/regression/test_chart_axis22.rb

@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartAxis22 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_axis22
+    @xlsx = 'chart_axis22.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, [86799104, 86801792 ])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_x_axis(:num_format => '#,##0.00')
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                {'xl/charts/chart1.xml' => ['<c:pageMargins']}
+                                )
+  end
+end

data/test/regression/test_chart_axis23.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartAxis23 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_axis23
+    @xlsx = 'chart_axis23.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, [46332160, 47470848])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_x_axis(:num_format => 'dd/mm/yyyy')
+    chart.set_y_axis(:num_format => '0.00%')
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                {'xl/charts/chart1.xml' => ['<c:pageMargins']}
+                                )
+  end
+end

data/test/regression/test_chart_axis24.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartAxis24 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_axis24
+    @xlsx = 'chart_axis24.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, [47471232, 48509696])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_x_axis(:num_format => 'dd/mm/yyyy', :num_format_linked => 1)
+    chart.set_y_axis(:num_format => '0.00%')
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                {'xl/charts/chart1.xml' => ['<c:pageMargins']}
+                                )
+  end
+end

data/test/regression/test_chart_font01.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartFont01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_area01
+    @xlsx = 'chart_font01.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'bar', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [43945344, 45705856])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_title(:name => 'Title')
+
+    chart.set_x_axis(
+                     :name     => 'XXX',
+                     :num_font => { :size => 11, :bold => 1, :italic => 1 }
+                     )
+
+    chart.set_y_axis(
+                     :name     => 'YYY',
+                     :num_font => { :size => 9, :bold => 0, :italic => 1 }
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+                 nil,
+                 { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+                 )
+  end
+end

data/test/regression/test_chart_font02.rb

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartFont02 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_area02
+    @xlsx = 'chart_font02.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'bar', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [43945344, 45705856])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_title(:name => 'Title')
+
+    chart.set_x_axis(
+                     :name      => 'XXX',
+                     :name_font => { :bold => 0, :italic => 1 },
+                     :num_font  => { :size => 11, :bold => 1, :italic => 1 }
+                     )
+
+    chart.set_y_axis(
+                     :name      => 'YYY',
+                     :name_font => { :bold => 1, :italic => 1 },
+                     :num_font  => { :size => 9, :bold => 0, :italic => 1 },
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+                 nil,
+                 { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+                 )
+  end
+end

data/test/regression/test_chart_font03.rb

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartFont03 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_area03
+    @xlsx = 'chart_font03.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'bar', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [45704704, 45716224])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_title(
+                    :name => 'Title',
+                    :name_font => { :bold => 0, :italic => 1 }
+                    )
+
+    chart.set_x_axis(
+                     :name      => 'XXX',
+                     :name_font => { :bold => 0, :italic => 1 },
+                     :num_font  => { :size => 11, :bold => 1, :italic => 1 }
+                     )
+
+    chart.set_y_axis(
+                     :name      => 'YYY',
+                     :name_font => { :bold => 1, :italic => 1 },
+                     :num_font  => { :size => 9, :bold => 0, :italic => 1 }
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+                 nil,
+                 { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+                 )
+  end
+end

data/test/regression/test_chart_font04.rb

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartFont04 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_area04
+    @xlsx = 'chart_font04.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'bar', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [43944960, 45705472])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_title(
+                    :name      => '=Sheet1!$A$1',
+                    :name_font => { :bold => 0, :italic => 1 }
+                    )
+
+    chart.set_x_axis(
+                     :name       => '=Sheet1!$A$2',
+                     :name_font  => { :bold => 0, :italic => 1 }
+                     )
+
+    chart.set_y_axis(
+                     :name       => '=Sheet1!$A$3',
+                     :name_font  => { :bold => 1, :italic => 1 }
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+                 nil,
+                 { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+                 )
+  end
+end

data/test/regression/test_chart_font05.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartFont05 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_area05
+    @xlsx = 'chart_font05.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'bar', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [49407488, 53740288])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_title(:name => 'Title')
+
+    chart.set_x_axis(
+                     :name      => 'XXX',
+                     :num_font  => { :name => 'Arial', :pitch_family => 34, :charset => 0 }
+                     )
+
+    chart.set_y_axis(
+                     :name      => 'YYY',
+                     :num_font  => { :bold => 1, :italic => 1, :underline => 1 }
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+                 nil,
+                 { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+                 )
+  end
+end

data/test/regression/test_chart_font06.rb

@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartFont06 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_area06
+    @xlsx = 'chart_font06.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'bar', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [49407488, 53740288])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [2, 4, 6,  8, 10],
+            [3, 6, 9, 12, 15]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_title(
+                    :name      => 'Title',
+                    :name_font => {
+                      :name         => 'Calibri',
+                      :pitch_family => 34,
+                      :charset      => 0,
+                      :color        => 'yellow'
+                    }
+                    )
+
+    chart.set_x_axis(
+                     :name       => 'XXX',
+                     :name_font  => {
+                       :name         => 'Courier New',
+                       :pitch_family => 49,
+                       :charset      => 0,
+                       :color        => '#92D050'
+                     },
+                     :num_font  => {
+                       :name         => 'Arial',
+                       :pitch_family => 34,
+                       :charset      => 0,
+                       :color        => '#00B0F0'
+                     },
+                     )
+
+    chart.set_y_axis(
+                     :name      => 'YYY',
+                     :name_font => {
+                       :name         => 'Century',
+                       :pitch_family => 18,
+                       :charset      => 0,
+                       :color        => 'red'
+                     },
+                     :num_font => {
+                       :bold      => 1,
+                       :italic    => 1,
+                       :underline => 1,
+                       :color     => '#7030A0',
+                     }
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+                 nil,
+                 { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+                 )
+  end
+end