rubyXL 3.4.14 → 3.4.33

data/lib/rubyXL/objects/stylesheet.rb

@@ -6,7 +6,6 @@ require 'rubyXL/objects/border'
 require 'rubyXL/objects/extensions'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_numFmt-1.html
   class NumberFormat < OOXMLObject
     define_attribute(:numFmtId,   :int,    :required => true)
@@ -15,9 +14,8 @@ module RubyXL
 
     def is_date_format?
       #             v-------- Toss all the escaped chars -------v v--- and see if any date-related remained
-      !!(format_code.gsub(/(\"[^\"]*\"|\[[^\]]*\]|[\\_*].)/i, '') =~ /[dmyhs]/i)
+      !!(format_code.gsub(/("[^"]*"|\[[^\]]*\]|[\\_*].)/i, '') =~ /[dmyhs]/i)
     end
-
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_numFmts-1.html
@@ -63,7 +61,6 @@ module RubyXL
     def find_by_format_id(format_id)
       self.find { |fmt| fmt.num_fmt_id == format_id }
     end
-
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_cellStyleXfs-1.html
@@ -82,11 +79,8 @@ module RubyXL
     define_element_name 'cellXfs'
 
     def self.default
-      self.new(:_ => [
-                 RubyXL::XF.new(
-                   :num_fmt_id => 0, :font_id => 0, :fill_id => 0, :border_id => 0, :xfId => 0
-                 )
-               ])
+      self.new(:_ => [ RubyXL::XF.new(:num_fmt_id => 0, :font_id => 0, :fill_id => 0,
+                                      :border_id => 0, :xfId => 0) ])
     end
   end
 
@@ -161,8 +155,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_styleSheet.html
   class Stylesheet < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles'.freeze
 
     define_child_node(RubyXL::NumberFormats, :accessor => :number_formats)
     define_child_node(RubyXL::Fonts)
@@ -176,11 +170,11 @@ module RubyXL
     define_child_node(RubyXL::Colors)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'styleSheet'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main'           => nil,
                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r',
-                   'http://schemas.openxmlformats.org/markup-compatibility/2006' => 'mc',
-                   'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac' => 'x14ac',
-                   'urn:schemas-microsoft-com:mac:vml' => 'mv')
+                   'http://schemas.openxmlformats.org/markup-compatibility/2006'         => 'mc',
+                   'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac'         => 'x14ac',
+                   'urn:schemas-microsoft-com:mac:vml'                                   => 'mv')
 
     def initialize(*args)
       super
@@ -226,7 +220,5 @@ module RubyXL
 
       return max_fmt_id
     end
-
   end
-
 end

data/lib/rubyXL/objects/text.rb

@@ -4,7 +4,6 @@ require 'rubyXL/objects/container_nodes'
 require 'rubyXL/objects/color'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_t-1.html
   class Text < OOXMLObject
     define_attribute(:_,           :string, :accessor => :value)
@@ -19,12 +18,12 @@ module RubyXL
 
     def before_write_xml
       preserve_whitespace
-      self.value.gsub!(INVALID_XML10_CHARS) { |c| "_x%04x_" % c.ord }
+      self.value.gsub(INVALID_XML10_CHARS) { |bad_char| format('_x%04x_', bad_char.ord) }
       true
     end
 
     def to_s
-      value.to_s.gsub(ESCAPED_UNICODE) { |m| $1.hex.chr(::Encoding::UTF_8) }
+      value.to_s.gsub(ESCAPED_UNICODE) { Regexp.last_match(1).hex.chr(::Encoding::UTF_8) }
     end
   end
 
@@ -57,7 +56,6 @@ module RubyXL
     def to_s
       t.to_s
     end
-
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_rPh-1.html
@@ -70,7 +68,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_phoneticPr-1.html
   class PhoneticProperties < OOXMLObject
-    define_attribute(:fontId,    :int,    :required => true)
+    define_attribute(:fontId,    :int, :required => true)
     define_attribute(:type,      RubyXL::ST_PhoneticType,      :default => 'fullwidthKatakana')
     define_attribute(:alignment, RubyXL::ST_PhoneticAlignment, :default => 'left')
     define_element_name 'phoneticPr'
@@ -85,10 +83,10 @@ module RubyXL
     define_element_name 'is'
 
     def to_s
-      str = if t.nil? then '' else t.to_s end
-      r && r.each { |rtr| str << rtr.to_s if rtr }
+      # `dup` here unfreezes the string since it's not a constant but initial value
+      str = t.nil? ? ''.dup : t.to_s
+      r&.each { |rtr| str << rtr.to_s if rtr }
       str
     end
   end
-
 end

data/lib/rubyXL/objects/theme.rb

@@ -1,9 +1,7 @@
-# encoding: UTF-8  <-- magic comment, need this because of sime fancy fonts in the default scheme below. See http://stackoverflow.com/questions/6444826/ruby-utf-8-file-encoding
 require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/extensions'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-a_ext-1.html
   class AExtension < OOXMLObject
     define_attribute(:uri, :string)
@@ -19,7 +17,6 @@ module RubyXL
     def write_xml(xml, node_name_override = nil)
       self.raw_xml
     end
-
   end
 
   class AExtensionStorageArea < OOXMLObject
@@ -1164,7 +1161,7 @@ module RubyXL
   class CT_Hyperlink < OOXMLObject
     define_child_node(RubyXL::CT_EmbeddedWAVAudioFile)
     define_child_node(RubyXL::AExtensionStorageArea)
-    define_attribute(:'r:id',         :string)
+    define_relationship
     define_attribute(:invalidUrl,     :string, :default => '')
     define_attribute(:action,         :string, :default => '')
     define_attribute(:tgtFrame,       :string, :default => '')
@@ -1183,7 +1180,7 @@ module RubyXL
     define_child_node(RubyXL::CT_GradientFillProperties)
     define_child_node(RubyXL::CT_BlipFillProperties)
     define_child_node(RubyXL::CT_PatternFillProperties)
-    define_child_node(RubyXL::BooleanValue,      :node_name => 'a:grpFill')
+    define_child_node(RubyXL::BooleanValue, :node_name => 'a:grpFill')
     # -- EG_EffectProperties
     define_child_node(RubyXL::CT_EffectList)
     define_child_node(RubyXL::CT_EffectContainer, :node_name => 'a:effectDag')
@@ -1373,8 +1370,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-a_theme.html
   class Theme < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.theme+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.theme+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme'.freeze
 
     define_attribute(:name, :string, :default => '')
     define_child_node(RubyXL::ThemeElements)
@@ -1392,21 +1389,21 @@ module RubyXL
     end
 
     def get_theme_color(idx)
-      color_scheme = a_theme_elements && a_theme_elements.a_clr_scheme
-
-      if color_scheme then
-        case idx
-        when 0 then color_scheme.a_lt1
-        when 1 then color_scheme.a_dk1
-        when 2 then color_scheme.a_lt2
-        when 3 then color_scheme.a_dk2
-        when 4 then color_scheme.a_accent1
-        when 5 then color_scheme.a_accent2
-        when 6 then color_scheme.a_accent3
-        when 7 then color_scheme.a_accent4
-        when 8 then color_scheme.a_accent5
-        when 9 then color_scheme.a_accent6
-        end
+      color_scheme = a_theme_elements&.a_clr_scheme
+
+      return unless color_scheme
+
+      case idx
+      when 0 then color_scheme.a_lt1
+      when 1 then color_scheme.a_dk1
+      when 2 then color_scheme.a_lt2
+      when 3 then color_scheme.a_dk2
+      when 4 then color_scheme.a_accent1
+      when 5 then color_scheme.a_accent2
+      when 6 then color_scheme.a_accent3
+      when 7 then color_scheme.a_accent4
+      when 8 then color_scheme.a_accent5
+      when 9 then color_scheme.a_accent6
       end
     end
 
@@ -1729,7 +1726,5 @@ module RubyXL
 </a:theme>'
       self.parse(default_theme)
     end
-
   end
-
 end

data/lib/rubyXL/objects/workbook.rb

@@ -1,4 +1,3 @@
-#require 'tmpdir'
 require 'date'
 require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/shared_strings'
@@ -14,7 +13,6 @@ require 'rubyXL/objects/extensions'
 require 'rubyXL/objects/external_links'
 
 module RubyXL
-
   # Eventually, the entire code for Workbook will be moved here.
 
   # http://www.datypic.com/sc/ooxml/e-ssml_fileVersion-1.html
@@ -37,7 +35,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_workbookPr-1.html
   class WorkbookProperties < OOXMLObject
-    define_attribute(:date1904,                   :bool,   :default => false)
+    define_attribute(:date1904,                   :bool, :default => false)
     define_attribute(:showObjects,                RubyXL::ST_Objects, :default => 'all')
     define_attribute(:showBorderUnselectedTables, :bool,   :default => true)
     define_attribute(:filterPrivacy,              :bool,   :default => false)
@@ -98,7 +96,7 @@ module RubyXL
     define_attribute(:name,            :string, :required => true)
     define_attribute(:sheetId,         :int,    :required => true)
     define_attribute(:state,           RubyXL::ST_Visibility, :default => 'visible')
-    define_attribute(:'r:id',          :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'sheet'
   end
 
@@ -110,7 +108,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_externalReference-1.html
   class ExternalReference < OOXMLObject
-    define_attribute(:'r:id', :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'externalReference'
   end
 
@@ -152,8 +150,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_pivotCache-1.html
   class PivotCache < OOXMLObject
-    define_attribute(:cacheId, :int,    :required => true)
-    define_attribute(:'r:id',  :string, :required => true)
+    define_attribute(:cacheId, :int, :required => true)
+    define_relationship(:required => true)
     define_element_name 'pivotCache'
   end
 
@@ -186,7 +184,7 @@ module RubyXL
     define_attribute(:vml,              :bool,   :default => false)
     define_attribute(:allowPng,         :bool,   :default => false)
     define_attribute(:targetScreenSize, RubyXL::ST_TargetScreenSize, :default => '800x600')
-    define_attribute(:dpi,              :int,    :default => 96)
+    define_attribute(:dpi,              :int, :default => 96)
     define_attribute(:codePage,         :int)
     define_element_name 'webPublishing'
   end
@@ -195,7 +193,7 @@ module RubyXL
   class CalculationProperties < OOXMLObject
     define_attribute(:calcId,                :int)
     define_attribute(:calcMode,              RubyXL::ST_CalcMode, :default => 'auto')
-    define_attribute(:fullCalcOnLoad,        :bool,   :default => false)
+    define_attribute(:fullCalcOnLoad,        :bool, :default => false)
     define_attribute(:refMode,               RubyXL::ST_RefMode, :default => 'A1')
     define_attribute(:iterate,               :bool,   :default => false)
     define_attribute(:iterateCount,          :int,    :default => 100)
@@ -216,7 +214,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 'webPublishObject'
   end
 
@@ -228,7 +226,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_smartTagPr-1.html
   class SmartTagProperties < OOXMLObject
-    define_attribute(:embed, :bool,   :default => false)
+    define_attribute(:embed, :bool, :default => false)
     define_attribute(:show,  RubyXL::ST_SmartTagShow, :default => 'all')
     define_element_name 'smartTagPr'
   end
@@ -280,7 +278,7 @@ module RubyXL
     define_attribute(:yWindow,              :int,    :default => 0)
     define_attribute(:windowWidth,          :int)
     define_attribute(:windowHeight,         :int)
-    define_attribute(:tabRatio,             :int,    :default => 600)
+    define_attribute(:tabRatio,             :int, :default => 600)
     define_attribute(:activeSheetId,        :int)
     define_attribute(:showFormulaBar,       :bool,   :default => true)
     define_attribute(:showStatusbar,        :bool,   :default => true)
@@ -298,15 +296,17 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_workbook.html
   class Workbook < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml'
-    CONTENT_TYPE_TEMPLATE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml'
-    CONTENT_TYPE_TEMPLATE_WITH_MACROS = 'application/vnd.ms-excel.template.macroEnabled.main+xml'
-    CONTENT_TYPE_WITH_MACROS = 'application/vnd.ms-excel.sheet.macroEnabled.main+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml'.freeze
+    CONTENT_TYPE_TEMPLATE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml'.freeze
+    CONTENT_TYPE_TEMPLATE_WITH_MACROS = 'application/vnd.ms-excel.template.macroEnabled.main+xml'.freeze
+    CONTENT_TYPE_WITH_MACROS = 'application/vnd.ms-excel.sheet.macroEnabled.main+xml'.freeze
+    REL_TYPE = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument'.freeze
 
     # http://www.accountingweb.com/technology/excel/seven-characters-you-cant-use-in-worksheet-names
-    SHEET_NAME_FORBIDDEN_CHARS = /[\/\\\*\[\]\:\?]/
-    #SHEET_NAME_FORBIDDEN_NAMES = [ 'History' ]
+    SHEET_NAME_FORBIDDEN_CHARS = %r{[/\\*\[\]:?]}
+
+    # https://answers.microsoft.com/en-us/msoffice/forum/all/excel-history-is-a-reserved-name-help/f8a398a4-b72c-48e3-82da-4f132c305e91
+    SHEET_NAME_FORBIDDEN_NAMES = [ 'History' ]
 
     include RubyXL::RelationshipSupport
 
@@ -332,8 +332,9 @@ module RubyXL
     define_relationship(RubyXL::PivotCacheDefinitionFile)
     define_relationship(RubyXL::PivotCacheRecordsFile)
     define_relationship(RubyXL::CustomXMLFile)
-    define_relationship(RubyXL::MacrosFile,         :macros)
+    define_relationship(RubyXL::MacrosFile, :macros)
     define_relationship(RubyXL::SlicerCacheFile)
+    define_relationship(RubyXL::PersonMetadata)
 
     define_child_node(RubyXL::FileVersion)
     define_child_node(RubyXL::FileSharing)
@@ -358,13 +359,12 @@ module RubyXL
     define_child_node(RubyXL::ExtensionStorageArea)
 
     define_element_name 'workbook'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main'           => nil,
                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r',
-                   'http://schemas.openxmlformats.org/markup-compatibility/2006' => 'mc',
-                   'http://schemas.microsoft.com/office/spreadsheetml/2010/11/main' => 'x15')
+                   'http://schemas.openxmlformats.org/markup-compatibility/2006'         => 'mc',
+                   'http://schemas.microsoft.com/office/spreadsheetml/2010/11/main'      => 'x15')
 
-    attr_accessor :worksheets
-    attr_accessor :is_template
+    attr_accessor :worksheets, :is_template
 
     def before_write_xml
       max_sheet_id = worksheets.collect(&:sheet_id).compact.max || 0
@@ -375,6 +375,7 @@ module RubyXL
         rel = relationship_container.find_by_target(sheet.xlsx_path)
 
         raise "Worksheet name '#{sheet.sheet_name}' contains forbidden characters" if sheet.sheet_name =~ SHEET_NAME_FORBIDDEN_CHARS
+        raise "Worksheet name '#{sheet.sheet_name}' is forbidden" if SHEET_NAME_FORBIDDEN_NAMES.include?(sheet.sheet_name)
 
         sheets << RubyXL::Sheet.new(:name     => sheet.sheet_name[0..30], # Max sheet name length is 31 char
                                     :sheet_id => sheet.sheet_id || (max_sheet_id += 1),
@@ -403,33 +404,39 @@ module RubyXL
         raise "Unsupported extension: #{extension} (only .xlsx, .xlsm, .xltx and .xltm files are supported)."
       end
 
-      File.open(dst_file_path, "wb") { |output_file| FileUtils.copy_stream(root.stream, output_file) }
+      File.open(dst_file_path, 'wb') { |output_file| FileUtils.copy_stream(root.stream, output_file) }
 
       return dst_file_path
     end
     alias_method :write, :save
 
     DATE1904 = DateTime.new(1904, 1, 1)
-    # Subtracting one day to accomodate for erroneous 1900 leap year compatibility only for 1900 based dates
+    # Subtracting one day to accommodate for erroneous 1900 leap year compatibility only for 1900 based dates
     DATE1899 = DateTime.new(1899, 12, 31) - 1
     MARCH_1_1900 = 61
 
     def base_date
-      (workbook_properties && workbook_properties.date1904) ? DATE1904 : DATE1899
+      workbook_properties&.date1904 ? DATE1904 : DATE1899
     end
     private :base_date
 
     def date_to_num(date)
-      date && (date.ajd - base_date().ajd).to_f
+      case date
+      when Date, DateTime then (date.ajd - base_date.ajd).to_f
+      when Time then ((date.to_r - base_date.to_time.to_r) / 86400).to_f
+      end
     end
 
     def num_to_date(num)
+      return nil if num.nil?
+
       # Bug-for-bug Excel compatibility (https://support.microsoft.com/kb/214058/)
-      if num && num < MARCH_1_1900 then
-        num += 1 unless workbook_properties && workbook_properties.date1904
+      if num < MARCH_1_1900 then
+        num += 1 unless workbook_properties&.date1904
       end
 
-      num && (base_date + num)
+      dateparts = num.divmod(1)
+      base_date + (dateparts[0] + ((dateparts[1] * 86400).round(6) / 86400))
     end
 
     include Enumerable
@@ -511,7 +518,7 @@ module RubyXL
     end
 
     def company
-      root.document_properties.company && root.document_properties.company.value
+      root.document_properties.company&.value
     end
 
     def company=(v)
@@ -520,7 +527,7 @@ module RubyXL
     end
 
     def application
-      root.document_properties.application && root.document_properties.application.value
+      root.document_properties.application&.value
     end
 
     def application=(v)
@@ -529,7 +536,7 @@ module RubyXL
     end
 
     def appversion
-      root.document_properties.app_version && root.document_properties.app_version.value
+      root.document_properties.app_version&.value
     end
 
     def appversion=(v)
@@ -554,14 +561,12 @@ module RubyXL
     end
 
     def date1904
-      workbook_properties && workbook_properties.date1904
+      workbook_properties&.date1904
     end
 
     def date1904=(v)
       self.workbook_properties ||= RubyXL::WorkbookProperties.new
       workbook_properties.date1904 = v
     end
-
   end
-
 end

data/lib/rubyXL/objects/worksheet.rb

@@ -15,7 +15,6 @@ require 'rubyXL/objects/query_table'
 require 'rubyXL/worksheet'
 
 module RubyXL
-
   # Eventually, the entire code for Worksheet will be moved here. One small step at a time!
 
   # http://www.datypic.com/sc/ooxml/e-ssml_outlinePr-1.html
@@ -58,7 +57,7 @@ module RubyXL
   end
 
   class WorksheetFormatProperties < OOXMLObject
-    define_attribute(:baseColWidth,     :int,    :default => 8)
+    define_attribute(:baseColWidth,     :int, :default => 8)
     define_attribute(:defaultColWidth,  :double)
     define_attribute(:defaultRowHeight, :double, :required => true)
     define_attribute(:customHeight,     :bool,   :default => false)
@@ -83,12 +82,12 @@ module RubyXL
     define_attribute(:blackAndWhite,      :bool,   :default => false)
     define_attribute(:draft,              :bool,   :default => false)
     define_attribute(:cellComments,       RubyXL::ST_CellComments, :default => 'none')
-    define_attribute(:useFirstPageNumber, :bool,   :default => false)
+    define_attribute(:useFirstPageNumber, :bool, :default => false)
     define_attribute(:errors,             RubyXL::ST_PrintError, :default => 'displayed')
     define_attribute(:horizontalDpi,      :int,    :default => 600)
     define_attribute(:verticalDpi,        :int,    :default => 600)
     define_attribute(:copies,             :int,    :default => 1)
-    define_attribute(:'r:id',             :string)
+    define_relationship
     define_element_name 'pageSetup'
   end
 
@@ -166,7 +165,7 @@ module RubyXL
   class ConditionalFormatValue < OOXMLObject
     define_attribute(:type, RubyXL::ST_CfvoType, :required => true)
     define_attribute(:val,  :string)
-    define_attribute(:gte,  :bool,   :default => true)
+    define_attribute(:gte,  :bool, :default => true)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'cfvo'
   end
@@ -174,7 +173,7 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_colorScale-1.html
   class ColorScale < OOXMLObject
     define_child_node(RubyXL::ConditionalFormatValue, :collection => true, :accessor => :cfvo)
-    define_child_node(RubyXL::Color)
+    define_child_node(RubyXL::Color, :collection => true)
     define_element_name 'colorScale'
   end
 
@@ -184,7 +183,7 @@ module RubyXL
     define_attribute(:maxLength, :int,  :default => 90)
     define_attribute(:showValue, :bool, :default => true)
     define_child_node(RubyXL::ConditionalFormatValue, :collection => true, :accessor => :cfvo)
-    define_child_node(RubyXL::Color)
+    define_child_node(RubyXL::Color, :collection => true)
     define_element_name 'dataBar'
   end
 
@@ -212,7 +211,7 @@ module RubyXL
     define_attribute(:timePeriod,   RubyXL::ST_TimePeriod)
     define_attribute(:rank,         :int)
     define_attribute(:stdDev,       :int)
-    define_attribute(:equalAverage, :bool,   :default  => false)
+    define_attribute(:equalAverage, :bool, :default => false)
     define_child_node(RubyXL::Formula, :collection => true, :node_name => :formula, :accessor => :formulas)
     define_child_node(RubyXL::ColorScale)
     define_child_node(RubyXL::DataBar)
@@ -301,8 +300,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_hyperlink-1.html
   class Hyperlink < OOXMLObject
-    define_attribute(:ref,      :ref,    :required => true)
-    define_attribute(:'r:id',   :string)
+    define_attribute(:ref, :ref, :required => true)
+    define_relationship
     define_attribute(:location, :string)
     define_attribute(:tooltip,  :string)
     define_attribute(:display,  :string)
@@ -323,7 +322,7 @@ module RubyXL
     define_attribute(:oleUpdate, RubyXL::ST_OleUpdate)
     define_attribute(:autoLoad,  :bool, :default => false)
     define_attribute(:shapeId,   :int,  :required => true)
-    define_attribute(:'r:id',    :string)
+    define_relationship
     define_element_name 'oleObject'
   end
 
@@ -339,7 +338,7 @@ module RubyXL
     define_attribute(:ref,    :ref)
     define_attribute(:name,   :string)
     define_attribute(:sheet,  :string)
-    define_attribute(:'r:id', :string)
+    define_relationship
     define_element_name 'dataRef'
   end
 
@@ -408,9 +407,9 @@ module RubyXL
     define_attribute(:hiddenRows,     :bool,   :default => false)
     define_attribute(:hiddenColumns,  :bool,   :default => false)
     define_attribute(:state,          RubyXL::ST_Visibility, :default => 'visible')
-    define_attribute(:filterUnique,   :bool,   :default => false)
+    define_attribute(:filterUnique,   :bool, :default => false)
     define_attribute(:view,           RubyXL::ST_SheetViewType, :default => 'normal')
-    define_attribute(:showRuler,      :bool,   :default => true)
+    define_attribute(:showRuler,      :bool, :default => true)
     define_attribute(:topLeftCell,    :ref)
     define_child_node(RubyXL::Pane)
     define_child_node(RubyXL::Selection)
@@ -433,9 +432,9 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_control-1.html
   class EmbeddedControl < OOXMLObject
-    define_attribute(:shapeId, :int,    :required => true)
-    define_attribute(:'r:id',  :string, :required => true)
-    define_attribute(:name,    :string)
+    define_attribute(:shapeId, :int, :required => true)
+    define_relationship(:required => true)
+    define_attribute(:name, :string)
     define_element_name 'control'
   end
 
@@ -489,8 +488,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_customPr-1.html
   class CustomProperty < OOXMLObject
-    define_attribute(:name,   :string, :required => true)
-    define_attribute(:'r:id', :string, :required => true)
+    define_attribute(:name, :string, :required => true)
+    define_relationship(:required => true)
     define_element_name 'customPr'
   end
 
@@ -546,7 +545,7 @@ module RubyXL
     define_attribute(:cacheIndex,    :bool, :default => false)
     define_attribute(:outline,       :bool, :default => true)
     define_attribute(:offset,        :ref)
-    define_attribute(:collapsedLevelsAreSubtotals, :bool,   :default => false)
+    define_attribute(:collapsedLevelsAreSubtotals, :bool, :default => false)
     define_attribute(:axis,          RubyXL::ST_Axis)
     define_attribute(:fieldPosition, :int,  :default => 0)
     define_child_node(RubyXL::PivotReferences)
@@ -572,7 +571,7 @@ module RubyXL
     define_attribute(:previousRow, :uint, :default => 0)
     define_attribute(:previousCol, :uint, :default => 0)
     define_attribute(:click,       :uint, :default => 0)
-    define_attribute(:'r:id',      :string)
+    define_relationship
     define_child_node(RubyXL::PivotArea)
     define_element_name 'pivotSelection'
   end
@@ -597,10 +596,10 @@ module RubyXL
     define_attribute(:zoomScaleNormal,          :uint, :default => 0)
     define_attribute(:zoomScaleSheetLayoutView, :uint, :default => 0)
     define_attribute(:zoomScalePageLayoutView,  :uint, :default => 0)
-    define_attribute(:workbookViewId,           :uint, :required => true, :default => 0 )
+    define_attribute(:workbookViewId,           :uint, :required => true, :default => 0)
     define_child_node(RubyXL::Pane)
     define_child_node(RubyXL::Selection, :collection => true, :accessor => :selections)
-    define_child_node(RubyXL::PivotTableSelection, :collection => true, :accessor => :pivot_table_selections )
+    define_child_node(RubyXL::PivotTableSelection, :collection => true, :accessor => :pivot_table_selections)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'sheetView'
   end
@@ -614,8 +613,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_worksheet.html
   class Worksheet < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -651,7 +650,7 @@ module RubyXL
     define_child_node(RubyXL::SortState)
     define_child_node(RubyXL::DataConsolidate)
     define_child_node(RubyXL::CustomSheetViews)
-    define_child_node(RubyXL::MergedCells,           :accessor => :merged_cells)
+    define_child_node(RubyXL::MergedCells, :accessor => :merged_cells)
     define_child_node(RubyXL::PhoneticProperties)
     define_child_node(RubyXL::ConditionalFormatting, :collection => [0..-1])
     define_child_node(RubyXL::DataValidations)
@@ -677,11 +676,11 @@ module RubyXL
     define_child_node(RubyXL::ExtensionStorageArea)
     define_child_node(RubyXL::AlternateContent)
     define_element_name 'worksheet'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main'           => nil,
                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r',
-                   'http://schemas.openxmlformats.org/markup-compatibility/2006' => 'mc',
-                   'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac' => 'x14ac',
-                   'urn:schemas-microsoft-com:mac:vml' => 'mv')
+                   'http://schemas.openxmlformats.org/markup-compatibility/2006'         => 'mc',
+                   'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac'         => 'x14ac',
+                   'urn:schemas-microsoft-com:mac:vml'                                   => 'mv')
 
     attr_accessor :workbook, :state, :sheet_name, :sheet_id, :rels
 
@@ -752,7 +751,12 @@ module RubyXL
       workbook.stylesheet.cell_xfs[get_row_style(row)]
     end
 
+    def cell_at(ref)
+      reference = RubyXL::Reference.new(ref)
+      raise "Invalid reference: #{ref}" unless reference.valid? && reference.single_cell?
+      sheet_data&.rows&.[](reference.first_row)&.cells&.[](reference.first_col)
+    end
+
     include LegacyWorksheet
   end
-
 end