roo 1.13.2 → 2.0.0beta1

data/examples/roo_soap_server.rb

@@ -1,11 +1,10 @@
 require 'roo'
 require 'soap/rpc/standaloneServer'
 
-NS = "spreadsheetserver" # name of your service = namespace
+NS = 'spreadsheetserver' # name of your service = namespace
 class Server2 < SOAP::RPC::StandaloneServer
-
   def on_init
-    spreadsheet = OpenOffice.new("./Ferien-de.ods")
+    spreadsheet = OpenOffice.new('./Ferien-de.ods')
     add_method(spreadsheet, 'cell', 'row', 'col')
     add_method(spreadsheet, 'officeversion')
     add_method(spreadsheet, 'first_row')
@@ -13,14 +12,13 @@ class Server2 < SOAP::RPC::StandaloneServer
     add_method(spreadsheet, 'first_column')
     add_method(spreadsheet, 'last_column')
     add_method(spreadsheet, 'sheets')
-    #add_method(spreadsheet, 'default_sheet=', 's')
+    # add_method(spreadsheet, 'default_sheet=', 's')
     # method with '...=' did not work? alias method 'set_default_sheet' created
     add_method(spreadsheet, 'set_default_sheet', 's')
   end
-
 end
 
-PORT = 12321
+PORT = 12_321
 puts "serving at port #{PORT}"
 svr = Server2.new('Roo', NS, '0.0.0.0', PORT)
 

data/examples/write_me.rb

@@ -5,28 +5,27 @@ require 'roo'
 MAXTRIES = 1000
 print "what's your name? "
 my_name = gets.chomp
-print "where do you live? "
+print 'where do you live? '
 my_location = gets.chomp
-print "your message? (if left blank, only your name and location will be inserted) "
+print 'your message? (if left blank, only your name and location will be inserted) '
 my_message = gets.chomp
 spreadsheet = Google.new('ptu6bbahNZpY0N0RrxQbWdw')
 spreadsheet.default_sheet = 'Sheet1'
 success = false
 MAXTRIES.times do
-  col = rand(10)+1
-  row = rand(10)+1
-  if spreadsheet.empty?(row,col)
+  col = rand(10) + 1
+  row = rand(10) + 1
+  if spreadsheet.empty?(row, col)
     if my_message.empty?
-      text = Time.now.to_s+" "+"Greetings from #{my_name} (#{my_location})"
+      text = Time.now.to_s + ' ' + "Greetings from #{my_name} (#{my_location})"
     else
-      text = Time.now.to_s+" "+"#{my_message} from #{my_name} (#{my_location})"
+      text = Time.now.to_s + ' ' + "#{my_message} from #{my_name} (#{my_location})"
     end
-    spreadsheet.set_value(row,col,text)
+    spreadsheet.set_value(row, col, text)
     puts "message written to row #{row}, column #{col}"
     success = true
     break
   end
   puts "Row #{row}, column #{col} already occupied, trying again..."
 end
-puts "no empty cell found within #{MAXTRIES} tries" if !success
-
+puts "no empty cell found within #{MAXTRIES} tries" unless success

data/lib/roo.rb

@@ -1,34 +1,28 @@
+require 'roo/spreadsheet'
+require 'roo/base'
+
 module Roo
+  autoload :OpenOffice,   'roo/open_office'
+  autoload :LibreOffice,  'roo/libre_office'
+  autoload :Excelx,       'roo/excelx'
+  autoload :CSV,          'roo/csv'
 
-  VERSION = '1.12.1'
+  CLASS_FOR_EXTENSION = {
+    ods: Roo::OpenOffice,
+    xlsx: Roo::Excelx,
+    csv: Roo::CSV
+  }
 
   def self.const_missing(const_name)
     case const_name
-    when :Libreoffice
-      warn "`Roo::Libreoffice` has been deprecated. Use `Roo::LibreOffice` instead."
-      LibreOffice
-    when :Openoffice
-      warn "`Roo::Openoffice` has been deprecated. Use `Roo::OpenOffice` instead."
-      OpenOffice
-    when :Csv
-      warn "`Roo::Csv` has been deprecated. Use `Roo::CSV` instead."
-      CSV
-    when :GenericSpreadsheet
-      warn "`Roo::GenericSpreadsheet` has been deprecated. Use `Roo::Base` instead."
-      Base
+    when :Excel
+      raise "Excel support has been extracted to roo-xls due to its dependency on the GPL'd spreadsheet gem. Install roo-xls to use Roo::Excel."
+    when :Excel2003XML
+      raise "Excel SpreadsheetML support has been extracted to roo-xls. Install roo-xls to use Roo::Excel2003XML."
+    when :Google
+      raise "Google support has been extracted to roo-google. Install roo-google to use Roo::Google."
     else
       super
     end
   end
-
-  autoload :Spreadsheet,  'roo/spreadsheet'
-  autoload :Base,         'roo/base'
-
-  autoload :OpenOffice,   'roo/openoffice'
-  autoload :LibreOffice,  'roo/openoffice'
-  autoload :Excel,        'roo/excel'
-  autoload :Excelx,       'roo/excelx'
-  autoload :Excel2003XML, 'roo/excel2003xml'
-  autoload :Google,       'roo/google'
-  autoload :CSV,          'roo/csv'
 end

