caxlsx 3.4.1 → 4.1.0

data/lib/axlsx/util/constants.rb

@@ -1,261 +1,263 @@
+# frozen_string_literal: true
+
 module Axlsx
   # XML Encoding
-  ENCODING = "UTF-8".freeze
+  ENCODING = "UTF-8"
 
   # spreadsheetML namespace
-  XML_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main".freeze
+  XML_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main"
 
   # content-types namespace
-  XML_NS_T = "http://schemas.openxmlformats.org/package/2006/content-types".freeze
+  XML_NS_T = "http://schemas.openxmlformats.org/package/2006/content-types"
 
   # extended-properties namespace
-  APP_NS = "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties".freeze
+  APP_NS = "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"
 
   # doc props namespace
-  APP_NS_VT = "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes".freeze
+  APP_NS_VT = "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
 
   # core properties namespace
-  CORE_NS = "http://schemas.openxmlformats.org/package/2006/metadata/core-properties".freeze
+  CORE_NS = "http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
 
   # dc elements (core) namespace
-  CORE_NS_DC = "http://purl.org/dc/elements/1.1/".freeze
+  CORE_NS_DC = "http://purl.org/dc/elements/1.1/"
 
   # dcmit (core) namespcace
-  CORE_NS_DCMIT = "http://purl.org/dc/dcmitype/".freeze
+  CORE_NS_DCMIT = "http://purl.org/dc/dcmitype/"
 
   # dc terms namespace
-  CORE_NS_DCT = "http://purl.org/dc/terms/".freeze
+  CORE_NS_DCT = "http://purl.org/dc/terms/"
 
   # xml schema namespace
-  CORE_NS_XSI = "http://www.w3.org/2001/XMLSchema-instance".freeze
+  CORE_NS_XSI = "http://www.w3.org/2001/XMLSchema-instance"
 
   # Digital signature namespace
-  DIGITAL_SIGNATURE_NS = "http://schemas.openxmlformats.org/package/2006/digital-signature".freeze
+  DIGITAL_SIGNATURE_NS = "http://schemas.openxmlformats.org/package/2006/digital-signature"
 
   # spreadsheet drawing namespace
-  XML_NS_XDR = "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing".freeze
+  XML_NS_XDR = "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"
 
   # drawing namespace
-  XML_NS_A  = "http://schemas.openxmlformats.org/drawingml/2006/main".freeze
+  XML_NS_A  = "http://schemas.openxmlformats.org/drawingml/2006/main"
 
   # chart namespace
-  XML_NS_C  = "http://schemas.openxmlformats.org/drawingml/2006/chart".freeze
+  XML_NS_C  = "http://schemas.openxmlformats.org/drawingml/2006/chart"
 
   # relationships namespace
-  XML_NS_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships".freeze
+  XML_NS_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
 
   # relationships name space
-  RELS_R = "http://schemas.openxmlformats.org/package/2006/relationships".freeze
+  RELS_R = "http://schemas.openxmlformats.org/package/2006/relationships"
 
   # table rels namespace
-  TABLE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table".freeze
+  TABLE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table"
 
   # pivot table rels namespace
-  PIVOT_TABLE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable".freeze
+  PIVOT_TABLE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable"
 
   # pivot table cache definition namespace
-  PIVOT_TABLE_CACHE_DEFINITION_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition".freeze
+  PIVOT_TABLE_CACHE_DEFINITION_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition"
 
   # workbook rels namespace
-  WORKBOOK_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument".freeze
+  WORKBOOK_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"
 
   # worksheet rels namespace
-  WORKSHEET_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet".freeze
+  WORKSHEET_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet"
 
   # app rels namespace
-  APP_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties".freeze
+  APP_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties"
 
   # core rels namespace
-  CORE_R = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties".freeze
+  CORE_R = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties"
 
   # digital signature rels namespace
-  DIGITAL_SIGNATURE_R = "http://schemas.openxmlformats.org/package/2006/relationships/digital- signature/signature".freeze
+  DIGITAL_SIGNATURE_R = "http://schemas.openxmlformats.org/package/2006/relationships/digital- signature/signature"
 
   # styles rels namespace
-  STYLES_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles".freeze
+  STYLES_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"
 
   # shared strings namespace
