write_xlsx 1.13.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8da4e683796759c1d6cdee00aaba72671bb7ea86e7ece2a794628d04289c880a
-  data.tar.gz: dd59c677e92a15eb273d6290c093e90c2a560d4c087a937c2ee343f2cf5286f4
+  metadata.gz: e475548e954baadcd73499953c8a6a01a3e668ec2e023d3a98f382e633b0b460
+  data.tar.gz: 57f95edde86df1b2a6d9d8bae225f0ad085a3d3f1f93e093c56d8f0be21897d4
 SHA512:
-  metadata.gz: 33646d4746630950a08a4f29546682a2c52c04db52df9e201c37b42d31e1033ecd486904009b09b88d637a0d7074f65ac92025c9ea0755e427f3d7d7183da33c
-  data.tar.gz: a6f60317b950822df36b6cc3eacfd4922bcff4026f090714964d547eaa8227b9e5cb56c6f49ea33686601bf95d9c6788b8b9d70dc1d8f46f46ce1e16855420bb
+  metadata.gz: 4565dea924eb24aeae0297e3bc8c418815618ffaa24c4f92b8ecb642bf5b18d1dc47731caf944092caeb9974c6f659a919a744b46a5b674933816d8f496ec096
+  data.tar.gz: a5b5094db8ce823dfb0fa773bf9f5e0c69a6fcc767cbbf2b1817ab5bc4735db9b02ebe5ab0d6c629cf3dc51cc29a8cd92735c4a03e595744974892334bf89f1d

data/.rubocop.yml

@@ -48,6 +48,9 @@ Lint/DuplicateBranch:
     - 'lib/write_xlsx/worksheet.rb'
     - 'lib/write_xlsx/worksheet/data_writing.rb'
 
+Lint/DuplicateMethods:
+  Enabled: false
+
 Lint/FloatComparison:
   Enabled: false
 
@@ -136,9 +139,18 @@ Style/NumericLiterals:
 Style/OptionalBooleanParameter:
   Enabled: false
 
+Style/ParallelAssignment:
+  Enabled: false
+
+Style/PreferredHashMethods:
+  Enabled: false
+
 Style/RaiseArgs:
   Enabled: false
 
+Style/RedundantSelf:
+  Enabled: false
+
 Style/SlicingWithRange:
   Enabled: false
 
@@ -148,3 +160,6 @@ Style/StringLiterals:
 Style/StringLiteralsInInterpolation:
   Enabled: true
   EnforcedStyle: double_quotes
+
+Styles/TrivialAccessors:
+  Enabled: false

data/Changes

@@ -1,5 +1,25 @@
 Change history of write_xlsx rubygem.
 
+2026-03-20 v1.15.0
+    Add the option to position custom data labels in the same way that the
+    data labels can be positioned for the entire series.
+
+    Add border, fill, gradient and pattern formatting options for
+    chart titles and also chart axis titles.
+
+    Added documentation for the Worksheet `autofit()` method.
+
+    Fix failed match for range string in conditional format.
+    Strings used in a cell equality must be quoted. In order to
+    ensure this there is a check for non-range/non-numeric strings.
+    However this test wasn't anchored properly and gave a false
+    positive.
+
+    Fixed an issue where `set_row()` with the default height of 15 was
+    ignored if `set_default_row()` was also used.
+
+    Fixed issue with 0 DPI in PNG images.
+
 2026-03-12 v1.13.0
     fix sheet name quoting with upstream Perl implementation.
 

data/lib/write_xlsx/chart/area.rb

@@ -15,12 +15,12 @@
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/chart'
-require 'write_xlsx/utility'
+require 'write_xlsx/utility/xml_primitives'
 
 module Writexlsx
   class Chart
     class Area < self
-      include Writexlsx::Utility
+      include Writexlsx::Utility::XmlPrimitives
 
       def initialize(subtype)
         super

data/lib/write_xlsx/chart/axis.rb

@@ -2,13 +2,13 @@
 # frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
-require 'write_xlsx/utility'
 require 'write_xlsx/chart/caption'
 
 module Writexlsx
   class Chart
-    class Axis < Caption
-      include Writexlsx::Utility
+    class Axis
+      include Writexlsx::Utility::Common
+      include Writexlsx::Utility::RichText
 
       attr_accessor :defaults
       attr_accessor :min, :max, :num_format, :position
@@ -19,39 +19,79 @@ module Writexlsx
       attr_reader :num_format_linked, :num_font, :layout, :interval_unit
       attr_reader :interval_tick, :major_gridlines, :minor_gridlines, :reverse
       attr_reader :line, :fill, :text_axis, :label_align
+      attr_reader :title
+
+      def initialize(chart)
+        @chart = chart
+        @title = Caption.new(chart)
+      end
 
       #
       # Convert user defined axis values into axis instance.
       #
-      def merge_with_hash(params) # :nodoc:
-        super
+      def apply_options(params) # :nodoc:
         args      = (defaults || {}).merge(params)
 
+        apply_axis_options(args)
+        apply_axis_display_options(args)
+        apply_axis_format_options(args)
+        apply_axis_tick_options(args)
+        apply_axis_title_options(args)
+      end
+
+      def apply_axis_options(args)
         %i[
           reverse min max minor_unit major_unit minor_unit_type
           major_unit_type log_base crossing position_axis
           label_position num_format num_format_linked interval_unit
           interval_tick line fill label_align
         ].each { |val| instance_variable_set("@#{val}", args[val]) }
-        set_major_minor_gridlines(args)
 
-        @visible           = args[:visible] || 1
+        @visible = args[:visible] || 1
+      end
+
+      def apply_axis_display_options(args)
+        set_major_minor_gridlines(args)
         set_display_units(args)
         set_display_units_visible(args)
         set_position(args)
         set_position_axis
-        set_font_properties(args)
-        set_axis_name_layout(args)
-        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
+      end
+
+      def apply_axis_format_options(args)
+        @num_font = convert_font_args(args[:num_font])
+        @line = @chart.line_properties(args[:line])
+        @fill = @chart.fill_properties(args[:fill])
+      end
 
-        # Set the tick marker types.
-        @major_tick_mark = get_tick_type(params[:major_tick_mark])
-        @minor_tick_mark = get_tick_type(params[:minor_tick_mark])
+      def apply_axis_tick_options(args)
+        @major_tick_mark = get_tick_type(args[:major_tick_mark])
+        @minor_tick_mark = get_tick_type(args[:minor_tick_mark])
+      end
+
+      def apply_axis_title_options(args)
+        # Set the axis title properties.
+        @title.apply_text_options(
+          name:         args[:name],
+          name_formula: args[:name_formula],
+          data:         args[:data],
+          name_font:    args[:name_font],
+          layout:       args[:name_layout]
+        )
+
+        # Set the format properties.
+        @title.apply_format_options(
+          line:     args[:name_line],
+          border:   args[:name_border],
+          fill:     args[:name_fill],
+          pattern:  args[:name_pattern],
+          gradient: args[:name_gradient]
+        )
       end
 
       #
@@ -171,23 +211,6 @@ module Writexlsx
           end
         end
       end
-
-      def set_font_properties(args)
-        @num_font  = convert_font_args(args[:num_font])
-        @name_font = convert_font_args(args[:name_font])
-      end
-
-      def set_axis_name_layout(args)
-        @layout    = chart.layout_properties(args[:name_layout], 1)
-      end
-
-      def set_axis_line(args)
-        @line = chart.line_properties(args[:line])
-      end
-
-      def set_axis_fill(args)
-        @fill = chart.fill_properties(args[:fill])
-      end
     end
   end
 end