data/lib/roo/base.rb

@@ -2,50 +2,23 @@
 
 require 'tmpdir'
 require 'stringio'
-
-begin
-  require 'zip/zipfilesystem'
-  Roo::ZipFile = Zip::ZipFile
-rescue LoadError
-  # For rubyzip >= 1.0.0
-  require 'zip/filesystem'
-  Roo::ZipFile = Zip::File
-end
+require 'nokogiri'
+require 'roo/utils'
 
 # Base class for all other types of spreadsheets
 class Roo::Base
   include Enumerable
 
-  TEMP_PREFIX = "oo_"
+  TEMP_PREFIX = 'roo_'
+  MAX_ROW_COL = 999_999.freeze
+  MIN_ROW_COL = 0.freeze
 
-  attr_reader :default_sheet, :headers
+  attr_reader :headers
 
   # sets the line with attribute names (default: 1)
   attr_accessor :header_line
 
-  protected
-
-  def self.split_coordinate(str)
-    letter,number = Roo::Base.split_coord(str)
-    x = letter_to_number(letter)
-    y = number
-    return y, x
-  end
-
-  def self.split_coord(s)
-    if s =~ /([a-zA-Z]+)([0-9]+)/
-      letter = $1
-      number = $2.to_i
-    else
-      raise ArgumentError
-    end
-    return letter, number
-  end
-
-
-  public
-
-  def initialize(filename, options={}, file_warning=:error, tmpdir=nil)
+  def initialize(filename, options = {}, _file_warning = :error, _tmpdir = nil)
     @filename = filename
     @options = options
 
@@ -59,8 +32,10 @@ class Roo::Base
     @last_column = {}
 
     @header_line = 1
-    @default_sheet = self.sheets.first
-    @header_line = 1
+  end
+
+  def default_sheet
+    @default_sheet ||= sheets.first
   end
 
   # sets the working sheet in the document
@@ -73,110 +48,79 @@ class Roo::Base
   end
 
   # first non-empty column as a letter
-  def first_column_as_letter(sheet=nil)
-    Roo::Base.number_to_letter(first_column(sheet))
+  def first_column_as_letter(sheet = default_sheet)
+    ::Roo::Utils.number_to_letter(first_column(sheet))
   end
 
   # last non-empty column as a letter
-  def last_column_as_letter(sheet=nil)
-    Roo::Base.number_to_letter(last_column(sheet))
-  end
-
-  # returns the number of the first non-empty row
-  def first_row(sheet=nil)
-    sheet ||= @default_sheet
-    read_cells(sheet)
-    if @first_row[sheet]
-      return @first_row[sheet]
-    end
-    impossible_value = 999_999 # more than a spreadsheet can hold
-    result = impossible_value
-    @cell[sheet].each_pair {|key,value|
-      y = key.first.to_i # _to_string(key).split(',')
-      result = [result, y].min if value
-    } if @cell[sheet]
-    result = nil if result == impossible_value
-    @first_row[sheet] = result
-    result
-  end
-
-  # returns the number of the last non-empty row
-  def last_row(sheet=nil)
-    sheet ||= @default_sheet
-    read_cells(sheet)
-    if @last_row[sheet]
-      return @last_row[sheet]
-    end
-    impossible_value = 0
-    result = impossible_value
-    @cell[sheet].each_pair {|key,value|
-      y = key.first.to_i # _to_string(key).split(',')
-      result = [result, y].max if value
-    } if @cell[sheet]
-    result = nil if result == impossible_value
-    @last_row[sheet] = result
-    result
+  def last_column_as_letter(sheet = default_sheet)
+    ::Roo::Utils.number_to_letter(last_column(sheet))
+  end
+
+  # Set first/last row/column for sheet
+  def first_last_row_col_for_sheet(sheet)
+    @first_last_row_cols ||= {}
+    @first_last_row_cols[sheet] ||= begin
+      result = collect_last_row_col_for_sheet(sheet)
+      {
+        first_row: result[:first_row] == MAX_ROW_COL ? nil : result[:first_row],
+        first_column: result[:first_column] == MAX_ROW_COL ? nil : result[:first_column],
+        last_row: result[:last_row] == MIN_ROW_COL ? nil : result[:last_row],
+        last_column: result[:last_column] == MIN_ROW_COL ? nil : result[:last_column]
+      }
+    end
   end
 
-  # returns the number of the first non-empty column
-  def first_column(sheet=nil)
-    sheet ||= @default_sheet
-    read_cells(sheet)
-    if @first_column[sheet]
-      return @first_column[sheet]
-    end
-    impossible_value = 999_999 # more than a spreadsheet can hold
-    result = impossible_value
-    @cell[sheet].each_pair {|key,value|
-      x = key.last.to_i # _to_string(key).split(',')
-      result = [result, x].min if value
-    } if @cell[sheet]
-    result = nil if result == impossible_value
-    @first_column[sheet] = result
-    result
+  # Collect first/last row/column from sheet
+  def collect_last_row_col_for_sheet(sheet)
+    first_row = first_column = MAX_ROW_COL
+    last_row = last_column = MIN_ROW_COL
+    @cell[sheet].each_pair do|key, value|
+      next unless value
+      first_row = [first_row, key.first.to_i].min
+      last_row = [last_row, key.first.to_i].max
+      first_column = [first_column, key.last.to_i].min
+      last_column = [last_column, key.last.to_i].max
+    end if @cell[sheet]
+    {first_row: first_row, first_column: first_column, last_row: last_row, last_column: last_column}
   end
 
