caxlsx 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcc3d364dba9ddb0058e9e64e7fbb537915dee8fc8adfc308e263d210c643488
-  data.tar.gz: e5582a8e8f2cecdcc7fcebea3c1193d8c6f7351a2882ffa2a51f25ca05b9874c
+  metadata.gz: 85f2cf4381c18d95630e069c270ec13a6f6e447efd10e20a8b7938c2cc453d51
+  data.tar.gz: 547ce4f04e33bcccd8ce2728a110b1caab8e49e0cd7a1f5ea06467a74b027ca0
 SHA512:
-  metadata.gz: bcb83efcf758bbdd201d877c1f34a2f30fcf5e676359aaecdaf47be68cc9c7481caf0b19786b605ce7c600d855d40d84e2b27b4987e0498e60507a157e6a6e53
-  data.tar.gz: 9caa406e7f059088f8adbd88e3429ccd920bb4a25b9ac6933395f2e072f561591f3b935f1eb08263c80486818941fef186a7d660e050c08973fb687d008eb29e
+  metadata.gz: 24b6d6be362e2dceb0a74ff3f891b21e2100af09eeae253a6bff1e86edf6d49a80fac9fa7747dadaf639f97bae121ecafecd3a1c5ac0022208efdb7fa08a056b
+  data.tar.gz: d1f7335c8199ae611bf4fdf49bd85aeae3936e6afc596193037dd6a7aeb7dbcbf72c9fb38b4f59bb6b6c2d868bb253e3e98b33a9fbd48bda75940bc5f65bf8ba

data/CHANGELOG.md

@@ -2,6 +2,14 @@ CHANGELOG
 ---------
 - **Unreleased**
 
