caxlsx 3.4.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bc64f23079fdbb6084190c180942bdf850ef2a0f0e6e75e68b3c9f63bcb6a2b
-  data.tar.gz: 389bd6a8434de5942a54d47c2fafd4b407fead102ef0186d6f180879689c9a96
+  metadata.gz: fcc3d364dba9ddb0058e9e64e7fbb537915dee8fc8adfc308e263d210c643488
+  data.tar.gz: e5582a8e8f2cecdcc7fcebea3c1193d8c6f7351a2882ffa2a51f25ca05b9874c
 SHA512:
-  metadata.gz: 4f0de7a6035a2179287b06eef2d942b53e4c5ba18f8d26dd5df7cb48ae32ecb320bce6fa8f778683f57de10a8f7a3b4e1c2123c8f25c3406360573bebf54ee25
-  data.tar.gz: 5c85f6027cf1e286b53885d9d2cd0226eaff9079d1bc6933a0bb7659a85965c0f791e0d3ccf22ca745d44b4927b981c4abffe8734aa43043c98ffa5363c4698c
+  metadata.gz: bcb83efcf758bbdd201d877c1f34a2f30fcf5e676359aaecdaf47be68cc9c7481caf0b19786b605ce7c600d855d40d84e2b27b4987e0498e60507a157e6a6e53
+  data.tar.gz: 9caa406e7f059088f8adbd88e3429ccd920bb4a25b9ac6933395f2e072f561591f3b935f1eb08263c80486818941fef186a7d660e050c08973fb687d008eb29e

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 CHANGELOG
 ---------
