Merge pull request #348 from ukolovda/name_with_leading_slash

Fix open error if sheet name lead from slash (i.e. "/xl/worksheets/sheet.xml").
roo-rb · Oct 13, 2016 · cc0d1ec · cc0d1ec
2 parents 8ded0dc + f1bc6e6
commit cc0d1ec
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/lib/roo/excelx.rb b/lib/roo/excelx.rb
@@ -363,7 +363,7 @@ def extract_worksheet_rels(entries, path)
     def extract_sheets_in_order(entries, sheet_ids, sheets, tmpdir)
       (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

diff --git a/test/files/name_with_leading_slash.xlsx b/test/files/name_with_leading_slash.xlsx
diff --git a/test/test_roo.rb b/test/test_roo.rb
@@ -2109,4 +2109,9 @@ def test_cleanup_on_error
     with_each_spreadsheet(:name=>'non_existent_file', :ignore_errors=>true) do |oo|; end
     assert_equal Dir.open(Dir.tmpdir).to_a, old_temp_files
   end
+
+  def test_name_with_leading_slash
+    xlsx = Roo::Excelx.new(File.join(TESTDIR,'name_with_leading_slash.xlsx'))
+    assert_equal 1, xlsx.sheets.count
+  end
 end # class