write_xlsx 1.00.0 → 1.01.0

data/test/drawing/test_drawing_chart_01.rb

@@ -4,8 +4,12 @@
 
 class DrawingChart011 < Minitest::Test
   def test_drawing_chart_01
-    @obj = Writexlsx::Drawing.new
-    @obj.add_drawing_object(1, 4, 8, 457200, 104775, 12, 22, 152400, 180975)
+    @obj = Writexlsx::Drawings.new
+    dimensions = [4, 8, 457200, 104775, 12, 22, 152400, 180975]
+    drawing = Writexlsx::Drawing.new(
+      1, dimensions, nil, nil, nil, nil, 1
+    )
+    @obj.add_drawing_object(drawing)
     @obj.embedded = true
     @obj.assemble_xml_file
     result = got_to_array(@obj.xml_str)

data/test/drawing/test_drawing_image_01.rb

@@ -4,9 +4,18 @@
 
 class DrawingImage011 < Minitest::Test
   def test_drawing_image_01
-    @obj = Writexlsx::Drawing.new
-    @obj.add_drawing_object(2, 2, 1, 0, 0, 3, 6, 533257, 190357,
-                           1219200, 190500, 1142857, 1142857, 'republic.png')
+    @obj = Writexlsx::Drawings.new
+    dimensions = [
+      2, 1, 0, 0, 3, 6, 533257, 190357, 1219200, 190500
+    ]
+    drawing = Writexlsx::Drawing.new(
+      2, dimensions, 1142857, 1142857, 'republic.png', nil, 2
+    )
+    @obj.add_drawing_object(drawing)
+    # @obj.add_drawing_object(
+    #   2, 2, 1, 0, 0, 3, 6, 533257, 190357,
+    #   1219200, 190500, 1142857, 1142857, 'republic.png', nil, 2
+    # )
     @obj.embedded = true
     @obj.assemble_xml_file
     result = got_to_array(@obj.xml_str)

data/test/drawing/test_drawing_shape_01.rb

@@ -8,12 +8,15 @@ def test_drawing_shape_01
     shape = Writexlsx::Shape.new
     shape.id = 1000
 
-    @obj = Writexlsx::Drawing.new
+    @obj = Writexlsx::Drawings.new
     @obj.embedded = 1