-  SHARED_STRINGS_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings".freeze
+  SHARED_STRINGS_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings"
 
   # drawing rels namespace
-  DRAWING_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing".freeze
+  DRAWING_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing"
 
   # chart rels namespace
-  CHART_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart".freeze
+  CHART_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart"
 
   # image rels namespace
-  IMAGE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image".freeze
+  IMAGE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"
 
   # hyperlink rels namespace
-  HYPERLINK_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink".freeze
+  HYPERLINK_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"
 
   # comment rels namespace
-  COMMENT_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments".freeze
+  COMMENT_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"
 
   # comment relation for nil target
-  COMMENT_R_NULL = "http://purl.oclc.org/ooxml/officeDocument/relationships/comments".freeze
+  COMMENT_R_NULL = "http://purl.oclc.org/ooxml/officeDocument/relationships/comments"
 
   # vml drawing relation namespace
   VML_DRAWING_R = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing'
 
   # VML Drawing content type
-  VML_DRAWING_CT = "application/vnd.openxmlformats-officedocument.vmlDrawing".freeze
+  VML_DRAWING_CT = "application/vnd.openxmlformats-officedocument.vmlDrawing"
 
   # table content type
-  TABLE_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml".freeze
+  TABLE_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml"
 
   # pivot table content type
-  PIVOT_TABLE_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml".freeze
+  PIVOT_TABLE_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml"
 
   # pivot table cache definition content type
-  PIVOT_TABLE_CACHE_DEFINITION_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml".freeze
+  PIVOT_TABLE_CACHE_DEFINITION_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml"
 
   # workbook content type
-  WORKBOOK_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml".freeze
+  WORKBOOK_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"
 
   # app content type
-  APP_CT = "application/vnd.openxmlformats-officedocument.extended-properties+xml".freeze
+  APP_CT = "application/vnd.openxmlformats-officedocument.extended-properties+xml"
 
   # rels content type
-  RELS_CT = "application/vnd.openxmlformats-package.relationships+xml".freeze
+  RELS_CT = "application/vnd.openxmlformats-package.relationships+xml"
 
   # styles content type
-  STYLES_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml".freeze
+  STYLES_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"
 
   # xml content type
-  XML_CT = "application/xml".freeze
+  XML_CT = "application/xml"
 
   # worksheet content type
-  WORKSHEET_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml".freeze
+  WORKSHEET_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"
 
   # shared strings content type
-  SHARED_STRINGS_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml".freeze
+  SHARED_STRINGS_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"
 
   # core content type
-  CORE_CT = "application/vnd.openxmlformats-package.core-properties+xml".freeze
+  CORE_CT = "application/vnd.openxmlformats-package.core-properties+xml"
 
   # digital signature xml content type
-  DIGITAL_SIGNATURE_XML_CT = "application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml".freeze
+  DIGITAL_SIGNATURE_XML_CT = "application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml"
 
   # digital signature origin content type
-  DIGITAL_SIGNATURE_ORIGIN_CT = "application/vnd.openxmlformats-package.digital-signature-origin".freeze
+  DIGITAL_SIGNATURE_ORIGIN_CT = "application/vnd.openxmlformats-package.digital-signature-origin"
 
   # digital signature certificate content type
-  DIGITAL_SIGNATURE_CERTIFICATE_CT = "application/vnd.openxmlformats-package.digital-signature-certificate".freeze
+  DIGITAL_SIGNATURE_CERTIFICATE_CT = "application/vnd.openxmlformats-package.digital-signature-certificate"
 
   # chart content type
-  CHART_CT = "application/vnd.openxmlformats-officedocument.drawingml.chart+xml".freeze
+  CHART_CT = "application/vnd.openxmlformats-officedocument.drawingml.chart+xml"
 
   # comments content type
-  COMMENT_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml".freeze
+  COMMENT_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml"
 
   # jpeg content type
-  JPEG_CT = "image/jpeg".freeze
+  JPEG_CT = "image/jpeg"
 
   # gif content type
-  GIF_CT = "image/gif".freeze
+  GIF_CT = "image/gif"
 
   # png content type
-  PNG_CT = "image/png".freeze
+  PNG_CT = "image/png"
 
   # drawing content type
-  DRAWING_CT = "application/vnd.openxmlformats-officedocument.drawing+xml".freeze
+  DRAWING_CT = "application/vnd.openxmlformats-officedocument.drawing+xml"
 
   # xml content type extensions
