roo 2.3.0 → 2.10.1

data/lib/roo/excelx/sheet.rb

@@ -4,11 +4,15 @@ module Roo
     class Sheet
       extend Forwardable
 
-      delegate [:styles, :workbook, :shared_strings, :rels_files, :sheet_files, :comments_files] => :@shared
+      delegate [:styles, :workbook, :shared_strings, :rels_files, :sheet_files, :comments_files, :image_rels] => :@shared
+
+      attr_reader :images
 
       def initialize(name, shared, sheet_index, options = {})
         @name = name
         @shared = shared
+        @sheet_index = sheet_index
+        @images = Images.new(image_rels[sheet_index]).list
         @rels = Relationships.new(rels_files[sheet_index])
         @comments = Comments.new(comments_files[sheet_index])
         @sheet = SheetDoc.new(sheet_files[sheet_index], @rels, shared, options)
@@ -19,7 +23,14 @@ module Roo
       end
 
       def present_cells
-        @present_cells ||= cells.select { |_, cell| cell && !cell.empty? }
+        @present_cells ||= begin
+          warn %{
+[DEPRECATION] present_cells is deprecated. Alternate:
+  with activesupport    => cells[key].presence
+  without activesupport => cells[key]&.presence
+          }
+          cells.select { |_, cell| cell&.presence }
+        end
       end
 
       # Yield each row as array of Excelx::Cell objects
@@ -39,33 +50,33 @@ module Roo
 
       def row(row_number)
         first_column.upto(last_column).map do |col|
-          cells[[row_number, col]]
-        end.map { |cell| cell && cell.value }
+          cells[[row_number, col]]&.value
+        end
       end
 
       def column(col_number)
         first_row.upto(last_row).map do |row|
-          cells[[row, col_number]]
-        end.map { |cell| cell && cell.value }
+          cells[[row, col_number]]&.value
+        end
       end
 
       # returns the number of the first non-empty row
       def first_row
-        @first_row ||= present_cells.keys.map { |row, _| row }.min
+        @first_row ||= first_last_row_col[:first_row]
       end
 
       def last_row
-        @last_row ||= present_cells.keys.map { |row, _| row }.max
+        @last_row ||= first_last_row_col[:last_row]
       end
 
       # returns the number of the first non-empty column
       def first_column
-        @first_column ||= present_cells.keys.map { |_, col| col }.min
+        @first_column ||= first_last_row_col[:first_column]
       end
 
       # returns the number of the last non-empty column
       def last_column
-        @last_column ||= present_cells.keys.map { |_, col| col }.max
+        @last_column ||= first_last_row_col[:last_column]
       end
 
       def excelx_format(key)
@@ -107,6 +118,34 @@ module Roo
         (cell.coordinate.column - 1 - last_column).times { pad << nil }
         pad
       end
+
+      def first_last_row_col
+        @first_last_row_col ||= begin
+          first_row = last_row = first_col = last_col = nil
+
+          cells.each do |(row, col), cell|
+            next unless cell&.presence
+            first_row ||= row
+            last_row ||= row
+            first_col ||= col
+            last_col ||= col
+
+            if row > last_row
+              last_row = row
+            elsif row < first_row
+              first_row = row
+            end
+
+            if col > last_col
+              last_col = col
+            elsif col < first_col
+              first_col = col
+            end
+          end
+
+          {first_row: first_row, last_row: last_row, first_column: first_col, last_column: last_col}
+        end
+      end
     end
   end
 end

data/lib/roo/excelx/sheet_doc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 require 'roo/excelx/extractor'
 
@@ -5,7 +7,7 @@ module Roo
   class Excelx
     class SheetDoc < Excelx::Extractor
       extend Forwardable
-      delegate [:styles, :workbook, :shared_strings, :base_date] => :@shared
+      delegate [:workbook] => :@shared
 
       def initialize(path, relationships, shared, options = {})
         super(path)
@@ -19,7 +21,12 @@ module Roo
       end
 
       def hyperlinks(relationships)
-        @hyperlinks ||= extract_hyperlinks(relationships)
+        # If you're sure you're not going to need this hyperlinks you can discard it
+        @hyperlinks ||= if @options[:no_hyperlinks] || !relationships.include_type?("hyperlink")
+          {}
+        else
+          extract_hyperlinks(relationships)
+        end
       end
 
       # Get the dimensions for the sheet.
