write_xlsx 1.02.0 → 1.04.0

data/test/test_example_match.rb

@@ -714,6 +714,81 @@ def test_chart_line
     # Insert the chart into the worksheet (with an offset).
     worksheet.insert_chart('D2', chart, 25, 10)
 
+    #
+    # Create a stacked chart sub-type
+    #
+    chart2 = workbook.add_chart(
+      :type     => 'line',
+      :embedded => 1,
+      :subtype  => 'stacked'
+    )
+
+    # 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,
+      { :x_offset => 25, :y_offset => 10 }
+    )
+
+
+    #
+    # Create a percent stacked chart sub-type
+    #
+    chart3 = workbook.add_chart(
+      :type     => 'line',
+      :embedded => 1,
+      :subtype  => 'percent_stacked'
+    )
+
+    # 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,
+      { :x_offset => 25, :y_offset => 10 }
+    )
+
     workbook.close
     store_to_tempfile
     compare_xlsx(File.join(@perl_output, @xlsx), @tempfile.path)
@@ -1320,7 +1395,7 @@ def test_comments2
     comment = 'Hello.'
 
     worksheet6.write( 'C9', cell_text, text_wrap )
-    worksheet6.write_comment( 'C9', comment, :color => 0x35 )
+    worksheet6.write_comment( 'C9', comment, :color => '#FF6600' )
 
 
     ###############################################################################
@@ -4595,6 +4670,7 @@ def test_tables
     worksheet10 = workbook.add_worksheet
     worksheet11 = workbook.add_worksheet
     worksheet12 = workbook.add_worksheet
+    worksheet13 = workbook.add_worksheet
 
     currency_format = workbook.add_format(:num_format => '$#,##0')
 
@@ -4626,7 +4702,7 @@ def test_tables
     #
     # Example 2.
     #
-    caption = 'Default table with data.';
+    caption = 'Default table with data.'
 
     # Set the columns widths.
     worksheet2.set_column('B:G', 12)
@@ -4695,7 +4771,7 @@ def test_tables
     #
     # Example 6.
     #
-    caption = 'Table with banded columns but without default banded rows.';
+    caption = 'Table with banded columns but without default banded rows.'
 
     # Set the columns widths.
     worksheet6.set_column('B:G', 12)
@@ -4713,7 +4789,7 @@ def test_tables
     #
     # Example 7.
     #
-    caption = 'Table with user defined column headers';
+    caption = 'Table with user defined column headers'
 
     # Set the columns widths.
     worksheet7.set_column('B:G', 12)
@@ -4740,7 +4816,7 @@ def test_tables
     #
     # Example 8.
     #
-    caption = 'Table with user defined column headers';
+    caption = 'Table with user defined column headers'
 
     # Set the columns widths.
     worksheet8.set_column('B:G', 12)
@@ -4772,7 +4848,7 @@ def test_tables
     #
     # Example 9.
     #
-    caption = 'Table with totals row (but no caption or totals).';
+    caption = 'Table with totals row (but no caption or totals).'
 
     # Set the columns widths.
     worksheet9.set_column('B:G', 12)
@@ -4804,7 +4880,7 @@ def test_tables
     #
     # Example 10.
     #
-    caption = 'Table with totals row with user captions and functions.';
+    caption = 'Table with totals row with user captions and functions.'
 
     # Set the columns widths.
     worksheet10.set_column('B:G', 12)
@@ -4837,7 +4913,7 @@ def test_tables
     #
     # Example 11.
     #
-    caption = 'Table with alternative Excel style.';
+    caption = 'Table with alternative Excel style.'
 
     # Set the columns widths.
     worksheet11.set_column('B:G', 12)
@@ -4871,7 +4947,7 @@ def test_tables
     #
     # Example 12.
     #
-    caption = 'Table with column formats.';
+    caption = 'Table with no Excel style.'
 
     # Set the columns widths.
     worksheet12.set_column('B:G', 12)
