caxlsx 2.0.2 → 3.0.4

data/lib/axlsx/rels/relationship.rb

@@ -5,32 +5,40 @@ module Axlsx
   class Relationship
     
     class << self
-      # Keeps track of all instances of this class.
+      # Keeps track of relationship ids in use.
       # @return [Array]
-      def instances
-        @instances ||= []
+      def ids_cache
+        Thread.current[:axlsx_relationship_ids_cache] ||= {}
       end
-      
-      # Clear cached instances.
+
+      # Initialize cached ids.
       # 
       # This should be called before serializing a package (see {Package#serialize} and
       # {Package#to_stream}) to make sure that serialization is idempotent (i.e. 
       # Relationship instances are generated with the same IDs everytime the package
       # is serialized).
+      def initialize_ids_cache
+        Thread.current[:axlsx_relationship_ids_cache] = {}
+      end
+      
+      # Clear cached ids.
       # 
-      # Also, calling this avoids memory leaks (cached instances lingering around 
+      # This should be called after serializing a package (see {Package#serialize} and
+      # {Package#to_stream}) to free the memory allocated for cache.
+      # 
+      # Also, calling this avoids memory leaks (cached ids lingering around 
       # forever). 
-      def clear_cached_instances
-        @instances = []
+      def clear_ids_cache
+        Thread.current[:axlsx_relationship_ids_cache] = nil
       end
       
       # Generate and return a unique id (eg. `rId123`) Used for setting {#Id}. 
       #
-      # The generated id depends on the number of cached instances, so using
-      # {clear_cached_instances} will automatically reset the generated ids, too.
+      # The generated id depends on the number of previously cached ids, so using
+      # {clear_ids_cache} will automatically reset the generated ids, too.
       # @return [String]
       def next_free_id
-        "rId#{@instances.size + 1}"
+        "rId#{ids_cache.size + 1}"
       end
     end
 
@@ -80,12 +88,7 @@ module Axlsx
       self.Target=target
       self.Type=type
       self.TargetMode = options[:target_mode] if options[:target_mode]
-      @Id = if (existing = self.class.instances.find{ |i| should_use_same_id_as?(i) })
-        existing.Id
-      else
-        self.class.next_free_id
-      end
-      self.class.instances << self
+      @Id = (self.class.ids_cache[ids_cache_key] ||= self.class.next_free_id)
     end
 
     # @see Target
@@ -102,11 +105,11 @@ module Axlsx
     def to_xml_string(str = '')
       h = self.instance_values.reject{|k, _| k == "source_obj"}
       str << '<Relationship '
-      str << h.map { |key, value| '' << key.to_s << '="' << Axlsx::coder.encode(value.to_s) << '"'}.join(' ')
+      str << (h.map { |key, value| '' << key.to_s << '="' << Axlsx::coder.encode(value.to_s) << '"'}.join(' '))
       str << '/>'
     end
     
-    # Whether this relationship should use the same id as `other`.
+    # A key that determines whether this relationship should use already generated id.
     #
     # Instances designating the same relationship need to use the same id. We can not simply
     # compare the {#Target} attribute, though: `foo/bar.xml`, `../foo/bar.xml`, 
@@ -116,13 +119,11 @@ module Axlsx
     # then {#Target} will be an absolute URL and thus can safely be compared).
     #
     # @todo Implement comparison of {#Target} based on normalized path names.
-    # @param other [Relationship]
-    def should_use_same_id_as?(other)
-      result = self.source_obj == other.source_obj && self.Type == other.Type && self.TargetMode == other.TargetMode
-      if self.TargetMode == :External
-        result &&= self.Target == other.Target
-      end
-      result
+    # @return [Array]
+    def ids_cache_key
+      key = [source_obj, self.Type, self.TargetMode]
+      key << self.Target if self.TargetMode == :External
+      key
     end
     
   end

data/lib/axlsx/rels/relationships.rb

@@ -10,17 +10,20 @@ require 'axlsx/rels/relationship.rb'
     def initialize
       super Relationship
     end
