write_xlsx 0.97.0 → 1.04.0

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/package/comments/test_comments_01.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestComments01 < Minitest::Test
+  def setup
+    @workbook = WriteXLSX.new(StringIO.new)
+    @worksheet = @workbook.add_worksheet('')
+  end
+
+  ###############################################################################
+  #
+  # Test the _assemble_xml_file() method.
+  #
+  def test_assemble_xml_file
+    @worksheet.write_comment(
+      1, 1, 'Some text',
+      :author => 'John', :visible => nil, :color => 81,
+      :font => 'Tahoma', :font_size => 8, :font_family => 2
+    )
+
+    comments = @worksheet.comments
+    comments.assemble_xml_file
+    result = got_to_array(comments.instance_variable_get(:@writer).string)
+
+    expected = expected_to_array(expected_xml)
+    assert_equal(expected, result)
+  end
+
+  def expected_xml
+    <<EOS
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<comments xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
+  <authors>
+    <author>John</author>
+  </authors>
+  <commentList>
+    <comment ref="B2" authorId="0">
+      <text>
+        <r>
+          <rPr>
+            <sz val="8"/>
+            <color indexed="81"/>
+            <rFont val="Tahoma"/>
+            <family val="2"/>
+          </rPr>
+          <t>Some text</t>
+        </r>
+      </text>
+    </comment>
+  </commentList>
+</comments>
+EOS
+  end
+end

data/test/package/comments/test_comments_02.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestComments02 < Minitest::Test
+  def setup
+    @workbook = WriteXLSX.new(StringIO.new)
+    @worksheet = @workbook.add_worksheet('')
+  end
+
+  ###############################################################################
+  #
+  # Test the _assemble_xml_file() method.
+  #
+  def test_assemble_xml_file
+    @worksheet.write_comment(
+      1, 1, 'Some text',
+      :author => 'John', :visible => nil, :color => 81,
+      :font => 'Calibri', :font_size => 20, :font_family => 2
+    )
+
+    comments = @worksheet.comments
+    comments.assemble_xml_file
+    result = got_to_array(comments.instance_variable_get(:@writer).string)
+
+    expected = expected_to_array(expected_xml)
+    assert_equal(expected, result)
+  end
+
+  def expected_xml
+    <<EOS
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<comments xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
+  <authors>
+    <author>John</author>
+  </authors>
+  <commentList>
+    <comment ref="B2" authorId="0">
+      <text>
+        <r>
+          <rPr>
+            <sz val="20"/>
+            <color indexed="81"/>
+            <rFont val="Calibri"/>
+            <family val="2"/>
+          </rPr>
+          <t>Some text</t>
+        </r>
+      </text>
+    </comment>
+  </commentList>
+</comments>
+EOS
+  end
+end

data/test/regression/test_array_formula03.rb

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionArrayFormula03 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_array_formula03
+    @xlsx = 'array_formula03.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    data = [0, 0, 0]
+
+    worksheet.write_col('B1', data)
+    worksheet.write_col('C1', data)
+
+    worksheet.write_formula(
+      'A1',
+      '{=SUM(B1:C1*B2:C2)}',
+      nil,
+      0
+    )
+
+    workbook.close
+    compare_for_regression(
+      [ 'xl/calcChain.xml', '[Content_Types].xml', 'xl/_rels/workbook.xml.rels' ],
+      {'xl/workbook.xml' => ['<workbookView']}
+    )
+  end
+end

data/test/regression/test_autofilter08.rb

