rubyXL 3.4.14 → 3.4.33

data/lib/rubyXL/objects/reference.rb

@@ -1,6 +1,6 @@
 module RubyXL
   class Reference
-    ROW_MAX = 1024*1024
+    ROW_MAX = 1024 * 1024
     COL_MAX = 16393
 
     attr_reader :row_range, :col_range
@@ -8,6 +8,7 @@ module RubyXL
     # RubyXL::Reference.new(row, col)
     # RubyXL::Reference.new(row_from, row_to, col_from, col_to)
     # RubyXL::Reference.new(reference_string)
+    # RubyXL::Reference.new(row_from:, row_to:, col_from:, col_to:)
     def initialize(*params)
       row_from = row_to = col_from = col_to = nil
 
@@ -15,10 +16,16 @@ module RubyXL
       when 4 then row_from, row_to, col_from, col_to = params
       when 2 then row_from, col_from = params
       when 1 then
-        raise ArgumentError.new("invalid value for #{self.class}: #{params[0].inspect}") unless params[0].is_a?(String)
-        from, to = params[0].split(':')
-        row_from, col_from = self.class.ref2ind(from)
-        row_to, col_to = self.class.ref2ind(to) unless to.nil?
+        case params.first
+        when Hash then
+          row_from, row_to, col_from, col_to = params.first.fetch_values(:row_from, :row_to, :col_from, :col_to)
+        when String then
+          from, to = params[0].split(':')
+          row_from, col_from = self.class.ref2ind(from)
+          row_to, col_to = self.class.ref2ind(to) unless to.nil?
+        else
+          raise ArgumentError.new("invalid value for #{self.class}: #{params[0].inspect}") unless params[0].is_a?(String)
+        end
       end
 
       @row_range = Range.new(row_from || 0, row_to || row_from || ROW_MAX)
@@ -29,6 +36,10 @@ module RubyXL
       (@row_range.begin == @row_range.end) && (@col_range.begin == @col_range.end)
     end
 
+    def valid?
+      !(row_range.begin.negative? || col_range.begin.negative?)
+    end
+
     def first_row
       @row_range.begin
     end
@@ -50,15 +61,18 @@ module RubyXL
     end
 
     def cover?(other)
-      !other.nil? && (@row_range.cover?(other.row_range.begin) && @row_range.cover?(other.row_range.end) &&
-                      @col_range.cover?(other.col_range.begin) && @col_range.cover?(other.col_range.end))
+      !other.nil? && (@row_range.cover?(other.row_range.begin) &&
+                      @row_range.cover?(other.row_range.end) &&
+                      @col_range.cover?(other.col_range.begin) &&
+                      @col_range.cover?(other.col_range.end))
     end
 
     def to_s
       if single_cell? then
         self.class.ind2ref(@row_range.begin, @col_range.begin)
       else
-        self.class.ind2ref(@row_range.begin, @col_range.begin) + ':' + self.class.ind2ref(@row_range.end, @col_range.end)
+        self.class.ind2ref(@row_range.begin, @col_range.begin) + ':' +
+                           self.class.ind2ref(@row_range.end, @col_range.end)
       end
     end
 
@@ -71,7 +85,7 @@ module RubyXL
     end
 
     # Converts +row+ and +col+ zero-based indices to Excel-style cell reference
-    # (0) A...Z, AA...AZ, BA... ...ZZ, AAA... ...AZZ, BAA... ...XFD (16383)
+    # <0> A...Z, AA...AZ, BA... ...ZZ, AAA... ...AZZ, BAA... ...XFD <16383>
     def self.ind2ref(row = 0, col = 0)
       str = ''
 
@@ -88,23 +102,18 @@ module RubyXL
     # Converts Excel-style cell reference to +row+ and +col+ zero-based indices.
     def self.ref2ind(str)
       return [ -1, -1 ] unless str =~ /\A([A-Z]+)(\d+)\Z/