-    
+
     # The relationship instance for the given source object, or nil if none exists.
     # @see Relationship#source_obj
     # @return [Relationship]
     def for(source_obj)
-      @list.find{ |rel| rel.source_obj == source_obj }
+      find{ |rel| rel.source_obj == source_obj }
     end
-    
+
+    # serialize relationships
+    # @param [String] str
+    # @return [String]
     def to_xml_string(str = '')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
-      str << '<Relationships xmlns="' << RELS_R << '">'
+      str << ('<Relationships xmlns="' << RELS_R << '">')
       each{ |rel| rel.to_xml_string(str) }
       str << '</Relationships>'
     end

data/lib/axlsx/stylesheet/border_pr.rb

@@ -62,9 +62,9 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      str << '<' << @name.to_s << ' style="' << @style.to_s << '">'
+      str << ('<' << @name.to_s << ' style="' << @style.to_s << '">')
       @color.to_xml_string(str) if @color.is_a?(Color)
-      str << '</' << @name.to_s << '>'
+      str << ('</' << @name.to_s << '>')
     end
 
   end

data/lib/axlsx/stylesheet/cell_alignment.rb

@@ -125,9 +125,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      str << '<alignment '
-      serialized_attributes str
-      str << '/>'
+      serialized_tag('alignment', str)
     end
 
   end

data/lib/axlsx/stylesheet/cell_protection.rb

@@ -34,9 +34,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      str << '<protection '
-      serialized_attributes str
-      str << '/>'
+      serialized_tag('protection', str)
     end
 
   end

data/lib/axlsx/stylesheet/cell_style.rb

@@ -64,9 +64,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      str << '<cellStyle '
-      serialized_attributes str
-      str << '/>'
+      serialized_tag('cellStyle', str)
     end
 
   end

data/lib/axlsx/stylesheet/color.rb

@@ -70,9 +70,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '', tag_name = 'color')
-      str << "<" << tag_name << " "
-      serialized_attributes str
-      str << "/>"
+      serialized_tag('' + tag_name + '', str)
     end
   end
 end

data/lib/axlsx/stylesheet/font.rb

@@ -76,7 +76,10 @@ module Axlsx
     attr_reader :i
 
     # Indicates if the font should be rendered underlined
-    # @return [Boolean]
+    # It must be one of :none, :single, :double, :singleAccounting, :doubleAccounting, true, false
+    # @return [String]
+    # @note
+    #  true or false is for backwards compatibility and is reassigned to :single or :none respectively
     attr_reader :u
 
     # Indicates if the font should be rendered with a strikthrough
@@ -118,7 +121,12 @@ module Axlsx
     # @see i
     def i=(v) Axlsx::validate_boolean v; @i = v end
     # @see u
-    def u=(v) Axlsx::validate_boolean v; @u = v end
+    def u=(v)
+      v = :single if (v == true || v == 1 || v == :true || v == 'true')
+      v = :none if (v == false || v == 0 || v == :false || v == 'false')
+      Axlsx::validate_cell_u v
+      @u = v
+    end
     # @see strike
     def strike=(v) Axlsx::validate_boolean v; @strike = v end
     # @see outline
@@ -140,7 +148,7 @@ module Axlsx
     def to_xml_string(str = '')
       str << '<font>'
       instance_values.each do |k, v|
-        v.is_a?(Color) ? v.to_xml_string(str) : (str << '<' << k.to_s << ' val="' << v.to_s << '"/>')
+        v.is_a?(Color) ? v.to_xml_string(str) : (str << ('<' << k.to_s << ' val="' << Axlsx.booleanize(v).to_s << '"/>'))
       end
       str << '</font>'
     end

data/lib/axlsx/stylesheet/gradient_stop.rb

@@ -29,7 +29,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      str << '<stop position="' << position.to_s << '">'
+      str << ('<stop position="' << position.to_s << '">')
       self.color.to_xml_string(str)
       str << '</stop>'
     end

data/lib/axlsx/stylesheet/num_fmt.rb

