write_xlsx 0.89.0 → 1.01.0

data/test/regression/test_chart_bar11.rb

@@ -24,6 +24,9 @@ def test_chart_bar11
             [3, 6, 9, 12, 15]
            ]
 
+    # Turn off default URL format for testing.
+    worksheet.instance_variable_set(:@default_url_format, nil)
+
     worksheet.write('A1', data)
     worksheet.write('A7', 'http://www.perl.com/')
     worksheet.write('A8', 'http://www.perl.org/')

data/test/regression/test_chart_bar14.rb

@@ -32,6 +32,9 @@ def test_chart_bar14
             [3, 6, 9, 12, 15]
            ]
 
+    # Turn off default URL format for testing.
+    worksheet2.instance_variable_set(:@default_url_format, nil)
+
     worksheet2.write('A1', data)
     worksheet2.write('A6', 'http://www.perl.com/')
 

data/test/regression/test_chart_chartarea05.rb

@@ -17,30 +17,29 @@ def test_chart_chartarea05
     chart     = workbook.add_chart(:type => 'pie', :embedded => 1)
 
     data = [
-            [2, 4, 6],
-            [60, 30, 10]
-           ]
+      [ 2,  4,  6],
+      [60, 30, 10]
+    ]
 
     worksheet.write('A1', data)
 
     chart.add_series(
-                     :categories => '=Sheet1!$A$1:$A$3',
-                     :values     => '=Sheet1!$B$1:$B$3'
-                     )
+      :categories => '=Sheet1!$A$1:$A$3',
+      :values     => '=Sheet1!$B$1:$B$3'
+    )
 
     chart.set_chartarea(
-                        :border => {
-                          :color     => '#FFFF00',
-                          :dash_type => 'long_dash'
-                        },
-                        :fill   => { :color     => '#92D050' }
-                        )
-
-    # This should be ignored for a pie chart.
+      :border => {
+        :color     => '#FFFF00',
+        :dash_type => 'long_dash'
+      },
+      :fill   => { :color     => '#92D050' }
+    )
+
     chart.set_plotarea(
-                       :border => { :dash_type => 'dash_dot' },
-                       :fill   => { :color     => '#FFC000' }
-                       )
+      :border => { :dash_type => 'square_dot' },
+      :fill   => { :color     => '#FF0000' }
+    )
 
     worksheet.insert_chart('E9', chart)
 

data/test/regression/test_chart_chartarea06.rb

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartChartArea06 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_chart_chartarea06
+    @xlsx = 'chart_chartarea06.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'doughnut', :embedded => 1)
+
+    data = [
+      [ 2,  4,  6],
+      [60, 30, 10]
+    ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+      :categories => '=Sheet1!$A$1:$A$3',
+      :values     => '=Sheet1!$B$1:$B$3'
+    )
+
+    chart.set_chartarea(
+      :border => {
+        :color     => '#FFFF00',
+        :dash_type => 'long_dash'
+      },
+      :fill   => { :color     => '#92D050' }
+    )
+
+    chart.set_plotarea(
+      :border => { :dash_type => 'square_dot' },
+      :fill   => { :color     => '#FF0000' }
+    )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_for_regression
+  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

@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDataLabels25 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_chart_data_labels25
+    @xlsx = 'chart_data_labels25.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, [108315392, 108329600])
+
+    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',
+      :data_labels => {
+        :value    => 1,
+        :position => 'outside_end',
+        :font     => {
+          :rotation => 45,
+          :baseline => -1
+        }
+      }
+    )
+
+    chart.add_series(
+      :values      => '=Sheet1!$B$1:$B$5',
+      :data_labels => {
+        :value => 1,
+        :position => 'inside_base',
+        :font => {
+          :rotation => -45,
+          :baseline => -1
+        }
+      }
+    )
+
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_for_regression
+  end
+end

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

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartFormat26 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_chart_format26
+    @xlsx = 'chart_format26.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+    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, [108652416, 108655744])
+
+    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',
+      :trendline  => { :type => 'linear', :display_equation => 1 }
+    )
+
+    chart.add_series(
+      :categories => '=Sheet1!$A$1:$A$5',
+      :values     => '=Sheet1!$C$1:$C$5'
+    )
+
+    chart.set_legend(:delete_series => [2, 0])
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_chart_format27.rb

@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartFormat27 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_chart_format27
+    @xlsx = 'chart_format27.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+    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, [108645376, 108655360])
+
+    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',
+      :trendline  => {
+        :type             => 'polynomial',
+        :name             => 'My trend name',
+        :order            => 2,
+        :forward          => 0.5,
+        :backward         => 0.5,
+        :display_equation => 1,
+        :line             => {
+          :color     => 'red',
+          :width     => 1,
+          :dash_type => 'long_dash'
+        }
+      }
+    )
+
+    chart.add_series(
+      :categories => '=Sheet1!$A$1:$A$5',
+      :values     => '=Sheet1!$C$1:$C$5'
+    )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_for_regression
+  end
+end