Switch to base url

Author: laurynas

lib/detect_language.rb

@@ -5,20 +5,18 @@
 
 module DetectLanguage
   class << self
-    attr_writer :configuration
+    attr_writer :config
 
     def configure
-      yield(configuration)
+      yield(config)
     end
 
-    # The configuration object.
-    # @see DetectLanguage.configure
-    def configuration
-      @configuration ||= Configuration.new
+    def config
+      @config ||= Configuration.new
     end
 
     def client
-      Thread.current[:detect_language_client] ||= Client.new(configuration)
+      Thread.current[:detect_language_client] ||= Client.new(config)
     end
 
     def detect(data)

lib/detect_language/client.rb

@@ -1,39 +1,33 @@
-require 'cgi'
 require 'net/http'
 require 'net/https'
 require 'json'
 
 module DetectLanguage
   class Client
-    attr_reader :configuration
+    attr_reader :config
 
-    def initialize(configuration)
-      @configuration = configuration
+    def initialize(config)
+      @config = config
     end
 
-    def post(method, params = {})
-      execute(method, params, :http_method => Net::HTTP::Post)
+    def post(path, params = {})
+      execute(Net::HTTP::Post, path, params)
     end
 
-    def get(method, params = {})
-      execute(method, params, :http_method => Net::HTTP::Get)
+    def get(path, params = {})
+      execute(Net::HTTP::Get, path, params)
     end
 
     private
 
-    def execute(method, params, options)
-      http            = setup_http_connection
-      http_method     = options[:http_method]
-      request         = http_method.new(request_uri(method))
+    def execute(method, path, params)
+      uri = URI.parse(config.base_url)
+      http = setup_http_connection(uri)
+      request = method.new(uri.path + path.to_s)
+      request.set_form_data(params)
 
-      if RUBY_VERSION == '1.8.7'
-        set_form_data_18(request, params)
-      else
-        request.set_form_data(params)
-      end
-
-      request['Authorization'] = 'Bearer ' + configuration.api_key.to_s
-      request['User-Agent'] = configuration.user_agent
+      request['Authorization'] = 'Bearer ' + config.api_key.to_s
+      request['User-Agent'] = config.user_agent
 
       response = http.request(request)
 
@@ -55,44 +49,22 @@ def parse_response(response_body)
       end
     end
 
-    def request_uri(method)
-      "/#{configuration.api_version}/#{method}"
-    end
-
-    def setup_http_connection
-      http =
-        Net::HTTP::Proxy(configuration.proxy_host, configuration.proxy_port, configuration.proxy_user,
-                         configuration.proxy_pass).
-          new(configuration.host, configuration.port)
+    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)
 
-      http.read_timeout = configuration.http_read_timeout
-      http.open_timeout = configuration.http_open_timeout
+      http.read_timeout = config.http_read_timeout
+      http.open_timeout = config.http_open_timeout
 
-      if configuration.secure?
-        http.use_ssl      = true
-        http.verify_mode  = OpenSSL::SSL::VERIFY_PEER
+      if uri.scheme == 'https'
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       else
-        http.use_ssl      = false
+        http.use_ssl = false
       end
 
       http
     end
-
-    def set_form_data_18(request, params, sep = '&')
-      request.body = params.map {|k,v|
-        if v.instance_of?(Array)
-          v.map {|e| "#{urlencode(k.to_s)}=#{urlencode(e.to_s)}"}.join(sep)
-        else
-          "#{urlencode(k.to_s)}=#{urlencode(v.to_s)}"
-        end
-      }.join(sep)
-
-      request.content_type = 'application/x-www-form-urlencoded'
-    end
-
-    def urlencode(str)
-      CGI::escape(str)
-    end
-
   end
 end

lib/detect_language/configuration.rb

@@ -1,24 +1,13 @@
 module DetectLanguage
   class Configuration
     # The API key for your project, found on your homepage after you login into detectlanguage.com website
-    # Defaults to 'demo', which has a limited number of requests.
     attr_accessor :api_key
 
-    # The API version you are using (defaults to 0.2).
-    attr_accessor :api_version
-
     # HTTP request user agent (defaults to 'Detect Language API ruby gem').
     attr_accessor :user_agent
 
-    # The host to connect to (defaults to ws.detectlanguage.com).
-    attr_accessor :host
-
-    # The port on which your DetectLanguage server runs (defaults to 443 for secure
-    # connections, 80 for insecure connections).
-    attr_accessor :port
-
-    # +true+ for https connections, +false+ for http connections.
-    attr_accessor :secure
+    # API base URL
+    attr_accessor :base_url
 
     # The HTTP open timeout in seconds.
     attr_accessor :http_open_timeout
@@ -38,46 +27,10 @@ class Configuration
     # The password to use when logging into your proxy server (if using a proxy).
     attr_accessor :proxy_pass
 
-    alias_method :secure?, :secure
-
     def initialize
-      @api_key            = nil
-      @api_version        = "0.2"
-      @host               = "ws.detectlanguage.com"
-      @user_agent         = "detectlanguage-ruby/#{VERSION}"
-    end
-
-    def protocol
-      if secure?
-        'https'
-      else
-        'http'
-      end
-    end
-
-    def port
-      @port || default_port
-    end
-
-    # Allows config options to be read like a hash
-    #
-    # @param [Symbol] option Key for a given attribute
-    def [](option)
-      send(option)
+      @api_key = nil
+      @base_url = "https://ws.detectlanguage.com/0.2/"
+      @user_agent = "detectlanguage-ruby/#{VERSION}"
     end
-
-    private
-
-    # Determines what port should we use for sending requests.
-    # @return [Fixnum] Returns 443 if you've set secure to true in your
-    # configuration, and 80 otherwise.
-    def default_port
-      if secure?
-        443
-      else
-        80
-      end
-    end
-
   end
 end

spec/detect_language_spec.rb

@@ -2,19 +2,16 @@
 
 RSpec.describe DetectLanguage do
   let(:api_key) { ENV['DETECTLANGUAGE_API_KEY'] }
-  let(:secure) { true }
 
   before do
-    described_class.configuration.api_key = api_key
-    described_class.configuration.secure = secure
+    described_class.config.api_key = api_key
   end
 
-  describe '.configuration' do
-    subject { described_class.configuration }
+  describe '.config' do
+    subject { described_class.config }
 
     it 'has default configuration values' do
-      expect(subject.api_version).to eq('0.2')
-      expect(subject.host).to eq('ws.detectlanguage.com')
+      expect(subject.base_url).to eq('https://ws.detectlanguage.com/0.2/')
       expect(subject.user_agent).to eq("detectlanguage-ruby/#{DetectLanguage::VERSION}")
     end
   end
@@ -90,13 +87,5 @@
     it 'fetches list of detectable languages' do
       expect(subject).to include('code' => 'en', 'name' => 'ENGLISH')
     end
-
-    context 'with http' do
-      let(:secure) { false }
-
-      it 'fetches languages over http' do
-        expect(subject).to include('code' => 'en', 'name' => 'ENGLISH')
-      end
-    end
   end
 end