write_xlsx 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14a7593970ecc4db14f2accbdc1634033ac9042cdd7680a20d4400ea1eda741f
-  data.tar.gz: 2ec671ba25dc571f612dc5b9d4a9c4ede2e147203d2e085313ea8b4a5f774377
+  metadata.gz: cabafeb058f3742956ec06251cab5ecf67d9b76cd5db3ec659e2e4184d2c1483
+  data.tar.gz: 95a68e0390bff44e03dc8577b31162c1d1c2cb80d77f3943947e1114327afb01
 SHA512:
-  metadata.gz: 255b8f5d60623d6c9966ba1209773129d3312238df315a16564d8c950fa39ac738296a9c788d4cb707abad7e659e9eaef528749fa7f1de7f93a2152e0534fbb4
-  data.tar.gz: c161bd9e8cfe47754f763a874ab83b183f76d7d290ecc53db1fa7a1ea1ec4433ee1d80efda0c139417321f02069db690fc113ab54104b5922b9c942210949e60
+  metadata.gz: 70a98e3ffc2be69574805f72a63678b2023cc3aef9a1c1a97c5f8a13de80de29c641c573d8c8c9bd7d33da088827a15fb6feb3b4c7591b50ffb26cb321591b49
+  data.tar.gz: 1d387aa195a7a35f0b664e4ff155ca71de765ad6ae886df66debc9063d1fea8c4c905ab10a7aef735d69813b79faa1d6e7ded96e70ce23a75df56e5f172b1648

data/.rubocop.yml

@@ -102,7 +102,7 @@ Style/FormatStringToken:
   EnforcedStyle: unannotated
 
 Style/HashSyntax:
-  EnforceStyle: ruby19_no_mixed_keys
+  EnforcedStyle: ruby19_no_mixed_keys
   EnforcedShorthandSyntax: either
 
 Style/IfUnlessModifier:

data/Changes

@@ -1,5 +1,8 @@
 Change history of write_xlsx rubygem.
 
+2023-08-09 v1.11.1
+    Fixed issue #110. Redefining costant Struct::ColInfo
+
 2023-05-06 v1.11.0
     Added support for simulated worksheet `autofit()`.
 

data/lib/write_xlsx/chart/area.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 ###############################################################################
 #

data/lib/write_xlsx/chart/axis.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/chart/bar.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 ###############################################################################
 #

data/lib/write_xlsx/chart/caption.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 module Writexlsx
   class Chart

data/lib/write_xlsx/chart/column.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 ###############################################################################
 #

data/lib/write_xlsx/chart/doughnut.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 ###############################################################################
 #

data/lib/write_xlsx/chart/legend.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 module Writexlsx
   class Chart

data/lib/write_xlsx/chart/line.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 ###############################################################################
 #

data/lib/write_xlsx/chart/pie.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 ###############################################################################
 #

data/lib/write_xlsx/chart/radar.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 ###############################################################################
 #

data/lib/write_xlsx/chart/scatter.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 ###############################################################################
 #

data/lib/write_xlsx/chart/series.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 module Writexlsx
   class Chart
@@ -182,6 +183,7 @@ module Writexlsx
       attr_reader :values, :categories, :name, :name_formula, :name_id
       attr_reader :cat_data_id, :val_data_id, :fill, :pattern, :gradient
       attr_reader :trendline, :smooth, :labels, :invert_if_negative
+      attr_reader :inverted_color
       attr_reader :x2_axis, :y2_axis, :error_bars, :points
       attr_accessor :line, :marker
 
@@ -217,10 +219,12 @@ module Writexlsx
 
         @label_positions = chart.label_positions
         @label_position_default = chart.label_position_default
-        @labels     = labels_properties(params[:data_labels])
+        @labels = labels_properties(params[:data_labels])
+        @inverted_color = params[:invert_if_negative_color]
 
-        %i[smooth invert_if_negative x2_axis y2_axis]
-          .each { |key| instance_variable_set("@#{key}", params[key]) }
+        %i[
+          smooth invert_if_negative x2_axis y2_axis
+        ].each { |key| instance_variable_set("@#{key}", params[key]) }
       end
 
       def ==(other)