@@ -70,9 +70,16 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      str << '<numFmt '
-      serialized_attributes str
-      str << '/>'
+      serialized_tag('numFmt', str)
+    end
+
+    # Override to avoid removing underscores
+    def serialized_attributes(str = '', additional_attributes = {})
+      attributes = declared_attributes.merge! additional_attributes
+      attributes.each do |key, value|
+        str << "#{Axlsx.camel(key, false)}=\"#{Axlsx.booleanize(value)}\" "
+      end
+      str
     end
 
   end

data/lib/axlsx/stylesheet/pattern_fill.rb

@@ -59,7 +59,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      str << '<patternFill patternType="' << patternType.to_s << '">'
+      str << ('<patternFill patternType="' << patternType.to_s << '">')
       if fgColor.is_a?(Color)
         fgColor.to_xml_string str, "fgColor"
       end

data/lib/axlsx/stylesheet/styles.rb

@@ -128,7 +128,7 @@ module Axlsx
     # @option options [Boolean] i Indicates if the text should be italicised
     # @option options [Boolean] u Indicates if the text should be underlined
     # @option options [Boolean] strike Indicates if the text should be rendered with a strikethrough
-    # @option options [Boolean] strike Indicates if the text should be rendered with a shadow
+    # @option options [Boolean] shadow Indicates if the text should be rendered with a shadow
     # @option options [Integer] charset The character set to use.
     # @option options [Integer] family The font family to use.
     # @option options [String] font_name The name of the font to use
@@ -151,7 +151,7 @@ module Axlsx
     #   ws = p.workbook.add_worksheet
     #
     #   # black text on a white background at 14pt with thin borders!
-    #   title = ws.style.add_style(:bg_color => "FFFF0000", :fg_color=>"#FF000000", :sz=>14,  :border=> {:style => :thin, :color => "FFFF0000"}
+    #   title = ws.styles.add_style(:bg_color => "FFFF0000", :fg_color=>"#FF000000", :sz=>14,  :border=> {:style => :thin, :color => "FFFF0000"}
     #
     #   ws.add_row ["Least Popular Pets"]
     #   ws.add_row ["", "Dry Skinned Reptiles", "Bald Cats", "Violent Parrots"], :style=>title
@@ -168,18 +168,18 @@ module Axlsx
     #   ws = p.workbook.add_worksheet
     #
     #   # define your styles
-    #   title = ws.style.add_style(:bg_color => "FFFF0000",
+    #   title = ws.styles.add_style(:bg_color => "FFFF0000",
     #                              :fg_color=>"#FF000000",
     #                              :border=>Axlsx::STYLE_THIN_BORDER,
     #                              :alignment=>{:horizontal => :center})
     #
-    #   date_time = ws.style.add_style(:num_fmt => Axlsx::NUM_FMT_YYYYMMDDHHMMSS,
+    #   date_time = ws.styles.add_style(:num_fmt => Axlsx::NUM_FMT_YYYYMMDDHHMMSS,
     #                                  :border=>Axlsx::STYLE_THIN_BORDER)
     #
-    #   percent = ws.style.add_style(:num_fmt => Axlsx::NUM_FMT_PERCENT,
+    #   percent = ws.styles.add_style(:num_fmt => Axlsx::NUM_FMT_PERCENT,
     #                                :border=>Axlsx::STYLE_THIN_BORDER)
     #
-    #   currency = ws.style.add_style(:format_code=>"¥#,##0;[Red]¥-#,##0",
+    #   currency = ws.styles.add_style(:format_code=>"¥#,##0;[Red]¥-#,##0",
     #                                 :border=>Axlsx::STYLE_THIN_BORDER)
     #
     #   # build your rows
@@ -362,7 +362,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      str << '<styleSheet xmlns="' << XML_NS << '">'
+      str << ('<styleSheet xmlns="' << XML_NS << '">')
       [:numFmts, :fonts, :fills, :borders, :cellStyleXfs, :cellXfs, :cellStyles, :dxfs, :tableStyles].each do |key|
         self.instance_values[key.to_s].to_xml_string(str) unless self.instance_values[key.to_s].nil?
       end