-  XML_EX = "xml".freeze
+  XML_EX = "xml"
 
-  # jpeg extension
-  JPEG_EX = "jpeg".freeze
+  # jpeg extensions
+  JPEG_EXS = ["jpeg", "jpg"].freeze
 
   # gif extension
-  GIF_EX = "gif".freeze
+  GIF_EX = "gif"
 
   # png extension
-  PNG_EX = "png".freeze
+  PNG_EX = "png"
 
   # rels content type extension
-  RELS_EX = "rels".freeze
+  RELS_EX = "rels"
 
   # workbook part
-  WORKBOOK_PN = "xl/workbook.xml".freeze
+  WORKBOOK_PN = "xl/workbook.xml"
 
   # styles part
-  STYLES_PN = "styles.xml".freeze
+  STYLES_PN = "styles.xml"
 
   # shared_strings  part
-  SHARED_STRINGS_PN = "sharedStrings.xml".freeze
+  SHARED_STRINGS_PN = "sharedStrings.xml"
 
   # app part
-  APP_PN = "docProps/app.xml".freeze
+  APP_PN = "docProps/app.xml"
 
   # core part
-  CORE_PN = "docProps/core.xml".freeze
+  CORE_PN = "docProps/core.xml"
 
   # content types part
-  CONTENT_TYPES_PN = "[Content_Types].xml".freeze
+  CONTENT_TYPES_PN = "[Content_Types].xml"
 
   # rels part
-  RELS_PN = "_rels/.rels".freeze
+  RELS_PN = "_rels/.rels"
 
   # workbook rels part
-  WORKBOOK_RELS_PN = "xl/_rels/workbook.xml.rels".freeze
+  WORKBOOK_RELS_PN = "xl/_rels/workbook.xml.rels"
 
   # worksheet part
-  WORKSHEET_PN = "worksheets/sheet%d.xml".freeze
+  WORKSHEET_PN = "worksheets/sheet%d.xml"
 
   # worksheet rels part
-  WORKSHEET_RELS_PN = "worksheets/_rels/sheet%d.xml.rels".freeze
+  WORKSHEET_RELS_PN = "worksheets/_rels/sheet%d.xml.rels"
 
   # drawing part
-  DRAWING_PN = "drawings/drawing%d.xml".freeze
+  DRAWING_PN = "drawings/drawing%d.xml"
 
   # drawing rels part
-  DRAWING_RELS_PN = "drawings/_rels/drawing%d.xml.rels".freeze
+  DRAWING_RELS_PN = "drawings/_rels/drawing%d.xml.rels"
 
   # vml drawing part
-  VML_DRAWING_PN = "drawings/vmlDrawing%d.vml".freeze
+  VML_DRAWING_PN = "drawings/vmlDrawing%d.vml"
 
   # drawing part
-  TABLE_PN = "tables/table%d.xml".freeze
+  TABLE_PN = "tables/table%d.xml"
 
   # pivot table parts
-  PIVOT_TABLE_PN = "pivotTables/pivotTable%d.xml".freeze
+  PIVOT_TABLE_PN = "pivotTables/pivotTable%d.xml"
 
   # pivot table cache definition part name
-  PIVOT_TABLE_CACHE_DEFINITION_PN = "pivotCache/pivotCacheDefinition%d.xml".freeze
+  PIVOT_TABLE_CACHE_DEFINITION_PN = "pivotCache/pivotCacheDefinition%d.xml"
 
   # pivot table rels parts
-  PIVOT_TABLE_RELS_PN = "pivotTables/_rels/pivotTable%d.xml.rels".freeze
+  PIVOT_TABLE_RELS_PN = "pivotTables/_rels/pivotTable%d.xml.rels"
 
   # chart part
-  CHART_PN = "charts/chart%d.xml".freeze
+  CHART_PN = "charts/chart%d.xml"
 
   # chart part
-  IMAGE_PN = "media/image%d.%s".freeze
+  IMAGE_PN = "media/image%d.%s"
 
   # comment part
-  COMMENT_PN = "comments%d.xml".freeze
+  COMMENT_PN = "comments%d.xml"
 
   # location of schema files for validation
