Skip to content

Commit

Permalink
Switch to Addressable.URI.escape away from obsolete URI.escape; updat…
Browse files Browse the repository at this point in the history
…ed some development gems
  • Loading branch information
johnphamvan committed May 13, 2020
1 parent 4b6c79f commit 32e48bd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
5 changes: 3 additions & 2 deletions kimurai.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions lib/kimurai/base_helper.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/kimurai/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Kimurai
VERSION = "1.4.0"
VERSION = "1.4.1"
end

0 comments on commit 32e48bd

Please sign in to comment.