write_xlsx 1.12.1 → 1.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1635db5db3b473587d463688e71ba65bea7af4d8509b1fdf494e8ea0272449f
-  data.tar.gz: ce2fe9f2b245cf39b1fdba9a40136e81fd5ce1bae6a40b18947bfad4fbbb24c8
+  metadata.gz: 2c81aa6fdc63eb67e64cccf8d93832fb838d2cf3212a2a4988d0d433e4f6de70
+  data.tar.gz: a65250b4aa8d062bd65a2ad766c8e10a7955f549bb3b4263783e3c64fed91282
 SHA512:
-  metadata.gz: 284486f2dc12475d785db789f441a9dc3055576c4868aba245a21c3e962d9677430333e3dc7516bc02174062af6e39c8b5f7aec546019e7fd3f968c92adb5bb0
-  data.tar.gz: 9396ea7ad6514b6ae2b24976e8fae95460439e084839481eabff928b18eecab9996a406866e493a69675f60f96c370312168ad9db9986a1bb0a072f4fca853f3
+  metadata.gz: 1264ad6d2c37cf05bb2204ecac9763c34b0613219bae0a6aa13cb0f23c9ff869b4da8289449ad33136f844df56382dd9ab775f2001423953c4a3412a6b7aa0fb
+  data.tar.gz: d405587eba26c664f9bfc2692b1da5d7400149db8823bd5a74a78fee95b39e0e05dc7b3d41d5c312eaf45bd45094e066989b6ed8290911f2483dcaf273257a3e

data/.rubocop.yml

@@ -17,6 +17,9 @@ Gemspec/RequiredRubyVersion:
 Gemspec/RequireMFA:
   Enabled: false
 
+Layout/ArgumentAlignment:
+  Enabled: false
+
 Layout/EndOfLine:
   EnforcedStyle: lf
 
@@ -76,6 +79,9 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 50
 
+Minitest/UselessAssertion:
+  Enabled: false
+
 Naming/HeredocDelimiterNaming:
   Enabled: false
 
@@ -85,6 +91,9 @@ Naming/MethodName:
 Naming/MethodParameterName:
   Enabled: false
 
+Naming/PredicateMethod:
+  Enabled: false
+
 Naming/VariableNumber:
   Enabled: false
 
@@ -104,6 +113,9 @@ Style/FormatString:
 Style/FormatStringToken:
   EnforcedStyle: unannotated
 
+Style/HashSlice:
+  Enabled: false
+
 Style/HashSyntax:
   EnforcedStyle: ruby19_no_mixed_keys
   EnforcedShorthandSyntax: either

data/Changes

@@ -1,5 +1,8 @@
 Change history of write_xlsx rubygem.
 
+2025-09-08 v1.12.2
+    Fix Update gemspec: require rubyzip ~> 2.4.0
+
 2024-04-12 v1.12.1
     Added support for embedding images into worksheets with
     worksheet `embed_image()`.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2023 Hideo NAKAMURA
+Copyright (c) 2012-2024 Hideo NAKAMURA
 
 MIT License
 

data/examples/autofilter.rb

@@ -28,8 +28,7 @@ bold = workbook.add_format(bold: 1)
 
 # Extract the data embedded at the end of this file.
 headings = DATA.gets.split
-data = []
-DATA.each { |line| data << line.split }
+data = DATA.map(&:split)
 
 # Set up several sheets with the same data.
 workbook.worksheets.each do |worksheet|

data/examples/colors.rb

@@ -116,12 +116,12 @@ worksheet2.write(0, 3, "Name",  heading)
     border:   1
   )
 
-  worksheet2.write((i - 7), 0, i,                    center)
-  worksheet2.write((i - 7), 1, sprintf("0x%02X", i), center)
-  worksheet2.write((i - 7), 2, '',                   format)
+  worksheet2.write(i - 7, 0, i,                    center)
+  worksheet2.write(i - 7, 1, sprintf("0x%02X", i), center)
+  worksheet2.write(i - 7, 2, '',                   format)
 
   # Add the  color names
-  worksheet2.write((i - 7), 3, colors[i], center) if colors.has_key?(i)
+  worksheet2.write(i - 7, 3, colors[i], center) if colors.has_key?(i)
 end
 
 #

data/examples/formats.rb

@@ -147,12 +147,12 @@ def standard_colors(workbook, center, heading, colors)
       border:   1
     )
 
-    worksheet.write((i - 7), 0, i, center)
-    worksheet.write((i - 7), 1, sprintf("0x%02X", i), center)
-    worksheet.write((i - 7), 2, '', format)
+    worksheet.write(i - 7, 0, i, center)
+    worksheet.write(i - 7, 1, sprintf("0x%02X", i), center)
+    worksheet.write(i - 7, 2, '', format)
 
     # Add the  color names