-  # returns the number of the last non-empty column
-  def last_column(sheet=nil)
-    sheet ||= @default_sheet
-    read_cells(sheet)
-    if @last_column[sheet]
-      return @last_column[sheet]
-    end
-    impossible_value = 0
-    result = impossible_value
-    @cell[sheet].each_pair {|key,value|
-      x = key.last.to_i # _to_string(key).split(',')
-      result = [result, x].max if value
-    } if @cell[sheet]
-    result = nil if result == impossible_value
-    @last_column[sheet] = result
-    result
+  %w(first_row last_row first_column last_column).each do |key|
+    class_eval <<-EOS, __FILE__, __LINE__ + 1
+      def #{key}(sheet = default_sheet)                                   # def first_row(sheet = default_sheet)
+        read_cells(sheet)                                                 #   read_cells(sheet)
+        @#{key}[sheet] ||= first_last_row_col_for_sheet(sheet)[:#{key}]   #   @first_row[sheet] ||= first_last_row_col_for_sheet(sheet)[:first_row]
+      end                                                                 # end
+    EOS
   end
 
   # returns a rectangular area (default: all cells) as yaml-output
   # you can add additional attributes with the prefix parameter like:
   # oo.to_yaml({"file"=>"flightdata_2007-06-26", "sheet" => "1"})
-  def to_yaml(prefix={}, from_row=nil, from_column=nil, to_row=nil, to_column=nil,sheet=nil)
-    sheet ||= @default_sheet
-    result = "--- \n"
+  def to_yaml(prefix = {}, from_row = nil, from_column = nil, to_row = nil, to_column = nil, sheet = default_sheet)
     return '' unless first_row # empty result if there is no first_row in a sheet
 
-    (from_row||first_row(sheet)).upto(to_row||last_row(sheet)) do |row|
-      (from_column||first_column(sheet)).upto(to_column||last_column(sheet)) do |col|
-        unless empty?(row,col,sheet)
+    from_row ||= first_row(sheet)
+    to_row ||= last_row(sheet)
+    from_column ||= first_column(sheet)
+    to_column ||= last_column(sheet)
+
+    result = "--- \n"
+    from_row.upto(to_row) do |row|
+      from_column.upto(to_column) do |col|
+        unless empty?(row, col, sheet)
           result << "cell_#{row}_#{col}: \n"
-          prefix.each {|k,v|
+          prefix.each do|k, v|
             result << "  #{k}: #{v} \n"
-          }
+          end
           result << "  row: #{row} \n"
           result << "  col: #{col} \n"
-          result << "  celltype: #{self.celltype(row,col,sheet)} \n"
-          if self.celltype(row,col,sheet) == :time
-            result << "  value: #{Roo::Base.integer_to_timestring( self.cell(row,col,sheet))} \n"
-          else
-            result << "  value: #{self.cell(row,col,sheet)} \n"
+          result << "  celltype: #{celltype(row, col, sheet)} \n"
+          value = cell(row, col, sheet)
+          if celltype(row, col, sheet) == :time
+            value = integer_to_timestring(value)
           end
+          result << "  value: #{value} \n"
         end
       end
     end
@@ -184,132 +128,109 @@ class Roo::Base
   end
 
   # write the current spreadsheet to stdout or into a file
-  def to_csv(filename=nil,sheet=nil)
-    sheet ||= @default_sheet
+  def to_csv(filename = nil, separator = ',', sheet = default_sheet)
     if filename
-      File.open(filename,"w") do |file|
-        write_csv_content(file,sheet)
+      File.open(filename, 'w') do |file|
+        write_csv_content(file, sheet, separator)
       end
-      return true
+      true
     else
-      sio = StringIO.new
-      write_csv_content(sio,sheet)
+      sio = ::StringIO.new
+      write_csv_content(sio, sheet, separator)
       sio.rewind
-      return sio.read
+      sio.read
     end
   end
 
   # returns a matrix object from the whole sheet or a rectangular area of a sheet
-  def to_matrix(from_row=nil, from_column=nil, to_row=nil, to_column=nil,sheet=nil)
+  def to_matrix(from_row = nil, from_column = nil, to_row = nil, to_column = nil, sheet = default_sheet)
     require 'matrix'
 
-    sheet ||= @default_sheet
     return Matrix.empty unless first_row
 
