Fix URI::escape deprecation

.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.7.0
   - 2.6.1
   - 2.5.1
   - 2.4.1

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Change Log
 
 ## Unreleased
+### Fixed
+* Fixed a deprecation warning in Ruby 2.7.0 for `URI::escape` and replaced it with a backwards compatible mechanism. [#217](https://github.com/contentful/contentful.rb/issues/217)
 
 ## 2.15.2
 ### Fixed

contentful.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'multi_json', '~> 1'
 
   gem.add_development_dependency 'bundler'
-  gem.add_development_dependency 'rake', '< 11.0'
+  gem.add_development_dependency 'rake', '>= 12.3.3'
   gem.add_development_dependency 'rubygems-tasks', '~> 0.2'
 
   gem.add_development_dependency 'guard'

lib/contentful/request.rb

@@ -13,7 +13,12 @@ def initialize(client, endpoint, query = {}, id = nil)
 
       if id
         @type = :single
-        @id = URI.escape(id)
+        # Given the deprecation of `URI::escape` and `URI::encode`
+        # it is needed to replace it with `URI::encode_www_form_component`.
+        # This method, does replace spaces with `+` instead of `%20`.
+        # Therefore, to keep backwards compatibility, we're replacing the resulting `+`
+        # back with `%20`.
+        @id = URI.encode_www_form_component(id).gsub('+', '%20')
       else
         @type = :multi
         @id = nil