@@ -228,7 +232,7 @@ module Writexlsx
           categories values name name_formula name_id
           cat_data_id val_data_id
           line fill gradient marker trendline
-          smooth labels invert_if_neg
+          smooth labels inverted_color
           x2_axis y2_axis error_bars points
         ]
         methods.each do |method|

data/lib/write_xlsx/chart/stock.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 ###############################################################################
 #

data/lib/write_xlsx/chart.rb

@@ -950,10 +950,36 @@ module Writexlsx
         write_val(series)
         # Write the c:smooth element.
         write_c_smooth(series.smooth) if ptrue?(@smooth_allowed)
+        write_ext_lst(series.inverted_color) if series.inverted_color
       end
       @series_index += 1
     end
 
+    def write_ext_lst(color)
+      uri = '{6F2FDCE9-48DA-4B69-8628-5D25D57E5C99}'
+      xmlns_c_14 =
+        'http://schemas.microsoft.com/office/drawing/2007/8/2/chart'
+
+      attributes_1 = [
+        ['uri', uri],
+        ['xmlns:c14', xmlns_c_14]
+      ]
+
+      attributes_2 = [
+        ['xmlns:c14', xmlns_c_14]
+      ]
+
+      @writer.tag_elements('c:extLst') do
+        @writer.tag_elements('c:ext', attributes_1) do
+          @writer.tag_elements('c14:invertSolidFillFmt') do
+            @writer.tag_elements('c14:spPr', attributes_2) do
+              write_a_solid_fill(color: color)
+            end
+          end
+        end
+      end
+    end
+
     def write_ser_base(series)
       # Write the c:idx element.
       write_idx(@series_index)
@@ -2018,20 +2044,25 @@ module Writexlsx
         attributes << ['w', width]
       end
 
-      @writer.tag_elements('a:ln', attributes) do
-        # Write the line fill.
-        if ptrue?(line[:none])
-          # Write the a:noFill element.
-          write_a_no_fill
-        elsif ptrue?(line[:color])
-          # Write the a:solidFill element.
-          write_a_solid_fill(line)
-        end
-        # Write the line/dash type.
-        if line[:dash_type]
-          # Write the a:prstDash element.
-          write_a_prst_dash(line[:dash_type])
+      if ptrue?(line[:none]) || ptrue?(line[:color]) || line[:dash_type]
+        @writer.tag_elements('a:ln', attributes) do
+          # Write the line fill.
+          if ptrue?(line[:none])
+            # Write the a:noFill element.
+            write_a_no_fill
+          elsif ptrue?(line[:color])
+            # Write the a:solidFill element.
+            write_a_solid_fill(line)
+          end
+
+          # Write the line/dash type.
+          if line[:dash_type]
+            # Write the a:prstDash element.
+            write_a_prst_dash(line[:dash_type])
+          end
         end
+      else
+        @writer.empty_tag('a:ln', attributes)
       end
     end
 

data/lib/write_xlsx/colors.rb

@@ -4,25 +4,26 @@
 module Writexlsx
   class Colors
     COLORS = {
-      aqua:    0x0F,
-      cyan:    0x0F,
-      black:   0x08,
-      blue:    0x0C,
-      brown:   0x10,
-      magenta: 0x0E,
-      fuchsia: 0x0E,
-      gray:    0x17,
-      grey:    0x17,
-      green:   0x11,
-      lime:    0x0B,
-      navy:    0x12,
-      orange:  0x35,
-      pink:    0x21,
-      purple:  0x14,
-      red:     0x0A,
-      silver:  0x16,
-      white:   0x09,
-      yellow:  0x0D
+      aqua:      0x0F,
+      cyan:      0x0F,
+      black:     0x08,
+      blue:      0x0C,
+      brown:     0x10,
+      magenta:   0x0E,
+      fuchsia:   0x0E,
+      gray:      0x17,
+      grey:      0x17,
+      green:     0x11,
+      lime:      0x0B,
+      navy:      0x12,
+      orange:    0x35,
+      pink:      0x21,
+      purple:    0x14,
+      red:       0x0A,
+      silver:    0x16,
+      white:     0x09,
+      yellow:    0x0D,
+      automatic: 0x40
     }   # :nodoc:
 
     ###############################################################################

