Merge branch 'master' into issue_389

roo-rb · Jun 5, 2021 · 158d767 · 158d767
2 parents d212720 + 709464c
commit 158d767
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ rvm:
   - 2.5
   - 2.6
   - 2.7
+  - 3.0
   - ruby-head
   - jruby-9.1.6.0
 env:

diff --git a/Gemfile b/Gemfile
@@ -10,6 +10,7 @@ group :test do
   gem 'simplecov', '>= 0.9.0', require: false
   gem 'coveralls', require: false
   gem "minitest-reporters"
+  gem 'webrick' if RUBY_VERSION >= '3.0.0'
 end
 
 group :local_development do

diff --git a/lib/roo/excelx.rb b/lib/roo/excelx.rb
@@ -429,6 +429,11 @@ def process_zipfile_entries(entries)
       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$/
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ rvm: @@
       - 2.5
       - 2.6
       - 2.7
+      - 3.0
       - ruby-head
       - jruby-9.1.6.0
     env:
@@ Expand Down @@