-    Matrix.rows((from_row||first_row(sheet)).upto(to_row||last_row(sheet)).map do |row|
-      (from_column||first_column(sheet)).upto(to_column||last_column(sheet)).map do |col|
-        cell(row,col,sheet)
+    from_row ||= first_row(sheet)
+    to_row ||= last_row(sheet)
+    from_column ||= first_column(sheet)
+    to_column ||= last_column(sheet)
+
+    Matrix.rows(from_row.upto(to_row).map do |row|
+      from_column.upto(to_column).map do |col|
+        cell(row, col, sheet)
       end
     end)
   end
 
+  def inspect
+    "<##{ self.class }:#{ self.object_id.to_s(8) } #{ self.instance_variables.join(' ') }>"
+  end
+
   # find a row either by row number or a condition
   # Caution: this works only within the default sheet -> set default_sheet before you call this method
   # (experimental. see examples in the test_roo.rb file)
   def find(*args) # :nodoc
     options = (args.last.is_a?(Hash) ? args.pop : {})
-    result_array = options[:array]
-    header_for = Hash[1.upto(last_column).map do |col|
-      [col, cell(@header_line,col)]
-    end]
-    #-- id
-    if args[0].class == Fixnum
-      rownum = args[0]
-      if @header_line
-        [Hash[1.upto(self.row().size).map {|j|
-          [header_for.fetch(j), cell(rownum,j)]
-        }]]
-      else
-        self.row(rownum).size.times.map {|j|
-          cell(rownum,j + 1)
-        }
-      end
-    #-- :all
-    elsif args[0] == :all
-      rows = first_row.upto(last_row)
-
-      # are all conditions met?
-      if (conditions = options[:conditions]) && !conditions.empty?
-        column_with = header_for.invert
-        rows = rows.select do |i|
-          conditions.all? { |key,val| cell(i,column_with[key]) == val }
-        end
-      end
 
-      rows.map do |i|
-        if result_array
-          self.row(i)
-        else
-          Hash[1.upto(self.row(i).size).map do |j|
-            [header_for.fetch(j), cell(i,j)]
-          end]
-        end
-      end
+    case args[0]
+    when Fixnum
+      find_by_row(args[0])
+    when :all
+      find_by_conditions(options)
+    else
+      fail ArgumentError, "unexpected arg #{args[0].inspect}, pass a row index or :all"
     end
   end
 
   # returns all values in this row as an array
   # row numbers are 1,2,3,... like in the spreadsheet
-  def row(rownumber,sheet=nil)
-    sheet ||= @default_sheet
+  def row(row_number, sheet = default_sheet)
     read_cells(sheet)
     first_column(sheet).upto(last_column(sheet)).map do |col|
-      cell(rownumber,col,sheet)
+      cell(row_number, col, sheet)
     end
   end
 
   # returns all values in this column as an array
   # column numbers are 1,2,3,... like in the spreadsheet
-  def column(columnnumber,sheet=nil)
-    if columnnumber.class == String
-      columnnumber = Roo::Excel.letter_to_number(columnnumber)
+  def column(column_number, sheet = default_sheet)
+    if column_number.is_a?(::String)
+      column_number = ::Roo::Utils.letter_to_number(column_number)
     end
-    sheet ||= @default_sheet
     read_cells(sheet)
     first_row(sheet).upto(last_row(sheet)).map do |row|
-      cell(row,columnnumber,sheet)
+      cell(row, column_number, sheet)
     end
   end
 
   # set a cell to a certain value
   # (this will not be saved back to the spreadsheet file!)
-  def set(row,col,value,sheet=nil) #:nodoc:
-    sheet ||= @default_sheet
+  def set(row, col, value, sheet = default_sheet) #:nodoc:
     read_cells(sheet)
-    row, col = normalize(row,col)
-    cell_type = case value
-                when Fixnum then :float
-                when String, Float then :string
-                else
-                  raise ArgumentError, "Type for #{value} not set"
-                end
+    row, col = normalize(row, col)
+    cell_type = cell_type_by_value(value)
+    set_value(row, col, value, sheet)
+    set_type(row, col, cell_type , sheet)
+  end
 
-    set_value(row,col,value,sheet)
-    set_type(row,col,cell_type,sheet)
+  def cell_type_by_value(value)
+    case value
+    when Fixnum then :float
+    when String, Float then :string
+    else
+      raise ArgumentError, "Type for #{value} not set"
+    end
   end
 
   # reopens and read a spreadsheet document
   def reload
-    ds = @default_sheet
+    ds = default_sheet
     reinitialize
     self.default_sheet = ds
   end
 
   # true if cell is empty
-  def empty?(row, col, sheet=nil)
-    sheet ||= @default_sheet
+  def empty?(row, col, sheet = default_sheet)
     read_cells(sheet)
-    row,col = normalize(row,col)
+    row, col = normalize(row, col)
     contents = cell(row, col, sheet)
     !contents || (celltype(row, col, sheet) == :string && contents.empty?) \
       || (row < first_row(sheet) || row > last_row(sheet) || col < first_column(sheet) || col > last_column(sheet))
@@ -319,24 +240,24 @@ class Roo::Base
   # this document.
   def info
     without_changing_default_sheet do
-      result = "File: #{File.basename(@filename)}\n"+
-        "Number of sheets: #{sheets.size}\n"+
+      result = "File: #{File.basename(@filename)}\n"\
+        "Number of sheets: #{sheets.size}\n"\
         "Sheets: #{sheets.join(', ')}\n"
       n = 1
-      sheets.each {|sheet|
+      sheets.each do|sheet|
         self.default_sheet = sheet
-        result << "Sheet " + n.to_s + ":\n"
+        result << 'Sheet ' + n.to_s + ":\n"
         unless first_row
-          result << "  - empty -"
+          result << '  - empty -'
         else
           result << "  First row: #{first_row}\n"
           result << "  Last row: #{last_row}\n"
-          result << "  First column: #{Roo::Base.number_to_letter(first_column)}\n"
-          result << "  Last column: #{Roo::Base.number_to_letter(last_column)}"
+          result << "  First column: #{::Roo::Utils.number_to_letter(first_column)}\n"
+          result << "  Last column: #{::Roo::Utils.number_to_letter(last_column)}"
         end
         result << "\n" if sheet != sheets.last
         n += 1
-      }
+      end
       result
     end
   end
@@ -344,26 +265,26 @@ class Roo::Base
   # returns an XML representation of all sheets of a spreadsheet file
   def to_xml
     Nokogiri::XML::Builder.new do |xml|
-      xml.spreadsheet {
-        self.sheets.each do |sheet|
+      xml.spreadsheet do
+        sheets.each do |sheet|
           self.default_sheet = sheet
-          xml.sheet(:name => sheet) { |x|
-            if first_row and last_row and first_column and last_column
+          xml.sheet(name: sheet) do |x|
+            if first_row && last_row && first_column && last_column
               # sonst gibt es Fehler bei leeren Blaettern
               first_row.upto(last_row) do |row|
                 first_column.upto(last_column) do |col|
-                  unless empty?(row,col)
-                    x.cell(cell(row,col),
-                      :row =>row,
-                      :column => col,
-                      :type => celltype(row,col))
+                  unless empty?(row, col)
+                    x.cell(cell(row, col),
+                           row: row,
+                           column: col,
+                           type: celltype(row, col))
                   end
                 end
               end
             end
-          }
+          end
         end
-      }
+      end
     end.to_xml
   end
 
@@ -373,12 +294,12 @@ class Roo::Base
     # #aa42 => #cell('aa',42)
     # #aa42('Sheet1')  => #cell('aa',42,'Sheet1')
     if m =~ /^([a-z]+)(\d)$/
-      col = Roo::Base.letter_to_number($1)
-      row = $2.to_i
+      col = ::Roo::Utils.letter_to_number(Regexp.last_match[1])
+      row = Regexp.last_match[2].to_i
       if args.empty?
-        cell(row,col)
+        cell(row, col)
       else
-        cell(row,col,args.first)
+        cell(row, col, args.first)
       end
     else
       super
@@ -387,18 +308,25 @@ class Roo::Base
 
   # access different worksheets by calling spreadsheet.sheet(1)
   # or spreadsheet.sheet('SHEETNAME')
-  def sheet(index,name=false)
-    @default_sheet = String === index ? index : self.sheets[index]
-    name ? [@default_sheet,self] : self
+  def sheet(index, name = false)
+    self.default_sheet = String === index ? index : sheets[index]
+    name ? [default_sheet, self] : self
   end
 
   # iterate through all worksheets of a document
   def each_with_pagename
-    self.sheets.each do |s|
-      yield sheet(s,true)
+    sheets.each do |s|
+      yield sheet(s, true)
     end
   end
 
+  def clean_sheet_if_need(options)
+    return unless options[:clean]
+    options.delete(:clean)
+    @cleaned ||= {}
+    clean_sheet(default_sheet) unless @cleaned[default_sheet]
+  end
+
   # by passing in headers as options, this method returns
   # specific columns from your header assignment
   # for example:
@@ -409,7 +337,6 @@ class Roo::Base
   # such as :price => '^(Cost|Price)'
   # case insensitive by default
 
-
   # by using the :header_search option, you can query for headers
   # and return a hash of every row with the keys set to the header result
   # for example:
@@ -420,115 +347,77 @@ class Roo::Base
   # * is the wildcard character
 
   # you can also pass in a :clean => true option to strip the sheet of
-  # odd unicode characters and white spaces around columns
+  # control characters and white spaces around columns
 
-  def each(options={})
+  def each(options = {})
     if options.empty?
       1.upto(last_row) do |line|
         yield row(line)
       end
     else
-      if options[:clean]
-        options.delete(:clean)
-        @cleaned ||= {}
-        @cleaned[@default_sheet] || clean_sheet(@default_sheet)
-      end
-
-      if options[:header_search]
-        @headers = nil
-        @header_line = row_with(options[:header_search])
-      elsif [:first_row,true].include?(options[:headers])
-        @headers = []
-        row(first_row).each_with_index {|x,i| @headers << [x,i + 1]}
-      else
-        set_headers(options)
-      end
-
+      clean_sheet_if_need(options)
+      search_or_set_header(options)
       headers = @headers ||
-        Hash[(first_column..last_column).map do |col|
-          [cell(@header_line,col), col]
-        end]
+                Hash[(first_column..last_column).map do |col|
+                  [cell(@header_line, col), col]
+                end]
 
       @header_line.upto(last_row) do |line|
-        yield(Hash[headers.map {|k,v| [k,cell(line,v)]}])
+        yield(Hash[headers.map { |k, v| [k, cell(line, v)] }])
       end
     end
   end
 
-  def parse(options={})
+  def parse(options = {})
     ary = []
-    if block_given?
-      each(options) {|row| ary << yield(row)}
-    else
-      each(options) {|row| ary << row}
+    each(options) do |row|
+      yield(row) if block_given?
+      ary << row
     end
     ary
   end
 
-  def row_with(query,return_headers=false)
-    query.map! {|x| Array(x.split('*'))}
+  def row_with(query, return_headers = false)
     line_no = 0
     each do |row|
       line_no += 1
-      # makes sure headers is the first part of wildcard search for priority
-      # ex. if UPC and SKU exist for UPC*SKU search, UPC takes the cake
-      headers = query.map do |q|
-        q.map {|i| row.grep(/#{i}/i)[0]}.compact[0]
-      end.compact
+      headers = query.map { |q| row.grep(q)[0] }.compact
 
       if headers.length == query.length
         @header_line = line_no
         return return_headers ? headers : line_no
       elsif line_no > 100
-        raise "Couldn't find header row."
+        fail "Couldn't find header row."
       end
     end
+    fail "Couldn't find header row."
   end
 
   protected
 
-  def load_xml(path)
-    File.open(path) do |file|
-      Nokogiri::XML(file)
-    end
-  end
-
-  def file_type_check(filename, ext, name, warning_level, packed=nil)
-    new_expression = {
-      '.ods' => 'Roo::OpenOffice.new',
-      '.xls' => 'Roo::Excel.new',
-      '.xlsx' => 'Roo::Excelx.new',
-      '.csv' => 'Roo::CSV.new',
-      '.xml' => 'Roo::Excel2003XML.new',
-    }
+  def file_type_check(filename, ext, name, warning_level, packed = nil)
     if packed == :zip
-	    # lalala.ods.zip => lalala.ods
-	    # hier wird KEIN unzip gemacht, sondern nur der Name der Datei
-	    # getestet, falls es eine gepackte Datei ist.
-	    filename = File.basename(filename,File.extname(filename))
-    end
-    case ext
-    when '.ods', '.xls', '.xlsx', '.csv', '.xml'
-      correct_class = "use #{new_expression[ext]} to handle #{ext} spreadsheet files. This has #{File.extname(filename).downcase}"
-    else
-      raise "unknown file type: #{ext}"
+      # lalala.ods.zip => lalala.ods
+      # hier wird KEIN unzip gemacht, sondern nur der Name der Datei
+      # getestet, falls es eine gepackte Datei ist.
+      filename = File.basename(filename, File.extname(filename))
     end
 
     if uri?(filename) && qs_begin = filename.rindex('?')
-      filename = filename[0..qs_begin-1]
+      filename = filename[0..qs_begin - 1]
     end
     if File.extname(filename).downcase != ext
       case warning_level
       when :error
-        warn correct_class
-        raise TypeError, "#{filename} is not #{name} file"
+        warn file_type_warning_message(filename, ext)
+        fail TypeError, "#{filename} is not #{name} file"
       when :warning
         warn "are you sure, this is #{name} spreadsheet file?"
-        warn correct_class
+        warn file_type_warning_message(filename, ext)
       when :ignore
         # ignore
       else
-        raise "#{warning_level} illegal state of file_warning"
+        fail "#{warning_level} illegal state of file_warning"
       end
     end
   end
@@ -538,8 +427,8 @@ class Roo::Base
   # Diese Methode ist eine temp. Loesung, um zu erforschen, ob der
   # Zugriff mit numerischen Keys schneller ist.
   def key_to_num(str)
-    r,c = str.split(',')
-    [r.to_i,c.to_i]
+    r, c = str.split(',')
+    [r.to_i, c.to_i]
   end
 
   # see: key_to_num
@@ -549,6 +438,67 @@ class Roo::Base
 
   private
 
+  def search_or_set_header(options)
+    if options[:header_search]
+      @headers = nil
+      @header_line = row_with(options[:header_search])
+    elsif [:first_row, true].include?(options[:headers])
+      @headers = []
+      row(first_row).each_with_index { |x, i| @headers << [x, i + 1] }
+    else
+      set_headers(options)
+    end
+  end
+
+  def local_filename(filename, tmpdir, packed)
+    filename = download_uri(filename, tmpdir) if uri?(filename)
+    filename = unzip(filename, tmpdir) if packed == :zip
+    unless File.file?(filename)
+      fail IOError, "file #{filename} does not exist"
+    end
+    filename
+  end
+
+  def file_type_warning_message(filename, ext)
+    "use #{Roo::CLASS_FOR_EXTENSION.fetch(ext.sub('.', '').to_sym)}.new to handle #{ext} spreadsheet files. This has #{File.extname(filename).downcase}"
+  rescue KeyError
+    raise "unknown file type: #{ext}"
+  end
+
+  def find_by_row(row_index)
+    row_index += (header_line - 1) if @header_line
+
+    row(row_index).size.times.map do |cell_index|
+      cell(row_index, cell_index + 1)
+    end
+  end
+
+  def find_by_conditions(options)
+    rows = first_row.upto(last_row)
+    header_for = Hash[1.upto(last_column).map do |col|
+      [col, cell(@header_line, col)]
+    end]
+
+    # are all conditions met?
+    conditions = options[:conditions]
+    if conditions && !conditions.empty?
+      column_with = header_for.invert
+      rows = rows.select do |i|
+        conditions.all? { |key, val| cell(i, column_with[key]) == val }
+      end
+    end
+
+    if options[:array]
+      rows.map { |i| row(i) }
+    else
+      rows.map do |i|
+        Hash[1.upto(row(i).size).map do |j|
+          [header_for.fetch(j), cell(i, j)]
+        end]
+      end
+    end
+  end
+
   def without_changing_default_sheet
     original_default_sheet = default_sheet
     yield
@@ -560,77 +510,77 @@ class Roo::Base
     initialize(@filename)
   end
 
-  def make_tmpdir(tmp_root = nil)
-    Dir.mktmpdir(TEMP_PREFIX, tmp_root || ENV['ROO_TMP']) do |tmpdir|
-      yield tmpdir
+  def make_tmpdir(prefix = nil, root = nil, &block)
+    prefix = if prefix
+      TEMP_PREFIX + prefix
+    else
+      TEMP_PREFIX
     end
+    Dir.mktmpdir(prefix, root || ENV['ROO_TMP'], &block)
   end
 
   def clean_sheet(sheet)
     read_cells(sheet)
-    @cell[sheet].each_pair do |coord,value|
-      if String === value
-        @cell[sheet][coord] = sanitize_value(value)
-      end
+    @cell[sheet].each_pair do |coord, value|
+      @cell[sheet][coord] = sanitize_value(value) if value.is_a?(::String)
     end
     @cleaned[sheet] = true
   end
 
   def sanitize_value(v)
-    v.strip.unpack('U*').select {|b| b < 127}.pack('U*')
+    v.gsub(/[[:cntrl:]]|^[\p{Space}]+|[\p{Space}]+$/, '')
   end
 
-  def set_headers(hash={})
+  def set_headers(hash = {})
     # try to find header row with all values or give an error
     # then create new hash by indexing strings and keeping integers for header array
-    @headers = row_with(hash.values,true)
-    @headers = Hash[hash.keys.zip(@headers.map {|x| header_index(x)})]
+    @headers = row_with(hash.values, true)
+    @headers = Hash[hash.keys.zip(@headers.map { |x| header_index(x) })]
   end
 
   def header_index(query)
     row(@header_line).index(query) + first_column
   end
 
-  def set_value(row,col,value,sheet=nil)
-    sheet ||= @default_sheet
-    @cell[sheet][[row,col]] = value
+  def set_value(row, col, value, sheet = default_sheet)
+    @cell[sheet][[row, col]] = value
   end
 
-  def set_type(row,col,type,sheet=nil)
-    sheet ||= @default_sheet
-    @cell_type[sheet][[row,col]] = type
+  def set_type(row, col, type, sheet = default_sheet)
+    @cell_type[sheet][[row, col]] = type
   end
 
   # converts cell coordinate to numeric values of row,col
-  def normalize(row,col)
-    if row.class == String
-      if col.class == Fixnum
+  def normalize(row, col)
+    if row.is_a?(::String)
+      if col.is_a?(::Fixnum)
         # ('A',1):
         # ('B', 5) -> (5, 2)
         row, col = col, row
       else
-        raise ArgumentError
+        fail ArgumentError
       end
     end
-    if col.class == String
-      col = Roo::Base.letter_to_number(col)
+    if col.is_a?(::String)
+      col = ::Roo::Utils.letter_to_number(col)
     end
-    return row,col
+    [row, col]
   end
 
   def uri?(filename)
-    filename.start_with?("http://", "https://")
+    filename.start_with?('http://', 'https://')
+  rescue
+    false
   end
 
   def download_uri(uri, tmpdir)
     require 'open-uri'
     tempfilename = File.join(tmpdir, File.basename(uri))
-    response = ''
     begin
-      File.open(tempfilename,"wb") do |file|
-        open(uri, "User-Agent" => "Ruby/#{RUBY_VERSION}") { |net|
+      File.open(tempfilename, 'wb') do |file|
+        open(uri, 'User-Agent' => "Ruby/#{RUBY_VERSION}") do |net|
           file.write(net.read)
-        }
+        end
       end
     rescue OpenURI::HTTPError
       raise "could not open #{uri}"
@@ -639,50 +589,17 @@ class Roo::Base
   end
 
   def open_from_stream(stream, tmpdir)
-    tempfilename = File.join(tmpdir, "spreadsheet")
-    File.open(tempfilename,"wb") do |file|
+    tempfilename = File.join(tmpdir, 'spreadsheet')
+    File.open(tempfilename, 'wb') do |file|
       file.write(stream[7..-1])
     end
-    File.join(tmpdir, "spreadsheet")
-  end
-
-  LETTERS = %w{A B C D E F G H I J K L M N O P Q R S T U V W X Y Z}
-
-  # convert a number to something like 'AB' (1 => 'A', 2 => 'B', ...)
-  def self.number_to_letter(n)
-    letters=""
-    if n > 26
-      while n % 26 == 0 && n != 0
-        letters << 'Z'
-        n = (n - 26) / 26
-      end
-      while n > 0
-        num = n%26
-        letters = LETTERS[num-1] + letters
-        n = (n / 26)
-      end
-    else
-      letters = LETTERS[n-1]
-    end
-    letters
-  end
-
-  # convert letters like 'AB' to a number ('A' => 1, 'B' => 2, ...)
-  def self.letter_to_number(letters)
-    result = 0
-    while letters && letters.length > 0
-      character = letters[0,1].upcase
-      num = LETTERS.index(character)
-      raise ArgumentError, "invalid column character '#{letters[0,1]}'" if num == nil
-      num += 1
-      result = result * 26 + num
-      letters = letters[1..-1]
-    end
-    result
+    File.join(tmpdir, 'spreadsheet')
   end
 
   def unzip(filename, tmpdir)
-    Roo::ZipFile.open(filename) do |zip|
+    require 'zip/filesystem'
+
+    Zip::File.open(filename) do |zip|
       process_zipfile_packed(zip, tmpdir)
     end
   end
@@ -691,29 +608,29 @@ class Roo::Base
   def validate_sheet!(sheet)
     case sheet
     when nil
-      raise ArgumentError, "Error: sheet 'nil' not valid"
+      fail ArgumentError, "Error: sheet 'nil' not valid"
     when Fixnum
-      self.sheets.fetch(sheet-1) do
-        raise RangeError, "sheet index #{sheet} not found"
+      sheets.fetch(sheet - 1) do
+        fail RangeError, "sheet index #{sheet} not found"
       end
     when String
-      if !sheets.include? sheet
-        raise RangeError, "sheet '#{sheet}' not found"
+      unless sheets.include? sheet
+        fail RangeError, "sheet '#{sheet}' not found"
       end
     else
-      raise TypeError, "not a valid sheet type: #{sheet.inspect}"
+      fail TypeError, "not a valid sheet type: #{sheet.inspect}"
     end
   end
 
-  def process_zipfile_packed(zip, tmpdir, path='')
+  def process_zipfile_packed(zip, tmpdir, path = '')
     if zip.file.file? path
       # extract and return filename
-      File.open(File.join(tmpdir, path),"wb") do |file|
+      File.open(File.join(tmpdir, path), 'wb') do |file|
         file.write(zip.read(path))
       end
       File.join(tmpdir, path)
     else
-      ret=nil
+      ret = nil
       path += '/' unless path.empty?
       zip.dir.foreach(path) do |filename|
         ret = process_zipfile_packed(zip, tmpdir, path + filename)
@@ -724,13 +641,13 @@ class Roo::Base
 
   # Write all cells to the csv file. File can be a filename or nil. If the this
   # parameter is nil the output goes to STDOUT
-  def write_csv_content(file=nil,sheet=nil)
+  def write_csv_content(file = nil, sheet = nil, separator = ',')
     file ||= STDOUT
     if first_row(sheet) # sheet is not empty
       1.upto(last_row(sheet)) do |row|
         1.upto(last_column(sheet)) do |col|
-          file.print(",") if col > 1
-          file.print cell_to_csv(row,col,sheet)
+          file.print(separator) if col > 1
+          file.print cell_to_csv(row, col, sheet)
         end
         file.print("\n")
       end # sheet not empty
@@ -739,18 +656,16 @@ class Roo::Base
 
   # The content of a cell in the csv output
   def cell_to_csv(row, col, sheet)
-    if empty?(row,col,sheet)
+    if empty?(row, col, sheet)
       ''
     else
-      onecell = cell(row,col,sheet)
+      onecell = cell(row, col, sheet)
 
-      case celltype(row,col,sheet)
+      case celltype(row, col, sheet)
       when :string
-        unless onecell.empty?
-          %{"#{onecell.gsub(/"/,'""')}"}
-        end
+        %("#{onecell.tr('"', '""')}") unless onecell.empty?
       when :boolean
-        %{"#{onecell.gsub(/"/,'""').downcase}"}
+        %("#{onecell.tr('"', '""').downcase}")
       when :float, :percentage
         if onecell == onecell.to_i
           onecell.to_i.to_s
@@ -760,9 +675,7 @@ class Roo::Base
       when :formula
         case onecell
         when String
-          unless onecell.empty?
-            %{"#{onecell.gsub(/"/,'""')}"}
-          end
+          %("#{onecell.tr('"', '""')}") unless onecell.empty?
         when Float
           if onecell == onecell.to_i
             onecell.to_i.to_s
@@ -772,25 +685,27 @@ class Roo::Base
         when DateTime
           onecell.to_s
         else
-          raise "unhandled onecell-class #{onecell.class}"
+          fail "unhandled onecell-class #{onecell.class}"
         end
       when :date, :datetime
         onecell.to_s
       when :time
-        Roo::Base.integer_to_timestring(onecell)
+        integer_to_timestring(onecell)
+      when :link
+        %("#{onecell.url.tr('"', '""')}")
       else
-        raise "unhandled celltype #{celltype(row,col,sheet)}"
-      end || ""
+        fail "unhandled celltype #{celltype(row, col, sheet)}"
+      end || ''
     end
   end
 
   # converts an integer value to a time string like '02:05:06'
-  def self.integer_to_timestring(content)
-    h = (content/3600.0).floor
-    content = content - h*3600
-    m = (content/60.0).floor
-    content = content - m*60
+  def integer_to_timestring(content)
+    h = (content / 3600.0).floor
+    content = content - h * 3600
+    m = (content / 60.0).floor
+    content = content - m * 60
     s = content
-    sprintf("%02d:%02d:%02d",h,m,s)
+    sprintf('%02d:%02d:%02d', h, m, s)
   end
 end