roo 1.12.2 → 1.13.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c041c89a52bab18a4a8c0f3ca606323c2a74dcf4
+  data.tar.gz: 73837bdf2ff5a36f18f70c0353f2535ca128c511
+SHA512:
+  metadata.gz: 802f2af75523ef329aeaeca290702eba0d0a87f866e07db3ad75efcf1191f252e9f1a9856eb5580d93446e64b95f05143132fbace981e4b2e522af96df916547
+  data.tar.gz: 9d28e8f7980756a1a9f8f9f7a5c3c47af33aaf53f3bf0fda6ebacf951d19cccb0e79467619f458436b0e1d322b04ec93138d0eddceace90987c344a67a49dc52

data/CHANGELOG

@@ -1,7 +1,21 @@
+== 1.13.0 2013-12-05
+
+* enhancements
+  * Support extracting link data from Excel and Excelx spreadsheets,
+    via Excel#read_cell(_content) and Excelx#hyperlink(?). #47
+  * Support setting the Excel Spreadsheet mode via the :mode option. #88
+  * Support Spreadsheet.open with a declared :extension that includes a leading '.'. #73
+  * Enable file type detection for URI's with parameters / anchors. #51
+
+* bugfixes
+  * Fix that CSV#each_row could overwrite the filename when run against a uri. #77
+  * Fix that #to_matrix wasn't respecting the sheet argument. #87
+
 == 1.12.2 2013-09-11
 
 * 1 enhancement
   * Support rubyzip >= 1.0.0. #65
+  * Fix typo in deprecation notices. #63
 
 == 1.12.1 2013-08-18
 

data/VERSION

@@ -1 +1 @@
-1.12.2
+1.13.0

data/lib/roo/base.rb

@@ -208,7 +208,7 @@ class Roo::Base
 
     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)
+        cell(row,col,sheet)
       end
     end)
   end

data/lib/roo/csv.rb

@@ -60,8 +60,8 @@ class Roo::CSV < Roo::Base
   def each_row(options, &block)
     if uri?(filename)
       make_tmpdir do |tmpdir|
-        filename = download_uri(filename, tmpdir)
-        CSV.foreach(filename, options, &block)
+        tmp_filename = download_uri(filename, tmpdir)
+        CSV.foreach(tmp_filename, options, &block)
       end
     else
       CSV.foreach(filename, options, &block)

data/lib/roo/excel.rb

@@ -19,9 +19,11 @@ class Roo::Excel < Roo::Base
     if Hash === options
       packed = options[:packed]
       file_warning = options[:file_warning] || :error
+      mode = options[:mode] || "rb+"
     else
-      warn 'Supplying `packed` or `file_warning` as separate arguments to `Roo::Excel.new` is deprected. Use an options hash instead.'
+      warn 'Supplying `packed` or `file_warning` as separate arguments to `Roo::Excel.new` is deprecated. Use an options hash instead.'
       packed = options
+      mode = "rb+"
       file_warning = deprecated_file_warning
     end
 
@@ -35,7 +37,7 @@ class Roo::Excel < Roo::Base
       unless File.file?(@filename)
         raise IOError, "file #{@filename} does not exist"
       end
-      @workbook = Spreadsheet.open(filename)
+      @workbook = Spreadsheet.open(filename, mode)
     end
     super(filename, options)
     @formula = Hash.new
@@ -274,6 +276,7 @@ class Roo::Excel < Roo::Base
   # way formula stores the value
   def read_cell_content(row, idx)
     cell = row.at(idx)
+    cell = row[idx] if row[idx].class == Spreadsheet::Link
     cell = cell.value if cell.class == Spreadsheet::Formula
     cell
   end
@@ -336,6 +339,9 @@ class Roo::Excel < Roo::Base
     when Float, Integer, Fixnum, Bignum
       value_type = :float
       value = cell.to_f
+    when Spreadsheet::Link
+      value_type = :link
+      value = cell
     when String, TrueClass, FalseClass
       value_type = :string
       value = cell.to_s

data/lib/roo/excel2003xml.rb

