write_xlsx 0.99.0 → 1.07.0

data/test/drawing/test_write_xfrm_offset.rb

@@ -4,7 +4,7 @@
 
 class TestWriteXfrmOffset < Minitest::Test
   def setup
-    @drawing = Writexlsx::Drawing.new
+    @drawing = Writexlsx::Drawings.new
   end
 
   def test_write_xfrm_offset

data/test/regression/test_array_formula04.rb

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionArrayFormula04 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_array_formula04
+    @xlsx = 'array_formula04.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.write_array_formula(
+      'A1:A3',
+      '{=SUM(B1:C1*B2:C2)}',
+      nil,
+      0
+    )
+
+    workbook.close
+    compare_for_regression(
+      [ 'xl/calcChain.xml', '[Content_Types].xml', 'xl/_rels/workbook.xml.rels' ],
+      {'xl/workbook.xml' => ['<workbookView']}
+    )
+  end
+end

data/test/regression/test_chart_axis26.rb

@@ -17,15 +17,17 @@ def test_chart_axis26
     chart       = workbook.add_chart(:type => 'line', :embedded => 1)
 
     # For testing, copy the randomly generated axis ids in the target xlsx file.
-    chart.instance_variable_set(:@axis_ids, [73048448, 73049984])
+    chart.instance_variable_set(:@axis_ids, [108315392, 108329216])
 
     data = [
-            [ 1, 2, 3, 4,  5 ],
-            [ 2, 4, 6, 8,  10 ],
-            [ 3, 6, 9, 12, 15 ]
-           ]
+      [ 1, 2, 3,  4,  5 ],
+      [ 2, 4, 6,  8, 10 ],
+      [ 3, 6, 9, 12, 15 ]
+    ]
 
-    chart.set_x_axis(:num_font => {:rotation => 45})
+    chart.set_x_axis(
+      :num_font => { :rotation => 45, :baseline => -1 }
+    )
 
     worksheet.write('A1', data)
 
@@ -37,8 +39,8 @@ def test_chart_axis26
 
     workbook.close
     compare_for_regression(
-      nil,
-      { 'xl/charts/chart1.xml' => ['<a:defRPr'] }
+      [],
+      {}
     )
   end
 end

data/test/regression/test_chart_axis27.rb

@@ -17,7 +17,7 @@ def test_chart_axis27
     chart       = workbook.add_chart(:type => 'line', :embedded => 1)
 
     # For testing, copy the randomly generated axis ids in the target xlsx file.