@@ -4881,6 +4957,40 @@ def test_tables
 
     # Add a table to the worksheet.
     worksheet12.add_table(
+      'B3:G8',
+      {
+        :data      => data,
+        :style     => 'None',
+        :total_row => 1,
+        :columns   => [
+          { :header => 'Product',   :total_string   => 'Totals' },
+          { :header => 'Quarter 1', :total_function => 'sum' },
+          { :header => 'Quarter 2', :total_function => 'sum' },
+          { :header => 'Quarter 3', :total_function => 'sum' },
+          { :header => 'Quarter 4', :total_function => 'sum' },
+          {
+            :header         => 'Year',
+            :formula        => '=SUM(Table12[@[Quarter 1]:[Quarter 4]])',
+            :total_function => 'sum'
+          }
+        ]
+      }
+    )
+
+    ###############################################################################
+    #
+    # Example 13.
+    #
+    caption = 'Table with column formats.'
+
+    # Set the columns widths.
+    worksheet13.set_column('B:G', 12)
+
+    # Write the caption.
+    worksheet13.write('B1', caption)
+
+    # Add a table to the worksheet.
+    worksheet13.add_table(
       'B3:G8',
       {
         :data      => data,

data/test/workbook/test_check_sheetname.rb

@@ -48,14 +48,4 @@ def test_check_sheetname_invalid_start_stop_character
       end
     end
   end
-
-  def test_check_sheetname_reserved_name
-    reserved_names = ['History', 'history', 'HISTORY', 'HisTory']
-
-    reserved_names.each do |sheetname|
-      assert_raises RuntimeError, "'#{sheetname}' passed incorrectly" do
-        @workbook.add_worksheet(sheetname)
-      end
-    end
-  end
 end

data/write_xlsx.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'rubyzip', '>= 1.0.0'
   gem.add_runtime_dependency 'zip-zip'
   gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'byebug'
   gem.add_development_dependency 'rake'
   gem.extra_rdoc_files = [
     "LICENSE.txt",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 1.02.0
+  version: 1.04.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -404,6 +418,7 @@ files:
 - test/regression/images/red.bmp
 - test/regression/images/red.jpg
 - test/regression/images/red.png
+- test/regression/images/red2.png
 - test/regression/images/red_208.png
 - test/regression/images/red_64x20.png
 - test/regression/images/train.jpg
@@ -698,6 +713,8 @@ files:
 - test/regression/test_chart_line02.rb
 - test/regression/test_chart_line03.rb
 - test/regression/test_chart_line04.rb
+- test/regression/test_chart_line05.rb
+- test/regression/test_chart_line06.rb
 - test/regression/test_chart_name01.rb
 - test/regression/test_chart_name02.rb
 - test/regression/test_chart_name03.rb
@@ -780,6 +797,8 @@ files:
 - test/regression/test_comment12.rb
 - test/regression/test_comment13.rb
 - test/regression/test_comment14.rb
+- test/regression/test_comment15.rb
+- test/regression/test_comment16.rb
 - test/regression/test_cond_format01.rb
 - test/regression/test_cond_format02.rb
 - test/regression/test_cond_format03.rb
@@ -870,6 +889,11 @@ files:
 - test/regression/test_header_image12.rb
 - test/regression/test_header_image13.rb
 - test/regression/test_header_image14.rb
+- test/regression/test_header_image15.rb
+- test/regression/test_header_image16.rb
+- test/regression/test_header_image17.rb
+- test/regression/test_header_image18.rb
+- test/regression/test_header_image19.rb
 - test/regression/test_hide01.rb
 - test/regression/test_hyperlink01.rb
 - test/regression/test_hyperlink02.rb
@@ -915,6 +939,8 @@ files:
 - test/regression/test_hyperlink44.rb
 - test/regression/test_hyperlink45.rb
 - test/regression/test_hyperlink47.rb
+- test/regression/test_hyperlink48.rb
+- test/regression/test_hyperlink49.rb
 - test/regression/test_image01.rb
 - test/regression/test_image02.rb
 - test/regression/test_image03.rb
@@ -952,6 +978,10 @@ files:
 - test/regression/test_image45.rb
 - test/regression/test_image46.rb
 - test/regression/test_image47.rb
+- test/regression/test_image48.rb
+- test/regression/test_image49.rb
+- test/regression/test_image50.rb
+- test/regression/test_image51.rb
 - test/regression/test_landscape01.rb
 - test/regression/test_macro01.rb
 - test/regression/test_merge_cells01.rb
@@ -969,6 +999,15 @@ files:
 - test/regression/test_object_position08.rb
 - test/regression/test_object_position09.rb
 - test/regression/test_object_position10.rb
+- test/regression/test_object_position12.rb
+- test/regression/test_object_position13.rb
+- test/regression/test_object_position14.rb
+- test/regression/test_object_position15.rb
+- test/regression/test_object_position16.rb
+- test/regression/test_object_position17.rb
+- test/regression/test_object_position18.rb
+- test/regression/test_object_position19.rb
+- test/regression/test_object_position20.rb
 - test/regression/test_outline01.rb
 - test/regression/test_outline02.rb
 - test/regression/test_outline03.rb
@@ -1097,6 +1136,8 @@ files:
 - test/regression/test_table21.rb
 - test/regression/test_table22.rb
 - test/regression/test_table23.rb
+- test/regression/test_table24.rb
+- test/regression/test_table25.rb
 - test/regression/test_tutorial01.rb
 - test/regression/test_tutorial02.rb
 - test/regression/test_tutorial03.rb
@@ -1403,6 +1444,8 @@ files:
 - test/regression/xlsx_files/chart_line02.xlsx
 - test/regression/xlsx_files/chart_line03.xlsx
 - test/regression/xlsx_files/chart_line04.xlsx
+- test/regression/xlsx_files/chart_line05.xlsx
+- test/regression/xlsx_files/chart_line06.xlsx
 - test/regression/xlsx_files/chart_name01.xlsx
 - test/regression/xlsx_files/chart_name02.xlsx
 - test/regression/xlsx_files/chart_name03.xlsx
@@ -1481,6 +1524,8 @@ files:
 - test/regression/xlsx_files/comment12.xlsx
 - test/regression/xlsx_files/comment13.xlsx
 - test/regression/xlsx_files/comment14.xlsx
+- test/regression/xlsx_files/comment15.xlsx
+- test/regression/xlsx_files/comment16.xlsx
 - test/regression/xlsx_files/cond_format01.xlsx
 - test/regression/xlsx_files/cond_format02.xlsx
 - test/regression/xlsx_files/cond_format03.xlsx
@@ -1569,6 +1614,11 @@ files:
 - test/regression/xlsx_files/header_image12.xlsx
 - test/regression/xlsx_files/header_image13.xlsx
 - test/regression/xlsx_files/header_image14.xlsx
+- test/regression/xlsx_files/header_image15.xlsx
+- test/regression/xlsx_files/header_image16.xlsx
+- test/regression/xlsx_files/header_image17.xlsx
+- test/regression/xlsx_files/header_image18.xlsx
+- test/regression/xlsx_files/header_image19.xlsx
 - test/regression/xlsx_files/hide01.xlsx
 - test/regression/xlsx_files/hyperlink01.xlsx
 - test/regression/xlsx_files/hyperlink02.xlsx
@@ -1614,6 +1664,7 @@ files:
 - test/regression/xlsx_files/hyperlink43.xlsx
 - test/regression/xlsx_files/hyperlink44.xlsx
 - test/regression/xlsx_files/hyperlink45.xlsx
+- test/regression/xlsx_files/hyperlink46.xlsx
 - test/regression/xlsx_files/hyperlink47.xlsx
 - test/regression/xlsx_files/hyperlink48.xlsx
 - test/regression/xlsx_files/hyperlink49.xlsx
@@ -1654,6 +1705,10 @@ files:
 - test/regression/xlsx_files/image45.xlsx
 - test/regression/xlsx_files/image46.xlsx
 - test/regression/xlsx_files/image47.xlsx
+- test/regression/xlsx_files/image48.xlsx
+- test/regression/xlsx_files/image49.xlsx
+- test/regression/xlsx_files/image50.xlsx
+- test/regression/xlsx_files/image51.xlsx
 - test/regression/xlsx_files/landscape01.xlsx
 - test/regression/xlsx_files/macro01.xlsm
 - test/regression/xlsx_files/merge_cells01.xlsx
@@ -1671,6 +1726,15 @@ files:
 - test/regression/xlsx_files/object_position08.xlsx
 - test/regression/xlsx_files/object_position09.xlsx
 - test/regression/xlsx_files/object_position10.xlsx
+- test/regression/xlsx_files/object_position12.xlsx
+- test/regression/xlsx_files/object_position13.xlsx
+- test/regression/xlsx_files/object_position14.xlsx
+- test/regression/xlsx_files/object_position15.xlsx
+- test/regression/xlsx_files/object_position16.xlsx
+- test/regression/xlsx_files/object_position17.xlsx
+- test/regression/xlsx_files/object_position18.xlsx
+- test/regression/xlsx_files/object_position19.xlsx
+- test/regression/xlsx_files/object_position20.xlsx
 - test/regression/xlsx_files/outline01.xlsx
 - test/regression/xlsx_files/outline02.xlsx
 - test/regression/xlsx_files/outline03.xlsx
@@ -1799,6 +1863,8 @@ files:
 - test/regression/xlsx_files/table21.xlsx
 - test/regression/xlsx_files/table22.xlsx
 - test/regression/xlsx_files/table23.xlsx
+- test/regression/xlsx_files/table24.xlsx
+- test/regression/xlsx_files/table25.xlsx
 - test/regression/xlsx_files/tutorial01.xlsx
 - test/regression/xlsx_files/tutorial02.xlsx
 - test/regression/xlsx_files/tutorial03.xlsx
@@ -2174,6 +2240,7 @@ test_files:
 - test/regression/images/red.bmp
 - test/regression/images/red.jpg
 - test/regression/images/red.png
+- test/regression/images/red2.png
 - test/regression/images/red_208.png
 - test/regression/images/red_64x20.png
 - test/regression/images/train.jpg
@@ -2468,6 +2535,8 @@ test_files:
 - test/regression/test_chart_line02.rb
 - test/regression/test_chart_line03.rb
 - test/regression/test_chart_line04.rb
+- test/regression/test_chart_line05.rb
+- test/regression/test_chart_line06.rb
 - test/regression/test_chart_name01.rb
 - test/regression/test_chart_name02.rb
 - test/regression/test_chart_name03.rb
@@ -2550,6 +2619,8 @@ test_files:
 - test/regression/test_comment12.rb
 - test/regression/test_comment13.rb
 - test/regression/test_comment14.rb
+- test/regression/test_comment15.rb
+- test/regression/test_comment16.rb
 - test/regression/test_cond_format01.rb
 - test/regression/test_cond_format02.rb
 - test/regression/test_cond_format03.rb
@@ -2640,6 +2711,11 @@ test_files:
 - test/regression/test_header_image12.rb
 - test/regression/test_header_image13.rb
 - test/regression/test_header_image14.rb
+- test/regression/test_header_image15.rb
+- test/regression/test_header_image16.rb
+- test/regression/test_header_image17.rb
+- test/regression/test_header_image18.rb
+- test/regression/test_header_image19.rb
 - test/regression/test_hide01.rb
 - test/regression/test_hyperlink01.rb
 - test/regression/test_hyperlink02.rb
@@ -2685,6 +2761,8 @@ test_files:
 - test/regression/test_hyperlink44.rb
 - test/regression/test_hyperlink45.rb
 - test/regression/test_hyperlink47.rb
+- test/regression/test_hyperlink48.rb
+- test/regression/test_hyperlink49.rb
 - test/regression/test_image01.rb
 - test/regression/test_image02.rb
 - test/regression/test_image03.rb
@@ -2722,6 +2800,10 @@ test_files:
 - test/regression/test_image45.rb
 - test/regression/test_image46.rb
 - test/regression/test_image47.rb
+- test/regression/test_image48.rb
+- test/regression/test_image49.rb
+- test/regression/test_image50.rb
+- test/regression/test_image51.rb
 - test/regression/test_landscape01.rb
 - test/regression/test_macro01.rb
 - test/regression/test_merge_cells01.rb
@@ -2739,6 +2821,15 @@ test_files:
 - test/regression/test_object_position08.rb
 - test/regression/test_object_position09.rb
 - test/regression/test_object_position10.rb
+- test/regression/test_object_position12.rb
+- test/regression/test_object_position13.rb
+- test/regression/test_object_position14.rb
+- test/regression/test_object_position15.rb
+- test/regression/test_object_position16.rb
+- test/regression/test_object_position17.rb
+- test/regression/test_object_position18.rb
+- test/regression/test_object_position19.rb
+- test/regression/test_object_position20.rb
 - test/regression/test_outline01.rb
 - test/regression/test_outline02.rb
 - test/regression/test_outline03.rb
@@ -2867,6 +2958,8 @@ test_files:
 - test/regression/test_table21.rb
 - test/regression/test_table22.rb
 - test/regression/test_table23.rb
+- test/regression/test_table24.rb
+- test/regression/test_table25.rb
 - test/regression/test_tutorial01.rb
 - test/regression/test_tutorial02.rb
 - test/regression/test_tutorial03.rb
@@ -3173,6 +3266,8 @@ test_files:
 - test/regression/xlsx_files/chart_line02.xlsx
 - test/regression/xlsx_files/chart_line03.xlsx
 - test/regression/xlsx_files/chart_line04.xlsx
+- test/regression/xlsx_files/chart_line05.xlsx
+- test/regression/xlsx_files/chart_line06.xlsx
 - test/regression/xlsx_files/chart_name01.xlsx
 - test/regression/xlsx_files/chart_name02.xlsx
 - test/regression/xlsx_files/chart_name03.xlsx
@@ -3251,6 +3346,8 @@ test_files:
 - test/regression/xlsx_files/comment12.xlsx
 - test/regression/xlsx_files/comment13.xlsx
 - test/regression/xlsx_files/comment14.xlsx
+- test/regression/xlsx_files/comment15.xlsx
+- test/regression/xlsx_files/comment16.xlsx
 - test/regression/xlsx_files/cond_format01.xlsx
 - test/regression/xlsx_files/cond_format02.xlsx
 - test/regression/xlsx_files/cond_format03.xlsx
@@ -3339,6 +3436,11 @@ test_files:
 - test/regression/xlsx_files/header_image12.xlsx
 - test/regression/xlsx_files/header_image13.xlsx
 - test/regression/xlsx_files/header_image14.xlsx
+- test/regression/xlsx_files/header_image15.xlsx
+- test/regression/xlsx_files/header_image16.xlsx
+- test/regression/xlsx_files/header_image17.xlsx
+- test/regression/xlsx_files/header_image18.xlsx
+- test/regression/xlsx_files/header_image19.xlsx
 - test/regression/xlsx_files/hide01.xlsx
 - test/regression/xlsx_files/hyperlink01.xlsx
 - test/regression/xlsx_files/hyperlink02.xlsx
@@ -3384,6 +3486,7 @@ test_files:
 - test/regression/xlsx_files/hyperlink43.xlsx
 - test/regression/xlsx_files/hyperlink44.xlsx
 - test/regression/xlsx_files/hyperlink45.xlsx
+- test/regression/xlsx_files/hyperlink46.xlsx
 - test/regression/xlsx_files/hyperlink47.xlsx
 - test/regression/xlsx_files/hyperlink48.xlsx
 - test/regression/xlsx_files/hyperlink49.xlsx
@@ -3424,6 +3527,10 @@ test_files:
 - test/regression/xlsx_files/image45.xlsx
 - test/regression/xlsx_files/image46.xlsx
 - test/regression/xlsx_files/image47.xlsx
+- test/regression/xlsx_files/image48.xlsx
+- test/regression/xlsx_files/image49.xlsx
+- test/regression/xlsx_files/image50.xlsx
+- test/regression/xlsx_files/image51.xlsx
 - test/regression/xlsx_files/landscape01.xlsx
 - test/regression/xlsx_files/macro01.xlsm
 - test/regression/xlsx_files/merge_cells01.xlsx
@@ -3441,6 +3548,15 @@ test_files:
 - test/regression/xlsx_files/object_position08.xlsx
 - test/regression/xlsx_files/object_position09.xlsx
 - test/regression/xlsx_files/object_position10.xlsx
+- test/regression/xlsx_files/object_position12.xlsx
+- test/regression/xlsx_files/object_position13.xlsx
+- test/regression/xlsx_files/object_position14.xlsx
+- test/regression/xlsx_files/object_position15.xlsx
+- test/regression/xlsx_files/object_position16.xlsx
+- test/regression/xlsx_files/object_position17.xlsx
+- test/regression/xlsx_files/object_position18.xlsx
+- test/regression/xlsx_files/object_position19.xlsx
+- test/regression/xlsx_files/object_position20.xlsx
 - test/regression/xlsx_files/outline01.xlsx
 - test/regression/xlsx_files/outline02.xlsx
 - test/regression/xlsx_files/outline03.xlsx
@@ -3569,6 +3685,8 @@ test_files:
 - test/regression/xlsx_files/table21.xlsx
 - test/regression/xlsx_files/table22.xlsx
 - test/regression/xlsx_files/table23.xlsx
+- test/regression/xlsx_files/table24.xlsx
+- test/regression/xlsx_files/table25.xlsx
 - test/regression/xlsx_files/tutorial01.xlsx
 - test/regression/xlsx_files/tutorial02.xlsx
 - test/regression/xlsx_files/tutorial03.xlsx