@@ -11,7 +11,7 @@ class Roo::Excel2003XML < Roo::Base
       packed = options[:packed]
       file_warning = options[:file_warning] || :error
     else
-      warn 'Supplying `packed` or `file_warning` as separate arguments to `Roo::Excel2003XML.new` is deprected. Use an options hash instead.'
+      warn 'Supplying `packed` or `file_warning` as separate arguments to `Roo::Excel2003XML.new` is deprecated. Use an options hash instead.'
       packed = options
       file_warning = deprecated_file_warning
     end

data/lib/roo/excelx.rb

@@ -1,5 +1,6 @@
 require 'date'
 require 'nokogiri'
+require 'spreadsheet'
 
 class Roo::Excelx < Roo::Base
   module Format
@@ -70,7 +71,7 @@ class Roo::Excelx < Roo::Base
       packed = options[:packed]
       file_warning = options[:file_warning] || :error
     else
-      warn 'Supplying `packed` or `file_warning` as separate arguments to `Roo::Excelx.new` is deprected. Use an options hash instead.'
+      warn 'Supplying `packed` or `file_warning` as separate arguments to `Roo::Excelx.new` is deprecated. Use an options hash instead.'
       packed = options
       file_warning = deprecated_file_warning
     end
@@ -84,6 +85,7 @@ class Roo::Excelx < Roo::Base
         raise IOError, "file #{@filename} does not exist"
       end
       @comments_files = Array.new
+      @rels_files = Array.new
       extract_content(tmpdir, @filename)
       @workbook_doc = load_xml(File.join(tmpdir, "roo_workbook.xml"))
       @shared_table = []
@@ -103,6 +105,9 @@ class Roo::Excelx < Roo::Base
       @comments_doc = @comments_files.compact.map do |item|
         load_xml(item)
       end
+      @rels_doc = @rels_files.map do |item|
+        load_xml(item)
+      end
     end
     super(filename, options)
     @formula = Hash.new
@@ -111,6 +116,8 @@ class Roo::Excelx < Roo::Base
     @s_attribute = Hash.new # TODO: ggf. wieder entfernen nur lokal benoetigt
     @comment = Hash.new
     @comments_read = Hash.new
+    @hyperlink = Hash.new
+    @hyperlinks_read = Hash.new
   end
 
   def method_missing(m,*args)
@@ -290,6 +297,20 @@ class Roo::Excelx < Roo::Base
     end
   end
 
+  def hyperlink?(row,col,sheet=nil)
+    hyperlink(row, col, sheet) != nil
+  end
+
+  # returns the hyperlink at (row/col)
+  # nil if there is no hyperlink
+  def hyperlink(row,col,sheet=nil)
+    sheet ||= @default_sheet
+    read_hyperlinks(sheet) unless @hyperlinks_read[sheet]
+    row,col = normalize(row,col)
+    return nil unless @hyperlink[sheet]
+    @hyperlink[sheet][[row,col]]
+  end
+
   # returns the comment at (row/col)
   # nil if there is no comment
   def comment(row,col,sheet=nil)
@@ -354,6 +375,8 @@ class Roo::Excelx < Roo::Base
       else
         v
       end
+
+    @cell[sheet][key] = Spreadsheet::Link.new(@hyperlink[sheet][key], @cell[sheet][key]) if hyperlink?(y,x+i)
     @excelx_type[sheet] ||= {}
     @excelx_type[sheet][key] = excelx_type
     @excelx_value[sheet] ||= {}
@@ -509,6 +532,26 @@ Datei xl/comments1.xml
     @comments_read[sheet] = true
   end
 
