write_xlsx 0.51.0 → 0.54.0

data/test/regression/test_chart_radar01.rb

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartRadar01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_radar01
+    @xlsx = 'chart_radar01.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'radar', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [56801152, 56802688])
+
+    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')
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_chart_radar02.rb

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartRadar02 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_radar02
+    @xlsx = 'chart_radar02.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(
+                                   :type     => 'radar',
+                                   :embedded => 1,
+                                   :subtype  => 'with_markers'
+                                   )
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [48543616, 48545152])
+
+    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')
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_chart_radar03.rb

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartRadar03 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_radar03
+    @xlsx = 'chart_radar03.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(
+                                   :type     => 'radar',
+                                   :embedded => 1,
+                                   :subtype  => 'filled'
+                                   )
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [56802304, 56845440])
+
+    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')
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_escapes04.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionEscapes04 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_escapes04
+    @xlsx = 'escapes04.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+
+    worksheet.write_url('A1', 'http://www.perl.com/?a=1&b=2')
+
+    workbook.close
+    compare_xlsx_for_regression(
+                                File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                {
+                                  'xl/workbook.xml' => ['<workbookView']
+                                }
+                                )
+  end
+end

data/test/regression/test_escapes05.rb

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionEscapes05 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_escapes05
+    @xlsx = 'escapes05.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet1  = workbook.add_worksheet('Start')
+    worksheet2  = workbook.add_worksheet('A & B')
+
+    worksheet1.write_url('A1', "internal:'A & B'!A1", 'Jump to A & B')
+
+    workbook.close
+    compare_xlsx_for_regression(
+                                File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                {
+                                  'xl/workbook.xml' => ['<workbookView']
+                                }
+                                )
+  end
+end

data/test/regression/test_rich_string01.rb

@@ -23,6 +23,6 @@ class TestRegressionRichString01 < Test::Unit::TestCase
     worksheet.write_rich_string('A3', 'a', bold, 'bc', 'defg')
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_rich_string02.rb

@@ -23,6 +23,6 @@ class TestRegressionRichString02 < Test::Unit::TestCase
     worksheet.write_rich_string('A3', 'abcd', italic, 'ef', 'g')
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_rich_string03.rb

@@ -23,6 +23,6 @@ class TestRegressionRichString03 < Test::Unit::TestCase
     worksheet.write_rich_string('A3', bold, 'abc', 'defg')
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_rich_string04.rb

@@ -23,6 +23,6 @@ class TestRegressionRichString04 < Test::Unit::TestCase
     worksheet.write_rich_string('A3', bold, 'abc', italic, 'defg')
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_rich_string05.rb

@@ -25,6 +25,6 @@ class TestRegressionRichString05 < Test::Unit::TestCase
     worksheet.write_rich_string('A3', 'This is ', bold, 'bold', ' and this is ', italic, 'italic')
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_rich_string06.rb

@@ -22,6 +22,6 @@ class TestRegressionRichString06 < Test::Unit::TestCase
     worksheet.write_rich_string('A3', 'ab', red, 'cde', 'fg')
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_rich_string07.rb

@@ -28,6 +28,6 @@ class TestRegressionRichString07 < Test::Unit::TestCase
     worksheet.write_rich_string('F8', italic, 'abcd', 'efg')
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_rich_string08.rb

@@ -24,6 +24,6 @@ class TestRegressionRichString08 < Test::Unit::TestCase
     worksheet.write_rich_string('A3', 'ab', bold, 'cd', 'efg', format)
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_rich_string09.rb

@@ -26,6 +26,6 @@ class TestRegressionRichString09 < Test::Unit::TestCase
     worksheet.write_rich_string('A3', 'a', bold, bold, 'bc', 'defg')
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_rich_string10.rb

@@ -25,6 +25,6 @@ class TestRegressionRichString10 < Test::Unit::TestCase
     worksheet.write_rich_string('A3', ' a', bold, 'bc', 'defg ')
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_rich_string11.rb

@@ -24,6 +24,6 @@ class TestRegressionRichString11 < Test::Unit::TestCase
     worksheet.write_rich_string('A3', 'a', bold, smiley, 'defg')
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_shape_connect01.rb

@@ -41,6 +41,6 @@ class TestRegressionShapeConnect01 < Test::Unit::TestCase
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_shape_connect02.rb

@@ -37,6 +37,6 @@ class TestRegressionShapeConnect02 < Test::Unit::TestCase
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_shape_connect03.rb

@@ -73,6 +73,6 @@ class TestRegressionShapeConnect03 < Test::Unit::TestCase
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/regression/test_shape_connect04.rb

@@ -70,6 +70,6 @@ class TestRegressionShapeConnect04 < Test::Unit::TestCase
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,)
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
   end
 end

data/test/test_example_match.rb

@@ -572,6 +572,124 @@ EOS
     compare_xlsx(File.join(@perl_output, @xlsx), @xlsx)
   end
 