data/lib/axlsx/stylesheet/table_style_element.rb

@@ -70,9 +70,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      str << '<tableStyleElement '
-      serialized_attributes str
-      str << '/>'
+      serialized_tag('tableStyleElement', str)
     end
 
   end

data/lib/axlsx/util/accessors.rb

@@ -19,7 +19,7 @@ module Axlsx
       # @param [Array] symbols An array of symbols representing the
       # names of the attributes you will add to your class.
       def string_attr_accessor(*symbols)
-        validated_attr_accessor(symbols, 'validate_string')
+        validated_attr_accessor(symbols, :validate_string)
       end
 
 
@@ -27,25 +27,25 @@ module Axlsx
       # @param [Array] symbols An array of symbols representing the
       # names of the attributes you will add to your class
       def unsigned_int_attr_accessor(*symbols)
-        validated_attr_accessor(symbols, 'validate_unsigned_int')
+        validated_attr_accessor(symbols, :validate_unsigned_int)
       end
 
       # Creates one or more float (double?) attr_accessors
       # @param [Array] symbols An array of symbols representing the
       # names of the attributes you will add to your class
       def float_attr_accessor(*symbols)
-        validated_attr_accessor(symbols, 'validate_float')
+        validated_attr_accessor(symbols, :validate_float)
       end
 
       # Creates on or more boolean validated attr_accessors
       # @param [Array] symbols An array of symbols representing the
       # names of the attributes you will add to your class.
       def boolean_attr_accessor(*symbols)
-        validated_attr_accessor(symbols, 'validate_boolean')
+        validated_attr_accessor(symbols, :validate_boolean)
       end
 
       # Template for defining validated write accessors
-      SETTER = "def %s=(value) Axlsx::%s(value); @%s = value; end"
+      SETTER = "def %s=(value) Axlsx::%s(value); @%s = value; end".freeze
 
       # Creates the reader and writer access methods
       # @param [Array] symbols The names of the attributes to create
@@ -55,7 +55,7 @@ module Axlsx
       def validated_attr_accessor(symbols, validator)
         symbols.each do |symbol|
           attr_reader symbol
-          module_eval(SETTER % [symbol.to_s, validator, symbol.to_s], __FILE__, __LINE__)
+          module_eval(SETTER % [symbol, validator, symbol], __FILE__, __LINE__)
         end
       end
     end

data/lib/axlsx/util/constants.rb

@@ -1,263 +1,263 @@
 module Axlsx
 
   # XML Encoding
-  ENCODING = "UTF-8"
+  ENCODING = "UTF-8".freeze
 
   # spreadsheetML namespace
-  XML_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main"
+  XML_NS = "http://schemas.openxmlformats.org/spreadsheetml/2006/main".freeze
 
   # content-types namespace
-  XML_NS_T = "http://schemas.openxmlformats.org/package/2006/content-types"
+  XML_NS_T = "http://schemas.openxmlformats.org/package/2006/content-types".freeze
 
   # extended-properties namespace
-  APP_NS = "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"
+  APP_NS = "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties".freeze
 
   # doc props namespace
-  APP_NS_VT = "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"
+  APP_NS_VT = "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes".freeze
 
   # core properties namespace
-  CORE_NS = "http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
+  CORE_NS = "http://schemas.openxmlformats.org/package/2006/metadata/core-properties".freeze
 
   # dc elements (core) namespace
-  CORE_NS_DC = "http://purl.org/dc/elements/1.1/"
+  CORE_NS_DC = "http://purl.org/dc/elements/1.1/".freeze
 
   # dcmit (core) namespcace
-  CORE_NS_DCMIT = "http://purl.org/dc/dcmitype/"
+  CORE_NS_DCMIT = "http://purl.org/dc/dcmitype/".freeze
 
   # dc terms namespace
-  CORE_NS_DCT = "http://purl.org/dc/terms/"
+  CORE_NS_DCT = "http://purl.org/dc/terms/".freeze
 
   # xml schema namespace