+  # Reads all hyperlinks from a sheet
+  def read_hyperlinks(sheet=nil)
+    sheet ||= @default_sheet
+    validate_sheet!(sheet)
+    n = self.sheets.index(sheet)
+    if rels_doc = @rels_doc[n]
+      rels = Hash[rels_doc.xpath("/xmlns:Relationships/xmlns:Relationship").map do |r|
+        [r.attribute('Id').text, r]
+      end]
+      @sheet_doc[n].xpath("/xmlns:worksheet/xmlns:hyperlinks/xmlns:hyperlink").each do |h|
+        if rel_element = rels[h.attribute('id').text]
+          row,col = Roo::Base.split_coordinate(h.attributes['ref'].to_s)
+          @hyperlink[sheet] ||= {}
+          @hyperlink[sheet][[row,col]] = rel_element.attribute('Target').text
+        end
+      end
+    end
+    @hyperlinks_read[sheet] = true
+  end
+
   def read_labels
     @label ||= Hash[@workbook_doc.xpath("//xmlns:definedName").map do |defined_name|
       # "Sheet1!$C$5"
@@ -523,43 +566,36 @@ Datei xl/comments1.xml
     @sheet_files = []
     Roo::ZipFile.open(zipfilename) {|zf|
       zf.entries.each {|entry|
-        if entry.to_s.end_with?('workbook.xml')
-          open(tmpdir+'/'+'roo_workbook.xml','wb') {|f|
-            f << zip.read(entry)
-          }
-        end
-        # if entry.to_s.end_with?('sharedStrings.xml')
-        # at least one application creates this file with another (incorrect?)
-        # casing. It doesn't hurt, if we ignore here the correct casing - there
-        # won't be both names in the archive.
-        # Changed the casing of all the following filenames.
-        if entry.to_s.downcase.end_with?('sharedstrings.xml')
-          open(tmpdir+'/'+'roo_sharedStrings.xml','wb') {|f|
-            f << zip.read(entry)
-          }
-        end
-        if entry.to_s.downcase.end_with?('styles.xml')
-          open(tmpdir+'/'+'roo_styles.xml','wb') {|f|
-            f << zip.read(entry)
-          }
-        end
-        if entry.to_s.downcase =~ /sheet([0-9]+).xml$/
-          nr = $1
-          open(tmpdir+'/'+"roo_sheet#{nr}",'wb') {|f|
-            f << zip.read(entry)
-          }
-          @sheet_files[nr.to_i-1] = tmpdir+'/'+"roo_sheet#{nr}"
-        end
-        if entry.to_s.downcase =~ /comments([0-9]+).xml$/
-          nr = $1
-          open(tmpdir+'/'+"roo_comments#{nr}",'wb') {|f|
-            f << zip.read(entry)
-          }
-          @comments_files[nr.to_i-1] = tmpdir+'/'+"roo_comments#{nr}"
+        entry_name = entry.to_s.downcase
+
+        path =
+          if entry_name.end_with?('workbook.xml')
+            "#{tmpdir}/roo_workbook.xml"
+          elsif entry_name.end_with?('sharedstrings.xml')
+            "#{tmpdir}/roo_sharedStrings.xml"
+          elsif entry_name.end_with?('styles.xml')
+            "#{tmpdir}/roo_styles.xml"
+          elsif entry_name =~ /sheet([0-9]+).xml$/
+            nr = $1
+            @sheet_files[nr.to_i-1] = "#{tmpdir}/roo_sheet#{nr}"
+          elsif entry_name =~ /comments([0-9]+).xml$/
+            nr = $1
+            @comments_files[nr.to_i-1] = "#{tmpdir}/roo_comments#{nr}"
+          elsif entry_name =~ /sheet([0-9]+).xml.rels$/
+            nr = $1
+            @rels_files[nr.to_i-1] = "#{tmpdir}/roo_rels#{nr}"
+          end
+        if path
+          extract_file(zip, entry, path)
         end
       }
     }
-    # return
+  end
+
+  def extract_file(source_zip, entry, destination_path)
+    open(destination_path,'wb') {|f|
+      f << source_zip.read(entry)
+    }
   end
 
   # extract files from the zip file

data/lib/roo/openoffice.rb

@@ -36,7 +36,7 @@ class Roo::OpenOffice < Roo::Base
       file_warning = options[:file_warning] || :error
       tmpdir_root = options[:tmpdir_root]
     else
-      warn 'Supplying `packed`, `file_warning`, or `tmpdir_root` as separate arguments to `Roo::OpenOffice.new` is deprected. Use an options hash instead.'
+      warn 'Supplying `packed`, `file_warning`, or `tmpdir_root` as separate arguments to `Roo::OpenOffice.new` is deprecated. Use an options hash instead.'
       packed = options
       file_warning = deprecated_file_warning
       tmpdir_root = deprecated_tmpdir_root

data/lib/roo/spreadsheet.rb

@@ -7,9 +7,9 @@ module Roo
         extension =
           if options[:extension]
             options[:file_warning] = :ignore
-            ".#{options[:extension]}"
+            ".#{options[:extension]}".gsub(/[.]+/, ".")
           else
-            File.extname(file)
+            File.extname(URI.parse(file).path)
           end
 
         case extension.downcase

data/roo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "roo"
-  s.version = "1.12.1"
+  s.version = "1.13.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Preymesser", "Hugh McGowan", "Ben Woosley"]
-  s.date = "2013-09-11"
+  s.date = "2013-12-05"
   s.description = "Roo can access the contents of various spreadsheet files. It can handle\n* OpenOffice\n* Excel\n* Google spreadsheets\n* Excelx\n* LibreOffice\n* CSV"
   s.email = "ruby.ruby.ruby.roo@gmail.com"
   s.extra_rdoc_files = [
@@ -110,6 +110,8 @@ Gem::Specification.new do |s|
     "test/files/formula_parse_error.xml",
     "test/files/formula_string_error.xlsx",
     "test/files/html-escape.ods",
+    "test/files/link.xls",
+    "test/files/link.xlsx",
     "test/files/matrix.ods",
     "test/files/matrix.xls",
     "test/files/named_cells.ods",
@@ -173,12 +175,12 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.0")
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.14"
   s.summary = "Roo can access the contents of various spreadsheet files."
-  s.test_files = ["spec/fixtures/vcr_cassettes/google_drive.yml", "spec/fixtures/vcr_cassettes/google_drive_access_token.yml", "spec/lib/roo/base_spec.rb", "spec/lib/roo/csv_spec.rb", "spec/lib/roo/excel2003xml_spec.rb", "spec/lib/roo/excel_spec.rb", "spec/lib/roo/excelx/format_spec.rb", "spec/lib/roo/excelx_spec.rb", "spec/lib/roo/google_spec.rb", "spec/lib/roo/libreoffice_spec.rb", "spec/lib/roo/openoffice_spec.rb", "spec/lib/roo/spreadsheet_spec.rb", "spec/spec_helper.rb", "test/all_ss.rb", "test/files/1900_base.xls", "test/files/1900_base.xlsx", "test/files/1904_base.xls", "test/files/1904_base.xlsx", "test/files/Bibelbund.csv", "test/files/Bibelbund.ods", "test/files/Bibelbund.xls", "test/files/Bibelbund.xlsx", "test/files/Bibelbund.xml", "test/files/Bibelbund1.ods", "test/files/Pfand_from_windows_phone.xlsx", "test/files/bad_excel_date.xls", "test/files/bbu.ods", "test/files/bbu.xls", "test/files/bbu.xlsx", "test/files/bbu.xml", "test/files/bode-v1.ods.zip", "test/files/bode-v1.xls.zip", "test/files/boolean.csv", "test/files/boolean.ods", "test/files/boolean.xls", "test/files/boolean.xlsx", "test/files/boolean.xml", "test/files/borders.ods", "test/files/borders.xls", "test/files/borders.xlsx", "test/files/borders.xml", "test/files/bug-numbered-sheet-names.xlsx", "test/files/bug-row-column-fixnum-float.xls", "test/files/bug-row-column-fixnum-float.xml", "test/files/comments.ods", "test/files/comments.xls", "test/files/comments.xlsx", "test/files/csvtypes.csv", "test/files/datetime.ods", "test/files/datetime.xls", "test/files/datetime.xlsx", "test/files/datetime.xml", "test/files/datetime_floatconv.xls", "test/files/datetime_floatconv.xml", "test/files/dreimalvier.ods", "test/files/emptysheets.ods", "test/files/emptysheets.xls", "test/files/emptysheets.xlsx", "test/files/emptysheets.xml", "test/files/excel2003.xml", "test/files/false_encoding.xls", "test/files/false_encoding.xml", "test/files/formula.ods", "test/files/formula.xls", "test/files/formula.xlsx", "test/files/formula.xml", "test/files/formula_parse_error.xls", "test/files/formula_parse_error.xml", "test/files/formula_string_error.xlsx", "test/files/html-escape.ods", "test/files/matrix.ods", "test/files/matrix.xls", "test/files/named_cells.ods", "test/files/named_cells.xls", "test/files/named_cells.xlsx", "test/files/no_spreadsheet_file.txt", "test/files/numbers1.csv", "test/files/numbers1.ods", "test/files/numbers1.xls", "test/files/numbers1.xlsx", "test/files/numbers1.xml", "test/files/only_one_sheet.ods", "test/files/only_one_sheet.xls", "test/files/only_one_sheet.xlsx", "test/files/only_one_sheet.xml", "test/files/paragraph.ods", "test/files/paragraph.xls", "test/files/paragraph.xlsx", "test/files/paragraph.xml", "test/files/prova.xls", "test/files/ric.ods", "test/files/simple_spreadsheet.ods", "test/files/simple_spreadsheet.xls", "test/files/simple_spreadsheet.xlsx", "test/files/simple_spreadsheet.xml", "test/files/simple_spreadsheet_from_italo.ods", "test/files/simple_spreadsheet_from_italo.xls", "test/files/simple_spreadsheet_from_italo.xml", "test/files/so_datetime.csv", "test/files/style.ods", "test/files/style.xls", "test/files/style.xlsx", "test/files/style.xml", "test/files/time-test.csv", "test/files/time-test.ods", "test/files/time-test.xls", "test/files/time-test.xlsx", "test/files/time-test.xml", "test/files/type_excel.ods", "test/files/type_excel.xlsx", "test/files/type_excelx.ods", "test/files/type_excelx.xls", "test/files/type_openoffice.xls", "test/files/type_openoffice.xlsx", "test/files/whitespace.ods", "test/files/whitespace.xls", "test/files/whitespace.xlsx", "test/files/whitespace.xml", "test/rm_sub_test.rb", "test/rm_test.rb", "test/test_generic_spreadsheet.rb", "test/test_helper.rb", "test/test_roo.rb"]
+  s.test_files = ["spec/fixtures/vcr_cassettes/google_drive.yml", "spec/fixtures/vcr_cassettes/google_drive_access_token.yml", "spec/lib/roo/base_spec.rb", "spec/lib/roo/csv_spec.rb", "spec/lib/roo/excel2003xml_spec.rb", "spec/lib/roo/excel_spec.rb", "spec/lib/roo/excelx/format_spec.rb", "spec/lib/roo/excelx_spec.rb", "spec/lib/roo/google_spec.rb", "spec/lib/roo/libreoffice_spec.rb", "spec/lib/roo/openoffice_spec.rb", "spec/lib/roo/spreadsheet_spec.rb", "spec/spec_helper.rb", "test/all_ss.rb", "test/files/1900_base.xls", "test/files/1900_base.xlsx", "test/files/1904_base.xls", "test/files/1904_base.xlsx", "test/files/Bibelbund.csv", "test/files/Bibelbund.ods", "test/files/Bibelbund.xls", "test/files/Bibelbund.xlsx", "test/files/Bibelbund.xml", "test/files/Bibelbund1.ods", "test/files/Pfand_from_windows_phone.xlsx", "test/files/bad_excel_date.xls", "test/files/bbu.ods", "test/files/bbu.xls", "test/files/bbu.xlsx", "test/files/bbu.xml", "test/files/bode-v1.ods.zip", "test/files/bode-v1.xls.zip", "test/files/boolean.csv", "test/files/boolean.ods", "test/files/boolean.xls", "test/files/boolean.xlsx", "test/files/boolean.xml", "test/files/borders.ods", "test/files/borders.xls", "test/files/borders.xlsx", "test/files/borders.xml", "test/files/bug-numbered-sheet-names.xlsx", "test/files/bug-row-column-fixnum-float.xls", "test/files/bug-row-column-fixnum-float.xml", "test/files/comments.ods", "test/files/comments.xls", "test/files/comments.xlsx", "test/files/csvtypes.csv", "test/files/datetime.ods", "test/files/datetime.xls", "test/files/datetime.xlsx", "test/files/datetime.xml", "test/files/datetime_floatconv.xls", "test/files/datetime_floatconv.xml", "test/files/dreimalvier.ods", "test/files/emptysheets.ods", "test/files/emptysheets.xls", "test/files/emptysheets.xlsx", "test/files/emptysheets.xml", "test/files/excel2003.xml", "test/files/false_encoding.xls", "test/files/false_encoding.xml", "test/files/formula.ods", "test/files/formula.xls", "test/files/formula.xlsx", "test/files/formula.xml", "test/files/formula_parse_error.xls", "test/files/formula_parse_error.xml", "test/files/formula_string_error.xlsx", "test/files/html-escape.ods", "test/files/link.xls", "test/files/link.xlsx", "test/files/matrix.ods", "test/files/matrix.xls", "test/files/named_cells.ods", "test/files/named_cells.xls", "test/files/named_cells.xlsx", "test/files/no_spreadsheet_file.txt", "test/files/numbers1.csv", "test/files/numbers1.ods", "test/files/numbers1.xls", "test/files/numbers1.xlsx", "test/files/numbers1.xml", "test/files/only_one_sheet.ods", "test/files/only_one_sheet.xls", "test/files/only_one_sheet.xlsx", "test/files/only_one_sheet.xml", "test/files/paragraph.ods", "test/files/paragraph.xls", "test/files/paragraph.xlsx", "test/files/paragraph.xml", "test/files/prova.xls", "test/files/ric.ods", "test/files/simple_spreadsheet.ods", "test/files/simple_spreadsheet.xls", "test/files/simple_spreadsheet.xlsx", "test/files/simple_spreadsheet.xml", "test/files/simple_spreadsheet_from_italo.ods", "test/files/simple_spreadsheet_from_italo.xls", "test/files/simple_spreadsheet_from_italo.xml", "test/files/so_datetime.csv", "test/files/style.ods", "test/files/style.xls", "test/files/style.xlsx", "test/files/style.xml", "test/files/time-test.csv", "test/files/time-test.ods", "test/files/time-test.xls", "test/files/time-test.xlsx", "test/files/time-test.xml", "test/files/type_excel.ods", "test/files/type_excel.xlsx", "test/files/type_excelx.ods", "test/files/type_excelx.xls", "test/files/type_openoffice.xls", "test/files/type_openoffice.xlsx", "test/files/whitespace.ods", "test/files/whitespace.xls", "test/files/whitespace.xlsx", "test/files/whitespace.xml", "test/rm_sub_test.rb", "test/rm_test.rb", "test/test_generic_spreadsheet.rb", "test/test_helper.rb", "test/test_roo.rb"]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<spreadsheet>, ["> 0.6.4"])