@@ -39,8 +46,10 @@ module Roo
       def each_cell(row_xml)
         return [] unless row_xml
         row_xml.children.each do |cell_element|
-          key = ::Roo::Utils.ref_to_key(cell_element['r'])
-          yield cell_from_xml(cell_element, hyperlinks(@relationships)[key])
+          coordinate = ::Roo::Utils.extract_coordinate(cell_element["r"])
+          hyperlinks = hyperlinks(@relationships)[coordinate]
+
+          yield cell_from_xml(cell_element, hyperlinks, coordinate)
         end
       end
 
@@ -48,13 +57,13 @@ module Roo
 
       def cell_value_type(type, format)
         case type
-        when 's'.freeze
+        when 's'
           :shared
-        when 'b'.freeze
+        when 'b'
           :boolean
-        when 'str'.freeze
+        when 'str'
           :string
-        when 'inlineStr'.freeze
+        when 'inlineStr'
           :inlinestr
         else
           Excelx::Format.to_type(format)
@@ -69,41 +78,53 @@ module Roo
       #             </c>
       # hyperlink - a String for the hyperlink for the cell or nil when no
       #             hyperlink is present.
+      # coordinate - a Roo::Excelx::Coordinate for the coordinate for the cell
+      #              or nil to extract coordinate from cell_xml.
+      # empty_cell - an Optional Boolean value.
       #
       # Examples
       #
-      #    cells_from_xml(<Nokogiri::XML::Element>, nil)
+      #    cells_from_xml(<Nokogiri::XML::Element>, nil, nil)
       #    # => <Excelx::Cell::String>
       #
       # Returns a type of <Excelx::Cell>.
-      def cell_from_xml(cell_xml, hyperlink)
-        coordinate = extract_coordinate(cell_xml['r'])
-        return Excelx::Cell::Empty.new(coordinate) if cell_xml.children.empty?
+      def cell_from_xml(cell_xml, hyperlink, coordinate, empty_cell=true)
+        coordinate ||= ::Roo::Utils.extract_coordinate(cell_xml["r"])
+        cell_xml_children = cell_xml.children
+        return create_empty_cell(coordinate, empty_cell) if cell_xml_children.empty?
 
         # NOTE: This is error prone, to_i will silently turn a nil into a 0.
         #       This works by coincidence because Format[0] is General.
-        style = cell_xml['s'].to_i
-        format = styles.style_format(style)
-        value_type = cell_value_type(cell_xml['t'], format)
+        style = cell_xml["s"].to_i
         formula = nil
 
-        cell_xml.children.each do |cell|
+        cell_xml_children.each do |cell|
           case cell.name
           when 'is'
-            cell.children.each do |inline_str|
-              if inline_str.name == 't'
-                return Excelx::Cell.create_cell(:string, inline_str.content, formula, style, hyperlink, coordinate)
-              end
+            content = cell.search('t').map(&:content).join
+            unless content.empty?
+              return Excelx::Cell.cell_class(:string).new(content, formula, style, hyperlink, coordinate)
             end
           when 'f'
             formula = cell.content
           when 'v'
-            return create_cell_from_value(value_type, cell, formula, format, style, hyperlink, base_date, coordinate)
+            format = style_format(style)
+            value_type = cell_value_type(cell_xml["t"], format)
+
+            return create_cell_from_value(value_type, cell, formula, format, style, hyperlink, coordinate)
           end
         end
+
+        create_empty_cell(coordinate, empty_cell)
+      end
+
+      def create_empty_cell(coordinate, empty_cell)
+        if empty_cell
+          Excelx::Cell::Empty.new(coordinate)
+        end
       end
 
-      def create_cell_from_value(value_type, cell, formula, format, style, hyperlink, base_date, coordinate)
+      def create_cell_from_value(value_type, cell, formula, format, style, hyperlink, coordinate)
         # NOTE: format.to_s can replace excelx_type as an argument for
         #       Cell::Time, Cell::DateTime, Cell::Date or Cell::Number, but
         #       it will break some brittle tests.
@@ -119,11 +140,12 @@ module Roo
         #       3. formula
         case value_type
         when :shared
-          value = shared_strings[cell.content.to_i]
-          Excelx::Cell.create_cell(:string, value, formula, style, hyperlink, coordinate)
+          cell_content = cell.content.to_i
+          value = shared_strings.use_html?(cell_content) ? shared_strings.to_html[cell_content] : shared_strings[cell_content]
+          Excelx::Cell.cell_class(:string).new(value, formula, style, hyperlink, coordinate)
         when :boolean, :string
           value = cell.content