-  CORE_NS_XSI = "http://www.w3.org/2001/XMLSchema-instance"
+  CORE_NS_XSI = "http://www.w3.org/2001/XMLSchema-instance".freeze
 
   # Digital signature namespace
-  DIGITAL_SIGNATURE_NS = "http://schemas.openxmlformats.org/package/2006/digital-signature"
+  DIGITAL_SIGNATURE_NS = "http://schemas.openxmlformats.org/package/2006/digital-signature".freeze
 
   # spreadsheet drawing namespace
-  XML_NS_XDR = "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"
+  XML_NS_XDR = "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing".freeze
 
   # drawing namespace
-  XML_NS_A  = "http://schemas.openxmlformats.org/drawingml/2006/main"
+  XML_NS_A  = "http://schemas.openxmlformats.org/drawingml/2006/main".freeze
 
   # chart namespace
-  XML_NS_C  = "http://schemas.openxmlformats.org/drawingml/2006/chart"
+  XML_NS_C  = "http://schemas.openxmlformats.org/drawingml/2006/chart".freeze
 
   # relationships namespace
-  XML_NS_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+  XML_NS_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships".freeze
 
   # relationships name space
-  RELS_R = "http://schemas.openxmlformats.org/package/2006/relationships"
+  RELS_R = "http://schemas.openxmlformats.org/package/2006/relationships".freeze
 
   # table rels namespace
-  TABLE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table"
+  TABLE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table".freeze
 
   # pivot table rels namespace
-  PIVOT_TABLE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable"
+  PIVOT_TABLE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable".freeze
 
   # pivot table cache definition namespace
-  PIVOT_TABLE_CACHE_DEFINITION_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition"
+  PIVOT_TABLE_CACHE_DEFINITION_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition".freeze
 
   # workbook rels namespace
-  WORKBOOK_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"
+  WORKBOOK_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument".freeze
 
   # worksheet rels namespace
-  WORKSHEET_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet"
+  WORKSHEET_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet".freeze
 
   # app rels namespace
-  APP_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties"
+  APP_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties".freeze
 
   # core rels namespace
-  CORE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/metadata/core-properties"
+  CORE_R = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties".freeze
 
   # digital signature rels namespace
-  DIGITAL_SIGNATURE_R = "http://schemas.openxmlformats.org/package/2006/relationships/digital- signature/signature"
+  DIGITAL_SIGNATURE_R = "http://schemas.openxmlformats.org/package/2006/relationships/digital- signature/signature".freeze
 
   # styles rels namespace
-  STYLES_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"
+  STYLES_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles".freeze
 
   # shared strings namespace
-  SHARED_STRINGS_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings"
+  SHARED_STRINGS_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings".freeze
 
   # drawing rels namespace
-  DRAWING_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing"
+  DRAWING_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing".freeze
 
   # chart rels namespace
-  CHART_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart"
+  CHART_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart".freeze
 
   # image rels namespace
-  IMAGE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"
+  IMAGE_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image".freeze
 
   # hyperlink rels namespace
-  HYPERLINK_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink"
+  HYPERLINK_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink".freeze
 
   # comment rels namespace
-  COMMENT_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"
+  COMMENT_R = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments".freeze
 
   # comment relation for nil target
-  COMMENT_R_NULL = "http://purl.oclc.org/ooxml/officeDocument/relationships/comments"
+  COMMENT_R_NULL = "http://purl.oclc.org/ooxml/officeDocument/relationships/comments".freeze
 
   #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"
+  VML_DRAWING_CT = "application/vnd.openxmlformats-officedocument.vmlDrawing".freeze
 
   # table content type
-  TABLE_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml"
+  TABLE_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml".freeze
 
   # pivot table content type
-  PIVOT_TABLE_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml"
+  PIVOT_TABLE_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml".freeze
 
   # pivot table cache definition content type