-
-      col = 0
-      $1.each_byte { |chr| col = col * 26 + (chr - 64) }
-      [ $2.to_i - 1, col - 1 ]
+      [ Regexp.last_match(2).to_i - 1,
+        Regexp.last_match(1).each_byte.inject(0) { |col, chr| (col * 26) + (chr - 64) } - 1 ]
     end
-
   end
 
   class Sqref < Array
-
     def initialize(str)
       str.split.each { |ref_str| self << RubyXL::Reference.new(ref_str) }
     end
 
     def to_s
-      self.collect{ |ref| ref.to_s }.join(' ')
+      self.collect(&:to_s).join(' ')
     end
-
   end
 end

data/lib/rubyXL/objects/relationships.rb

@@ -2,9 +2,8 @@ require 'pathname'
 require 'rubyXL/objects/ooxml_object'
 
 module RubyXL
-
   class RID < OOXMLObject
-    define_attribute(:'r:id', :string, :required => true)
+    define_relationship(:required => true)
   end
 
   class Relationship < OOXMLObject
@@ -16,7 +15,7 @@ module RubyXL
   end
 
   class OOXMLRelationshipsFile < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-package.relationships+xml'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-package.relationships+xml'.freeze
     SAVE_ORDER = 100
 
     define_child_node(RubyXL::Relationship, :collection => true, :accessor => :relationships)
@@ -28,8 +27,8 @@ module RubyXL
     @@debug_indent = ($DEBUG ? 0 : nil)
 
     def new_relationship(target, type)
-      RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}",
-                               :type => type,
+      RubyXL::Relationship.new(:id     => "rId#{relationships.size + 1}",
+                               :type   => type,
                                :target => target)
     end
     protected :new_relationship
@@ -37,8 +36,8 @@ module RubyXL
     def add_relationship(obj)
       return if obj.nil? || !defined?(obj.class::REL_TYPE) || (obj.respond_to?(:empty?) && obj.empty?)
 
-      relationships << RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}",
-                                                :type => obj.class::REL_TYPE,
+      relationships << RubyXL::Relationship.new(:id     => "rId#{relationships.size + 1}",
+                                                :type   => obj.class::REL_TYPE,
                                                 :target => obj.xlsx_path.relative_path_from(owner.xlsx_path.dirname))
     end
     protected :add_relationship
@@ -96,7 +95,7 @@ module RubyXL
         self.related_files[rel.id] = obj
       }
 
-      @@debug_indent -=2 if @@debug_indent
+      @@debug_indent -= 2 if @@debug_indent
 
       related_files
     end
@@ -131,12 +130,10 @@ module RubyXL
       basename = base_file_path.root? ? '' : base_file_path.basename
       base_file_path.dirname.join('_rels', "#{basename}.rels").cleanpath
     end
-
   end
 
   # +RelationshipSupport+ module enables automatic loading and saving of _rels for the respective file
   module RelationshipSupport
-
     module ClassMehods
       def define_relationship(klass, accessor = nil)
         class_variable_get(:@@ooxml_relationships)[klass] = accessor
@@ -212,7 +209,5 @@ module RubyXL
       end
       self.generic_storage << related_file
     end
-
   end
-
 end

data/lib/rubyXL/objects/root.rb

@@ -5,7 +5,6 @@ require 'rubyXL/objects/content_types'
 require 'rubyXL/objects/workbook'
 
 module RubyXL
-
   class WorkbookRoot
     @@debug = $DEBUG
 
@@ -82,5 +81,4 @@ module RubyXL
       root
     end
   end
-
 end

data/lib/rubyXL/objects/shared_strings.rb

@@ -3,15 +3,14 @@ require 'rubyXL/objects/text'
 require 'rubyXL/objects/extensions'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_sst.html
   class SharedStringsTable < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings'.freeze
 
     # According to http://msdn.microsoft.com/en-us/library/office/gg278314.aspx,
     # +count+ and +uniqueCount+ may be either both missing, or both present. Need to validate.
