Fix warnings caused by Ruby 2.7 update

.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
   - jruby-9.1.6.0
 env:

lib/roo/base.rb

@@ -544,7 +544,7 @@ def download_uri(uri, tmpdir)
     tempfilename = File.join(tmpdir, find_basename(uri))
     begin
       File.open(tempfilename, "wb") do |file|
-        open(uri, "User-Agent" => "Ruby/#{RUBY_VERSION}") do |net|
+        open_uri(uri, "User-Agent" => "Ruby/#{RUBY_VERSION}") do |net|
           file.write(net.read)
         end
       end
@@ -554,6 +554,18 @@ def download_uri(uri, tmpdir)
     tempfilename
   end
 
+  # Kernel#open re-defined by 'open-uri' is deprecated from Ruby 2.7.
+  # Before Ruby 2.5, URI.open is not defined by 'open-uri'.
+  # Therefore, this workaround is needed.
+  def open_uri(uri, options, &block)
+    require "open-uri"
+    if RUBY_VERSION >= '2.5.0'
+      URI.open(uri, options, &block)
+    else 
+      open(uri, options, &block)
+    end
+  end
+
   def open_from_stream(stream, tmpdir)
     tempfilename = File.join(tmpdir, "spreadsheet")
     File.open(tempfilename, "wb") do |file|

lib/roo/csv.rb

@@ -90,17 +90,36 @@ def read_cells(sheet = default_sheet)
     def each_row(options, &block)
       if uri?(filename)
         each_row_using_tempdir(options, &block)
-      elsif is_stream?(filename_or_stream)
-        ::CSV.new(filename_or_stream, options).each(&block)
       else
-        ::CSV.foreach(filename, options, &block)
+        csv_foreach(filename_or_stream, options, &block)
       end
     end
 
     def each_row_using_tempdir(options, &block)
       ::Dir.mktmpdir(Roo::TEMP_PREFIX, ENV["ROO_TMP"]) do |tmpdir|
         tmp_filename = download_uri(filename, tmpdir)
-        ::CSV.foreach(tmp_filename, options, &block)
+        csv_foreach(tmp_filename, options, &block)
+      end
+    end
+
+    # From Ruby 2.5, options argument of CSV.new/CSV.foreach is a keyword argument.
+    # Before Ruby 2.5, that argument is a Hash.
+    # Therefore, this workaround can be removed if Ruby 2.3 and 2.4 are dropped.
+    if RUBY_VERSION >= '2.5.0'
+      def csv_foreach(path_or_io, options, &block)
+        if is_stream?(path_or_io)
+          ::CSV.new(path_or_io, **options).each(&block)
+        else
+          ::CSV.foreach(path_or_io, **options, &block)
+        end
+      end
+    else
+      def csv_foreach(path_or_io, options, &block)
+        if is_stream?(path_or_io)
+          ::CSV.new(path_or_io, options).each(&block)
+        else
+          ::CSV.foreach(path_or_io, options, &block)
+        end
       end
     end
 

lib/roo/spreadsheet.rb

@@ -24,8 +24,14 @@ def extension_for(path, options)
           options[:file_warning] = :ignore
           extension.tr('.', '').downcase.to_sym
         else
-          res = ::File.extname((path =~ /\A#{::URI::DEFAULT_PARSER.make_regexp}\z/) ? ::URI.parse(::URI.encode(path)).path : path)
-          res.tr('.', '').downcase.to_sym
+          parsed_path =
+            if path =~ /\A#{::URI::DEFAULT_PARSER.make_regexp}\z/
+              # path is 7th match
+              Regexp.last_match[7]
+            else
+              path
+            end
+          ::File.extname(parsed_path).tr('.', '').downcase.to_sym
         end
       end
     end

roo.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'nokogiri', '~> 1'
   spec.add_dependency 'rubyzip', '>= 1.3.0', '< 3.0.0'
 
-  spec.add_development_dependency 'rake', '~> 10.1'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest', '~> 5.4', '>= 5.4.3'
   spec.add_development_dependency 'rack', '~> 1.6', '< 2.0.0'
 end