-  PIVOT_TABLE_CACHE_DEFINITION_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml"
+  PIVOT_TABLE_CACHE_DEFINITION_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml".freeze
 
   # workbook content type
-  WORKBOOK_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"
+  WORKBOOK_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml".freeze
 
   # app content type
-  APP_CT = "application/vnd.openxmlformats-officedocument.extended-properties+xml"
+  APP_CT = "application/vnd.openxmlformats-officedocument.extended-properties+xml".freeze
 
   # rels content type
-  RELS_CT = "application/vnd.openxmlformats-package.relationships+xml"
+  RELS_CT = "application/vnd.openxmlformats-package.relationships+xml".freeze
 
   # styles content type
-  STYLES_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"
+  STYLES_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml".freeze
 
   # xml content type
-  XML_CT = "application/xml"
+  XML_CT = "application/xml".freeze
 
   # worksheet content type
-  WORKSHEET_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"
+  WORKSHEET_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml".freeze
 
   # shared strings content type
-  SHARED_STRINGS_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"
+  SHARED_STRINGS_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml".freeze
 
   # core content type
-  CORE_CT = "application/vnd.openxmlformats-package.core-properties+xml"
+  CORE_CT = "application/vnd.openxmlformats-package.core-properties+xml".freeze
 
   # digital signature xml content type
-  DIGITAL_SIGNATURE_XML_CT = "application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml"
+  DIGITAL_SIGNATURE_XML_CT = "application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml".freeze
 
   # digital signature origin content type
-  DIGITAL_SIGNATURE_ORIGIN_CT = "application/vnd.openxmlformats-package.digital-signature-origin"
+  DIGITAL_SIGNATURE_ORIGIN_CT = "application/vnd.openxmlformats-package.digital-signature-origin".freeze
 
   # digital signature certificate content type
-  DIGITAL_SIGNATURE_CERTIFICATE_CT = "application/vnd.openxmlformats-package.digital-signature-certificate"
+  DIGITAL_SIGNATURE_CERTIFICATE_CT = "application/vnd.openxmlformats-package.digital-signature-certificate".freeze
 
   # chart content type
-  CHART_CT = "application/vnd.openxmlformats-officedocument.drawingml.chart+xml"
+  CHART_CT = "application/vnd.openxmlformats-officedocument.drawingml.chart+xml".freeze
 
   # comments content type
-  COMMENT_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml"
+  COMMENT_CT = "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml".freeze
 
   # jpeg content type
-  JPEG_CT = "image/jpeg"
+  JPEG_CT = "image/jpeg".freeze
 
   # gif content type
-  GIF_CT = "image/gif"
+  GIF_CT = "image/gif".freeze
 
   # png content type
-  PNG_CT = "image/png"
+  PNG_CT = "image/png".freeze
 
   #drawing content type
-  DRAWING_CT = "application/vnd.openxmlformats-officedocument.drawing+xml"
+  DRAWING_CT = "application/vnd.openxmlformats-officedocument.drawing+xml".freeze
 
 
   # xml content type extensions
-  XML_EX = "xml"
+  XML_EX = "xml".freeze
 
   # jpeg extension
-  JPEG_EX = "jpeg"
+  JPEG_EX = "jpeg".freeze
 
   # gif extension
-  GIF_EX = "gif"
+  GIF_EX = "gif".freeze
 
   # png extension
-  PNG_EX = "png"
+  PNG_EX = "png".freeze
 
   # rels content type extension
-  RELS_EX = "rels"
+  RELS_EX = "rels".freeze
 
   # workbook part
-  WORKBOOK_PN = "xl/workbook.xml"
+  WORKBOOK_PN = "xl/workbook.xml".freeze
 
   # styles part
-  STYLES_PN = "styles.xml"
+  STYLES_PN = "styles.xml".freeze
 
   # shared_strings  part
-  SHARED_STRINGS_PN = "sharedStrings.xml"
+  SHARED_STRINGS_PN = "sharedStrings.xml".freeze
 
   # app part
-  APP_PN = "docProps/app.xml"
+  APP_PN = "docProps/app.xml".freeze
 
   # core part