-          Excelx::Cell.create_cell(value_type, value, formula, style, hyperlink, coordinate)
+          Excelx::Cell.cell_class(value_type).new(value, formula, style, hyperlink, coordinate)
         when :time, :datetime
           cell_content = cell.content.to_f
           # NOTE: A date will be a whole number. A time will have be > 1. And
@@ -142,38 +164,40 @@ module Roo
                       else
                         :date
                       end
-          Excelx::Cell.create_cell(cell_type, cell.content, formula, excelx_type, style, hyperlink, base_date, coordinate)
+          base_value = cell_type == :date ? base_date : base_timestamp
+          Excelx::Cell.cell_class(cell_type).new(cell_content, formula, excelx_type, style, hyperlink, base_value, coordinate)
         when :date
-          Excelx::Cell.create_cell(value_type, cell.content, formula, excelx_type, style, hyperlink, base_date, coordinate)
+          Excelx::Cell.cell_class(:date).new(cell.content, formula, excelx_type, style, hyperlink, base_date, coordinate)
         else
-          Excelx::Cell.create_cell(:number, cell.content, formula, excelx_type, style, hyperlink, coordinate)
+          Excelx::Cell.cell_class(:number).new(cell.content, formula, excelx_type, style, hyperlink, coordinate)
         end
       end
 
-      def extract_coordinate(coordinate)
-        row, column = ::Roo::Utils.split_coordinate(coordinate)
+      def extract_hyperlinks(relationships)
+        return {} unless (hyperlinks = doc.xpath('/worksheet/hyperlinks/hyperlink'))
 
-        Excelx::Coordinate.new(row, column)
-      end
+        hyperlinks.each_with_object({}) do |hyperlink, hash|
+          if relationship = relationships[hyperlink['id']]
+            target_link = relationship['Target']
+            target_link += "##{hyperlink['location']}" if hyperlink['location']
 
-      def extract_hyperlinks(relationships)
-        # FIXME: select the valid hyperlinks and then map those.
-        Hash[doc.xpath('/worksheet/hyperlinks/hyperlink').map do |hyperlink|
-          if hyperlink.attribute('id') && (relationship = relationships[hyperlink.attribute('id').text])
-            [::Roo::Utils.ref_to_key(hyperlink.attributes['ref'].to_s), relationship.attribute('Target').text]
+            Roo::Utils.coordinates_in_range(hyperlink["ref"].to_s) do |coord|
+              hash[coord] = target_link
+            end
           end
-        end.compact]
+        end
       end
 
       def expand_merged_ranges(cells)
         # Extract merged ranges from xml
         merges = {}
         doc.xpath('/worksheet/mergeCells/mergeCell').each do |mergecell_xml|
-          tl, br = mergecell_xml['ref'].split(/:/).map { |ref| ::Roo::Utils.ref_to_key(ref) }
-          for row in tl[0]..br[0] do
-            for col in tl[1]..br[1] do
-              next if row == tl[0] && col == tl[1]
-              merges[[row, col]] = tl
+          src, dst = mergecell_xml["ref"].split(/:/).map { |ref| ::Roo::Utils.ref_to_key(ref) }
+          next unless cells[src]
+          for row in src[0]..dst[0] do
+            for col in src[1]..dst[1] do
+              next if row == src[0] && col == src[1]
+              merges[[row, col]] = src
             end
           end
         end
@@ -184,10 +208,23 @@ module Roo
       end
 
       def extract_cells(relationships)
-        extracted_cells = Hash[doc.xpath('/worksheet/sheetData/row/c').map do |cell_xml|
-          key = ::Roo::Utils.ref_to_key(cell_xml['r'])
-          [key, cell_from_xml(cell_xml, hyperlinks(relationships)[key])]
-        end]
+        extracted_cells = {}
+        empty_cell = @options[:empty_cell]
+
+        doc.xpath('/worksheet/sheetData/row').each.with_index(1) do |row_xml, ycoord|
+          row_xml.xpath('c').each.with_index(1) do |cell_xml, xcoord|
+            r = cell_xml['r']
+            coordinate =
+              if r.nil?
+                ::Roo::Excelx::Coordinate.new(ycoord, xcoord)
+              else
+                ::Roo::Utils.extract_coordinate(r)
+              end
+
+            cell = cell_from_xml(cell_xml, hyperlinks(relationships)[coordinate], coordinate, empty_cell)
+            extracted_cells[coordinate] = cell if cell
+          end
+        end
 
         expand_merged_ranges(extracted_cells) if @options[:expand_merged_ranges]
 