-    @obj.add_drawing_object(
-                               3, 4, 8, 209550, 95250, 12, 22, 209660,
-                               96260, 10000, 20000, 95250, 190500, 'rect 1', shape
-                               )
+    dimensions = [
+      4, 8, 209550, 95250, 12, 22, 209660, 96260, 10000, 20000
+    ]
+    drawing = Writexlsx::Drawing.new(
+      3, dimensions, 95250, 190500, 'rect 1', shape, 1
+    )
+    @obj.add_drawing_object(drawing)
     @obj.assemble_xml_file
     result = got_to_array(@obj.xml_str)
     expected = expected_to_array(<<EOS

data/test/drawing/test_drawing_shape_02.rb

@@ -13,12 +13,19 @@ def test_drawing_shape_02
     # Set bulk shape properties via set_properties method
     shape.set_properties(:type => 'straightConnector1', :connect => 1)
 
-    @obj = Writexlsx::Drawing.new
+    @obj = Writexlsx::Drawings.new
     @obj.embedded = 1
-    @obj.add_drawing_object(
-                               3, 4, 8, 209550, 95250, 12, 22, 209660,
-                               96260, 10000, 20000, 95250, 190500, 'Connector 1', shape
-                               )
+    dimensions = [
+      4, 8, 209550, 95250, 12, 22, 209660, 96260, 10000, 20000
+    ]
+    drawing = Writexlsx::Drawing.new(
+      3, dimensions, 95250, 190500, 'Connector 1', shape, 1
+    )
+    @obj.add_drawing_object(drawing)
+    # @obj.add_drawing_object(
+    #   3, 4, 8, 209550, 95250, 12, 22, 209660,
+    #   96260, 10000, 20000, 95250, 190500, 'Connector 1', shape, 1
+    # )
     @obj.assemble_xml_file
     result = got_to_array(@obj.xml_str)
     expected = expected_to_array(<<EOS

data/test/drawing/test_drawing_shape_03.rb

@@ -13,12 +13,15 @@ def test_drawing_shape_03
     shape.end         = 1002
     shape.end_index   = 4
 
-    @obj = Writexlsx::Drawing.new
+    @obj = Writexlsx::Drawings.new
     @obj.embedded = 1
-    @obj.add_drawing_object(
-                               3, 4, 8, 209550, 95250, 12, 22, 209660,
-                               96260, 10000, 20000, 95250, 190500, '', shape
-                               )
+    dimensions = [
+      4, 8, 209550, 95250, 12, 22, 209660, 96260, 10000, 20000
+    ]
+    drawing = Writexlsx::Drawing.new(
+      3, dimensions, 95250, 190500, '', shape, 1
+    )
+    @obj.add_drawing_object(drawing)
     @obj.__send__('write_nv_cxn_sp_pr', 1, shape)
 
     result = got_to_array(@obj.xml_str)

data/test/drawing/test_drawing_shape_04.rb

@@ -19,36 +19,20 @@ def test_drawing_shape_04
     shape.palette[0] = [0x00, 0x00, 0x00, 0x00]
     shape.palette[7] = [0x00, 0x00, 0x00, 0x00]
 
-    @obj = Writexlsx::Drawing.new
+    @obj = Writexlsx::Drawings.new
     @obj.embedded = 2
-    @obj.add_drawing_object(
-                               3, 4, 8, 209550, 95250, 12, 22, 209660,
-                               96260, 10000, 20000, 95250, 190500, 'rect 1', shape
-                               )
+    dimensions = [
+      4, 8, 209550, 95250, 12, 22, 209660, 96260, 10000, 20000
+    ]
+    drawing = Writexlsx::Drawing.new(
+      3, dimensions, 95250, 190500, 'rect 1', shape, 1
+    )
+    @obj.add_drawing_object(drawing)
     @obj.assemble_xml_file
 
     result = got_to_array(@obj.xml_str)
     expected = expected_to_array(expected_str)
     assert_equal(expected, result)
-
-    drawing1 = Writexlsx::Drawing.new
-    @worksheet.instance_variable_set(:@drawing, drawing1)
-    inserted = @worksheet.insert_shape(4, 8, shape, 300, 400)
-
-    # Force the shape cell x offset to be non-integer
-    inserted.x_offset += 0.5
-    @worksheet.__send__(:prepare_shape, 0, 1)
-
-    # Truncate drawing object to just the dimensions
-    drawing1.instance_variable_get(:@drawings)[0] =
-      drawing1.instance_variable_get(:@drawings)[0][0..12]
-
-    # Verify fractional dimensions have been rounded
-    expected = [
-                3, 12, 24, 423862, 0, 13, 26, 290512,
-                95250, 7739062, 4572000, 476250, 476250
-               ]
-    assert_equal(expected, drawing1.instance_variable_get(:@drawings)[0])
   end
 
   def expected_str

data/test/drawing/test_drawing_shape_05.rb

@@ -19,14 +19,17 @@ def test_drawing_shape_05
     shape.flip_h   = 1
     shape.rotation = 90
 
-    @obj = Writexlsx::Drawing.new
+    @obj = Writexlsx::Drawings.new
     @obj.instance_variable_set(:@palette, @worksheet.instance_variable_get(:@palette))
     @obj.embedded = 1
 
-    @obj.add_drawing_object(
-                            3, 4, 8, 209550, 95250, 12, 22, 209660,
-                            96260, 10000, 20000, 95250, 190500, '', shape
-                            )
+    dimensions = [
+      4, 8, 209550, 95250, 12, 22, 209660, 96260, 10000, 20000
+    ]
+    drawing = Writexlsx::Drawing.new(
+      3, dimensions, 95250, 190500, '', shape, 1
+    )
+    @obj.add_drawing_object(drawing)
     @obj.__send__(:write_a_xfrm, 100, 200, 10, 20, shape)
 
     result = got_to_array(@obj.xml_str)

data/test/drawing/test_drawing_shape_06.rb

@@ -16,13 +16,18 @@ def test_drawing_shape_06
     shape = Writexlsx::Shape.new
     shape.adjustments = -10, 100, 20
 
-    @obj = Writexlsx::Drawing.new
+    @obj = Writexlsx::Drawings.new
     @obj.embedded = 1
-
-    @obj.add_drawing_object(
-                            3, 4, 8, 209550, 95250, 12, 22, 209660,
-                            96260, 10000, 20000, 95250, 190500, '', shape
-                            )
+    dimensions = [
+      4, 8, 209550, 95250, 12, 22, 209660, 96260, 10000, 20000
+    ]
+    drawing = Writexlsx::Drawing.new(
+      3, dimensions, 95250, 190500, '', shape, 1
+    )
+    @obj.add_drawing_object(drawing)
+                            # 3, 4, 8, 209550, 95250, 12, 22, 209660,
+                            # 96260, 10000, 20000, 95250, 190500, '', shape
+                            # )
     @obj.__send__(:write_a_av_lst, shape)
 
     result = got_to_array(@obj.xml_str)

data/test/drawing/test_drawing_shape_07.rb

@@ -17,13 +17,18 @@ def test_drawing_shape_07
     shape.line_weight = 5
     shape.line_type   = 'lgDashDot'
 
-    @obj = Writexlsx::Drawing.new
+    @obj = Writexlsx::Drawings.new
     @obj.embedded = 1
-
-    @obj.add_drawing_object(
-                            3, 4, 8, 209550, 95250, 12, 22, 209660,
-                            96260, 10000, 20000, 95250, 190500, '', shape
-                            )
+    dimensions = [
+      4, 8, 209550, 95250, 12, 22, 209660, 96260, 10000, 20000
+    ]
+    drawing = Writexlsx::Drawing.new(
+      3, dimensions, 95250, 190500, '', shape, 1
+    )
+    @obj.add_drawing_object(drawing)
+                            # 3, 4, 8, 209550, 95250, 12, 22, 209660,
+                            # 96260, 10000, 20000, 95250, 190500, '', shape
+                            # )
     @obj.__send__(:write_a_ln, shape)
 
     result = got_to_array(@obj.xml_str)

data/test/drawing/test_write_a_graphic_frame_locks.rb

@@ -4,7 +4,7 @@
 
 class TestWriteAGraphicFrameLocks < Minitest::Test
   def setup
-    @drawing = Writexlsx::Drawing.new
+    @drawing = Writexlsx::Drawings.new
   end
 
   def test_write_a_graphic_frame_locks

data/test/drawing/test_write_c_chart.rb

@@ -4,7 +4,7 @@
 
 class TestWriteCChart < Minitest::Test
   def setup
-    @drawing = Writexlsx::Drawing.new
+    @drawing = Writexlsx::Drawings.new
   end
 
   def test_write_c_chart

data/test/drawing/test_write_c_nv_graphic_frame_pr.rb

@@ -4,7 +4,7 @@
 
 class TestWriteCNvGraphicFramePr < Minitest::Test
   def setup
-    @drawing = Writexlsx::Drawing.new
+    @drawing = Writexlsx::Drawings.new
   end
 
   def test_write_c_nv_graphic_frame_pr_01

data/test/drawing/test_write_c_nv_pr.rb

@@ -4,7 +4,7 @@
 
 class TestWriteCNvPr < Minitest::Test
   def setup
-    @drawing = Writexlsx::Drawing.new
+    @drawing = Writexlsx::Drawings.new
   end
 
   def test_write_c_nv_pr

data/test/drawing/test_write_col.rb

@@ -4,7 +4,7 @@
 
 class TestWriteCol < Minitest::Test
   def setup
-    @drawing = Writexlsx::Drawing.new
+    @drawing = Writexlsx::Drawings.new
   end
 
   def test_write_col

data/test/drawing/test_write_col_off.rb

@@ -4,7 +4,7 @@
 
 class TestWriteColOff < Minitest::Test
   def setup
-    @drawing = Writexlsx::Drawing.new
+    @drawing = Writexlsx::Drawings.new
   end
 
   def test_write_col_off

data/test/drawing/test_write_ext.rb

@@ -4,7 +4,7 @@
 
 class TestWriteExt < Minitest::Test
   def setup
-    @drawing = Writexlsx::Drawing.new
+    @drawing = Writexlsx::Drawings.new
   end
 
   def test_write_ext

data/test/drawing/test_write_pos.rb

@@ -4,7 +4,7 @@
 
 class TestWritePos < Minitest::Test
   def setup
-    @drawing = Writexlsx::Drawing.new
+    @drawing = Writexlsx::Drawings.new
   end
 
   def test_write_pos

data/test/drawing/test_write_row.rb

@@ -4,7 +4,7 @@
 
 class TestDrawingWriteRow < Minitest::Test
   def setup
-    @drawing = Writexlsx::Drawing.new
+    @drawing = Writexlsx::Drawings.new
   end
 
   def test_write_row

data/test/drawing/test_write_row_off.rb

@@ -4,7 +4,7 @@
 
 class TestWriteRowOff < Minitest::Test
   def setup
-    @drawing = Writexlsx::Drawing.new
+    @drawing = Writexlsx::Drawings.new
   end
 
   def test_write_row_off

data/test/drawing/test_write_xfrm_extension.rb

@@ -4,7 +4,7 @@
 
 class TestWriteXfrmExtension < Minitest::Test
   def setup
-    @drawing = Writexlsx::Drawing.new
+    @drawing = Writexlsx::Drawings.new
   end
 
   def test_write_xfrm_extension

data/test/drawing/test_write_xfrm_offset.rb

@@ -4,7 +4,7 @@
 
 class TestWriteXfrmOffset < Minitest::Test
   def setup
-    @drawing = Writexlsx::Drawing.new
+    @drawing = Writexlsx::Drawings.new
   end
 
   def test_write_xfrm_offset

data/test/regression/test_chart_axis26.rb

@@ -17,15 +17,17 @@ def test_chart_axis26
     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, [73048448, 73049984])
+    chart.instance_variable_set(:@axis_ids, [108315392, 108329216])
 
     data = [
-            [ 1, 2, 3, 4,  5 ],
-            [ 2, 4, 6, 8,  10 ],
-            [ 3, 6, 9, 12, 15 ]
-           ]
+      [ 1, 2, 3,  4,  5 ],
+      [ 2, 4, 6,  8, 10 ],
+      [ 3, 6, 9, 12, 15 ]
+    ]
 