-  CORE_PN = "docProps/core.xml"
+  CORE_PN = "docProps/core.xml".freeze
 
   # content types part
-  CONTENT_TYPES_PN = "[Content_Types].xml"
+  CONTENT_TYPES_PN = "[Content_Types].xml".freeze
 
   # rels part
-  RELS_PN = "_rels/.rels"
+  RELS_PN = "_rels/.rels".freeze
 
   # workbook rels part
-  WORKBOOK_RELS_PN = "xl/_rels/workbook.xml.rels"
+  WORKBOOK_RELS_PN = "xl/_rels/workbook.xml.rels".freeze
 
   # worksheet part
-  WORKSHEET_PN = "worksheets/sheet%d.xml"
+  WORKSHEET_PN = "worksheets/sheet%d.xml".freeze
 
   # worksheet rels part
-  WORKSHEET_RELS_PN = "worksheets/_rels/sheet%d.xml.rels"
+  WORKSHEET_RELS_PN = "worksheets/_rels/sheet%d.xml.rels".freeze
 
   # drawing part
-  DRAWING_PN = "drawings/drawing%d.xml"
+  DRAWING_PN = "drawings/drawing%d.xml".freeze
 
   # drawing rels part
-  DRAWING_RELS_PN = "drawings/_rels/drawing%d.xml.rels"
+  DRAWING_RELS_PN = "drawings/_rels/drawing%d.xml.rels".freeze
 
   # vml drawing part
-  VML_DRAWING_PN = "drawings/vmlDrawing%d.vml"
+  VML_DRAWING_PN = "drawings/vmlDrawing%d.vml".freeze
 
   # drawing part
-  TABLE_PN = "tables/table%d.xml"
+  TABLE_PN = "tables/table%d.xml".freeze
 
   # pivot table parts
-  PIVOT_TABLE_PN = "pivotTables/pivotTable%d.xml"
+  PIVOT_TABLE_PN = "pivotTables/pivotTable%d.xml".freeze
 
   # pivot table cache definition part name
-  PIVOT_TABLE_CACHE_DEFINITION_PN = "pivotCache/pivotCacheDefinition%d.xml"
+  PIVOT_TABLE_CACHE_DEFINITION_PN = "pivotCache/pivotCacheDefinition%d.xml".freeze
 
   # pivot table rels parts
-  PIVOT_TABLE_RELS_PN = "pivotTables/_rels/pivotTable%d.xml.rels"
+  PIVOT_TABLE_RELS_PN = "pivotTables/_rels/pivotTable%d.xml.rels".freeze
 
   # chart part
-  CHART_PN = "charts/chart%d.xml"
+  CHART_PN = "charts/chart%d.xml".freeze
 
   # chart part
-  IMAGE_PN = "media/image%d.%s"
+  IMAGE_PN = "media/image%d.%s".freeze
 
   # comment part
-  COMMENT_PN = "comments%d.xml"
+  COMMENT_PN = "comments%d.xml".freeze
 
   # location of schema files for validation
-  SCHEMA_BASE = File.dirname(__FILE__)+'/../../schema/'
+  SCHEMA_BASE = (File.dirname(__FILE__)+'/../../schema/').freeze
 
   # App validation schema
-  APP_XSD = SCHEMA_BASE + "shared-documentPropertiesExtended.xsd"
+  APP_XSD = (SCHEMA_BASE + "shared-documentPropertiesExtended.xsd").freeze
 
   # core validation schema
-  CORE_XSD = SCHEMA_BASE + "opc-coreProperties.xsd"
+  CORE_XSD = (SCHEMA_BASE + "opc-coreProperties.xsd").freeze
 
   # content types validation schema
-  CONTENT_TYPES_XSD = SCHEMA_BASE + "opc-contentTypes.xsd"
+  CONTENT_TYPES_XSD = (SCHEMA_BASE + "opc-contentTypes.xsd").freeze
 
   # rels validation schema