-    worksheet.write((i - 7), 3, colors[i], center) if colors[i]
+    worksheet.write(i - 7, 3, colors[i], center) if colors[i]
   end
 end
 
@@ -294,11 +294,11 @@ def borders(workbook, center, heading, _colors)
     format.set_border_color('red')
     format.set_align('center')
 
-    worksheet.write((2 * (i + 1)), 0, i, center)
-    worksheet.write((2 * (i + 1)),
+    worksheet.write(2 * (i + 1), 0, i, center)
+    worksheet.write(2 * (i + 1),
                     1, sprintf("0x%02X", i), center)
 
-    worksheet.write((2 * (i + 1)), 3, "Border", format)
+    worksheet.write(2 * (i + 1), 3, "Border", format)
   end
 
   worksheet.write(30, 0, "Diag type",             heading)
@@ -313,11 +313,11 @@ def borders(workbook, center, heading, _colors)
     format.set_diag_color('red')
     format.set_align('center')
 
-    worksheet.write((2 * (i + 15)), 0, i, center)
-    worksheet.write((2 * (i + 15)),
+    worksheet.write(2 * (i + 15), 0, i, center)
+    worksheet.write(2 * (i + 15),
                     1, sprintf("0x%02X", i), center)
 
-    worksheet.write((2 * (i + 15)), 3, "Border", format)
+    worksheet.write(2 * (i + 15), 3, "Border", format)
   end
 end
 
@@ -348,14 +348,14 @@ def patterns(workbook, center, heading, _colors)
     format.set_fg_color('green')
     format.set_align('center')
 
-    worksheet.write((2 * (i + 1)), 0, i, center)
-    worksheet.write((2 * (i + 1)),
+    worksheet.write(2 * (i + 1), 0, i, center)
+    worksheet.write(2 * (i + 1),
                     1, sprintf("0x%02X", i), center)
 
-    worksheet.write((2 * (i + 1)), 3, "Pattern", format)
+    worksheet.write(2 * (i + 1), 3, "Pattern", format)
 
     if i == 1
-      worksheet.write((2 * (i + 1)),
+      worksheet.write(2 * (i + 1),
                       5, "This is solid colour, the most useful pattern.", heading)
     end
   end

data/lib/write_xlsx/chart/area.rb

@@ -23,7 +23,7 @@ module Writexlsx
       include Writexlsx::Utility
 
       def initialize(subtype)
-        super(subtype)
+        super
         @subtype = subtype || 'standard'
         @cross_between = 'midCat'
         @show_crosses  = false

data/lib/write_xlsx/chart/axis.rb

@@ -45,7 +45,7 @@ module Writexlsx
         set_axis_line(args)
         set_axis_fill(args)
         if ptrue?(args[:text_axis])
-          @chart.date_category = false
+          chart.date_category = false
           @text_axis = true
         end
 
@@ -178,15 +178,15 @@ module Writexlsx
       end
 
       def set_axis_name_layout(args)
-        @layout    = @chart.layout_properties(args[:name_layout], 1)
+        @layout    = chart.layout_properties(args[:name_layout], 1)
       end
 
       def set_axis_line(args)
-        @line = @chart.line_properties(args[:line])
+        @line = chart.line_properties(args[:line])
       end
 
       def set_axis_fill(args)
-        @fill = @chart.fill_properties(args[:fill])
+        @fill = chart.fill_properties(args[:fill])
       end
     end
   end

data/lib/write_xlsx/chart/bar.rb

@@ -22,7 +22,7 @@ module Writexlsx
       include Writexlsx::Utility
 
       def initialize(subtype)
-        super(subtype)
+        super
         @subtype = subtype || 'clustered'
         @cat_axis_position = 'l'
         @val_axis_position = 'b'

data/lib/write_xlsx/chart/caption.rb

@@ -14,10 +14,10 @@ module Writexlsx
       end
 
       def merge_with_hash(params) # :nodoc:
-        @name, @formula = @chart.process_names(params[:name], params[:name_formula])
-        @data_id        = @chart.data_id(@formula, params[:data])
-        @name_font      = convert_font_args(params[:name_font])
-        @layout   = @chart.layout_properties(params[:layout], 1)
+        @name, @formula = chart.process_names(params[:name], params[:name_formula])
+        @data_id   = chart.data_id(@formula, params[:data])
+        @name_font = convert_font_args(params[:name_font])
+        @layout    = chart.layout_properties(params[:layout], 1)
 
         # Set the title overlay option.
         @overlay  = params[:overlay]
@@ -25,6 +25,10 @@ module Writexlsx
         # Set the no automatic title option.
         @none = params[:none]
       end
+
+      private
+
+      attr_reader :chart
     end
   end
 end

data/lib/write_xlsx/chart/column.rb

@@ -31,7 +31,7 @@ module Writexlsx
       include Writexlsx::Utility
 
       def initialize(subtype)
-        super(subtype)
+        super
         @subtype = subtype || 'clustered'
         @horiz_val_axis = 0
 

data/lib/write_xlsx/chart/doughnut.rb

@@ -24,7 +24,7 @@ module Writexlsx
       include Writexlsx::Utility
 
       def initialize(subtype)
-        super(subtype)
+        super
         @vary_data_color = 1
         @hole_size       = 50
         @rotation        = 0
@@ -38,7 +38,7 @@ module Writexlsx
       def set_hole_size(size)
         return unless size
 
-        if size >= 10 && size <= 90
+        if size.between?(10, 90)
           @hole_size = size
         else
           raise "Hole size $size outside Excel range: 10 <= size <= 90"

data/lib/write_xlsx/chart/line.rb

@@ -23,7 +23,7 @@ module Writexlsx
       include Writexlsx::WriteDPtPoint
 
       def initialize(subtype)
-        super(subtype)
+        super
         @subtype ||= 'standard'
         @default_marker = Marker.new(type: 'none')
         @smooth_allowed = 1

data/lib/write_xlsx/chart/pie.rb

@@ -29,7 +29,7 @@ module Writexlsx
       include Writexlsx::Utility
 
       def initialize(subtype)
-        super(subtype)
+        super
         @vary_data_color = 1
         @rotation        = 0
 
@@ -50,7 +50,7 @@ module Writexlsx
       def set_rotation(rotation)
         return unless rotation
 
-        if rotation >= 0 && rotation <= 360
+        if rotation.between?(0, 360)
           @rotation = rotation
         else
           raise "Chart rotation $rotation outside range: 0 <= rotation <= 360"

data/lib/write_xlsx/chart/radar.rb

@@ -31,7 +31,7 @@ module Writexlsx
       include Writexlsx::Utility
 
       def initialize(subtype)
-        super(subtype)
+        super
         @subtype = subtype || 'marker'
         @default_marker = Marker.new(type: 'none') if @subtype == 'marker'
 

data/lib/write_xlsx/chart/scatter.rb

@@ -24,7 +24,7 @@ module Writexlsx
       include Writexlsx::WriteDPtPoint
 
       def initialize(subtype)
-        super(subtype)
+        super
         @subtype           = subtype || 'marker_only'
         @cross_between     = 'midCat'
         @horiz_val_axis    = 0

data/lib/write_xlsx/chart/series.rb

@@ -51,7 +51,7 @@ module Writexlsx
       attr_reader :visible
 
       def initialize(params)
-        super(params)
+        super
         @visible = params[:visible]
       end
     end
@@ -62,7 +62,7 @@ module Writexlsx
       attr_reader :label
 
       def initialize(params)
-        super(params)
+        super
 
         @label = trendline_label_properties(params[:label])
 
@@ -98,17 +98,15 @@ module Writexlsx
         # Allow 'border' as a synonym for 'line'.
         line = line_properties(_label[:border]) if ptrue?(_label[:border])
 
-        # Set the fill properties for the label.
-        fill = fill_properties(_label[:fill])
-
         # Set the pattern properties for the label.
         pattern = pattern_properties(_label[:pattern])
 
         # Set the gradient fill properties for the label.
         gradient = gradient_properties(_label[:gradient])
 
+        # Set the fill properties for the label.
         # Pattern fill overrides solid fill.
-        fill = nil if ptrue?(pattern)
+        fill = pattern ? nil : fill_properties(_label[:fill])
 
         # Gradient fill overrides solid and pattern fills.
         if ptrue?(gradient)
@@ -140,7 +138,7 @@ module Writexlsx
       attr_reader :size
 
       def initialize(params)
-        super(params)
+        super
 
         @type = value_or_raise(types, params[:type], 'maker type') if params[:type]
 
@@ -354,13 +352,7 @@ module Writexlsx
         end
 
         # Set the line properties for the data labels.
-        line = line_properties(labels[:line])
-
-        # Allow 'border' as a synonym for 'line'.
-        line = line_properties(labels[:border]) if labels[:border]
-
-        # Set the fill properties for the labels.
-        fill = fill_properties(labels[:fill])
+        line = line_properties(labels[:border] || labels[:line])
 
         # Set the pattern properties for the labels.
         pattern = pattern_properties(labels[:pattern])
@@ -368,8 +360,8 @@ module Writexlsx
         # Set the gradient fill properties for the labels.
         gradient = gradient_properties(labels[:gradient])
 
-        # Pattern fill overrides solid fill.
-        fill = nil if pattern
+        # Set the fill properties for the labels.
+        fill = pattern ? nil : fill_properties(labels[:fill])
 
         # Gradient fill overrides solid and pattern fills.
         if gradient
@@ -412,7 +404,8 @@ module Writexlsx
             line = line_properties(property[:border] || property[:line])
 
             # Set the fill properties for the labels.
-            fill = fill_properties(property[:fill])
+            # Pattern fill overrides solid fill.
+            fill = pattern ? nil : fill_properties(property[:fill])
 
             # Set the pattern properties for the labels.
             pattern = pattern_properties(property[:pattern])
@@ -420,9 +413,6 @@ module Writexlsx
             # Set the gradient fill properties for the labels.
             gradient = gradient_properties(property[:gradient])
 
-            # Pattern fill overrides solid fill.
-            fill = nil if pattern
-
             # Gradient fill overrides solid and pattern fills.
             if gradient
               pattern = nil

data/lib/write_xlsx/chart/stock.rb

@@ -27,7 +27,7 @@ module Writexlsx
       include Writexlsx::Utility
 
       def initialize(subtype)
-        super(subtype)
+        super
         @show_crosses  = false
         @hi_low_lines  = Chartline.new({})
         @date_category = true

data/lib/write_xlsx/chart.rb

@@ -17,9 +17,9 @@ module Writexlsx
 
     def initialize(params = {})
       @horizontal = true
-      @vertical = true
-      @outline = true
-      @show_keys = false
+      @vertical   = true
+      @outline    = true
+      @show_keys  = false
       @horizontal = params[:horizontal] if params.has_key?(:horizontal)
       @vertical   = params[:vertical]   if params.has_key?(:vertical)
       @outline    = params[:outline]    if params.has_key?(:outline)
@@ -218,7 +218,7 @@ module Writexlsx
       @subtype           = subtype
       @sheet_type        = 0x0200
       @series            = []
-      @embedded          = 0
+      @embedded          = false
       @id                = -1
       @series_index      = 0
       @style_id          = 2
@@ -257,7 +257,7 @@ module Writexlsx
           # Write the c:spPr element for the chartarea formatting.
           write_sp_pr(@chartarea)
           # Write the c:printSettings element.
-          write_print_settings if @embedded && @embedded != 0
+          write_print_settings if @embedded
         end
       end
     end
@@ -462,7 +462,7 @@ module Writexlsx
     # Setup the default configuration data for an embedded chart.
     #
     def set_embedded_config_data
-      @embedded = 1
+      @embedded = true
     end
 
     #
@@ -480,7 +480,7 @@ module Writexlsx
       subtype = 'percentStacked' if subtype == 'percent_stacked'
 
       # Set a default overlap for stacked charts.
-      @series_overlap_1 = 100 if @subtype =~ (/stacked/) && !@series_overlap_1
+      @series_overlap_1 = 100 if @subtype =~ /stacked/ && !@series_overlap_1
 
       @writer.tag_elements('c:barChart') do
         # Write the c:barDir element.
@@ -1814,20 +1814,13 @@ module Writexlsx
     # Write the <c:pageMargins> element.
     #
     def write_page_margins # :nodoc:
-      b      = 0.75
-      l      = 0.7
-      r      = 0.7
-      t      = 0.75
-      header = 0.3
-      footer = 0.3
-
       attributes = [
-        ['b',      b],
-        ['l',      l],
-        ['r',      r],
-        ['t',      t],
-        ['header', header],
-        ['footer', footer]
+        ['b',      0.75],
+        ['l',      0.7],
+        ['r',      0.7],
+        ['t',      0.75],
+        ['header', 0.3],
+        ['footer', 0.3]
       ]
 
       @writer.empty_tag('c:pageMargins', attributes)
@@ -2872,7 +2865,7 @@ module Writexlsx
       colors    = gradient[:colors]
 
       @writer.tag_elements('a:gsLst') do
-        (0..colors.size - 1).each do |i|
+        (0..(colors.size - 1)).each do |i|
           pos = (positions[i] * 1000).to_i
 
           attributes = [['pos', pos]]

data/lib/write_xlsx/chartsheet.rb

@@ -203,9 +203,9 @@ module Writexlsx
     # Write the <chartsheet> element. This is the root element of Chartsheet.
     #
     def write_chartsheet(&block) # :nodoc:
-      schema                 = 'http://schemas.openxmlformats.org/'
-      xmlns                  = schema + 'spreadsheetml/2006/main'
-      xmlns_r                = schema + 'officeDocument/2006/relationships'
+      schema  = 'http://schemas.openxmlformats.org/'
+      xmlns   = schema + 'spreadsheetml/2006/main'
+      xmlns_r = schema + 'officeDocument/2006/relationships'
 
       attributes = [
         ['xmlns',   xmlns],