-    define_attribute(:uniqueCount,  :int)
+    define_attribute(:uniqueCount, :int)
     define_child_node(RubyXL::RichText, :collection => :with_count, :node_name => 'si', :accessor => :strings)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'sst'
@@ -21,7 +20,7 @@ module RubyXL
       super
       # So far, going by the structure that the original creator had in mind. However,
       # since the actual implementation is now extracted into a separate class,
-      # we will be able to transparrently change it later if needs be.
+      # we will be able to transparently change it later if needs be.
       @index_by_content = {}
     end
 
@@ -64,7 +63,5 @@ module RubyXL
     def xlsx_path
       ROOT.join('xl', 'sharedStrings.xml')
     end
-
   end
-
 end

data/lib/rubyXL/objects/sheet_common.rb

@@ -2,7 +2,6 @@ require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/storage'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_webPublishItem-1.html
   class WebPublishingItem < OOXMLObject
     define_attribute(:id,              :int,    :required => true)
@@ -12,7 +11,7 @@ module RubyXL
     define_attribute(:sourceObject,    :string)
     define_attribute(:destinationFile, :string, :required => true)
     define_attribute(:title,           :string)
-    define_attribute(:autoRepublish,   :bool,   :default => false)
+    define_attribute(:autoRepublish,   :bool, :default => false)
     define_element_name 'webPublishItem'
   end
 
@@ -47,5 +46,4 @@ module RubyXL
     define_child_node(RubyXL::StringNode, :node_name => :firstFooter)
     define_element_name 'headerFooter'
   end
-
 end

data/lib/rubyXL/objects/sheet_data.rb

@@ -5,7 +5,6 @@ require 'rubyXL/objects/formula'
 require 'rubyXL/cell'
 
 module RubyXL
-
   # http://msdn.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.cellvalues(v=office.14).aspx
   module DataType
     SHARED_STRING = 's'
@@ -14,7 +13,7 @@ module RubyXL
     ERROR         = 'e'
     BOOLEAN       = 'b'
     NUMBER        = 'n'
-    DATE          = 'd'  # Only available in Office2010.
+    DATE          = 'd' # Only available in Office2010.
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_v-1.html
@@ -35,13 +34,13 @@ module RubyXL
 
     define_attribute(:r,   :ref)
     define_attribute(:s,   :int,  :default => 0, :accessor => :style_index)
-    define_attribute(:t,   RubyXL::ST_CellType,  :accessor => :datatype, :default => 'n' )
+    define_attribute(:t,   RubyXL::ST_CellType,  :accessor => :datatype, :default => 'n')
     define_attribute(:cm,  :int,  :default => 0)
     define_attribute(:vm,  :int,  :default => 0)
     define_attribute(:ph,  :bool, :default => false)
     define_child_node(RubyXL::Formula,   :accessor => :formula)
     define_child_node(RubyXL::CellValue, :accessor => :value_container)
-    define_child_node(RubyXL::RichText)    # is
+    define_child_node(RubyXL::RichText) # is
     define_element_name 'c'
 
     attr_accessor :worksheet
@@ -51,7 +50,7 @@ module RubyXL
     end
 
     def row
-      r && r.first_row
+      r&.first_row
     end
 
     def row=(v)
@@ -59,7 +58,7 @@ module RubyXL
     end
 
     def column
-      r && r.first_col
+      r&.first_col
     end
 
     def column=(v)
@@ -67,7 +66,7 @@ module RubyXL
     end
 
     def raw_value
-      value_container && value_container.value
+      value_container&.value
     end
 
     def raw_value=(v)
@@ -99,8 +98,7 @@ module RubyXL
         else false
         end
 
-      num_fmt = self.number_format
-      num_fmt && num_fmt.is_date_format?
+      self.number_format&.is_date_format?
     end
 
     # Gets massaged value of the cell, converting datatypes to those known to Ruby (that includes