-- **Unreleased**: 3.4.1
+- **Unreleased**
+
+
+- **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.
+  - [PR #212](https://github.com/caxlsx/caxlsx/pull/212) **breaking** Raise exception if `axlsx_styler` gem is present as its code was merged directly into `caxlsx` in v3.3.0
+  - [PR #225](https://github.com/caxlsx/caxlsx/pull/225) **breaking** Remove ability to set `u=` to true in favor of using :single or one of the other underline options
+  - Drop support for Ruby versions < 2.6
+  - [PR #219](https://github.com/caxlsx/caxlsx/pull/219) Added frozen string literals
+  - [PR #223](https://github.com/caxlsx/caxlsx/pull/223) Fix `SimpleTypedList#to_a` and `SimpleTypedList#to_ary` returning the internal list instance
+  - [PR #239](https://github.com/caxlsx/caxlsx/pull/239) Fix `Workbook#sheet_by_name` not returning sheets with encoded characters in the name
+  - [PR #286](https://github.com/caxlsx/caxlsx/pull/286) Add 'SortState' and 'SortCondition' classes to the 'AutoFilter' class to add sorting to the generated file.
+  - [PR #269](https://github.com/caxlsx/caxlsx/pull/269) Add optional interpolation points to icon sets
+  - [PR #304](https://github.com/caxlsx/caxlsx/pull/304) Fix data validations for none type validations
+
+- **April.23.23**: 3.4.1
   - [PR #209](https://github.com/caxlsx/caxlsx/pull/209) - Revert characters other than `=` being considered as formulas.
 
 - **April.12.23**: 3.4.0

data/README.md

@@ -15,7 +15,7 @@ https://github.com/caxlsx
 ## Synopsis
 
 Axlsx is an Office Open XML Spreadsheet generator for the Ruby programming language.
-With Axlsx you can create excel worksheets with charts, images (with links), automated and fixed column widths, customized styles, functions, tables, conditional formatting, print options, comments, merged cells, auto filters, file and stream serialization  as well as full schema validation. Axlsx excels at helping you generate beautiful Office Open XML Spreadsheet documents without having to understand the entire ECMA specification.
+With Axlsx you can create Excel worksheets with charts, images (with links), automated and fixed column widths, customized styles, functions, tables, conditional formatting, print options, comments, merged cells, auto filters, file and stream serialization  as well as full schema validation. Axlsx excels at helping you generate beautiful Office Open XML Spreadsheet documents without having to understand the entire ECMA specification.
 
 ![Screen 1](https://github.com/caxlsx/caxlsx/raw/master/examples/sample.png)
 
@@ -73,6 +73,8 @@ and Numbers
 gem 'caxlsx'
 ```
 
+**Supported Ruby versions:** Caxlsx supports Ruby 2.6 and newer.
+
 ## Usage
 
 Here's a teaser that kicks about 2% of what the gem can do.
@@ -122,24 +124,20 @@ Currently the following additional gems are available:
 
 ## Security
 
-To prevent [Formula Injection](https://www.owasp.org/index.php/CSV_Injection) vulnerabilities, set the following in an initializer:
+To prevent [Formula Injection](https://www.owasp.org/index.php/CSV_Injection) vulnerabilities, as of version 4.0, axlsx escapes all formulas by default. To permit formulas on a specific cell, please use:
 
 ```ruby
-Axlsx.escape_formulas = true
+cell.escape_formulas = false
 ```
 
-Then, set the following on each cell you'd like to add a formula:
+You may set `escape_formulas` on the workbook, worksheet, row and/or cell level. Refer to examples/escape_formula.md for details.
+
+To allow formulas globally by default (which was the behavior in axlsx 3.x and prior), you may set the following in an initializer:
 
 ```ruby
-cell.escape_formulas = false
+Axlsx.escape_formulas = false
 ```
 
-Refer to examples/escape_formula.md for how to set `escape_formulas` on the workbook, worksheet, row and/or cell level.
-
-**Important:** The global setting `Axlsx.escape_formulas = true` will become the default in the next major release (Axlsx 4.0).
-If you do not wish to set `Axlsx.escape_formulas = true` now, at a minimum, please set `Axlsx.escape_formulas = false` to
-ensure continuity when upgrading.
-
 ## Known Software Interoperability Issues
 
 As axslx implements the Office Open XML (ECMA-376 spec) much of the

data/Rakefile

@@ -1,11 +1,13 @@
-require File.expand_path(File.dirname(__FILE__) + '/lib/axlsx/version.rb')
+# frozen_string_literal: true
 
-task :build => :gendoc do
+require File.expand_path("#{File.dirname(__FILE__)}/lib/axlsx/version.rb")
+
+task build: :gendoc do
   system "gem build axlsx.gemspec"
 end
 
 task :benchmark do
-  require File.expand_path(File.dirname(__FILE__) + '/test/benchmark.rb')
+  require File.expand_path("#{File.dirname(__FILE__)}/test/benchmark.rb")
 end
 
 task :gendoc do
@@ -21,8 +23,8 @@ Rake::TestTask.new do |t|
   t.warning = true
 end
 
-task :release => :build do
+task release: :build do
   system "gem push caxlsx-#{Axlsx::VERSION}.gem"
 end
 
-task :default => :test
+task default: :test

data/lib/axlsx/content_type/abstract_content_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # This class extracts the common parts from Default and Override
   class AbstractContentType
@@ -16,13 +18,16 @@ 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
-    def to_xml_string(node_name = '', str = '')
-      str << "<#{node_name} "
-      str << Axlsx.instance_values_for(self).map { |key, value| Axlsx::camel(key) << '="' << value.to_s << '"' }.join(' ')
+    def to_xml_string(node_name = '', str = +'')
+      str << '<' << node_name << ' '
+      Axlsx.instance_values_for(self).each_with_index do |key_value, index|
+        str << ' ' unless index.zero?
+        str << Axlsx.camel(key_value.first) << '="' << key_value.last.to_s << '"'
+      end
       str << '/>'
     end
   end

data/lib/axlsx/content_type/content_type.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Axlsx
-  require 'axlsx/content_type/abstract_content_type.rb'
-  require 'axlsx/content_type/default.rb'
-  require 'axlsx/content_type/override.rb'
+  require 'axlsx/content_type/abstract_content_type'
+  require 'axlsx/content_type/default'
+  require 'axlsx/content_type/override'
 
   # ContentTypes used in the package. This is automatically managed by the package package.
   class ContentType < SimpleTypedList
@@ -12,9 +14,9 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
-      str << ('<Types xmlns="' << XML_NS_T << '">')
+      str << '<Types xmlns="' << XML_NS_T << '">'
       each { |type| type.to_xml_string(str) }
       str << '</Types>'
     end

data/lib/axlsx/content_type/default.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # An default content part. These parts are automatically created by for you based on the content of your package.
   class Default < AbstractContentType
@@ -10,11 +12,11 @@ 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
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       super(NODE_NAME, str)
     end
   end

data/lib/axlsx/content_type/override.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # An override content part. These parts are automatically created by for you based on the content of your package.
   class Override < AbstractContentType
@@ -10,11 +12,11 @@ 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
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       super(NODE_NAME, str)
     end
   end

data/lib/axlsx/doc_props/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # App represents the app.xml document. The attributes for this object are primarily managed by the application the end user uses to edit the document. None of the attributes are required to serialize a valid xlsx object.
   # @see shared-documentPropertiesExtended.xsd
@@ -130,96 +132,96 @@ 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
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
-      str << ('<Properties xmlns="' << APP_NS << '" xmlns:vt="' << APP_NS_VT << '">')
+      str << '<Properties xmlns="' << APP_NS << '" xmlns:vt="' << APP_NS_VT << '">'
       Axlsx.instance_values_for(self).each do |key, value|
         node_name = Axlsx.camel(key)
         str << "<#{node_name}>#{value}</#{node_name}>"

data/lib/axlsx/doc_props/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The core object for the package.
   # @note Packages manage their own core object.
@@ -20,13 +22,13 @@ module Axlsx
 
     # serializes the core.xml document
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
-      str << ('<cp:coreProperties xmlns:cp="' << CORE_NS << '" xmlns:dc="' << CORE_NS_DC << '" ')
-      str << ('xmlns:dcmitype="' << CORE_NS_DCMIT << '" xmlns:dcterms="' << CORE_NS_DCT << '" ')
-      str << ('xmlns:xsi="' << CORE_NS_XSI << '">')
-      str << ('<dc:creator>' << self.creator << '</dc:creator>')
-      str << ('<dcterms:created xsi:type="dcterms:W3CDTF">' << (created || Time.now).strftime('%Y-%m-%dT%H:%M:%S') << 'Z</dcterms:created>')
+      str << '<cp:coreProperties xmlns:cp="' << CORE_NS << '" xmlns:dc="' << CORE_NS_DC << '" '
+      str << 'xmlns:dcmitype="' << CORE_NS_DCMIT << '" xmlns:dcterms="' << CORE_NS_DCT << '" '
+      str << 'xmlns:xsi="' << CORE_NS_XSI << '">'
+      str << '<dc:creator>' << creator << '</dc:creator>'
+      str << '<dcterms:created xsi:type="dcterms:W3CDTF">' << (created || Time.now).strftime('%Y-%m-%dT%H:%M:%S') << 'Z</dcterms:created>'
       str << '<cp:revision>0</cp:revision>'
       str << '</cp:coreProperties>'
     end

data/lib/axlsx/drawing/area_chart.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The AreaChart is a two dimentional line chart (who would have guessed?) that you can add to your worksheet.
   # @example Creating a chart
@@ -61,7 +63,7 @@ module Axlsx
     # chart based on the actual class type and not a fixed node name.
     # @return [String]
     def node_name
-      path = self.class.to_s
+      path = self.class.name
       if i = path.rindex('::')
         path = path[(i + 2)..-1]
       end
@@ -72,16 +74,16 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       super(str) do
-        str << ("<c:" << node_name << ">")
-        str << ('<c:grouping val="' << grouping.to_s << '"/>')
-        str << ('<c:varyColors val="' << vary_colors.to_s << '"/>')
+        str << "<c:" << node_name << ">"
+        str << '<c:grouping val="' << grouping.to_s << '"/>'
+        str << '<c:varyColors val="' << vary_colors.to_s << '"/>'
         @series.each { |ser| ser.to_xml_string(str) }
         @d_lbls.to_xml_string(str) if @d_lbls
         yield if block_given?
-        axes.to_xml_string(str, :ids => true)
-        str << ("</c:" << node_name << ">")
+        axes.to_xml_string(str, ids: true)
+        str << "</c:" << node_name << ">"
         axes.to_xml_string(str)
       end
     end
@@ -90,7 +92,7 @@ module Axlsx
     # axis.
     # @return [Axes]
     def axes
-      @axes ||= Axes.new(:cat_axis => CatAxis, :val_axis => ValAxis)
+      @axes ||= Axes.new(cat_axis: CatAxis, val_axis: ValAxis)
     end
   end
 end

data/lib/axlsx/drawing/area_series.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A AreaSeries defines the title, data and labels for line charts
   # @note The recommended way to manage series is to use Chart#add_series
@@ -35,11 +37,11 @@ module Axlsx
     # @param [Chart] chart
     def initialize(chart, options = {})
       @show_marker = false
-      @marker_symbol = options[:marker_symbol] ? options[:marker_symbol] : :default
+      @marker_symbol = options[:marker_symbol] || :default
       @smooth = false
       @labels, @data = nil, nil
       super(chart, options)
-      @labels = AxDataSource.new(:data => options[:labels]) unless options[:labels].nil?
+      @labels = AxDataSource.new(data: options[:labels]) unless options[:labels].nil?
       @data = NumDataSource.new(options) unless options[:data].nil?
     end
 
@@ -50,34 +52,34 @@ module Axlsx
 
     # @see show_marker
     def show_marker=(v)
-      Axlsx::validate_boolean(v)
+      Axlsx.validate_boolean(v)
       @show_marker = v
     end
 
     # @see marker_symbol
     def marker_symbol=(v)
-      Axlsx::validate_marker_symbol(v)
+      Axlsx.validate_marker_symbol(v)
       @marker_symbol = v
     end
 
     # @see smooth
     def smooth=(v)
-      Axlsx::validate_boolean(v)
+      Axlsx.validate_boolean(v)
       @smooth = v
     end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       super(str) do
         if color
           str << '<c:spPr><a:solidFill>'
-          str << ('<a:srgbClr val="' << color << '"/>')
+          str << '<a:srgbClr val="' << color << '"/>'
           str << '</a:solidFill>'
           str << '<a:ln w="28800">'
           str << '<a:solidFill>'
-          str << ('<a:srgbClr val="' << color << '"/>')
+          str << '<a:srgbClr val="' << color << '"/>'
           str << '</a:solidFill>'
           str << '</a:ln>'
           str << '<a:round/>'
@@ -87,12 +89,12 @@ module Axlsx
         if !@show_marker
           str << '<c:marker><c:symbol val="none"/></c:marker>'
         elsif @marker_symbol != :default
-          str << '<c:marker><c:symbol val="' + @marker_symbol.to_s + '"/></c:marker>'
+          str << '<c:marker><c:symbol val="' << @marker_symbol.to_s << '"/></c:marker>'
         end
 
         @labels.to_xml_string(str) unless @labels.nil?
         @data.to_xml_string(str) unless @data.nil?
-        str << ('<c:smooth val="' << ((smooth) ? '1' : '0') << '"/>')
+        str << '<c:smooth val="' << (smooth ? '1' : '0') << '"/>'
       end
     end
 

data/lib/axlsx/drawing/ax_data_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # An axis data source that can contain referenced or literal strings or numbers
   # @note only string data types are supported - mainly because we have not implemented a chart type that requires a numerical axis value

data/lib/axlsx/drawing/axes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The Axes class creates and manages axis information and
   # serialization for charts.
@@ -7,7 +9,7 @@ module Axlsx
     # class of the axis type to construct. The :cat_axis, if there is one,
     # must come first (we assume a Ruby 1.9+ Hash or an OrderedHash).
     def initialize(options = {})
-      raise(ArgumentError, "CatAxis must come first") if options.keys.include?(:cat_axis) && options.keys.first != :cat_axis
+      raise(ArgumentError, "CatAxis must come first") if options.key?(:cat_axis) && options.keys.first != :cat_axis
 
       options.each do |name, axis_class|
         add_axis(name, axis_class)
@@ -27,11 +29,11 @@ module Axlsx
     # @option options ids
     # If the ids option is specified only the axis identifier is
     # serialized. Otherwise, each axis is serialized in full.
-    def to_xml_string(str = '', options = {})
+    def to_xml_string(str = +'', options = {})
       if options[:ids]
         # CatAxis must come first in the XML (for Microsoft Excel at least)
-        sorted = axes.sort_by { |name, axis| axis.kind_of?(CatAxis) ? 0 : 1 }
-        sorted.each { |axis| str << ('<c:axId val="' << axis[1].id.to_s << '"/>') }
+        sorted = axes.sort_by { |_name, axis| axis.is_a?(CatAxis) ? 0 : 1 }
+        sorted.each { |axis| str << '<c:axId val="' << axis[1].id.to_s << '"/>' }
       else
         axes.each { |axis| axis[1].to_xml_string(str) }
       end

data/lib/axlsx/drawing/axis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # the access class defines common properties and values for a chart axis.
   class Axis
@@ -13,7 +15,7 @@ module Axlsx
       @id = rand(8**8)
       @format_code = "General"
       @delete = @label_rotation = 0
-      @scaling = Scaling.new(:orientation => :minMax)
+      @scaling = Scaling.new(orientation: :minMax)
       @title = @color = nil
       self.ax_pos = :b
       self.tick_lbl_pos = :nextTo
@@ -107,15 +109,15 @@ module Axlsx
 
     # 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]
@@ -124,9 +126,9 @@ module Axlsx
     # Specify the degree of label rotation to apply to labels
     # default true
     def label_rotation=(v)
-      Axlsx::validate_int(v)
+      Axlsx.validate_int(v)
       adjusted = v.to_i * 60000
-      Axlsx::validate_angle(adjusted)
+      Axlsx.validate_angle(adjusted)
       @label_rotation = adjusted
     end
 
@@ -146,13 +148,13 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
-      str << ('<c:axId val="' << @id.to_s << '"/>')
+    def to_xml_string(str = +'')
+      str << '<c:axId val="' << @id.to_s << '"/>'
       @scaling.to_xml_string str
-      str << ('<c:delete val="' << @delete.to_s << '"/>')
-      str << ('<c:axPos val="' << @ax_pos.to_s << '"/>')
+      str << '<c:delete val="' << @delete.to_s << '"/>'
+      str << '<c:axPos val="' << @ax_pos.to_s << '"/>'
       str << '<c:majorGridlines>'
-      # TODO shape properties need to be extracted into a class
+      # TODO: shape properties need to be extracted into a class
       if gridlines == false
         str << '<c:spPr>'
         str << '<a:ln>'
@@ -161,25 +163,25 @@ module Axlsx
         str << '</c:spPr>'
       end
       str << '</c:majorGridlines>'
-      @title.to_xml_string(str) unless @title == nil
+      @title.to_xml_string(str) unless @title.nil?
       # Need to set sourceLinked to 0 if we're setting a format code on this row
       # otherwise it will never take, as it will always prefer the 'General' formatting
       # of the cells themselves
-      str << ('<c:numFmt formatCode="' << @format_code << '" sourceLinked="' << (@format_code.eql?('General') ? '1' : '0') << '"/>')
+      str << '<c:numFmt formatCode="' << @format_code << '" sourceLinked="' << (@format_code.eql?('General') ? '1' : '0') << '"/>'
       str << '<c:majorTickMark val="none"/>'
       str << '<c:minorTickMark val="none"/>'
-      str << ('<c:tickLblPos val="' << @tick_lbl_pos.to_s << '"/>')
-      # TODO - this is also being used for series colors
+      str << '<c:tickLblPos val="' << @tick_lbl_pos.to_s << '"/>'
+      # TODO: this is also being used for series colors
       # time to extract this into a class spPr - Shape Properties
       if @color
         str << '<c:spPr><a:ln><a:solidFill>'
-        str << ('<a:srgbClr val="' << @color << '"/>')
+        str << '<a:srgbClr val="' << @color << '"/>'
         str << '</a:solidFill></a:ln></c:spPr>'
       end
       # some potential value in implementing this in full. Very detailed!
-      str << ('<c:txPr><a:bodyPr rot="' << @label_rotation.to_s << '"/><a:lstStyle/><a:p><a:pPr><a:defRPr/></a:pPr><a:endParaRPr/></a:p></c:txPr>')
-      str << ('<c:crossAx val="' << @cross_axis.id.to_s << '"/>')
-      str << ('<c:crosses val="' << @crosses.to_s << '"/>')
+      str << '<c:txPr><a:bodyPr rot="' << @label_rotation.to_s << '"/><a:lstStyle/><a:p><a:pPr><a:defRPr/></a:pPr><a:endParaRPr/></a:p></c:txPr>'
+      str << '<c:crossAx val="' << @cross_axis.id.to_s << '"/>'
+      str << '<c:crosses val="' << @crosses.to_s << '"/>'
     end
   end
 end