data/spec/lib/roo/spreadsheet_spec.rb

@@ -6,21 +6,55 @@ describe Roo::Spreadsheet do
       let(:filename) { 'file.XLS' }
 
       it 'loads the proper type' do
-        Roo::Excel.should_receive(:new).with(filename, {})
+        expect(Roo::Excel).to receive(:new).with(filename, {})
         Roo::Spreadsheet.open(filename)
       end
     end
 
+    context 'for a url' do
+      context 'that is csv' do
+        let(:filename) { 'http://example.com/file.csv?with=params#and=anchor' }
+
+        it 'treats the url as CSV' do
+          expect(Roo::CSV).to receive(:new).with(filename, {})
+          Roo::Spreadsheet.open(filename)
+        end
+      end
+    end
+
     context 'for a csv file' do
       let(:filename) { 'file.csv' }
       let(:options) { {csv_options: {col_sep: '"'}} }
 
       context 'with options' do
         it 'passes the options through' do
-          Roo::CSV.should_receive(:new).with(filename, options)
+          expect(Roo::CSV).to receive(:new).with(filename, options)
+          Roo::Spreadsheet.open(filename, options)
+        end
+      end
+    end
+
+    context 'when the file extension' do
+      let(:filename) { 'file.xls' }
+
+      context "is xls" do
+        let(:options) { { extension: "xls" } }
+
+        it 'loads with xls extension options' do
+          expect(Roo::Excel).to receive(:new).with(filename, options)
           Roo::Spreadsheet.open(filename, options)
         end
       end