+  def test_chart_radar
+    @xlsx = 'chart_radar.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    bold      = workbook.add_format(:bold => 1)
+
+    # Add the worksheet data that the charts will refer to.
+    headings = [ 'Number', 'Batch 1', 'Batch 2' ]
+    data = [
+            [ 2, 3, 4, 5, 6, 7 ],
+            [ 30, 60, 70, 50, 40, 30 ],
+            [ 25, 40, 50, 30, 50, 40 ]
+           ]
+
+    worksheet.write('A1', headings, bold)
+    worksheet.write('A2', data)
+
+    # Create a new chart object. In this case an embedded chart.
+    chart1 = workbook.add_chart(:type => 'radar', :embedded => 1)
+
+    # Configure the first series.
+    chart1.add_series(
+                      :name       => '=Sheet1!$B$1',
+                      :categories => '=Sheet1!$A$2:$A$7',
+                      :values     => '=Sheet1!$B$2:$B$7'
+                      )
+
+    # Configure second series. Note alternative use of array ref to define
+    # ranges: [ sheetname, row_start, row_end, col_start, col_end ].
+    chart1.add_series(
+                      :name       => '=Sheet1!$C$1',
+                      :categories => [ 'Sheet1', 1, 6, 0, 0 ],
+                      :values     => [ 'Sheet1', 1, 6, 2, 2 ]
+                      )
+
+    # Add a chart title and some axis labels.
+    chart1.set_title(:name => 'Results of sample analysis')
+    chart1.set_x_axis(:name => 'Test number')
+    chart1.set_y_axis(:name => 'Sample length (mm)')
+
+    # Set an Excel chart style. Blue colors with white outline and shadow.
+    chart1.set_style(11)
+
+    # Insert the chart into the worksheet (with an offset).
+    worksheet.insert_chart('D2', chart1, 25, 10)
+
+    #
+    # Create a with_markers chart sub-type
+    #
+    chart2 = workbook.add_chart(
+                                :type     => 'radar',
+                                :embedded => 1,
+                                :subtype  => 'with_markers'
+                                )
+
+    # Configure the first series.
+    chart2.add_series(
+                      :name       => '=Sheet1!$B$1',
+                      :categories => '=Sheet1!$A$2:$A$7',
+                      :values     => '=Sheet1!$B$2:$B$7'
+                      )
+
+    # Configure second series.
+    chart2.add_series(
+                      :name       => '=Sheet1!$C$1',
+                      :categories => [ 'Sheet1', 1, 6, 0, 0 ],
+                      :values     => [ 'Sheet1', 1, 6, 2, 2 ]
+                      )
+
+    # Add a chart title and some axis labels.
+    chart2.set_title(:name  => 'Stacked Chart')
+    chart2.set_x_axis(:name => 'Test number')
+    chart2.set_y_axis(:name => 'Sample length (mm)')
+
+    # Set an Excel chart style. Blue colors with white outline and shadow.
+    chart2.set_style(12)
+
+    # Insert the chart into the worksheet (with an offset).
+    worksheet.insert_chart('D18', chart2, 25, 11)
+
+    #
+    # Create a filled chart sub-type
+    #
+    chart3 = workbook.add_chart(
+                                :type     => 'radar',
+                                :embedded => 1,
+                                :subtype  => 'filled'
+                                )
+
+    # Configure the first series.
+    chart3.add_series(
+                      :name       => '=Sheet1!$B$1',
+                      :categories => '=Sheet1!$A$2:$A$7',
+                      :values     => '=Sheet1!$B$2:$B$7'
+                      )
+
+    # Configure second series.
+    chart3.add_series(
+                      :name       => '=Sheet1!$C$1',
+                      :categories => [ 'Sheet1', 1, 6, 0, 0 ],
+                      :values     => [ 'Sheet1', 1, 6, 2, 2 ]
+                      )
+
+    # Add a chart title and some axis labels.
+    chart3.set_title(:name  => 'Percent Stacked Chart')
+    chart3.set_x_axis(:name => 'Test number')
+    chart3.set_y_axis(:name => 'Sample length (mm)')
+
+    # Set an Excel chart style. Blue colors with white outline and shadow.
+    chart3.set_style(13)
+
+    # Insert the chart into the worksheet (with an offset).
+    worksheet.insert_chart('D34', chart3, 25, 11)
+
+    workbook.close
+    compare_xlsx(File.join(@perl_output, @xlsx), @xlsx)
+  end
+
   def test_chart_scatter
     @xlsx = 'chart_scatter.xlsx'
     workbook  = WriteXLSX.new(@xlsx)
@@ -714,7 +832,7 @@ EOS
     # Add a chart title and some axis labels.
     chart.set_title(:name => 'Survey results')
     chart.set_x_axis(:name => 'Days')
-    chart.set_y_axis(:name => 'Population', :major_gridlines => {:show => 0})
+    chart.set_y_axis(:name => 'Population', :major_gridlines => {:visible => 0})
     chart.set_y2_axis(:name => 'Laser wounds')
 
     # Insert the chart into the worksheet (with an offset).

data/test/test_xml_writer_simple.rb

@@ -15,13 +15,13 @@ class TestXMLWriterSimple < Test::Unit::TestCase
   end
 
   def test_empty_tag
-    assert_equal('<foo />', @obj.empty_tag('foo'))
+    assert_equal('<foo/>', @obj.empty_tag('foo'))
   end
 
   def test_empty_tag_with_xml_decl
     expected = <<EOS
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<foo />
+<foo/>
 EOS
     assert_equal(expected, @obj.xml_decl << @obj.empty_tag('foo') << "\n")
   end
@@ -32,7 +32,7 @@ EOS
 
   def test_attribute
     assert_equal(
-      "<foo x=\"1&gt;2\" />", @obj.empty_tag("foo", ['x', '1>2'])
+      "<foo x=\"1&gt;2\"/>", @obj.empty_tag("foo", ['x', '1>2'])
     )
   end
 
@@ -55,7 +55,7 @@ EOS
       'name', '_xlnm.Print_Titles',
       'localSheetId', 0
     ]
-    expected = 
+    expected =
       "<definedName name=\"_xlnm.Print_Titles\" localSheetId=\"0\">Sheet1!$1:$1</definedName>"
     @obj.data_element('definedName', 'Sheet1!$1:$1', attributes)
     result = @obj.string