@@ -196,9 +233,25 @@ module Roo
 
       def extract_dimensions
         Roo::Utils.each_element(@path, 'dimension') do |dimension|
-          return dimension.attributes['ref'].value
+          return dimension["ref"]
         end
       end
+
+      def style_format(style)
+        @shared.styles.style_format(style)
+      end
+
+      def base_date
+        @shared.base_date
+      end
+
+      def base_timestamp
+        @shared.base_timestamp
+      end
+
+      def shared_strings
+        @shared.shared_strings
+      end
     end
   end
 end

data/lib/roo/excelx/styles.rb

@@ -51,13 +51,13 @@ module Roo
           xfs.children.map do |xf|
             xf['numFmtId']
           end
-        end
+        end.compact
       end
 
       def extract_num_fmts
-        Hash[doc.xpath('//numFmt').map do |num_fmt|
-          [num_fmt['numFmtId'], num_fmt['formatCode']]
-        end]
+        doc.xpath('//numFmt').each_with_object({}) do |num_fmt, hash|
+          hash[num_fmt['numFmtId']] = num_fmt['formatCode']
+        end
       end
     end
   end

data/lib/roo/excelx/workbook.rb

@@ -29,13 +29,18 @@ module Roo
 
       # aka labels
       def defined_names
-        Hash[doc.xpath('//definedName').map do |defined_name|
+        doc.xpath('//definedName').each_with_object({}) do |defined_name, hash|
           # "Sheet1!$C$5"
           sheet, coordinates = defined_name.text.split('!$', 2)
+          next unless coordinates
           col, row = coordinates.split('$')
           name = defined_name['name']
-          [name, Label.new(name, sheet, row, col)]
-        end]
+          hash[name] = Label.new(name, sheet, row, col)
+        end
+      end
+
+      def base_timestamp
+        @base_timestamp ||= base_date.to_datetime.to_time.to_i
       end
 
       def base_date

data/lib/roo/excelx.rb

@@ -1,13 +1,18 @@
 require 'nokogiri'
 require 'zip/filesystem'
 require 'roo/link'
+require 'roo/tempdir'
 require 'roo/utils'
 require 'forwardable'
+require 'set'
 
 module Roo
   class Excelx < Roo::Base
+    extend Roo::Tempdir
     extend Forwardable
 
