Merge pull request #56 from CyberSource/uri-change

Change uri (deprecated) to addressable/uri

Author: gnongsie

cybersource_rest_client.gemspec

@@ -17,7 +17,7 @@ require "cybersource_rest_client/version"
 
 Gem::Specification.new do |s|
   s.name        = "cybersource_rest_client"
-  s.version     = "0.0.30"
+  s.version     = "0.0.31"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["CyberSource"]
   s.email       = ["cybersourcedev@gmail.com"]
@@ -30,7 +30,13 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1'
   s.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0'
+  s.add_runtime_dependency 'activesupport', '~> 6.0', '>= 6.0.3.2'
+  s.add_runtime_dependency 'interface','~> 1.0', '>= 1.0.4'
+  s.add_runtime_dependency 'jwt', '~> 2.1.0'
+  s.add_runtime_dependency 'addressable', '~> 2.3', '>= 2.3.0'
 
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'rubocop', '~> 0.57.2'
   s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
   s.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.1'
   s.add_development_dependency 'webmock', '~> 1.24', '>= 1.24.3'
@@ -39,12 +45,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'autotest-growl', '~> 0.2', '>= 0.2.16'
   s.add_development_dependency 'autotest-fsevent', '~> 0.2', '>= 0.2.12'
 
-  s.add_runtime_dependency 'activesupport', '~> 6.0', '>= 6.0.3.2'
-  s.add_runtime_dependency 'interface','~> 1.0', '>= 1.0.4'
-  s.add_runtime_dependency 'jwt', '~> 2.1.0'
-  
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'rubocop', '~> 0.57.2'
-  
   s.require_paths = ["lib"]
 end

generator/cybersource-ruby-template/api_client.mustache

@@ -7,7 +7,7 @@ require 'json'
 require 'logger'
 require 'tempfile'
 require 'typhoeus'
-require 'uri'
+require 'addressable/uri'
 
 module {{moduleName}}
   class ApiClient
@@ -105,7 +105,7 @@ module {{moduleName}}
       body_params = opts[:body] || {}
       query_params = opts[:query_params] || {}
       if !query_params.empty?
-        query_params = URI.encode_www_form(query_params)
+        query_params = Addressable::URI.form_encode(query_params)
       end
       headers = CallAuthenticationHeader(http_method, path, body_params, opts[:header_params], query_params)
       http_method = http_method.to_sym.downcase
@@ -354,7 +354,7 @@ module {{moduleName}}
     def build_request_url(path)
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      URI.encode(@config.base_url + path)
+      Addressable::URI.encode(@config.base_url + path)
     end
 
     # Builds the HTTP request body

generator/cybersource-ruby-template/configuration.mustache

@@ -2,7 +2,7 @@
 {{> api_info}}
 =end
 
-require 'uri'
+require 'addressable/uri'
 
 module {{moduleName}}
   class Configuration
@@ -167,7 +167,7 @@ module {{moduleName}}
 
     def base_url
       url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
-      URI.encode(url)
+      Addressable::URI.encode(url)
     end
 
     # Gets API key (with prefix if set).

lib/cybersource_rest_client/api_client.rb

@@ -15,7 +15,7 @@
 require 'logger'
 require 'tempfile'
 require 'typhoeus'
-require 'uri'
+require 'addressable/uri'
 
 module CyberSource
   class ApiClient
@@ -113,7 +113,7 @@ def build_request(http_method, path, opts = {})
       body_params = opts[:body] || {}
       query_params = opts[:query_params] || {}
       if !query_params.empty?
-        query_params = URI.encode_www_form(query_params)
+        query_params = Addressable::URI.form_encode(query_params)
       end
       headers = CallAuthenticationHeader(http_method, path, body_params, opts[:header_params], query_params)
       http_method = http_method.to_sym.downcase
@@ -359,7 +359,7 @@ def sanitize_filename(filename)
     def build_request_url(path)
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      URI.encode(@config.base_url + path)
+      Addressable::URI.encode(@config.base_url + path)
     end
 
     # Builds the HTTP request body

lib/cybersource_rest_client/configuration.rb

@@ -10,7 +10,7 @@
 
 =end
 
-require 'uri'
+require 'addressable/uri'
 
 module CyberSource
   class Configuration
@@ -175,7 +175,7 @@ def base_path=(base_path)
 
     def base_url
       url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
-      URI.encode(url)
+      Addressable::URI.encode(url)
     end
 
     # Gets API key (with prefix if set).