+- **February.26.24**: 4.1.0
+  - [PR #316](https://github.com/caxlsx/caxlsx/pull/316) Prevent camelization of hyperlink locations
+  - [PR #312](https://github.com/caxlsx/caxlsx/pull/312) Added 2D/flat PieChart drawing
+  - [PR #317](https://github.com/caxlsx/caxlsx/pull/317) Apply style for columns without defining cells
+  - [PR #345](https://github.com/caxlsx/caxlsx/pull/345) Show outline symbols by default to match original behavior
+  - [PR #334](https://github.com/caxlsx/caxlsx/pull/334) Add pattern fill options to add_style
+  - [PR #342](https://github.com/caxlsx/caxlsx/pull/342) Fix show button for filter columns
+  - [PR #349](https://github.com/caxlsx/caxlsx/pull/349) Convert test suite to Minitest
 
 - **October.30.23**: 4.0.0
   - [PR #189](https://github.com/caxlsx/caxlsx/pull/189) **breaking** Make `Axlsx::escape_formulas` true by default to mitigate [Formula Injection](https://www.owasp.org/index.php/CSV_Injection) vulnerabilities.

data/examples/generate.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+
 files = if !ARGV.empty?
           ARGV.select { |file| File.exist?(file) }
         else
@@ -10,6 +12,6 @@ files.each do |file|
   puts "Executing #{file.split('.')[0].tr('_', ' ')}"
   code = File.read(file).match(/```ruby(?<code>.+)```/m)[:code]
   unless code.nil?
-    eval(['$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"', code].join("\n"))
+    eval(code)
   end
 end

data/lib/axlsx/content_type/abstract_content_type.rb

@@ -18,7 +18,10 @@ module Axlsx
 
     # The content type.
     # @see Axlsx#validate_content_type
-    def content_type=(v) Axlsx.validate_content_type v; @content_type = v end
+    def content_type=(v)
+      Axlsx.validate_content_type v
+      @content_type = v
+    end
     alias :ContentType= :content_type=
 
     # Serialize the contenty type to xml

data/lib/axlsx/content_type/content_type.rb

@@ -8,7 +8,7 @@ module Axlsx
   # ContentTypes used in the package. This is automatically managed by the package package.
   class ContentType < SimpleTypedList
     def initialize
-      super [Override, Default]
+      super([Override, Default])
     end
 
     # Serializes the object

data/lib/axlsx/content_type/default.rb

@@ -12,7 +12,10 @@ module Axlsx
     alias :Extension :extension
 
     # Sets the file extension for this content type.
-    def extension=(v) Axlsx.validate_string v; @extension = v end
+    def extension=(v)
+      Axlsx.validate_string v
+      @extension = v
+    end
     alias :Extension= :extension=
 
     # Serializes this object to xml

data/lib/axlsx/content_type/override.rb

@@ -12,7 +12,10 @@ module Axlsx
     alias :PartName :part_name
 
     # The name and location of the part.
-    def part_name=(v) Axlsx.validate_string v; @part_name = v end
+    def part_name=(v)
+      Axlsx.validate_string v
+      @part_name = v
+    end
     alias :PartName= :part_name=
 
     # Serializes this object to xml

data/lib/axlsx/doc_props/app.rb

@@ -75,7 +75,7 @@ module Axlsx
     attr_reader :paragraphs
     alias :Paragraphs :paragraphs
 
-    # @return [Intger] The number of slides in the document.
+    # @return [Integer] The number of slides in the document.
     attr_reader :slides
     alias :Slides :slides
 
@@ -121,7 +121,7 @@ module Axlsx
 
     # @return [String] The name of the application
     attr_reader :application
-    alias :Applicatoin :application
+    alias :Application :application
 
     # @return [String] The version of the application.
     attr_reader :app_version
@@ -132,89 +132,156 @@ module Axlsx
     alias :DocSecurity :doc_security
 
     # Sets the template property of your app.xml file
-    def template=(v) Axlsx.validate_string v; @template = v; end
+    def template=(v)
+      Axlsx.validate_string v
+      @template = v
+    end
     alias :Template= :template=
 
     # Sets the manager property of your app.xml file
-    def manager=(v) Axlsx.validate_string v; @manager = v; end
+    def manager=(v)
+      Axlsx.validate_string v
+      @manager = v
+    end
     alias :Manager= :manager=
 
     # Sets the company property of your app.xml file
-    def company=(v) Axlsx.validate_string v; @company = v; end
+    def company=(v)
+      Axlsx.validate_string v
+      @company = v
+    end
     alias :Company= :company=
+
     # Sets the pages property of your app.xml file
-    def pages=(v) Axlsx.validate_int v; @pages = v; end
+    def pages=(v)
+      Axlsx.validate_int v
+      @pages = v
+    end
 
     # Sets the words property of your app.xml file
-    def words=(v) Axlsx.validate_int v; @words = v; end
+    def words=(v)
+      Axlsx.validate_int v
+      @words = v
+    end
     alias :Words= :words=
 
     # Sets the characters property of your app.xml file
-    def characters=(v) Axlsx.validate_int v; @characters = v; end
+    def characters=(v)
+      Axlsx.validate_int v
+      @characters = v
+    end
     alias :Characters= :characters=
 
     # Sets the presentation_format property of your app.xml file
-    def presentation_format=(v) Axlsx.validate_string v; @presentation_format = v; end
+    def presentation_format=(v)
+      Axlsx.validate_string v
+      @presentation_format = v
+    end
     alias :PresentationFormat= :presentation_format=
 
     # Sets the lines property of your app.xml file
-    def lines=(v) Axlsx.validate_int v; @lines = v; end
+    def lines=(v)
+      Axlsx.validate_int v
+      @lines = v
+    end
     alias :Lines= :lines=
 
     # Sets the paragraphs property of your app.xml file
-    def paragraphs=(v) Axlsx.validate_int v; @paragraphs = v; end
+    def paragraphs=(v)
+      Axlsx.validate_int v
+      @paragraphs = v
+    end
     alias :Paragraphs= :paragraphs=
 
     # sets the slides property of your app.xml file
-    def slides=(v) Axlsx.validate_int v; @slides = v; end
+    def slides=(v)
+      Axlsx.validate_int v
+      @slides = v
+    end
     alias :Slides= :slides=
 
     # sets the notes property of your app.xml file
-    def notes=(v) Axlsx.validate_int v; @notes = v; end
+    def notes=(v)
+      Axlsx.validate_int v
+      @notes = v
+    end
     alias :Notes= :notes=
 
     # Sets the total_time property of your app.xml file
-    def total_time=(v) Axlsx.validate_int v; @total_time = v; end
+    def total_time=(v)
+      Axlsx.validate_int v
+      @total_time = v
+    end
     alias :TotalTime= :total_time=
 
     # Sets the hidden_slides property of your app.xml file
-    def hidden_slides=(v) Axlsx.validate_int v; @hidden_slides = v; end
+    def hidden_slides=(v)
+      Axlsx.validate_int v
+      @hidden_slides = v
+    end
     alias :HiddenSlides= :hidden_slides=
 
     # Sets the m_m_clips property of your app.xml file
-    def m_m_clips=(v) Axlsx.validate_int v; @m_m_clips = v; end
+    def m_m_clips=(v)
+      Axlsx.validate_int v
+      @m_m_clips = v
+    end
     alias :MMClips= :m_m_clips=
 
     # Sets the scale_crop property of your app.xml file
-    def scale_crop=(v) Axlsx.validate_boolean v; @scale_crop = v; end
+    def scale_crop=(v)
+      Axlsx.validate_boolean v
+      @scale_crop = v
+    end
     alias :ScaleCrop= :scale_crop=
 
     # Sets the links_up_to_date property of your app.xml file
-    def links_up_to_date=(v) Axlsx.validate_boolean v; @links_up_to_date = v; end
+    def links_up_to_date=(v)
+      Axlsx.validate_boolean v
+      @links_up_to_date = v
+    end
     alias :LinksUpToDate= :links_up_to_date=
 
     # Sets the characters_with_spaces property of your app.xml file
-    def characters_with_spaces=(v) Axlsx.validate_int v; @characters_with_spaces = v; end
+    def characters_with_spaces=(v)
+      Axlsx.validate_int v
+      @characters_with_spaces = v
+    end
     alias :CharactersWithSpaces= :characters_with_spaces=
 
     # Sets the share_doc property of your app.xml file
-    def shared_doc=(v) Axlsx.validate_boolean v; @shared_doc = v; end
+    def shared_doc=(v)
+      Axlsx.validate_boolean v
+      @shared_doc = v
+    end
     alias :SharedDoc= :shared_doc=
 
     # Sets the hyperlink_base property of your app.xml file
-    def hyperlink_base=(v) Axlsx.validate_string v; @hyperlink_base = v; end
+    def hyperlink_base=(v)
+      Axlsx.validate_string v
+      @hyperlink_base = v
+    end
     alias :HyperlinkBase= :hyperlink_base=
 
     # Sets the HyperLinksChanged property of your app.xml file
-    def hyperlinks_changed=(v) Axlsx.validate_boolean v; @hyperlinks_changed = v; end
+    def hyperlinks_changed=(v)
+      Axlsx.validate_boolean v
+      @hyperlinks_changed = v
+    end
     alias :HyperLinksChanged= :hyperlinks_changed=
 
     # Sets the app_version property of your app.xml file
-    def app_version=(v) Axlsx.validate_string v; @app_version = v; end
+    def app_version=(v)
+      Axlsx.validate_string v
+      @app_version = v
+    end
     alias :AppVersion= :app_version=
 
     # Sets the doc_security property of your app.xml file
-    def doc_security=(v) Axlsx.validate_int v; @doc_security = v; end
+    def doc_security=(v)
+      Axlsx.validate_int v
+      @doc_security = v
+    end
     alias :DocSecurity= :doc_security=
 
     # Serialize the app.xml document

data/lib/axlsx/drawing/area_series.rb

@@ -101,9 +101,15 @@ module Axlsx
     private
 
     # assigns the data for this series
-    def data=(v) DataTypeValidator.validate "Series.data", [NumDataSource], v; @data = v; end
+    def data=(v)
+      DataTypeValidator.validate "Series.data", [NumDataSource], v
+      @data = v
+    end
 
     # assigns the labels for this series
-    def labels=(v) DataTypeValidator.validate "Series.labels", [AxDataSource], v; @labels = v; end
+    def labels=(v)
+      DataTypeValidator.validate "Series.labels", [AxDataSource], v
+      @labels = v
+    end
   end
 end

data/lib/axlsx/drawing/axis.rb

@@ -99,29 +99,47 @@ module Axlsx
 
     # The position of the axis
     # must be one of [:l, :r, :t, :b]
-    def ax_pos=(v) RestrictionValidator.validate "#{self.class}.ax_pos", [:l, :r, :b, :t], v; @ax_pos = v; end
+    def ax_pos=(v)
+      RestrictionValidator.validate "#{self.class}.ax_pos", [:l, :r, :b, :t], v
+      @ax_pos = v
+    end
     alias :axPos= :ax_pos=
 
     # the position of the tick labels
     # must be one of [:nextTo, :high, :low1]
-    def tick_lbl_pos=(v) RestrictionValidator.validate "#{self.class}.tick_lbl_pos", [:nextTo, :high, :low, :none], v; @tick_lbl_pos = v; end
+    def tick_lbl_pos=(v)
+      RestrictionValidator.validate "#{self.class}.tick_lbl_pos", [:nextTo, :high, :low, :none], v
+      @tick_lbl_pos = v
+    end
     alias :tickLblPos= :tick_lbl_pos=
 
     # The number format format code for this axis
     # default :General
-    def format_code=(v) Axlsx.validate_string(v); @format_code = v; end
+    def format_code=(v)
+      Axlsx.validate_string(v)
+      @format_code = v
+    end
 
     # Specify if gridlines should be shown for this axis
     # default true
-    def gridlines=(v) Axlsx.validate_boolean(v); @gridlines = v; end
+    def gridlines=(v)
+      Axlsx.validate_boolean(v)
+      @gridlines = v
+    end
 
     # Specify if axis should be removed from the chart
     # default false
-    def delete=(v) Axlsx.validate_boolean(v); @delete = v; end
+    def delete=(v)
+      Axlsx.validate_boolean(v)
+      @delete = v
+    end
 
     # specifies how the perpendicular axis is crossed
     # must be one of [:autoZero, :min, :max]
-    def crosses=(v) RestrictionValidator.validate "#{self.class}.crosses", [:autoZero, :min, :max], v; @crosses = v; end
+    def crosses=(v)
+      RestrictionValidator.validate "#{self.class}.crosses", [:autoZero, :min, :max], v
+      @crosses = v
+    end
 
     # Specify the degree of label rotation to apply to labels
     # default true

data/lib/axlsx/drawing/bar_series.rb

@@ -43,7 +43,10 @@ module Axlsx
     end
 
     # @see colors
-    def colors=(v) DataTypeValidator.validate "BarSeries.colors", [Array], v; @colors = v end
+    def colors=(v)
+      DataTypeValidator.validate "BarSeries.colors", [Array], v
+      @colors = v
+    end
 
     def series_color=(v)
       @series_color = v
@@ -85,9 +88,15 @@ module Axlsx
     private
 
     # assigns the data for this series
-    def data=(v) DataTypeValidator.validate "Series.data", [NumDataSource], v; @data = v; end
+    def data=(v)
+      DataTypeValidator.validate "Series.data", [NumDataSource], v
+      @data = v
+    end
 
     # assigns the labels for this series
-    def labels=(v) DataTypeValidator.validate "Series.labels", [AxDataSource], v; @labels = v; end
+    def labels=(v)
+      DataTypeValidator.validate "Series.labels", [AxDataSource], v
+      @labels = v
+    end
   end
 end

data/lib/axlsx/drawing/cat_axis.rb

@@ -45,24 +45,39 @@ module Axlsx
     LBL_OFFSET_REGEX = /0*(([0-9])|([1-9][0-9])|([1-9][0-9][0-9])|1000)/.freeze
 
     # @see tick_lbl_skip
-    def tick_lbl_skip=(v) Axlsx.validate_unsigned_int(v); @tick_lbl_skip = v; end
+    def tick_lbl_skip=(v)
+      Axlsx.validate_unsigned_int(v)
+      @tick_lbl_skip = v
+    end
     alias :tickLblSkip= :tick_lbl_skip=
 
     # @see tick_mark_skip
-    def tick_mark_skip=(v) Axlsx.validate_unsigned_int(v); @tick_mark_skip = v; end
+    def tick_mark_skip=(v)
+      Axlsx.validate_unsigned_int(v)
+      @tick_mark_skip = v
+    end
     alias :tickMarkSkip= :tick_mark_skip=
 
     # From the docs: This element specifies that this axis is a date or text axis based on the data that is used for the axis labels, not a specific choice.
-    def auto=(v) Axlsx.validate_boolean(v); @auto = v; end
+    def auto=(v)
+      Axlsx.validate_boolean(v)
+      @auto = v
+    end
 
     # specifies how the perpendicular axis is crossed
     # must be one of [:ctr, :l, :r]
-    def lbl_algn=(v) RestrictionValidator.validate "#{self.class}.lbl_algn", [:ctr, :l, :r], v; @lbl_algn = v; end
+    def lbl_algn=(v)
+      RestrictionValidator.validate "#{self.class}.lbl_algn", [:ctr, :l, :r], v
+      @lbl_algn = v
+    end
     alias :lblAlgn= :lbl_algn=
 
     # The offset of the labels
     # must be between a string between 0 and 1000
-    def lbl_offset=(v) RegexValidator.validate "#{self.class}.lbl_offset", LBL_OFFSET_REGEX, v; @lbl_offset = v; end
+    def lbl_offset=(v)
+      RegexValidator.validate "#{self.class}.lbl_offset", LBL_OFFSET_REGEX, v
+      @lbl_offset = v
+    end
     alias :lblOffset= :lbl_offset=
 
     # Serializes the object

data/lib/axlsx/drawing/chart.rb

@@ -62,7 +62,10 @@ module Axlsx
 
     # Configures the vary_colors options for this chart
     # @param [Boolean] v The value to set
-    def vary_colors=(v) Axlsx.validate_boolean(v); @vary_colors = v; end
+    def vary_colors=(v)
+      Axlsx.validate_boolean(v)
+      @vary_colors = v
+    end
 
     # The title object for the chart.
     # @return [Title]
@@ -149,21 +152,33 @@ module Axlsx
     # Show the legend in the chart
     # @param [Boolean] v
     # @return [Boolean]
-    def show_legend=(v) Axlsx.validate_boolean(v); @show_legend = v; end
+    def show_legend=(v)
+      Axlsx.validate_boolean(v)
+      @show_legend = v
+    end
 
     # How to display blank values
     # @see display_blanks_as
     # @param [Symbol] v
     # @return [Symbol]
-    def display_blanks_as=(v) Axlsx.validate_display_blanks_as(v); @display_blanks_as = v; end
+    def display_blanks_as=(v)
+      Axlsx.validate_display_blanks_as(v)
+      @display_blanks_as = v
+    end
 
     # The style for the chart.
     # see ECMA Part 1 §21.2.2.196
     # @param [Integer] v must be between 1 and 48
-    def style=(v) DataTypeValidator.validate "Chart.style", Integer, v, ->(arg) { arg >= 1 && arg <= 48 }; @style = v; end
+    def style=(v)
+      DataTypeValidator.validate "Chart.style", Integer, v, ->(arg) { arg >= 1 && arg <= 48 }
+      @style = v
+    end
 
     # @see legend_position
-    def legend_position=(v) RestrictionValidator.validate "Chart.legend_position", [:b, :l, :r, :t, :tr], v; @legend_position = v; end
+    def legend_position=(v)
+      RestrictionValidator.validate "Chart.legend_position", [:b, :l, :r, :t, :tr], v
+      @legend_position = v
+    end
 
     # backwards compatibility to allow chart.to and chart.from access to anchor markers
     # @note This will be disconinued in version 2.0.0. Please use the end_at method
@@ -194,12 +209,18 @@ module Axlsx
     # Whether only data from visible cells should be plotted.
     # @param [Boolean] v
     # @return [Boolean]
-    def plot_visible_only=(v) Axlsx.validate_boolean(v); @plot_visible_only = v; end
+    def plot_visible_only=(v)
+      Axlsx.validate_boolean(v)
+      @plot_visible_only = v
+    end
 
     # Whether the chart area shall have rounded corners.
     # @param [Boolean] v
     # @return [Boolean]
-    def rounded_corners=(v) Axlsx.validate_boolean(v); @rounded_corners = v; end
+    def rounded_corners=(v)
+      Axlsx.validate_boolean(v)
+      @rounded_corners = v
+    end
 
     # Serializes the object
     # @param [String] str
@@ -290,7 +311,10 @@ module Axlsx
     end
 
     # sets the view_3D object for the chart
-    def view_3D=(v) DataTypeValidator.validate "#{self.class}.view_3D", View3D, v; @view_3D = v; end
+    def view_3D=(v)
+      DataTypeValidator.validate "#{self.class}.view_3D", View3D, v
+      @view_3D = v
+    end
     alias :view3D= :view_3D=
   end
 end

data/lib/axlsx/drawing/d_lbls.rb

@@ -38,7 +38,7 @@ module Axlsx
       [:show_legend_key, :show_val, :show_cat_name,
        :show_ser_name, :show_percent, :show_bubble_size,
        :show_leader_lines].each do |attr|
-        send("#{attr}=", false)
+        send(:"#{attr}=", false)
       end
     end
 
@@ -51,7 +51,7 @@ module Axlsx
     # @see d_lbl_pos= for a list of allowed values
     # @return [Symbol]
     def d_lbl_pos
-      return unless [Pie3DChart, LineChart].include? @chart_type
+      return unless [PieChart, Pie3DChart, LineChart].include? @chart_type
 
       @d_lbl_pos ||= :bestFit
     end
@@ -63,7 +63,7 @@ module Axlsx
     # The default is :bestFit
     # @param [Symbol] label_position the postion you want to use.
     def d_lbl_pos=(label_position)
-      return unless [Pie3DChart, LineChart].include? @chart_type
+      return unless [PieChart, Pie3DChart, LineChart].include? @chart_type
 
       Axlsx::RestrictionValidator.validate 'DLbls#d_lbl_pos', [:bestFit, :b, :ctr, :inBase, :inEnd, :l, :outEnd, :r, :t], label_position
       @d_lbl_pos = label_position
@@ -85,7 +85,7 @@ module Axlsx
 
     # nills out d_lbl_pos and show_leader_lines as these attributes, while valid in the spec actually crash Excel for any chart type other than pie charts.
     def validate_attributes_for_chart_type
-      return if [Pie3DChart, LineChart].include? @chart_type
+      return if [PieChart, Pie3DChart, LineChart].include? @chart_type
 
       @d_lbl_pos = nil
       @show_leader_lines = nil

data/lib/axlsx/drawing/drawing.rb

@@ -36,6 +36,7 @@ module Axlsx
   require 'axlsx/drawing/view_3D'
   require 'axlsx/drawing/chart'
   require 'axlsx/drawing/pie_3D_chart'
+  require 'axlsx/drawing/pie_chart'
   require 'axlsx/drawing/bar_3D_chart'
   require 'axlsx/drawing/bar_chart'
   require 'axlsx/drawing/line_chart'

data/lib/axlsx/drawing/hyperlink.rb

@@ -52,7 +52,10 @@ module Axlsx
     # @see endSnd
     # @param [Boolean] v The boolean value indicating the termination of playing sounds on click
     # @return [Boolean]
-    def end_snd=(v) Axlsx.validate_boolean(v); @end_snd = v end
+    def end_snd=(v)
+      Axlsx.validate_boolean(v)
+      @end_snd = v
+    end
     alias :endSnd= :end_snd=
 
     # indicates that the link has already been clicked.
@@ -62,7 +65,10 @@ module Axlsx
 
     # @see highlightClick
     # @param [Boolean] v The value to assign
-    def highlight_click=(v) Axlsx.validate_boolean(v); @highlight_click = v end
+    def highlight_click=(v)
+      Axlsx.validate_boolean(v)
+      @highlight_click = v
+    end
     alias :highlightClick= :highlight_click=
 
     # From the specs: Specifies whether to add this URI to the history when navigating to it. This allows for the viewing of this presentation without the storing of history information on the viewing machine. If this attribute is omitted, then a value of 1 or true is assumed.
@@ -71,7 +77,10 @@ module Axlsx
 
     # @see history
     # param [Boolean] v The value to assing
-    def history=(v) Axlsx.validate_boolean(v); @history = v end
+    def history=(v)
+      Axlsx.validate_boolean(v)
+      @history = v
+    end
 
     # From the specs: Specifies the target frame that is to be used when opening this hyperlink. When the hyperlink is activated this attribute is used to determine if a new window is launched for viewing or if an existing one can be used. If this attribute is omitted, than a new window is opened.
     # @return [String]

data/lib/axlsx/drawing/line_series.rb

@@ -101,9 +101,15 @@ module Axlsx
     private
 
     # assigns the data for this series
-    def data=(v) DataTypeValidator.validate "Series.data", [NumDataSource], v; @data = v; end
+    def data=(v)
+      DataTypeValidator.validate "Series.data", [NumDataSource], v
+      @data = v
+    end
 
     # assigns the labels for this series
-    def labels=(v) DataTypeValidator.validate "Series.labels", [AxDataSource], v; @labels = v; end
+    def labels=(v)
+      DataTypeValidator.validate "Series.labels", [AxDataSource], v
+      @labels = v
+    end
   end
 end

data/lib/axlsx/drawing/marker.rb

@@ -34,13 +34,28 @@ module Axlsx
     attr_reader :rowOff
 
     # @see col
-    def col=(v) Axlsx.validate_unsigned_int v; @col = v end
+    def col=(v)
+      Axlsx.validate_unsigned_int v
+      @col = v
+    end
+
     # @see colOff
-    def colOff=(v) Axlsx.validate_int v; @colOff = v end
+    def colOff=(v)
+      Axlsx.validate_int v
+      @colOff = v
+    end
+
     # @see row
-    def row=(v) Axlsx.validate_unsigned_int v; @row = v end
+    def row=(v)
+      Axlsx.validate_unsigned_int v
+      @row = v
+    end
+
     # @see rowOff
-    def rowOff=(v) Axlsx.validate_int v; @rowOff = v end
+    def rowOff=(v)
+      Axlsx.validate_int v
+      @rowOff = v
+    end
 
     # shortcut to set the column, row position for this marker
     # @param col the column for the marker, a Cell object or a string reference like "B7"

data/lib/axlsx/drawing/one_cell_anchor.rb

@@ -60,10 +60,16 @@ module Axlsx
 
     #
     # @see height
-    def height=(v) Axlsx.validate_unsigned_int(v); @height = v; end
+    def height=(v)
+      Axlsx.validate_unsigned_int(v)
+      @height = v
+    end
 
     # @see width
-    def width=(v) Axlsx.validate_unsigned_int(v); @width = v; end
+    def width=(v)
+      Axlsx.validate_unsigned_int(v)
+      @width = v
+    end
 
     # The index of this anchor in the drawing
     # @return [Integer]