-    chart.instance_variable_set(:@axis_ids, [73048448, 73049984])
+    chart.instance_variable_set(:@axis_ids, [108315392, 108329216])
 
     data = [
             [ 1, 2, 3, 4,  5 ],

data/test/regression/test_chart_axis28.rb

@@ -17,7 +17,7 @@ def test_chart_axis28
     chart       = workbook.add_chart(:type => 'line', :embedded => 1)
 
     # For testing, copy the randomly generated axis ids in the target xlsx file.
-    chart.instance_variable_set(:@axis_ids, [45451904, 47401600])
+    chart.instance_variable_set(:@axis_ids, [115375104, 115390720])
 
     data = [
             [ 1, 2, 3, 4,  5 ],

data/test/regression/test_chart_axis29.rb

@@ -17,7 +17,7 @@ def test_chart_axis29
     chart       = workbook.add_chart(:type => 'line', :embedded => 1)
 
     # For testing, copy the randomly generated axis ids in the target xlsx file.
-    chart.instance_variable_set(:@axis_ids, [45444480, 47402368])
+    chart.instance_variable_set(:@axis_ids, [145169024, 145176448])
     data = [
             [ 1, 2, 3, 4,  5 ],
             [ 2, 4, 6, 8,  10 ],

data/test/regression/test_chart_axis33.rb

@@ -17,7 +17,7 @@ def test_chart_axis33
     chart       = workbook.add_chart(:type => 'line', :embedded => 1)
 
     # For testing, copy the randomly generated axis ids in the target xlsx file.
-    chart.instance_variable_set(:@axis_ids, [68827008, 68898816])
+    chart.instance_variable_set(:@axis_ids, [143682944, 143946496])
     data = [
             [ 1, 2, 3, 4,  5 ],
             [ 2, 4, 6, 8,  10 ],

data/test/regression/test_chart_axis44.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartAxis44 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_chart_axis44
+    @xlsx = 'chart_axis44.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    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, [108176896, 108178816])
+
+    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(
+      :name      => 'XXX',
+      :name_font => { :rotation => -45, :baseline => -1},
+      :num_font  => { :rotation => -45, :baseline => -1}
+    )
+
+    chart.set_y_axis(
+      :name      => 'YYY',
+      :name_font => { :rotation => -45, :baseline => -1},
+      :num_font  => { :rotation => -45, :baseline => -1}
+    )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_for_regression(
+      nil,
+      { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+    )
+  end
+end

data/test/regression/test_chart_axis45.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartAxis45 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_chart_axis45
+    @xlsx = 'chart_axis45.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    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, [108178048, 108321408])
+
+    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(
+      :name      => 'XXX',
+      :name_font => { :rotation => 270, :baseline => -1},
+      :num_font  => { :rotation => 270, :baseline => -1}
+    )
+
+    chart.set_y_axis(
+      :name      => 'YYY',
+      :name_font => { :rotation => 270, :baseline => -1},
+      :num_font  => { :rotation => 270, :baseline => -1}
+    )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_for_regression(
+      nil,
+      { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+    )
+  end
+end

data/test/regression/test_chart_axis46.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartAxis46 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_chart_axis46
+    @xlsx = 'chart_axis46.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    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, [108178048, 108321408])
+
+    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(
+      :name      => 'XXX',
+      :name_font => { :rotation => 271, :baseline => -1},
+      :num_font  => { :rotation => 271, :baseline => -1}
+    )
+
+    chart.set_y_axis(
+      :name      => 'YYY',
+      :name_font => { :rotation => 271, :baseline => -1},
+      :num_font  => { :rotation => 271, :baseline => -1}
+    )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_for_regression(
+      nil,
+      { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+    )
+  end
+end

data/test/regression/test_chart_combined10.rb

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartCombined10 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_chart_combined10
+    @xlsx = 'chart_combined10.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+    chart_doughnut = workbook.add_chart(:type => 'doughnut', :embedded => 1)
+    chart_pie      = workbook.add_chart(:type => 'pie',      :embedded => 1)
+
+    worksheet.write_col('H2', ['Donut', 25, 50, 25, 100])
+    worksheet.write_col('I2', ['Pie',   75,  1, 124])
+
+    chart_doughnut.add_series(
+      :name   => '=Sheet1!$H$2',
+      :values => '=Sheet1!$H$3:$H$6'
+    )
+    chart_doughnut.show_blanks_as('gap')
+
+    chart_pie.add_series(
+      :name   => '=Sheet1!$I$2',
+      :values => '=Sheet1!$I$3:$I$6'
+    )
+    chart_doughnut.combine(chart_pie)
+
+    worksheet.insert_chart('E9', chart_doughnut)
+
+    workbook.close
+    compare_for_regression(
+      [],
+      { 'xl/charts/chart1.xml' => ['<c:dispBlanksAs'] }
+    )
+  end
+end

data/test/regression/test_chart_combined11.rb

@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartCombined11 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_chart_combined11
+    @xlsx = 'chart_combined11.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+    chart_doughnut = workbook.add_chart(:type => 'doughnut', :embedded => 1)
+    chart_pie      = workbook.add_chart(:type => 'pie',      :embedded => 1)
+
+    worksheet.write_col('H2', ['Donut', 25, 50, 25, 100])
+    worksheet.write_col('I2', ['Pie',   75,  1, 124])
+
+    chart_doughnut.add_series(
+      :name   => '=Sheet1!$H$2',
+      :values => '=Sheet1!$H$3:$H$6',
+      :points => [
+        { :fill => { :color => '#FF0000' } },
+        { :fill => { :color => '#FFC000' } },
+        { :fill => { :color => '#00B050' } },
+        { :fill => { :none  => 1 } }
+      ]
+    )
+
+    chart_doughnut.set_rotation(270)
+    chart_doughnut.set_legend(:none => 1)
+    chart_doughnut.set_chartarea(
+      :border => { :none => 1 },
+      :fill   => { :none => 1 }
+    )
+
+    chart_pie.add_series(
+      :name   => '=Sheet1!$I$2',
+      :values => '=Sheet1!$I$3:$I$6',
+      :points => [
+        { :fill => { :none  => 1 } },
+        { :fill => { :color => '#FF0000' } },
+        { :fill => { :none  => 1 } }
+      ]
+    )
+
+    chart_pie.set_rotation(270)
+
+    chart_doughnut.combine(chart_pie)
+
+    worksheet.insert_chart('A1', chart_doughnut)
+
+    workbook.close
+    compare_for_regression(
+      [],
+      { 'xl/charts/chart1.xml' => ['<c:dispBlanksAs'] }
+    )
+  end
+end

data/test/regression/test_chart_data_labels25.rb

@@ -17,7 +17,7 @@ def test_chart_data_labels25
     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, [108652800, 108656128])
+    chart.instance_variable_set(:@axis_ids, [108315392, 108329600])
 
     data = [
             [1, 2, 3,  4,  5],

data/test/regression/test_chart_data_labels26.rb

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDataLabels26 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_chart_data_labels26
+    @xlsx = 'chart_data_labels26.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    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, [48514944, 48516480])
+
+    data = [
+      [ 1,  2,  3,  4,  5],
+      [ 2,  4,  6,  8, 10],
+      [ 3,  6,  9, 12, 15],
+      [10, 20, 30, 40, 50]
+    ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+      :values      => '=Sheet1!$A$1:$A$5',
+      :data_labels => {:value    => 1, :custom => [{:value => 33}]}
+    )
+
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_for_regression
+  end
+end