-    chart.set_x_axis(:num_font => {:rotation => 45})
+    chart.set_x_axis(
+      :num_font => { :rotation => 45, :baseline => -1 }
+    )
 
     worksheet.write('A1', data)
 
@@ -37,8 +39,8 @@ def test_chart_axis26
 
     workbook.close
     compare_for_regression(
-      nil,
-      { 'xl/charts/chart1.xml' => ['<a:defRPr'] }
+      [],
+      {}
     )
   end
 end

data/test/regression/test_chart_axis27.rb

@@ -17,7 +17,7 @@ def test_chart_axis27
     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, [73048448, 73049984])
+    chart.instance_variable_set(:@axis_ids, [108315392, 108329216])
 
     data = [
             [ 1, 2, 3, 4,  5 ],

data/test/regression/test_chart_axis28.rb

@@ -17,7 +17,7 @@ def test_chart_axis28
     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, [45451904, 47401600])
+    chart.instance_variable_set(:@axis_ids, [115375104, 115390720])
 
     data = [
             [ 1, 2, 3, 4,  5 ],

data/test/regression/test_chart_axis29.rb

@@ -17,7 +17,7 @@ def test_chart_axis29
     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, [45444480, 47402368])
+    chart.instance_variable_set(:@axis_ids, [145169024, 145176448])
     data = [
             [ 1, 2, 3, 4,  5 ],
             [ 2, 4, 6, 8,  10 ],

data/test/regression/test_chart_axis33.rb

@@ -17,7 +17,7 @@ def test_chart_axis33
     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, [68827008, 68898816])
+    chart.instance_variable_set(:@axis_ids, [143682944, 143946496])
     data = [
             [ 1, 2, 3, 4,  5 ],
             [ 2, 4, 6, 8,  10 ],

data/test/regression/test_chart_axis44.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartAxis44 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_chart_axis44
+    @xlsx = 'chart_axis44.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, [108176896, 108178816])
+
+    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 => -45, :baseline => -1},
+      :num_font  => { :rotation => -45, :baseline => -1}
+    )
+
+    chart.set_y_axis(
+      :name      => 'YYY',
+      :name_font => { :rotation => -45, :baseline => -1},
+      :num_font  => { :rotation => -45, :baseline => -1}
+    )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_for_regression(
+      nil,
+      { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+    )
+  end
+end