@@ -112,10 +110,12 @@ module RubyXL
       when RubyXL::DataType::SHARED_STRING then workbook.shared_strings_container[r.to_i].to_s
       when RubyXL::DataType::INLINE_STRING then is.to_s
       when RubyXL::DataType::RAW_STRING    then raw_value
+      when RubyXL::DataType::DATE          then raw_value && DateTime.parse(raw_value)
       else
-        if is_date? then workbook.num_to_date(r.to_f)
+        if is then is.to_s
+        elsif is_date? then workbook.num_to_date(r.to_f)
         elsif r.is_a?(String) && (r =~ NUMBER_REGEXP) then # Numeric
-          if $1 != '' then r.to_f
+          if Regexp.last_match(1) != '' then r.to_f
           else r.to_i
           end
         else r
@@ -133,7 +133,7 @@ module RubyXL
     include LegacyCell
   end
 
-#TODO#<row r="1" spans="1:1" x14ac:dyDescent="0.25">
+#TODO# <row r="1" spans="1:1" x14ac:dyDescent="0.25">
 
   # http://www.datypic.com/sc/ooxml/e-ssml_row-1.html
   class Row < OOXMLObject
@@ -215,7 +215,5 @@ module RubyXL
     def size
       rows.size
     end
-
   end
-
 end

data/lib/rubyXL/objects/simple_types.rb

@@ -140,7 +140,7 @@ module RubyXL
   ST_TextHorzOverflowType = %w{ overflow clip }
   ST_TextVerticalType     = %w{ horz vert vert270 wordArtVert eaVert mongolianVert wordArtVertRtl }
   ST_TextWrappingType     = %w{ none square }