-  SCHEMA_BASE = (File.dirname(__FILE__) + '/../../schema/').freeze
+  SCHEMA_BASE = "#{File.dirname(__FILE__)}/../../schema/"
 
   # App validation schema
-  APP_XSD = (SCHEMA_BASE + "shared-documentPropertiesExtended.xsd").freeze
+  APP_XSD = "#{SCHEMA_BASE}shared-documentPropertiesExtended.xsd"
 
   # core validation schema
-  CORE_XSD = (SCHEMA_BASE + "opc-coreProperties.xsd").freeze
+  CORE_XSD = "#{SCHEMA_BASE}opc-coreProperties.xsd"
 
   # content types validation schema
-  CONTENT_TYPES_XSD = (SCHEMA_BASE + "opc-contentTypes.xsd").freeze
+  CONTENT_TYPES_XSD = "#{SCHEMA_BASE}opc-contentTypes.xsd"
 
   # rels validation schema
-  RELS_XSD = (SCHEMA_BASE + "opc-relationships.xsd").freeze
+  RELS_XSD = "#{SCHEMA_BASE}opc-relationships.xsd"
 
   # spreadsheetML validation schema
-  SML_XSD = (SCHEMA_BASE + "sml.xsd").freeze
+  SML_XSD = "#{SCHEMA_BASE}sml.xsd"
 
   # drawing validation schema
-  DRAWING_XSD = (SCHEMA_BASE + "dml-spreadsheetDrawing.xsd").freeze
+  DRAWING_XSD = "#{SCHEMA_BASE}dml-spreadsheetDrawing.xsd"
 
   # number format id for pecentage formatting using the default formatting id.
   NUM_FMT_PERCENT = 9
@@ -279,46 +281,46 @@ module Axlsx
   WORKSHEET_NAME_FORBIDDEN_CHARS = '[]*/\?:'.chars.freeze
 
   # error messages RestrictionValidor
-  ERR_RESTRICTION = "Invalid Data: %s. %s must be one of %s.".freeze
+  ERR_RESTRICTION = "Invalid Data: %s. %s must be one of %s."
 
   # error message DataTypeValidator
-  ERR_TYPE = "Invalid Data %s for %s. must be %s.".freeze
+  ERR_TYPE = "Invalid Data %s for %s. must be %s."
 
   # error message for RegexValidator
-  ERR_REGEX = "Invalid Data. %s does not match %s.".freeze
+  ERR_REGEX = "Invalid Data. %s does not match %s."
 
   # error message for RangeValidator
-  ERR_RANGE = "Invalid Data. %s must be between %s and %s, (inclusive:%s) you gave: %s".freeze
+  ERR_RANGE = "Invalid Data. %s must be between %s and %s, (inclusive:%s) you gave: %s"
 
   # error message for sheets that use explicit empty string name
-  ERR_SHEET_NAME_EMPTY = "Your worksheet name is empty. Worksheet name can't be empty. Please assign name of your sheet or don't use name option at all.".freeze
+  ERR_SHEET_NAME_EMPTY = "Your worksheet name is empty. Worksheet name can't be empty. Please assign name of your sheet or don't use name option at all."
 
   # error message for sheets that use a name which is longer than 31 bytes
-  ERR_SHEET_NAME_TOO_LONG = "Your worksheet name '%s' is too long. Worksheet names must be #{WORKSHEET_MAX_NAME_LENGTH} characters (bytes) or less".freeze
+  ERR_SHEET_NAME_TOO_LONG = "Your worksheet name '%s' is too long. Worksheet names must be #{WORKSHEET_MAX_NAME_LENGTH} characters (bytes) or less"
 
   # error message for sheets that use a name which include invalid characters
-  ERR_SHEET_NAME_CHARACTER_FORBIDDEN = "Your worksheet name '%s' contains a character which is not allowed by MS Excel and will cause repair warnings. Please change the name of your sheet.".freeze
+  ERR_SHEET_NAME_CHARACTER_FORBIDDEN = "Your worksheet name '%s' contains a character which is not allowed by MS Excel and will cause repair warnings. Please change the name of your sheet."
 
   # error message for duplicate sheet names
-  ERR_DUPLICATE_SHEET_NAME = "There is already a worksheet in this workbook named '%s'. Please use a unique name".freeze
+  ERR_DUPLICATE_SHEET_NAME = "There is already a worksheet in this workbook named '%s'. Please use a unique name"
 
   # error message when user does not provide color and or style options for border in Style#add_sytle
