Switch to Addressable.URI.escape away from obsolete URI.escape; updat…

…ed some development gems

Fixed Ruby 2.7 warning for keyword arguments

CHANGELOG.md

@@ -1,4 +1,9 @@
 # CHANGELOG
+## 1.4.1
+New
+* Updated for Ruby 2.7+ support
+* Switched to Addressable.URI.escape from obsolete URI.escape
+
 ## 1.4.0
 ### New
 * Add `encoding` config option (see [All available config options](https://github.com/vifreefly/kimuraframework#all-available-config-options))

kimurai.gemspec

@@ -37,12 +37,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "headless"
   spec.add_dependency "pmap"
 
+  spec.add_dependency "addressable"
   spec.add_dependency "whenever"
 
   spec.add_dependency "rbcat", "~> 0.2"
   spec.add_dependency "pry"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

lib/kimurai/base.rb

@@ -207,7 +207,9 @@ def request_to(handler, delay = nil, url:, data: {}, response_type: :html)
       visited = delay ? browser.visit(url, delay: delay) : browser.visit(url)
       return unless visited
 
-      public_send(handler, browser.current_response(response_type), { url: url, data: data })
+      options =  { url: url, data: data }
+
+      public_send(handler, browser.current_response(response_type), **options)
     end
 
     def console(response = nil, url: nil, data: {})

lib/kimurai/base_helper.rb

@@ -1,16 +1,18 @@
+require 'addressable/uri'
+
 module Kimurai
   module BaseHelper
     private
 
     def absolute_url(url, base:)
       return unless url
-      URI.join(base, URI.escape(url)).to_s
+      URI.join(base, Addressable::URI.escape(url)).to_s
     end
 
     def escape_url(url)
       uri = URI.parse(url)
     rescue URI::InvalidURIError => e
-      URI.parse(URI.escape url).to_s rescue url
+      URI.parse(Addressable::URI.escape(url)).to_s rescue url
     else
       url
     end

lib/kimurai/version.rb

@@ -1,3 +1,3 @@
 module Kimurai
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end