data/lib/write_xlsx/format.rb

@@ -584,14 +584,16 @@ module Writexlsx
         if theme == -1
         # Ignore for excel2003_style
         elsif ptrue?(theme)
-          write_color(writer, 'theme', theme)
+          write_color('theme', theme, writer)
         elsif ptrue?(@color_indexed)
-          write_color(writer, 'indexed', @color_indexed)
+          write_color('indexed', @color_indexed, writer)
         elsif ptrue?(@color)
           color = worksheet.palette_color(@color)
-          write_color(writer, 'rgb', color)
+          if color != 'Automatic'
+            write_color('rgb', color, writer)
+          end
         elsif !ptrue?(dxf_format)
-          write_color(writer, 'theme', 1)
+          write_color('theme', 1, writer)
         end
 
         unless ptrue?(dxf_format)
@@ -607,12 +609,12 @@ module Writexlsx
         writer.empty_tag('sz', [['val', size]])
 
         if ptrue?(theme)
-          write_color(writer, 'theme', theme)
+          write_color('theme', theme, writer)
         elsif ptrue?(@color)
           color = worksheet.palette_color(@color)
-          write_color(writer, 'rgb', color)
+          write_color('rgb', color, writer)
         else
-          write_color(writer, 'theme', 1)
+          write_color('theme', 1, writer)
         end
 
         writer.empty_tag('rFont', [['val', @font]])

data/lib/write_xlsx/package/comments.rb

@@ -57,7 +57,8 @@ module Writexlsx
       # Minor modification to allow comparison testing. Change RGB colors
       # from long format, ffcc00 to short format fc0 used by VML.
       def rgb_color(rgb)
