write_xlsx 0.62.0 → 0.64.0

data/test/regression/test_chart_points06.rb

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartPoints06 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_points06
+    @xlsx = 'chart_points06.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", [71050368, 71051904])
+
+    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',
+                     :marker     => { :type => 'automatic' },
+                     :points => [
+                                 { :fill => { :color => 'red' } }
+                                ]
+                     )
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$C$1:$C$5',
+                     :marker     => { :type => 'automatic' }
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_chartsheet05.rb

@@ -33,7 +33,7 @@ def test_chartsheet05
     chart.add_series(:values => '=Sheet1!$C$1:$C$5')
 
     # Chartsheet test.
-    chart.set_zoom(75)
+    chart.zoom = 75
 
     workbook.close
     compare_xlsx_for_regression(

data/test/regression/test_chartsheet06.rb

@@ -33,7 +33,7 @@ def test_chartsheet06
     chart.add_series(:values => '=Sheet1!$C$1:$C$5')
 
     # Chartsheet test.
-    chart.set_tab_color('red')
+    chart.tab_color = 'red'
 
     workbook.close
     compare_xlsx_for_regression(

data/test/regression/test_comment01.rb

@@ -19,7 +19,7 @@ def test_comment01
     worksheet.write_comment('B2', 'Some text')
 
     # Set the author to match the target XLSX file.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
 
     workbook.close
     compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)

data/test/regression/test_comment02.rb

@@ -20,7 +20,7 @@ def test_comment02
     worksheet.write_comment('D17', 'More text')
 
     # Set the author to match the target XLSX file.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
 
     workbook.close
     compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)

data/test/regression/test_comment03.rb