+
+      context "is .xls" do
+        let(:options) { { extension: ".xls" } }
+
+        it 'loads with .xls extension options' do
+          expect(Roo::Excel).to receive(:new).with(filename, options)
+          Roo::Spreadsheet.open(filename, options)
+        end
+      end
+
     end
   end
 end

data/test/test_roo.rb

@@ -1542,6 +1542,21 @@ Sheet 3:
      end
   end
 
+
+  def test_excel_links
+    with_each_spreadsheet(:name=>'link', :format=>:excel) do |oo|
+      assert_equal 'Google', oo.cell(1,1)
+      assert_equal 'http://www.google.com', oo.cell(1,1).url
+    end
+  end
+
+  def test_excelx_links
+    with_each_spreadsheet(:name=>'link', :format=>:excelx) do |oo|
+      assert_equal 'Google', oo.cell(1,1)
+      assert_equal 'http://www.google.com', oo.cell(1,1).url
+    end
+  end
+
   # Excel has two base date formats one from 1900 and the other from 1904.
   # There's a MS bug that 1900 base dates include an extra day due to erroneously
   # including 1900 as a leap yar.
@@ -1771,6 +1786,16 @@ Sheet 3:
     end
   end
 
+  def test_matrix_specifying_sheet
+    with_each_spreadsheet(:name => 'matrix', :format => [:openoffice, :excel, :google]) do |oo|
+      oo.default_sheet = oo.sheets.first
+      assert_equal Matrix[
+        [1.0, nil, 3.0],
+        [4.0, 5.0, 6.0],
+        [7.0, 8.0, nil] ], oo.to_matrix(nil, nil, nil, nil, 'Sheet3')
+    end
+  end
+
   # unter Windows soll es laut Bug-Reports nicht moeglich sein, eine Excel-Datei, die
   # mit Excel.new geoeffnet wurde nach dem Processing anschliessend zu loeschen.
   # Anmerkung: Das Spreadsheet-Gem erlaubt kein explizites Close von Spreadsheet-Dateien,

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roo
 version: !ruby/object:Gem::Version