-        result = sprintf("%02x%02x%02x", *rgb)
+        r, g, b = rgb
+        result = sprintf("%02x%02x%02x", r, g, b)
         result = "#{::Regexp.last_match(1)}#{::Regexp.last_match(2)}#{::Regexp.last_match(3)}" if result =~ /^([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3$/
         result
       end

data/lib/write_xlsx/package/conditional_format.rb

@@ -818,9 +818,9 @@ module Writexlsx
           write_cfvo(min_type, min_value)
           write_cfvo(mid_type, mid_value) if mid_type
           write_cfvo(max_type, max_value)
-          write_color(@writer, 'rgb', min_color)
-          write_color(@writer, 'rgb', mid_color)  if mid_color
-          write_color(@writer, 'rgb', max_color)
+          write_color('rgb', min_color)
+          write_color('rgb', mid_color)  if mid_color
+          write_color('rgb', max_color)
         end
       end
     end
@@ -844,7 +844,7 @@ module Writexlsx
           write_cfvo(min_type, min_value)
           write_cfvo(max_type, max_value)
 
-          write_color(@writer, 'rgb', bar_color)
+          write_color('rgb', bar_color)
         end
       end
 

data/lib/write_xlsx/package/styles.rb

@@ -59,6 +59,8 @@ module Writexlsx
       def palette_color(index)
         if index.to_s =~ /^#([0-9A-F]{6})$/i
           "FF#{::Regexp.last_match(1).upcase}"
+        elsif index == 0x40
+          "Automatic"
         else
           "FF#{super(index)}"
         end
@@ -186,15 +188,6 @@ module Writexlsx
         end
       end
 
-      #
-      # Write the <color> element.
-      #
-      def write_color(name, value)
-        attributes = [[name, value]]
-
-        @writer.empty_tag('color', attributes)
-      end
-
       #
       # Write the <fills> element.
       #
@@ -284,10 +277,14 @@ module Writexlsx
       def write_pattern_fill(format, dxf_format)
         bg_color, fg_color = bg_and_fg_color(format, dxf_format)
 
-        @writer.empty_tag('fgColor', [['rgb', palette_color(fg_color)]]) if fg_color && fg_color != 0
+        if fg_color && fg_color != 0 && fg_color != 0x40  # 'Automatic'
+          @writer.empty_tag('fgColor', [['rgb', palette_color(fg_color)]])
+        end
 
         if bg_color && bg_color != 0
-          @writer.empty_tag('bgColor', [['rgb', palette_color(bg_color)]])
+          if bg_color != 0x40 # 'Automatic'
+            @writer.empty_tag('bgColor', [['rgb', palette_color(bg_color)]])
+          end
         elsif !dxf_format && format.pattern <= 1
           @writer.empty_tag('bgColor', [['indexed', 64]])
         end
@@ -390,10 +387,11 @@ module Writexlsx
         attributes = [[:style, BORDER_STYLES[style]]]
 
         @writer.tag_elements(type, attributes) do
-          if color == 0
+          if [0, 0x40].include?(color) # 'Automatic'
             @writer.empty_tag('color', [['auto', 1]])
-          else
+          elsif color != 0 && color != 0x40 # 'Automatic'
             color = palette_color(color)
+
             @writer.empty_tag('color', [['rgb', color]])
           end
         end

data/lib/write_xlsx/utility.rb

@@ -341,7 +341,7 @@ module Writexlsx
     #
     # Write the <color> element.
     #
-    def write_color(writer, name, value) # :nodoc:
+    def write_color(name, value, writer = @writer) # :nodoc:
       attributes = [[name, value]]
 
       writer.empty_tag('color', attributes)
@@ -751,8 +751,8 @@ module Writexlsx
       # Adjust the colour index.
       idx = index - 8
 
-      rgb = @palette[idx]
-      sprintf("%02X%02X%02X", *rgb)
+      r, g, b = @palette[idx]
+      sprintf("%02X%02X%02X", r, g, b)
     end
 
     #

data/lib/write_xlsx/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-WriteXLSX_VERSION = "1.11.0"
+WriteXLSX_VERSION = "1.11.1"

data/lib/write_xlsx/workbook.rb

@@ -988,7 +988,6 @@ module Writexlsx
       num_formats        = []
       unique_num_formats = {}
       index              = 164
-      num_format_count   = 0
 
       (@xf_formats + @dxf_formats).each do |format|
         num_format = format.num_format

data/lib/write_xlsx/worksheet/cell_data.rb

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-
-# frozen__literal: true
+# frozen_string_literal: true
 
 module Writexlsx
   class Worksheet

data/lib/write_xlsx/worksheet.rb

@@ -23,6 +23,7 @@ module Writexlsx
 
     MAX_DIGIT_WIDTH = 7    # For Calabri 11.  # :nodoc:
     PADDING         = 5                       # :nodoc:
+    COLINFO         = Struct.new('ColInfo', :width, :format, :hidden, :level, :collapsed, :autofit)
 
     attr_reader :index                                            # :nodoc:
     attr_reader :charts, :images, :tables, :shapes, :drawings     # :nodoc:
@@ -357,8 +358,7 @@ module Writexlsx
       # Store the column data based on the first column. Padded for sorting.
       (firstcol..lastcol).each do |col|
         @col_info[col] =
-          Struct.new('ColInfo', :width, :format, :hidden, :level, :collapsed, :autofit)
-            .new(width, format, hidden, level, collapsed, autofit)
+          COLINFO.new(width, format, hidden, level, collapsed, autofit)
       end
 
       # Store the column change to allow optimisations.
@@ -497,8 +497,7 @@ module Writexlsx
           @col_info[col_num].autofit = 1
         else
           @col_info[col_num] =
-            Struct.new('ColInfo', :width, :format, :hidden, :level, :collapsed, :autofit)
-              .new(width, nil, 0, 0, 0, 1)
+            COLINFO.new(width, nil, 0, 0, 0, 1)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip