rubyXL 3.3.33 → 3.4.25

data/lib/rubyXL/objects/workbook.rb

@@ -1,6 +1,4 @@
-#require 'tmpdir'
 require 'date'
-require 'rubyXL/convenience_methods'
 require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/shared_strings'
 require 'rubyXL/objects/stylesheet'
@@ -8,13 +6,13 @@ require 'rubyXL/objects/theme'
 require 'rubyXL/objects/calculation_chain'
 require 'rubyXL/objects/worksheet'
 require 'rubyXL/objects/chartsheet'
+require 'rubyXL/objects/connection'
 require 'rubyXL/objects/relationships'
 require 'rubyXL/objects/simple_types'
 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,18 +296,25 @@ 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_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 = /[\/\\*\[\]:?]/
+
+    # 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
 
     def content_type
-      if macros then CONTENT_TYPE_WITH_MACROS else CONTENT_TYPE end
+      content_type_name = 'CONTENT_TYPE'
+      content_type_name << '_TEMPLATE' if is_template
+      content_type_name << '_WITH_MACROS' if macros
+      self.class.const_get(content_type_name)
     end
 
     def related_objects
@@ -322,11 +327,12 @@ module RubyXL
     define_relationship(RubyXL::CalculationChain,   :calculation_chain)
     define_relationship(RubyXL::Worksheet,          false)
     define_relationship(RubyXL::Chartsheet,         false)
+    define_relationship(RubyXL::Connections)
     define_relationship(RubyXL::ExternalLinksFile)
     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_child_node(RubyXL::FileVersion)
@@ -352,12 +358,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 :worksheets, :is_template
 
     def before_write_xml
       max_sheet_id = worksheets.collect(&:sheet_id).compact.max || 0
@@ -368,6 +374,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),
@@ -392,11 +399,11 @@ module RubyXL
       dst_file_path ||= root.source_file_path
 
       extension = File.extname(dst_file_path)
-      unless %w{.xlsx .xlsm}.include?(extension.downcase)
-        raise "Unsupported extension: #{extension} (only .xlsx and .xlsm files are supported)."
+      unless %w{.xlsx .xlsm .xltx .xltm}.include?(extension.downcase)
+        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
@@ -413,16 +420,22 @@ module RubyXL
     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
+      if num < MARCH_1_1900 then
         num += 1 unless workbook_properties && 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
@@ -431,7 +444,8 @@ module RubyXL
     APPVERSION  = '12.0000'
 
     def initialize(worksheets = [], src_file_path = nil, creator = nil, modifier = nil, created_at = nil,
-                   company = '', application = APPLICATION, appversion = APPVERSION, date1904 = 0)
+                   company = '', application = APPLICATION, appversion = APPVERSION, date1904 = 0,
+                   is_template = false)
       super()
 
       # Order of sheets in the +worksheets+ array corresponds to the order of pages in Excel UI.
@@ -456,9 +470,102 @@ module RubyXL
       self.creator     = creator
       self.modifier    = modifier
       self.date1904    = date1904 > 0
+      self.is_template = is_template
     end
 
-    include WorkbookConvenienceMethods
-  end
+    SHEET_NAME_TEMPLATE = 'Sheet%d'
+
+    # Finds worksheet by its name or numerical index
+    def [](ind)
+      case ind
+      when Integer then worksheets[ind]
+      when String  then worksheets.find { |ws| ws.sheet_name == ind }
+      end
+    end
+
+    # Create new simple worksheet and add it to the workbook worksheets
+    #
+    # @param [String] The name for the new worksheet
+    def add_worksheet(name = nil)
+      if name.nil? then
+        n = 0
+
+        begin
+          name = SHEET_NAME_TEMPLATE % (n += 1)
+        end until self[name].nil?
+      end
+
+      new_worksheet = Worksheet.new(:workbook => self, :sheet_name => name)
+      worksheets << new_worksheet
+      new_worksheet
+    end
+
+    def created_at
+      root.core_properties.created_at
+    end
+
+    def created_at=(v)
+      root.core_properties.created_at = v
+    end
+
+    def modified_at
+      root.core_properties.modified_at
+    end
+
+    def modified_at=(v)
+      root.core_properties.modified_at = v
+    end
+
+    def company
+      root.document_properties.company && root.document_properties.company.value
+    end
 
+    def company=(v)
+      root.document_properties.company ||= StringNode.new
+      root.document_properties.company.value = v
+    end
+
+    def application
+      root.document_properties.application && root.document_properties.application.value
+    end
+
+    def application=(v)
+      root.document_properties.application ||= StringNode.new
+      root.document_properties.application.value = v
+    end
+
+    def appversion
+      root.document_properties.app_version && root.document_properties.app_version.value
+    end
+
+    def appversion=(v)
+      root.document_properties.app_version ||= StringNode.new
+      root.document_properties.app_version.value = v
+    end
+
+    def creator
+      root.core_properties.creator
+    end
+
+    def creator=(v)
+      root.core_properties.creator = v
+    end
+
+    def modifier
+      root.core_properties.modifier
+    end
+
+    def modifier=(v)
+      root.core_properties.modifier = v
+    end
+
+    def date1904
+      workbook_properties && 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

@@ -10,11 +10,11 @@ require 'rubyXL/objects/column_range'
 require 'rubyXL/objects/filters'
 require 'rubyXL/objects/data_validation'
 require 'rubyXL/objects/comments'
+require 'rubyXL/objects/connection'
+require 'rubyXL/objects/query_table'
 require 'rubyXL/worksheet'
-require 'rubyXL/convenience_methods'
 
 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
@@ -57,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)
@@ -82,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
 
@@ -165,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
@@ -211,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)
@@ -300,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)
@@ -322,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
 
@@ -338,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
 
@@ -407,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)
@@ -432,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
 
@@ -488,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
 
@@ -545,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)
@@ -571,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
@@ -596,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
@@ -613,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
 
@@ -634,6 +634,7 @@ module RubyXL
     define_relationship(RubyXL::SlicerFile)
     define_relationship(RubyXL::OLEObjectFile)
     define_relationship(RubyXL::ActiveX)
+    define_relationship(RubyXL::QueryTable)
 
     define_child_node(RubyXL::WorksheetProperties)
     define_child_node(RubyXL::WorksheetDimensions)
@@ -649,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)
@@ -675,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
 
@@ -742,8 +743,20 @@ module RubyXL
       sheet_obj
     end
 
+    def get_col_xf(column_index)
+      workbook.stylesheet.cell_xfs[get_col_style(column_index)]
+    end
+
+    def get_row_xf(row)
+      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
-    include WorksheetConvenienceMethods
   end
-
 end

data/lib/rubyXL/parser.rb

@@ -1,6 +1,5 @@
 module RubyXL
   class Parser
-
     # Parse <tt>.xslx</tt> file by reading it from local disk.
     def self.parse(src_file_path)
       begin
@@ -18,12 +17,11 @@ module RubyXL
     def self.parse_buffer(buffer)
       root = nil # Zip::File.open_buffer somehow fails to return the value from the block :(
       begin
-        ::Zip::File.open_buffer(buffer) { |zip_file| root = RubyXL::WorkbookRoot.parse_zip_file(zip_file)  } 
+        ::Zip::File.open_buffer(buffer) { |zip_file| root = RubyXL::WorkbookRoot.parse_zip_file(zip_file) }
         root.workbook
       rescue ::Zip::Error => e
         raise e, "XLSX file format error: #{e}", e.backtrace
       end
     end
-
   end
 end