-  version: 1.12.2
-  prerelease: 
+  version: 1.13.0
 platform: ruby
 authors:
 - Thomas Preymesser
@@ -11,101 +10,86 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: google_drive
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Roo can access the contents of various spreadsheet files. It can handle
-
+description: |-
+  Roo can access the contents of various spreadsheet files. It can handle
   * OpenOffice
-
   * Excel
-
   * Google spreadsheets
-
   * Excelx
-
   * LibreOffice
-
-  * CSV'
+  * CSV
 email: ruby.ruby.ruby.roo@gmail.com
 executables: []
 extensions: []
@@ -206,6 +190,8 @@ files:
 - test/files/formula_parse_error.xml
 - test/files/formula_string_error.xlsx
 - test/files/html-escape.ods
+- test/files/link.xls
+- test/files/link.xlsx
 - test/files/matrix.ods
 - test/files/matrix.xls
 - test/files/named_cells.ods
@@ -267,27 +253,26 @@ files:
 homepage: http://github.com/Empact/roo
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Roo can access the contents of various spreadsheet files.
 test_files:
 - spec/fixtures/vcr_cassettes/google_drive.yml
@@ -360,6 +345,8 @@ test_files:
 - test/files/formula_parse_error.xml
 - test/files/formula_string_error.xlsx
 - test/files/html-escape.ods
+- test/files/link.xls
+- test/files/link.xlsx
 - test/files/matrix.ods
 - test/files/matrix.xls
 - test/files/named_cells.ods