write_xlsx 1.00.0 → 1.01.0

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_doughnut07.rb

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDoughnut07 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_chart_doughnut07
+    @xlsx = 'chart_doughnut07.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+    chart_doughnut = workbook.add_chart(:type => 'doughnut', :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.add_series(
+      :name   => '=Sheet1!$I$2',
+      :values => '=Sheet1!$I$3:$I$6'
+    )
+
+    worksheet.insert_chart('E9', chart_doughnut)
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_chart_font09.rb

@@ -13,7 +13,7 @@ def test_chart_font09
     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, [68825472, 68827392])
+    chart.instance_variable_set(:@axis_ids, [108178432, 108321408])
 
     data = [
             [1, 2, 3,  4,  5],

data/test/regression/test_chart_size03.rb

@@ -31,7 +31,10 @@ def test_chart_size03
     chart.add_series(:values => '=Sheet1!$B$1:$B$5')
     chart.add_series(:values => '=Sheet1!$C$1:$C$5')
 
-    worksheet.insert_chart('E9', chart, 0, 0, 1.066666666, 1.11111111)
+    worksheet.insert_chart(
+      'E9', chart,
+      :x_scale => 1.066666666, :y_scale => 1.11111111
+    )
 
     workbook.close
     compare_for_regression

data/test/regression/test_comment14.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionComment14 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_comment14
+    @xlsx = 'comment14.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.write('A1', 'Foo')
+    worksheet.write_comment('B2', 'Some text')
+
+    worksheet.set_column('C:C', 13)
+
+    # Set the author to match the target XLSX file.
+    worksheet.comments_author = 'John'
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_image08.rb

@@ -15,10 +15,11 @@ def test_image08
     workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
-    worksheet.insert_image('B3',
-                           'test/regression/images/grey.png',
-                           0, 0, 0.5, 0.5
-                           )
+    worksheet.insert_image(
+      'B3',
+      'test/regression/images/grey.png',
+      :x_scale => 0.5, :y_scale => 0.5
+    )
 
     workbook.close
     compare_for_regression

data/test/regression/test_image15.rb

@@ -20,8 +20,10 @@ def test_image15
     worksheet.set_column('C:E', 3.29)
     worksheet.set_column('F:F', 10.71)
 
-    worksheet.insert_image('C2',
-                           'test/regression/images/logo.png', 13, 2)
+    worksheet.insert_image(
+      'C2',
+      'test/regression/images/logo.png', 13, 2
+    )
 
     workbook.close
     compare_for_regression

data/test/regression/test_image28.rb

@@ -18,7 +18,7 @@ def test_image28
     worksheet.insert_image(
       0, 6,
       File.join(@test_dir, 'regression', 'images/red_208.png'),
-      46, 1
+      :x_offset => 46, :y_offset => 1
     )
 
     workbook.close

data/test/regression/test_object_position01.rb

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionObjectPosition01 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_object_position01
+    @xlsx = 'object_position01.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      :object_position => 1
+    )
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_object_position02.rb

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionObjectPosition02 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_object_position02
+    @xlsx = 'object_position02.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      0, 0, 1, 1, 2
+    )
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_object_position03.rb

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionObjectPosition03 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_object_position03
+    @xlsx = 'object_position03.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      0, 0, 1, 1, 3
+    )
+
+    workbook.close
+    compare_for_regression
+  end
+end