@@ -0,0 +1,110 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionAutofilter08 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_autofilter08
+    @xlsx = 'autofilter08.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    # Extract the data embedded at the end of this file.
+    data = []
+    data_lines.split(/\n/).each { |line| data << line.split }
+
+    worksheet.write('A1', headings)
+
+    # Create a blank cell in out test data.
+    data[5][0] = ''
+
+    worksheet.autofilter('A1:D51')
+    worksheet.filter_column('A', 'x == Blanks or x == North')
+
+    # Hide the rows that don't match the filter criteria.
+    row = 1
+
+    data.each do |row_data|
+      region = row_data[0]
+      if region == '' || region == 'North'
+        # Row is visible.
+      else
+        # Hide row.
+        worksheet.set_row(row, nil, nil, 1)
+      end
+      worksheet.write(row, 0, row_data)
+      row += 1
+    end
+
+    workbook.close
+    compare_for_regression(
+      nil,
+      {'xl/workbook.xml' => ['<workbookView']}
+    )
+  end
+
+  def headings
+    %w[Region Item Volume Month]
+  end
+
+  def data_lines
+    <<EOS
+East      Apple     9000      July
+East      Apple     5000      July
+South     Orange    9000      September
+North     Apple     2000      November
+West      Apple     9000      November
+South     Pear      7000      October
+North     Pear      9000      August
+West      Orange    1000      December
+West      Grape     1000      November
+South     Pear      10000     April
+West      Grape     6000      January
+South     Orange    3000      May
+North     Apple     3000      December
+South     Apple     7000      February
+West      Grape     1000      December
+East      Grape     8000      February
+South     Grape     10000     June
+West      Pear      7000      December
+South     Apple     2000      October
+East      Grape     7000      December
+North     Grape     6000      April
+East      Pear      8000      February
+North     Apple     7000      August
+North     Orange    7000      July
+North     Apple     6000      June
+South     Grape     8000      September
+West      Apple     3000      October
+South     Orange    10000     November
+West      Grape     4000      July
+North     Orange    5000      August
+East      Orange    1000      November
+East      Orange    4000      October
+North     Grape     5000      August
+East      Apple     1000      December
+South     Apple     10000     March
+East      Grape     7000      October
+West      Grape     1000      September
+East      Grape     10000     October
+South     Orange    8000      March
+North     Apple     4000      July
+South     Orange    5000      July
+West      Apple     4000      June
+East      Apple     5000      April
+North     Pear      3000      August
+East      Grape     9000      November
+North     Orange    8000      October
+East      Apple     10000     June
+South     Pear      1000      December
+North     Grape     10000     July
+East      Grape     6000      February
+EOS
+  end
+end

data/test/regression/test_autofilter09.rb

@@ -0,0 +1,110 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionAutofilter09 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_autofilter09
+    @xlsx = 'autofilter09.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    # Extract the data embedded at the end of this file.
+    data = []
+    data_lines.split(/\n/).each { |line| data << line.split }
+
+    worksheet.write('A1', headings)
+
+    # Create a blank cell in out test data.
+    data[5][0] = ''
+
+    worksheet.autofilter('A1:D51')
+    worksheet.filter_column_list('A', %w(East North South))
+
+    # Hide the rows that don't match the filter criteria.
+    row = 1
+
+    data.each do |row_data|
+      region = row_data[0]
+      if %w(East North South).include?(region)
+        # Row is visible.
+      else
+        # Hide row.
+        worksheet.set_row(row, nil, nil, 1)
+      end
+      worksheet.write(row, 0, row_data)
+      row += 1
+    end
+
+    workbook.close
+    compare_for_regression(
+      nil,
+      {'xl/workbook.xml' => ['<workbookView']}
+    )
+  end
+
+  def headings
+    %w[Region Item Volume Month]
+  end
+
+  def data_lines
+    <<EOS
+East      Apple     9000      July
+East      Apple     5000      July
+South     Orange    9000      September
+North     Apple     2000      November
+West      Apple     9000      November
+South     Pear      7000      October
+North     Pear      9000      August
+West      Orange    1000      December
+West      Grape     1000      November
+South     Pear      10000     April
+West      Grape     6000      January
+South     Orange    3000      May
+North     Apple     3000      December
+South     Apple     7000      February
+West      Grape     1000      December
+East      Grape     8000      February
+South     Grape     10000     June
+West      Pear      7000      December
+South     Apple     2000      October
+East      Grape     7000      December
+North     Grape     6000      April
+East      Pear      8000      February
+North     Apple     7000      August
+North     Orange    7000      July
+North     Apple     6000      June
+South     Grape     8000      September
+West      Apple     3000      October
+South     Orange    10000     November
+West      Grape     4000      July
+North     Orange    5000      August
+East      Orange    1000      November
+East      Orange    4000      October
+North     Grape     5000      August
+East      Apple     1000      December
+South     Apple     10000     March
+East      Grape     7000      October
+West      Grape     1000      September
+East      Grape     10000     October
+South     Orange    8000      March
+North     Apple     4000      July
+South     Orange    5000      July
+West      Apple     4000      June
+East      Apple     5000      April
+North     Pear      3000      August
+East      Grape     9000      November
+North     Orange    8000      October
+East      Apple     10000     June
+South     Pear      1000      December
+North     Grape     10000     July
+East      Grape     6000      February
+EOS
+  end
+end