Refactor proxy

Author: laurynas

Gemfile

@@ -6,5 +6,5 @@ gem 'rake'
 gem 'json'
 
 group :test do
-  gem "rspec"
-end
+  gem 'rspec'
+end

lib/detect_language.rb

@@ -19,6 +19,10 @@ def client
       Thread.current[:detect_language_client] ||= Client.new(config)
     end
 
+    def client=(client)
+      Thread.current[:detect_language_client] = client
+    end
+
     def detect(query)
       client.post('detect', q: query)
     end

lib/detect_language/client.rb

@@ -21,19 +21,17 @@ def get(path)
     private
 
     def execute(method, path, body: nil)
-      uri = URI(config.base_url)
-      http = setup_http_connection(uri)
-      request = method.new(uri.path + path)
+      request = method.new(base_uri.path + path)
       request.body = body
 
       request['Content-Type'] = 'application/json'
       request['Authorization'] = 'Bearer ' + config.api_key.to_s
       request['User-Agent'] = config.user_agent
 
-      response = http.request(request)
+      response = connection.request(request)
 
       case response
-      when Net::HTTPSuccess, Net::HTTPUnauthorized then
+      when Net::HTTPSuccess, Net::HTTPUnauthorized
         parse_response(response.body)
       else
         raise(Error, "Failure: #{response.class}")
@@ -50,21 +48,29 @@ def parse_response(response_body)
       end
     end
 
-    def setup_http_connection(uri)
-      http = Net::HTTP::Proxy(
-        config.proxy_host, config.proxy_port, config.proxy_user, config.proxy_pass
-      ).new(uri.host, uri.port)
+    def base_uri
+      @base_uri ||= URI(config.base_url)
+    end
 
-      http.read_timeout = config.http_read_timeout
-      http.open_timeout = config.http_open_timeout
+    def connection
+      @connection ||= setup_connection
+    end
 
-      if uri.scheme == 'https'
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    def setup_connection
+      http = if config.proxy
+        proxy = URI(config.proxy)
+        proxy_use_ssl = proxy.scheme == 'https'
+        Net::HTTP.new(base_uri.hostname, base_uri.port,
+          proxy.hostname, proxy.port, proxy.user, proxy.password, nil, proxy_use_ssl)
       else
-        http.use_ssl = false
+        Net::HTTP.new(base_uri.hostname, base_uri.port)
       end
 
+      http.use_ssl = base_uri.scheme == 'https'
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER if http.use_ssl?
+      http.read_timeout = config.http_read_timeout
+      http.open_timeout = config.http_open_timeout
+
       http
     end
   end

lib/detect_language/configuration.rb

@@ -1,31 +1,23 @@
 module DetectLanguage
   class Configuration
-    # The API key for your project, found on your homepage after you login into detectlanguage.com website
+    # The API key for your project, found on your homepage after you log in into
+    # https://detectlanguage.com website
     attr_accessor :api_key
 
-    # HTTP request user agent (defaults to 'Detect Language API ruby gem').
-    attr_accessor :user_agent
-
     # API base URL
     attr_accessor :base_url
 
+    # HTTP request user agent (defaults to 'Detect Language API ruby gem').
+    attr_accessor :user_agent
+
     # The HTTP open timeout in seconds.
     attr_accessor :http_open_timeout
 
     # The HTTP read timeout in seconds.
     attr_accessor :http_read_timeout
 
-    # The hostname of your proxy server (if using a proxy).
-    attr_accessor :proxy_host
-
-    # The port of your proxy server (if using a proxy).
-    attr_accessor :proxy_port
-
-    # The username to use when logging into your proxy server (if using a proxy).
-    attr_accessor :proxy_user
-
-    # The password to use when logging into your proxy server (if using a proxy).
-    attr_accessor :proxy_pass
+    # The HTTP proxy to use for requests. Example: 'http://my-proxy:8080'
+    attr_accessor :proxy
 
     def initialize
       @api_key = nil

spec/detect_language_spec.rb spec/lib/detect_language_spec.rbspec/detect_language_spec.rb renamed to spec/lib/detect_language_spec.rb

@@ -2,9 +2,12 @@
 
 RSpec.describe DetectLanguage do
   let(:api_key) { ENV['DETECTLANGUAGE_API_KEY'] }
+  let(:proxy) { nil }
 
   before do
+    described_class.client = nil
     described_class.config.api_key = api_key
+    described_class.config.proxy = proxy
   end
 
   describe '.config' do
@@ -42,6 +45,14 @@
         expect { subject }.to raise_error(DetectLanguage::Error)
       end
     end
+
+    xcontext 'with proxy' do
+      let(:proxy) { 'http://my-proxy:8080' }
+
+      it 'uses the proxy for requests' do
+        expect { subject }.not_to raise_error
+      end
+    end
   end
 
   describe '.detect_code' do