@@ -20,7 +20,7 @@ def test_comment03
     worksheet.write_comment('XFD1048576', 'Some text')
 
     # Set the author to match the target XLSX file.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
 
     workbook.close
     compare_xlsx_for_regression(

data/test/regression/test_comment04.rb

@@ -24,8 +24,8 @@ def test_comment04
     worksheet3.write_comment('C7', 'More text')
 
     # Set the author to match the target XLSX file.
-    worksheet1.set_comments_author('John')
-    worksheet3.set_comments_author('John')
+    worksheet1.comments_author = 'John'
+    worksheet3.comments_author = 'John'
 
     workbook.close
     compare_xlsx_for_regression(

data/test/regression/test_comment06.rb

@@ -22,7 +22,7 @@ def test_comment06
     worksheet.write_comment('A5', 'Some text')
 
     # Set the author to match the target XLSX file.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
 
     workbook.close
     compare_xlsx_for_regression(

data/test/regression/test_comment07.rb

@@ -24,7 +24,7 @@ def test_comment07
     worksheet.show_comments
 
     # Set the author to match the target XLSX file.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
 
     workbook.close
     compare_xlsx_for_regression(

data/test/regression/test_comment08.rb

@@ -24,7 +24,7 @@ def test_comment08
     worksheet.show_comments
 
     # Set the author to match the target XLSX file.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
 
     workbook.close
     compare_xlsx_for_regression(

data/test/regression/test_comment09.rb

@@ -20,7 +20,7 @@ def test_comment09
     worksheet.write_comment('A3', 'Some text')
 
     # Set the author to match the target XLSX file.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
 
     workbook.close
     compare_xlsx_for_regression(

data/test/regression/test_comment10.rb

@@ -19,7 +19,7 @@ def test_comment10
     worksheet.write_comment('B2', 'Some text', :color => 51)
 
     # Set the author to match the target XLSX file.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
 
     workbook.close
     compare_xlsx_for_regression(

data/test/regression/test_default_row04.rb

@@ -23,7 +23,7 @@ def test_default_row04
     worksheet.write_comment('C4', 'Hello', :y_offset => 22)
 
     # Set the author to match the target XLSX file.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
 
     workbook.close
     compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)

data/test/regression/test_escapes02.rb

@@ -19,7 +19,7 @@ def test_chart_escapes02
     worksheet.write_comment('B2', %q{<>&"'})
 
     # Set the author to match the target XLSX file.
-    worksheet.set_comments_author(%q{I am '"<>&})
+    worksheet.comments_author = %q{I am '"<>&}
 
     workbook.close
     compare_xlsx_for_regression(

data/test/regression/test_hyperlink15.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'helper'
 
-class TestRegressionHyperlink16 < Test::Unit::TestCase
+class TestRegressionHyperlink15 < Test::Unit::TestCase
   def setup
     setup_dir_var
   end
@@ -10,7 +10,7 @@ def teardown
     File.delete(@xlsx) if File.exist?(@xlsx)
   end
 
-  def test_hyperlink16
+  def test_hyperlink15
     @xlsx = 'hyperlink16.xlsx'
     workbook  = WriteXLSX.new(@xlsx)
     worksheet = workbook.add_worksheet

data/test/regression/test_shape_connect01.rb

@@ -29,14 +29,14 @@ def test_shape_connect01
     cxn_shape = workbook.add_shape(:type => 'bentConnector3')
 
     # Link the connector to the bottom of the circle
-    cxn_shape[:start] = ellipse[:id]
-    cxn_shape[:start_index] = 4    # 4th connection point, clockwise from top(0)
-    cxn_shape[:start_side]  = 'b'  # r)ight or b)ottom
+    cxn_shape.start = ellipse.id
+    cxn_shape.start_index = 4    # 4th connection point, clockwise from top(0)
+    cxn_shape.start_side  = 'b'  # r)ight or b)ottom
 
     # Link the connector to the bottom of the plus sign
-    cxn_shape[:end] = plus[:id]
-    cxn_shape[:end_index] = 0      # 0 - top connection point
-    cxn_shape[:end_side]  = 't'    # l)eft of t)op
+    cxn_shape.end = plus.id
+    cxn_shape.end_index = 0      # 0 - top connection point
+    cxn_shape.end_side  = 't'    # l)eft of t)op
 
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 

data/test/regression/test_shape_connect02.rb

@@ -25,14 +25,14 @@ def test_shape_connect02
     cxn_shape = workbook.add_shape(:type => 'curvedConnector3')
 
     # Link the start of the connector to the right side
-    cxn_shape[:start] = s1[:id]
-    cxn_shape[:start_index] = 2   # 2nd connection point, clockwise from top(0)
-    cxn_shape[:start_side] = 'r'  # r)ight or b)ottom
+    cxn_shape.start = s1.id
+    cxn_shape.start_index = 2   # 2nd connection point, clockwise from top(0)
+    cxn_shape.start_side = 'r'  # r)ight or b)ottom
 
     # Link the end of the connector to the left side
-    cxn_shape[:end] = s2[:id]
-    cxn_shape[:end_index] = 4     # 4th connection point, clockwise from top(0)
-    cxn_shape[:end_side] = 'l'    # l)eft or t)op
+    cxn_shape.end = s2.id
+    cxn_shape.end_index = 4     # 4th connection point, clockwise from top(0)
+    cxn_shape.end_side = 'l'    # l)eft or t)op
 
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 

data/test/regression/test_shape_connect03.rb

@@ -48,28 +48,28 @@ def test_shape_connect03
     p2 = worksheet.insert_shape('A1', plus, 150, 350)
     p3 = worksheet.insert_shape('A1', plus, 350, 150)
 
-    plus[:adjustments] = 35  # change shape of plus symbol
+    plus.adjustments = 35  # change shape of plus symbol
     p4 = worksheet.insert_shape('A1', plus, 150, 150)
 
     cxn_shape = workbook.add_shape(:type => 'bentConnector3', :fill=> 0)
-    cxn_shape[:start] = ellipse[:id]
-    cxn_shape[:start_index] = 4   # 4th connection point, clockwise from top(0)
-    cxn_shape[:start_side] = 'b'  # r)ight or b)ottom
+    cxn_shape.start = ellipse.id
+    cxn_shape.start_index = 4   # 4th connection point, clockwise from top(0)
+    cxn_shape.start_side = 'b'  # r)ight or b)ottom
 
-    cxn_shape[:end] = p1[:id]
-    cxn_shape[:end_index] = 0     # first connection (zero based) from top
-    cxn_shape[:end_side] = 't'    # l)eft or t)op
+    cxn_shape.end = p1.id
+    cxn_shape.end_index = 0     # first connection (zero based) from top
+    cxn_shape.end_side = 't'    # l)eft or t)op
 
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 
-    cxn_shape[:end] = p2[:id]
+    cxn_shape.end = p2.id
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 
-    cxn_shape[:end] = p3[:id]
+    cxn_shape.end = p3.id
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 
-    cxn_shape[:end] = p4[:id]
-    cxn_shape[:adjustments] = [-50, 45, 120]
+    cxn_shape.end = p4.id
+    cxn_shape.adjustments = [-50, 45, 120]
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 
     workbook.close

data/test/regression/test_shape_connect04.rb

@@ -49,24 +49,24 @@ def test_shape_connect04
 
     cxn_shape = workbook.add_shape(:type => 'bentConnector3', :fill => 0)
 
-    cxn_shape[:start] = ellipse[:id]
-    cxn_shape[:start_index] = 2   # 2nd connection point, clockwise from top(0)
-    cxn_shape[:start_side] = 'r'  # r)ight or b)ottom
+    cxn_shape.start = ellipse.id
+    cxn_shape.start_index = 2   # 2nd connection point, clockwise from top(0)
+    cxn_shape.start_side = 'r'  # r)ight or b)ottom
 
-    cxn_shape[:end] = p1[:id]
-    cxn_shape[:end_index] = 3     # 3rd connection point on plus, right side
-    cxn_shape[:end_side] = 'l'    # l)eft or t)op
+    cxn_shape.end = p1.id
+    cxn_shape.end_index = 3     # 3rd connection point on plus, right side
+    cxn_shape.end_side = 'l'    # l)eft or t)op
 
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 
-    cxn_shape[:end] = p2[:id]
+    cxn_shape.end = p2.id
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 
-    cxn_shape[:end] = p3[:id]
+    cxn_shape.end = p3.id
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 
-    cxn_shape[:end] = p4[:id]
-    cxn_shape[:adjustments] = [-50, 45, 120]
+    cxn_shape.end = p4.id
+    cxn_shape.adjustments = [-50, 45, 120]
     worksheet.insert_shape('A1', cxn_shape, 0, 0)
 
     workbook.close

data/test/regression/test_shape_scale01.rb

@@ -26,8 +26,8 @@ def test_shape_scale01
                                      )
     worksheet.insert_shape('A1', normal, 50, 50)
 
-    normal[:text] = 'Scaled 3w x 2h'
-    normal[:name] = 'Hope'
+    normal.text = 'Scaled 3w x 2h'
+    normal.name = 'Hope'
     worksheet.insert_shape('A1', normal, 250, 50, 3, 2)
 
     workbook.close

data/test/regression/test_shape_stencil01.rb

@@ -27,9 +27,9 @@ def test_shape_stencil01
     (1..10).each do |n|
       # Change the last 5 rectangles to stars.
       # Previously inserted shapes stay as rectangles
-      shape[:type] = 'star5' if n == 6
-      text = shape[:type]
-      shape[:text] = [text, n.to_s].join(' ')
+      shape.type = 'star5' if n == 6
+      text = shape.type
+      shape.text = [text, n.to_s].join(' ')
       worksheet.insert_shape('A1', shape, n * 100, 50)
     end
 

data/test/regression/test_tab_color01.rb

@@ -16,7 +16,7 @@ def test_tab_color01
     worksheet   = workbook.add_worksheet
 
     worksheet.write('A1', 'Foo')
-    worksheet.set_tab_color('red')
+    worksheet.tab_color = 'red'
 
     workbook.close
     compare_xlsx_for_regression(

data/test/regression/test_table04.rb

@@ -25,7 +25,7 @@ def test_table04
     worksheet.write('A1', 'http://perl.com/')
 
     # Add comments to check rId handling.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
     worksheet.write_comment('H1', 'Test1')
     worksheet.write_comment('J1', 'Test2')
     workbook.close

data/test/regression/test_table05.rb

@@ -25,7 +25,7 @@ def test_table05
     worksheet.write('A1', 'http://perl.com/')
 
     # Add comments to check rId handling.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
     worksheet.write_comment('H1', 'Test1')
     worksheet.write_comment('J1', 'Test2')
 

data/test/regression/test_table06.rb

@@ -28,7 +28,7 @@ def test_table06
     worksheet.write('C1', 'http://perl.com/')
 
     # Add comments to check rId handling.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
     worksheet.write_comment('H1', 'Test1')
     worksheet.write_comment('J1', 'Test2')
 

data/test/regression/test_vml01.rb

@@ -19,7 +19,7 @@ def test_vml01
     worksheet.write_comment('B2', 'Some text')
 
     # Set the author to match the target XLSX file.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
 
     worksheet.insert_button('C4', {})
 

data/test/regression/test_vml02.rb

@@ -20,7 +20,7 @@ def test_vml02
     worksheet.write_comment('D17', 'More text')
 
     # Set the author to match the target XLSX file.
-    worksheet.set_comments_author('John')
+    worksheet.comments_author = 'John'
 
     worksheet.insert_button('C4', {})
     worksheet.insert_button('E8', {})

data/test/regression/test_vml03.rb

@@ -24,8 +24,8 @@ def test_vml03
     worksheet3.write_comment('C7', 'More text')
 
     # Set the author to match the target XLSX file.
-    worksheet1.set_comments_author('John')
-    worksheet3.set_comments_author('John')
+    worksheet1.comments_author = 'John'
+    worksheet3.comments_author = 'John'
 
     worksheet1.insert_button('C4', {})
     worksheet1.insert_button('E8', {})