-  ST_TextAnchoringType	  = %w{ t ctr b just dist }
+  ST_TextAnchoringType = %w{ t ctr b just dist }
   ST_TextShapeType        = %w{ textNoShape textPlain textStop textTriangle textTriangleInverted textChevron
                                 textChevronInverted textRingInside textRingOutside textArchUp textArchDown
                                 textCircle textButton textArchUpPour textArchDownPour textCirclePour textButtonPour
@@ -223,6 +223,8 @@ module RubyXL
 
   ST_TextUnderlineType    = %w{ none words sng dbl heavy dotted dottedHeavy dash dashHeavy dashLong dashLongHeavy
                                 dotDash dotDashHeavy dotDotDash dotDotDashHeavy wavy wavyHeavy wavyDbl }
+  ST_UnderlineValues      = %w{ single double singleAccounting doubleAccounting none }
+
   ST_TextStrikeType       = %w{ noStrike sngStrike dblStrike }
   ST_TextCapsType         = %w{ none small all }
 

data/lib/rubyXL/objects/storage.rb

@@ -1,5 +1,4 @@
 module RubyXL
-
   class GenericStorageObject
     SAVE_ORDER = 0
 
@@ -12,7 +11,7 @@ module RubyXL
     end
 
     def self.parse_file(zip_file, file_path)
-      (entry = zip_file.find_entry(RubyXL::from_root(file_path))) && self.new(file_path, entry.get_input_stream { |f| f.read })
+      (entry = zip_file.find_entry(RubyXL::from_root(file_path))) && self.new(file_path, entry.get_input_stream(&:read))
     end
 
     def add_to_zip(zip_stream)
@@ -24,18 +23,18 @@ module RubyXL
   end
 
   class PrinterSettingsFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.printerSettings'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings'.freeze
   end
 
   class CustomPropertyFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.customProperty'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/customProperty'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.customProperty'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/customProperty'.freeze
   end
 
   class DrawingFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawing+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawing+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -46,12 +45,11 @@ module RubyXL
       else store_relationship(rf, :unknown)
       end
     end
-
   end
 
   class ChartFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -63,18 +61,17 @@ module RubyXL
       else store_relationship(rf, :unknown)
       end
     end
-
   end
 
   class BinaryImageFile < GenericStorageObject
-    CONTENT_TYPE = 'image/jpeg'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image'
+    CONTENT_TYPE = 'image/jpeg'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image'.freeze
   end
 
   class VMLDrawingFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.vmlDrawing'
-#    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'
-    REL_TYPE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.vmlDrawing'.freeze
+#    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'.freeze
+    REL_TYPE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -82,32 +79,33 @@ module RubyXL
   end
 
   class ChartColorsFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-office.chartcolorstyle+xml'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2011/relationships/chartColorStyle'
+    CONTENT_TYPE = 'application/vnd.ms-office.chartcolorstyle+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2011/relationships/chartColorStyle'.freeze
   end
 
   class ChartStyleFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-office.chartstyle+xml'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2011/relationships/chartStyle'
+    CONTENT_TYPE = 'application/vnd.ms-office.chartstyle+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2011/relationships/chartStyle'.freeze
   end
 
   class TableFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/table'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/table'.freeze
   end
 
   class ControlPropertiesFile < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp'
+    CONTENT_TYPE = 'application/vnd.ms-excel.controlproperties+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp'.freeze
   end
 
   class PivotCacheRecordsFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheRecords'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheRecords'.freeze
   end
 
   class PivotCacheDefinitionFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -115,8 +113,8 @@ module RubyXL
   end
 
   class PivotTableFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -124,64 +122,72 @@ module RubyXL
   end
 
   class HyperlinkRelFile < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink'.freeze
   end
 
   class ThumbnailFile < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail'
-    CONTENT_TYPE = 'image/x-wmf'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail'.freeze
+    CONTENT_TYPE = 'image/x-wmf'.freeze
   end
 
   class ChartUserShapesFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartUserShapes'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chartUserShapes'.freeze
   end
 
   class CustomPropertiesFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.custom-properties+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.custom-properties+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties'.freeze
   end
 
   class MacrosFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-office.vbaProject'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2006/relationships/vbaProject'
+    CONTENT_TYPE = 'application/vnd.ms-office.vbaProject'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2006/relationships/vbaProject'.freeze
   end
 
   class CustomXMLFile < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml'.freeze
   end
 
   class SlicerFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-excel.slicer+xml'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2007/relationships/slicer'
+    CONTENT_TYPE = 'application/vnd.ms-excel.slicer+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2007/relationships/slicer'.freeze
   end
 
   class SlicerCacheFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.ms-excel.slicerCache+xml'
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2007/relationships/slicerCache'
+    CONTENT_TYPE = 'application/vnd.ms-excel.slicerCache+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2007/relationships/slicerCache'.freeze
   end
 
   class OLEObjectFile < GenericStorageObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.oleObject'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.oleObject'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject'.freeze
+  end
+
+  class SheetMetadata < GenericStorageObject
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMetadata+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sheetMetadata'.freeze
+  end
+
+  class PersonMetadata < GenericStorageObject
+    CONTENT_TYPE = 'application/vnd.ms-excel.person+xml'.freeze
+    REL_TYPE     = 'http://schemas.microsoft.com/office/2017/10/relationships/person'.freeze
   end
 
   class ActiveX < GenericStorageObject
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/control'
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/control'.freeze
 
     include RubyXL::RelationshipSupport
 
     def attach_relationship(rid, rf)
       case rf
-      when RubyXL::ChartFile       then store_relationship(rf) # TODO
+      when RubyXL::ChartFile then store_relationship(rf) # TODO
       else store_relationship(rf, :unknown)
       end
     end
-
   end
 
   class ActiveXBinary < GenericStorageObject
-    REL_TYPE     = 'http://schemas.microsoft.com/office/2006/relationships/activeXControlBinary'
+    REL_TYPE = 'http://schemas.microsoft.com/office/2006/relationships/activeXControlBinary'.freeze
   end
-
 end