-  ERR_INVALID_BORDER_OPTIONS = "border hash must include both style and color. e.g. :border => { :color => 'FF000000', :style => :thin }. You provided: %s".freeze
+  ERR_INVALID_BORDER_OPTIONS = "border hash must include both style and color. e.g. :border => { :color => 'FF000000', :style => :thin }. You provided: %s"
 
   # error message for invalid border id reference
-  ERR_INVALID_BORDER_ID = "The border id you specified (%s) does not exist. Please add a border with Style#add_style before referencing its index.".freeze
+  ERR_INVALID_BORDER_ID = "The border id you specified (%s) does not exist. Please add a border with Style#add_style before referencing its index."
 
   # error message for invalid angles
-  ERR_ANGLE = "Angles must be a value between -90 and 90. You provided: %s".freeze
+  ERR_ANGLE = "Angles must be a value between -90 and 90. You provided: %s"
 
   # error message for non 'integerish' value
-  ERR_INTEGERISH = "You value must be, or be castable via to_i, an Integer. You provided %s".freeze
+  ERR_INTEGERISH = "You value must be, or be castable via to_i, an Integer. You provided %s"
 
   # error message for invalid cell reference
-  ERR_CELL_REFERENCE_INVALID = "Invalid cell definition `%s`".freeze
+  ERR_CELL_REFERENCE_INVALID = "Invalid cell definition `%s`"
 
   # error message for cell reference with last cell missing
-  ERR_CELL_REFERENCE_MISSING_CELL = "Missing cell `%s` for the specified range `%s`".freeze
+  ERR_CELL_REFERENCE_MISSING_CELL = "Missing cell `%s` for the specified range `%s`"
 
   # Regex to match forbidden control characters
   # The following will be automatically stripped from worksheets.
@@ -354,7 +356,7 @@ module Axlsx
   # x1F Information Separator One
   #
   # The following are not dealt with.
-  # If you have this in your data, expect excel to blow up!
+  # If you have this in your data, expect Excel to blow up!
   #
   # x7F	Delete
   # x80	Control 0080
@@ -395,9 +397,8 @@ module Axlsx
   # x0A Line Feed (Lf)
   # x0D Carriage Return (Cr)
   # x09 Character Tabulation
-  # @see http://www.codetable.net/asciikeycodes
-  pattern = "\x0-\x08\x0B\x0C\x0E-\x1F"
-  pattern = pattern.respond_to?(:encode) ? pattern.encode('UTF-8') : pattern
+  # @see https://www.codetable.net/asciikeycodes
+  pattern = "\x0-\x08\x0B\x0C\x0E-\x1F".encode(Encoding::UTF_8)
 
   # The regular expression used to remove control characters from worksheets
   CONTROL_CHARS = pattern.freeze
@@ -411,4 +412,16 @@ module Axlsx
 
   # Numeric recognition
   NUMERIC_REGEX = /\A[+-]?\d+?\Z/.freeze
+
+  # Leading characters that indicate a formula.
+  # See: https://owasp.org/www-community/attacks/CSV_Injection
+  FORMULA_PREFIX = '='
+
+  # Leading characters that indicate an array formula.
+  ARRAY_FORMULA_PREFIX = '{='
+
+  # Trailing character that indicates an array formula.
+  ARRAY_FORMULA_SUFFIX = '}'
+
+  BOOLEAN_VALUES = [true, false].freeze
 end

data/lib/axlsx/util/mime_type_utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 
 module Axlsx
@@ -14,11 +16,7 @@ module Axlsx
     # @param [String] v URI
     # @return [String] File mime type
     def self.get_mime_type_from_uri(v)
-      if URI.respond_to?(:open)
-        Marcel::MimeType.for(URI.open(v))
-      else
-        Marcel::MimeType.for(URI.parse(v).open)
-      end
+      Marcel::MimeType.for(URI.parse(v).open)
     end
   end
 end

data/lib/axlsx/util/options_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # This module defines a single method for parsing options in class
   # initializers.
@@ -8,7 +10,7 @@ module Axlsx
     def parse_options(options = {})
       options.each do |key, value|
         key = :"#{key}="
-        self.send(key, value) if !value.nil? && self.respond_to?(key)
+        send(key, value) if !value.nil? && respond_to?(key)
       end
     end
   end

