write_xlsx 0.62.0 → 0.64.0

data/test/drawing/test_drawing_shape_01.rb

@@ -6,7 +6,7 @@
 class DrawingShape01 < Test::Unit::TestCase
   def test_drawing_shape_01
     shape = Writexlsx::Shape.new
-    shape[:id] = 1000
+    shape.id = 1000
 
     @obj = Writexlsx::Drawing.new
     @obj.embedded = 1

data/test/drawing/test_drawing_shape_02.rb

@@ -7,8 +7,8 @@ class DrawingShape02 < Test::Unit::TestCase
   def test_drawing_shape_02
     shape = Writexlsx::Shape.new
     # Set shape properties via []= method
-    shape[:id] = 1000
-    shape[:name] = 'Connector 1'
+    shape.id = 1000
+    shape.name = 'Connector 1'
 
     # Set bulk shape properties via set_properties method
     shape.set_properties(:type => 'straightConnector1', :connect => 1)

data/test/drawing/test_drawing_shape_03.rb

@@ -7,11 +7,11 @@ class DrawingShape03 < Test::Unit::TestCase
   def test_drawing_shape_03
     shape = Writexlsx::Shape.new
     # Set shape properties via []= method
-    shape[:id]         = 1000
-    shape[:start]       = 1001
-    shape[:start_index] = 1
-    shape[:end]         = 1002
-    shape[:end_index]   = 4
+    shape.id          = 1000
+    shape.start       = 1001
+    shape.start_index = 1
+    shape.end         = 1002
+    shape.end_index   = 4
 
     @obj = Writexlsx::Drawing.new
     @obj.embedded = 1

data/test/drawing/test_drawing_shape_04.rb

@@ -16,8 +16,8 @@ def test_drawing_shape_04
     shape = Writexlsx::Shape.new(:text => 'test', :id => 1000)
 
     # Mock up the color palette.
-    shape[:palette][0] = [0x00, 0x00, 0x00, 0x00]
-    shape[:palette][7] = [0x00, 0x00, 0x00, 0x00]
+    shape.palette[0] = [0x00, 0x00, 0x00, 0x00]
+    shape.palette[7] = [0x00, 0x00, 0x00, 0x00]
 
     @obj = Writexlsx::Drawing.new
     @obj.embedded = 2
@@ -36,7 +36,7 @@ def test_drawing_shape_04
     inserted = @worksheet.insert_shape(4, 8, shape, 300, 400)
 
     # Force the shape cell x offset to be non-integer
-    inserted[:x_offset] += 0.5
+    inserted.x_offset += 0.5
     @worksheet.__send__(:prepare_shape, 0, 1)
 
     # Truncate drawing object to just the dimensions

data/test/drawing/test_drawing_shape_05.rb

@@ -14,10 +14,10 @@ def setup
 
   def test_drawing_shape_05
     shape = Writexlsx::Shape.new
-    shape[:id]      = 1000
-    shape[:flip_v]   = 1
-    shape[:flip_h]   = 1
-    shape[:rotation] = 90
+    shape.id       = 1000
+    shape.flip_v   = 1
+    shape.flip_h   = 1
+    shape.rotation = 90
 
     @obj = Writexlsx::Drawing.new
     @obj.instance_variable_set(:@palette, @worksheet.instance_variable_get(:@palette))

data/test/drawing/test_drawing_shape_07.rb

@@ -14,8 +14,8 @@ def setup
 
   def test_drawing_shape_07
     shape = Writexlsx::Shape.new
-    shape[:line_weight] = 5
-    shape[:line_type] = 'lgDashDot'
+    shape.line_weight = 5
+    shape.line_type   = 'lgDashDot'
 
     @obj = Writexlsx::Drawing.new
     @obj.embedded = 1

data/test/regression/disabled_test_vml04.rb

@@ -26,8 +26,8 @@ def test_vml04
     worksheet3.write_comment('A1',  '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('B2', {})
     worksheet1.insert_button('C4', {})

data/test/regression/test_chart_drop_lines01.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDropLines01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_drop_lines01
+    @xlsx = 'chart_drop_lines01.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    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, [48034944, 48036864])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.set_drop_lines
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$B$1:$B$5'
+                     )
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :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_drop_lines02.rb

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDropLines02 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_drop_lines02
+    @xlsx = 'chart_drop_lines02.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    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, [70938624, 70940160])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.set_drop_lines(
+                         :line => {
+                           :color     => 'red',
+                           :dash_type => 'square_dot'
+                         }
+                         )
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$B$1:$B$5'
+                     )
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :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_drop_lines03.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDropLines03 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_drop_lines03
+    @xlsx = 'chart_drop_lines03.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'area', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [61151872, 63947136])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 1, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.set_drop_lines
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$B$1:$B$5'
+                     )
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :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_drop_lines04.rb

@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartDropLines04 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_drop_lines04
+    @xlsx = 'chart_drop_lines04.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'stock', :embedded => 1)
+    data_format = workbook.add_format(:num_format => 14)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [49019520, 49222016])
+
+    data = [
+            [ '2007-01-01T', '2007-01-02T', '2007-01-03T', '2007-01-04T', '2007-01-05T' ],
+            [ 27.2,  25.03, 19.05, 20.34, 18.5 ],
+            [ 23.49, 19.55, 15.12, 17.84, 16.34 ],
+            [ 25.45, 23.05, 17.32, 20.45, 17.34 ]
+           ]
+
+    (0..4).each do |row|
+      worksheet.write_date_time(row, 0, data[0][row], data_format)
+      worksheet.write(row, 1, data[1][row])
+      worksheet.write(row, 2, data[2][row])
+      worksheet.write(row, 3, data[3][row])
+    end
+
+    worksheet.set_column('A:D', 11)
+
+    chart.set_drop_lines
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$B$1:$B$5'
+                     )
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$C$1:$C$5'
+                     )
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$D$1:$D$5'
+                     )
+
+    chart.set_drop_lines
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+                                [],
+                                { 'xl/charts/chart1.xml' => [ '<c:formatCode', ] }
+                                )
+  end
+end

data/test/regression/test_chart_errorbars01.rb

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartErrorbars01 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_errorbars01
+    @xlsx = 'chart_errorbars01.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    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, [63386752, 63388288])
+
+    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',
+                     :y_error_bars => { :type => 'standard_error' }
+                     )
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :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_errorbars02.rb

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartErrorbars02 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_errorbars02
+    @xlsx = 'chart_errorbars02.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    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, [63385984, 63387904])
+
+    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',
+                     :y_error_bars => {
+                       :type      => 'fixed',
+                       :value     => 2,
+                       :end_style => 0,
+                       :direction => 'minus'
+                     }
+                     )
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$C$1:$C$5',
+                     :y_error_bars => {
+                       :type      => 'percentage',
+                       :value     => 5,
+                       :direction => 'plus'
+                     }
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(
+                                File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_chart_errorbars03.rb

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartErrorbars03 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_errorbars03
+    @xlsx = 'chart_errorbars03.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    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, [52288896, 53605504])
+
+    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',
+                     :y_error_bars => {
+                       :type => 'standard_error',
+                       :line => {
+                         :color     => 'red',
+                         :dash_type => 'round_dot'
+                       }
+                     }
+                     )
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :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