-  RELS_XSD = SCHEMA_BASE + "opc-relationships.xsd"
+  RELS_XSD = (SCHEMA_BASE + "opc-relationships.xsd").freeze
 
   # spreadsheetML validation schema
-  SML_XSD = SCHEMA_BASE + "sml.xsd"
+  SML_XSD = (SCHEMA_BASE + "sml.xsd").freeze
 
   # drawing validation schema
-  DRAWING_XSD = SCHEMA_BASE + "dml-spreadsheetDrawing.xsd"
+  DRAWING_XSD = (SCHEMA_BASE + "dml-spreadsheetDrawing.xsd").freeze
 
   # number format id for pecentage formatting using the default formatting id.
   NUM_FMT_PERCENT = 9
@@ -275,37 +275,37 @@ module Axlsx
   STYLE_DATE = 2
 
   # error messages RestrictionValidor
-  ERR_RESTRICTION = "Invalid Data: %s. %s must be one of %s."
+  ERR_RESTRICTION = "Invalid Data: %s. %s must be one of %s.".freeze
 
   # error message DataTypeValidator
-  ERR_TYPE = "Invalid Data %s for %s. must be %s."
+  ERR_TYPE = "Invalid Data %s for %s. must be %s.".freeze
 
   # error message for RegexValidator
-  ERR_REGEX = "Invalid Data. %s does not match %s."
+  ERR_REGEX = "Invalid Data. %s does not match %s.".freeze
 
   # error message for RangeValidator
-  ERR_RANGE = "Invalid Data. %s must be between %s and %s, (inclusive:%s) you gave: %s"
+  ERR_RANGE = "Invalid Data. %s must be between %s and %s, (inclusive:%s) you gave: %s".freeze
 
   # 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 31 characters (bytes) or less"
+  ERR_SHEET_NAME_TOO_LONG = "Your worksheet name '%s' is too long. Worksheet names must be 31 characters (bytes) or less".freeze
 
   # 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."
+  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
 
   # 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"
+  ERR_DUPLICATE_SHEET_NAME = "There is already a worksheet in this workbook named '%s'. Please use a unique name".freeze
 
   # 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"
+  ERR_INVALID_BORDER_OPTIONS = "border hash must include both style and color. e.g. :border => { :color => 'FF000000', :style => :thin }. You provided: %s".freeze
 
   # 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."
+  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
 
   # error message for invalid angles
-  ERR_ANGLE = "Angles must be a value between -90 and 90. You provided: %s"
+  ERR_ANGLE = "Angles must be a value between -90 and 90. You provided: %s".freeze
 
   # error message for non 'integerish' value
-  ERR_INTEGERISH = "You value must be, or be castable via to_i, an Integer. You provided %s"
+  ERR_INTEGERISH = "You value must be, or be castable via to_i, an Integer. You provided %s".freeze
 
   # Regex to match forbidden control characters
   # The following will be automatically stripped from worksheets.
@@ -383,10 +383,19 @@ module Axlsx
   # 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
+  pattern = "\x0-\x08\x0B\x0C\x0E-\x1F"
+  pattern = pattern.respond_to?(:encode) ? pattern.encode('UTF-8') : pattern
 
   # The regular expression used to remove control characters from worksheets
-  CONTROL_CHAR_REGEX = Regexp.new(pattern, 'n')
+  CONTROL_CHARS = pattern.freeze
 
+  # ISO 8601 date recognition
+  ISO_8601_REGEX = /\A(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|0[1-9]|[1-2][0-9])T(2[0-3]|[0-1][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-](?:2[0-3]|[0-1][0-9]):[0-5][0-9])?\Z/.freeze
+
+  # FLOAT recognition
+  SAFE_FLOAT_REGEX = /\A[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]{1,2})?\Z/.freeze
+  MAYBE_FLOAT_REGEX = /\A[-+]?[0-9]*\.?[0-9]+[eE](?<exp>[-+]?[0-9]{3})\Z/.freeze
+
+  # Numeric recognition
+  NUMERIC_REGEX = /\A[+-]?\d+?\Z/.freeze
 end