data/lib/axlsx/util/serialized_attributes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # This module allows us to define a list of symbols defining which
   # attributes will be serialized for a class.
@@ -13,11 +15,21 @@ module Axlsx
       # which of the instance values are serializable
       def serializable_attributes(*symbols)
         @xml_attributes = symbols
+        @camel_xml_attributes = nil
+        @ivar_xml_attributes = nil
       end
 
       # a reader for those attributes
       attr_reader :xml_attributes
 
+      def camel_xml_attributes
+        @camel_xml_attributes ||= @xml_attributes.map { |attr| Axlsx.camel(attr, false) }
+      end
+
+      def ivar_xml_attributes
+        @ivar_xml_attributes ||= @xml_attributes.map { |attr| :"@#{attr}" }
+      end
+
       # This helper registers the attributes that will be formatted as elements.
       def serializable_element_attributes(*symbols)
         @xml_element_attributes = symbols
@@ -29,13 +41,13 @@ module Axlsx
 
     # creates a XML tag with serialized attributes
     # @see SerializedAttributes#serialized_attributes
-    def serialized_tag(tagname, str, additional_attributes = {}, &block)
-      str << "<#{tagname} "
+    def serialized_tag(tagname, str, additional_attributes = {})
+      str << '<' << tagname << ' '
       serialized_attributes(str, additional_attributes)
       if block_given?
         str << '>'
         yield
-        str << "</#{tagname}>"
+        str << '</' << tagname << '>'
       else
         str << '/>'
       end
@@ -47,21 +59,34 @@ module Axlsx
     # serialization to.
     # @param [Hash] additional_attributes An option key value hash for
     # defining values that are not serializable attributes list.
-    def serialized_attributes(str = '', additional_attributes = {})
-      attributes = declared_attributes.merge! additional_attributes
-      attributes.each do |key, value|
-        str << "#{Axlsx.camel(key, false)}=\"#{Axlsx.camel(Axlsx.booleanize(value), false)}\" "
+    # @param [Boolean] camelize_value Should the attribute values be camelized
+    def serialized_attributes(str = +'', additional_attributes = {}, camelize_value = true)
+      camel_xml_attributes = self.class.camel_xml_attributes
+      ivar_xml_attributes = self.class.ivar_xml_attributes
+
+      self.class.xml_attributes.each_with_index do |attr, index|
+        next if additional_attributes.key?(attr)
+        next unless instance_variable_defined?(ivar_xml_attributes[index])
+
+        value = instance_variable_get(ivar_xml_attributes[index])
+        next if value.nil?
+
+        value = Axlsx.booleanize(value)
+        value = Axlsx.camel(value, false) if camelize_value
+
+        str << camel_xml_attributes[index] << '="' << value.to_s << '" '
       end
-      str
-    end
 
-    # A hash of instance variables that have been declared with
-    # seraialized_attributes and are not nil.
-    # This requires ruby 1.9.3 or higher
-    def declared_attributes
-      Axlsx.instance_values_for(self).select do |key, value|
-        value != nil && self.class.xml_attributes.include?(key.to_sym)
+      additional_attributes.each do |attr, value|
+        next if value.nil?
+
+        value = Axlsx.booleanize(value)
+        value = Axlsx.camel(value, false) if camelize_value
+
+        str << Axlsx.camel(attr, false) << '="' << value.to_s << '" '
       end
+
+      str
     end
 
     # serialized instance values at text nodes on a camelized element of the
@@ -71,7 +96,7 @@ module Axlsx
     # @param [String] str The string instance to which serialized data is appended
     # @param [Array] additional_attributes An array of additional attribute names.
     # @return [String] The serialized output.
-    def serialized_element_attributes(str = '', additional_attributes = [], &block)
+    def serialized_element_attributes(str = +'', additional_attributes = [])
       attrs = self.class.xml_element_attributes + additional_attributes
       values = Axlsx.instance_values_for(self)
       attrs.each do |attribute_name|
@@ -80,7 +105,7 @@ module Axlsx
 
         value = yield value if block_given?
         element_name = Axlsx.camel(attribute_name, false)
-        str << "<#{element_name}>#{value}</#{element_name}>"
+        str << '<' << element_name << '>' << value << '</' << element_name << '>'
       end
       str
     end