+    ERROR_VALUES = %w(#N/A #REF! #NAME? #DIV/0! #NULL! #VALUE! #NUM!).to_set
+
     require 'roo/excelx/shared'
     require 'roo/excelx/workbook'
     require 'roo/excelx/shared_strings'
@@ -19,8 +24,9 @@ module Roo
     require 'roo/excelx/sheet_doc'
     require 'roo/excelx/coordinate'
     require 'roo/excelx/format'
+    require 'roo/excelx/images'
 
-    delegate [:styles, :workbook, :shared_strings, :rels_files, :sheet_files, :comments_files] => :@shared
+    delegate [:styles, :workbook, :shared_strings, :rels_files, :sheet_files, :comments_files, :image_rels, :image_files] => :@shared
     ExceedsMaxError = Class.new(StandardError)
 
     # initialization and opening of a spreadsheet file
@@ -33,27 +39,38 @@ module Roo
       cell_max = options.delete(:cell_max)
       sheet_options = {}
       sheet_options[:expand_merged_ranges] = (options[:expand_merged_ranges] || false)
+      sheet_options[:no_hyperlinks] = (options[:no_hyperlinks] || false)
+      sheet_options[:empty_cell] = (options[:empty_cell] || false)
+      shared_options = {}
 
+      shared_options[:disable_html_wrapper] = (options[:disable_html_wrapper] || false)
       unless is_stream?(filename_or_stream)
         file_type_check(filename_or_stream, %w[.xlsx .xlsm], 'an Excel 2007', file_warning, packed)
-        basename = File.basename(filename_or_stream)
+        basename = find_basename(filename_or_stream)
       end
 
-      @tmpdir = make_tmpdir(basename, options[:tmpdir_root])
-      @shared = Shared.new(@tmpdir)
+      # NOTE: Create temp directory and allow Ruby to cleanup the temp directory
+      #       when the object is garbage collected. Initially, the finalizer was
+      #       created in the Roo::Tempdir module, but that led to a segfault
+      #       when testing in Ruby 2.4.0.
+      @tmpdir = self.class.make_tempdir(self, basename, options[:tmpdir_root])
+      ObjectSpace.define_finalizer(self, self.class.finalize(object_id))
+
+      @shared = Shared.new(@tmpdir, shared_options)
       @filename = local_filename(filename_or_stream, @tmpdir, packed)
       process_zipfile(@filename || filename_or_stream)
 
-      @sheet_names = workbook.sheets.map do |sheet|
-        unless options[:only_visible_sheets] && sheet['state'] == 'hidden'
-          sheet['name']
-        end
-      end.compact
+      @sheet_names = []
       @sheets = []
-      @sheets_by_name = Hash[@sheet_names.map.with_index do |sheet_name, n|
-        @sheets[n] = Sheet.new(sheet_name, @shared, n, sheet_options)
-        [sheet_name, @sheets[n]]
-      end]
+      @sheets_by_name = {}
+
+      workbook.sheets.each_with_index do |sheet, index|
+        next if options[:only_visible_sheets] && sheet['state'] == 'hidden'
+
+        sheet_name = sheet['name']
+        @sheet_names << sheet_name
+        @sheets_by_name[sheet_name] = @sheets[index] = Sheet.new(sheet_name, @shared, index, sheet_options)
+      end
 
       if cell_max
         cell_count = ::Roo::Utils.num_cells_in_range(sheet_for(options.delete(:sheet)).dimensions)
@@ -61,9 +78,9 @@ module Roo
       end
 
       super
-    rescue => e # clean up any temp files, but only if an error was raised
-      close
-      raise e
+    rescue
+      self.class.finalize_tempdirs(object_id)
+      raise
     end
 
     def method_missing(method, *args)
@@ -82,7 +99,12 @@ module Roo
     def sheet_for(sheet)
       sheet ||= default_sheet
       validate_sheet!(sheet)
-      @sheets_by_name[sheet]
+      @sheets_by_name[sheet] || @sheets[sheet]
+    end
+
+    def images(sheet = nil)
+      images_names = sheet_for(sheet).images.map(&:last)
+      images_names.map { |iname| image_files.find { |ifile| ifile[iname] } }
     end
 
     # Returns the content of a spreadsheet-cell.
@@ -194,6 +216,13 @@ module Roo
       safe_send(sheet_for(sheet).cells[key], :cell_value)
     end
 
+    # returns the internal value of an excelx cell
+    # Note: this is only available within the Excelx class
+    def formatted_value(row, col, sheet = nil)
+      key = normalize(row, col)
+      safe_send(sheet_for(sheet).cells[key], :formatted_value)
+    end
+
     # returns the internal format of an excel cell
     def excelx_format(row, col, sheet = nil)
       key = normalize(row, col)
@@ -204,7 +233,7 @@ module Roo
       sheet = sheet_for(sheet)
       key = normalize(row, col)
       cell = sheet.cells[key]
-      !cell || cell.empty? || (cell.type == :string && cell.value.empty?) ||
+      !cell || cell.empty? ||
         (row < sheet.first_row || row > sheet.last_row || col < sheet.first_column || col > sheet.last_column)
     end
 
@@ -306,7 +335,7 @@ module Roo
 
       wb.extract(path)
       workbook_doc = Roo::Utils.load_xml(path).remove_namespaces!
-      workbook_doc.xpath('//sheet').map { |s| s.attributes['id'].value }
+      workbook_doc.xpath('//sheet').map { |s| s['id'] }
     end
 
     # Internal
@@ -330,24 +359,22 @@ module Roo
 
       wb_rels.extract(path)
       rels_doc = Roo::Utils.load_xml(path).remove_namespaces!
-      worksheet_type = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet'
 
       relationships = rels_doc.xpath('//Relationship').select do |relationship|
-        relationship.attributes['Type'].value == worksheet_type
+        worksheet_types.include? relationship['Type']
       end
 
-      relationships.inject({}) do |hash, relationship|
-        attributes = relationship.attributes
-        id = attributes['Id']
-        hash[id.value] = attributes['Target'].value
-        hash
+      relationships.each_with_object({}) do |relationship, hash|
+        hash[relationship['Id']] = relationship['Target']
       end
     end
 
+    # Extracts the sheets in order, but it will ignore sheets that are not
+    # worksheets.
     def extract_sheets_in_order(entries, sheet_ids, sheets, tmpdir)
-      sheet_ids.each_with_index do |id, i|
+      (sheet_ids & sheets.keys).each_with_index do |id, i|
         name = sheets[id]
-        entry = entries.find { |e| e.name =~ /#{name}$/ }
+        entry = entries.find { |e| "/#{e.name}" =~ /#{name}$/ }
         path = "#{tmpdir}/roo_sheet#{i + 1}"
         sheet_files << path
         @sheet_files << path
@@ -355,6 +382,15 @@ module Roo
       end
     end
 
+    def extract_images(entries, tmpdir)
+      img_entries = entries.select { |e| e.name[/media\/image([0-9]+)/] }
+      img_entries.each do |entry|
+        path = "#{@tmpdir}/roo#{entry.name.gsub(/xl\/|\//, "_")}"
+        image_files << path
+        entry.extract(path)
+      end
+    end
+
     # Extracts all needed files from the zip file
     def process_zipfile(zipfilename_or_stream)
       @sheet_files = []
@@ -388,10 +424,16 @@ module Roo
       sheet_ids = extract_worksheet_ids(entries, "#{@tmpdir}/roo_workbook.xml")
       sheets = extract_worksheet_rels(entries, "#{@tmpdir}/roo_workbook.xml.rels")
       extract_sheets_in_order(entries, sheet_ids, sheets, @tmpdir)
+      extract_images(entries, @tmpdir)
 
       entries.each do |entry|
         path =
         case entry.name.downcase
+        when /richdata/
+          # FIXME: Ignore richData as parsing is not implemented yet and can cause
+          # Zip::DestinationFileExistsError when including a second "styles.xml" entry
+          # see http://schemas.microsoft.com/office/spreadsheetml/2017/richdata2
+          nil
         when /sharedstrings.xml$/
           "#{@tmpdir}/roo_sharedStrings.xml"
         when /styles.xml$/
@@ -404,34 +446,35 @@ module Roo
           #       ECMA-376 12.3.3 in "Ecma Office Open XML Part 1".
           nr = Regexp.last_match[1].to_i
           comments_files[nr - 1] = "#{@tmpdir}/roo_comments#{nr}"
+        when %r{chartsheets/_rels/sheet([0-9]+).xml.rels$}
+          # NOTE: Chart sheet relationship files were interfering with
+          #       worksheets.
+          nil
         when /sheet([0-9]+).xml.rels$/
           # FIXME: Roo seems to use sheet[\d].xml.rels for hyperlinks only, but
           #        it also stores the location for sharedStrings, comments,
           #        drawings, etc.
           nr = Regexp.last_match[1].to_i
           rels_files[nr - 1] = "#{@tmpdir}/roo_rels#{nr}"
+        when /drawing([0-9]+).xml.rels$/
+          # Extracting drawing relationships to make images lists for each sheet
+          nr = Regexp.last_match[1].to_i
+          image_rels[nr - 1] = "#{@tmpdir}/roo_image_rels#{nr}"
         end
 
         entry.extract(path) if path
       end
     end
 
-    # NOTE: To reduce memory, styles, shared_strings, workbook can be class
-    #       variables in a Shared module.
-    def styles
-      @styles ||= Styles.new(File.join(@tmpdir, 'roo_styles.xml'))
-    end
-
-    def shared_strings
-      @shared_strings ||= SharedStrings.new(File.join(@tmpdir, 'roo_sharedStrings.xml'))
-    end
-
-    def workbook
-      @workbook ||= Workbook.new(File.join(@tmpdir, 'roo_workbook.xml'))
+    def safe_send(object, method, *args)
+      object.send(method, *args) if object&.respond_to?(method)
     end
 
-    def safe_send(object, method, *args)
-      object.send(method, *args) if object && object.respond_to?(method)
+    def worksheet_types
+      [
+        'http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet', # OOXML Transitional
+        'http://purl.oclc.org/ooxml/officeDocument/relationships/worksheet' # OOXML Strict
+      ]
     end
   end
 end

data/lib/roo/formatters/base.rb

@@ -0,0 +1,15 @@
+module Roo
+  module Formatters
+    module Base
+      # converts an integer value to a time string like '02:05:06'
+      def integer_to_timestring(content)
+        h = (content / 3600.0).floor
+        content -= h * 3600
+        m = (content / 60.0).floor
+        content -= m * 60
+        s = content
+        Kernel.format("%02d:%02d:%02d", h, m, s)
+      end
+    end
+  end
+end