[DEVREL-115] Remove prod / dev URL switching

Author: zero-bites

README.md

@@ -52,16 +52,21 @@ bundle exec ruby spec/integration/RecipientTest.rb
 ```ruby
 require 'trolley'
 
-client = Trolley.client('YOUR-API-KEY', 'YOUR-SECRET-KEY')
+client = Trolley.client('ACCESS-KEY', 'SECRET-KEY')
 
 recipient = client.recipient.find('R-1234567abcdefg')
 print recipient.id
 ```
 
-#### Need a proxy?
+#### Configuring a proxy
 
 ```Ruby
-client = Trolley.client('YOUR-API-KEY', 'YOUR-SECRET-KEY', 'production', proxy_uri: 'peter_the_proxy.com')
+client = Trolley.client('ACCESS-KEY', 'SECRET-KEY', proxy_uri: 'peter_the_proxy.com')
+```
+
+### Configuring a custom base API URL
+```ruby
+client = Trolley.client('key', 'secret', api_base: 'https://api.railz.io')
 ```
 
 ## Documentation for API Endpoints

lib/trolley.rb

@@ -24,7 +24,7 @@
 module Trolley
   VERSION = '1.0.0'.freeze
 
-  def self.client(key, secret, environment = 'production', **optionals)
-    Gateway.new(Configuration.new(key, secret, environment, **optionals))
+  def self.client(key, secret, **optionals)
+    Gateway.new(Configuration.new(key, secret, **optionals))
   end
 end

lib/trolley/Client.rb

@@ -36,7 +36,7 @@ def patch(endPoint, body)
     # rubocop:disable Metrics/CyclomaticComplexity
     # rubocop:disable Metrics/PerceivedComplexity
     def send_request(endPoint, method, body = '')
-      uri = URI.parse(@config.apiBase + endPoint)
+      uri = URI.parse(@config.api_base + endPoint)
       http = Net::HTTP.new(
         uri.host, uri.port,
         @config.proxy&.host, @config.proxy&.port, @config.proxy&.user, @config.proxy&.password

lib/trolley/Configuration.rb

@@ -1,40 +1,30 @@
 module Trolley
   class Configuration
     class InvalidProxyAddress < StandardError; end
+    attr_reader :api_base, :proxy, :environment
 
-    def initialize(publicKey, privateKey, environment = 'production', proxy_uri: nil)
+    DEFAULT_API_BASE = 'https://api.trolley.com'.freeze
+
+    def initialize(publicKey, privateKey, **optionals)
       raise ArgumentError, 'Both key/secret must be a nonempty string' if publicKey.to_s&.empty? || privateKey.to_s&.empty?
 
       @publicKey = publicKey
       @privateKey = privateKey
-      @environment = environment
+      @api_base = optionals[:api_base] || DEFAULT_API_BASE
       # failfast on a bad proxy
+      proxy_uri = optionals[:proxy_uri]
       begin
         @proxy = proxy_uri.nil? ? nil : URI.parse(proxy_uri)
       rescue URI::InvalidURIError
         raise InvalidProxyAddress, "Invalid proxy provided to configuration: #{proxy_uri}"
       end
     end
 
-    def apiBase
-      case environment
-      when 'production'
-        'https://api.trolley.com'
-      when 'development'
-        'https://api.railz.io'
-      when 'integration'
-        'http://api.local.dev:3000'
-      else
-        'https://api.trolley.com'
-      end
-    end
-
     def useSsl?
-      apiBase.start_with? 'https'
+      api_base.start_with? 'https'
     end
 
     attr_accessor :publicKey, :privateKey
-    attr_reader :proxy, :environment
 
   end
 end

spec/integration/helper.rb

@@ -8,7 +8,7 @@ def setup
     @client = Trolley.client(
       ENV.fetch('SANDBOX_API_KEY'),
       ENV.fetch('SANDBOX_SECRET_KEY'),
-      'production',
+      api_base: ENV['API_BASE'],
       proxy_uri: ENV['PROXY_URI']
     )
   end

spec/unit/ConfigurationTest.rb

@@ -21,28 +21,24 @@ def test_new_nonempty_string
   end
 
   def test_api_base
-    assert_equal 'http://api.local.dev:3000', Trolley::Configuration.new('key', 'secret', 'integration').apiBase
-    assert_equal 'https://api.trolley.com', Trolley::Configuration.new('key', 'secret', 'production').apiBase
-    assert_equal 'https://api.railz.io', Trolley::Configuration.new('key', 'secret', 'development').apiBase
-    assert_equal 'https://api.trolley.com', Trolley::Configuration.new('key', 'secret', 'non_standard_environment').apiBase
+    assert_equal 'https://api.trolley.com', Trolley::Configuration.new('key', 'secret').api_base
+    assert_equal 'http://localhost:8080', Trolley::Configuration.new('key', 'secret', api_base: 'http://localhost:8080').api_base
   end
 
   def test_use_ssl?
-    assert_equal false, Trolley::Configuration.new('key', 'secret', 'integration').useSsl?
-    assert_equal true, Trolley::Configuration.new('key', 'secret', 'production').useSsl?
-    assert_equal true, Trolley::Configuration.new('key', 'secret', 'development').useSsl?
-    assert_equal true, Trolley::Configuration.new('key', 'secret', 'non_standard_environment').useSsl?
+    assert_equal false, Trolley::Configuration.new('key', 'secret', api_base: 'http://example.com').useSsl?
+    assert_equal true, Trolley::Configuration.new('key', 'secret').useSsl?
   end
 
   def test_invalid_proxy_uri
     proxy_uri = 'not_://*a_valid_proxy'
     assert_raise Trolley::Configuration::InvalidProxyAddress.new("Invalid proxy provided to configuration: #{proxy_uri}") do
-      Trolley::Configuration.new('k', 's', 'production', proxy_uri: proxy_uri).proxy
+      Trolley::Configuration.new('k', 's', proxy_uri: proxy_uri).proxy
     end
   end
 
   def test_vaid_proxy_uri
-    config = Trolley::Configuration.new('k', 's', 'production', proxy_uri: 'http://user:pass@gimmeproxy.com:80')
+    config = Trolley::Configuration.new('k', 's', proxy_uri: 'http://user:pass@gimmeproxy.com:80')
     assert_equal 'gimmeproxy.com', config.proxy.host
     assert_equal 80, config.proxy.port
     assert_equal 'user', config.proxy.user

spec/unit/TrolleyTest.rb

@@ -3,13 +3,13 @@
 
 class PaymentRailsTest < Test::Unit::TestCase
   def test_client
-    Trolley.client('key', 'secret', 'environment', proxy_uri: 'http://user:pass@gimmeproxy.com:80')
+    Trolley.client('key', 'secret', proxy_uri: 'http://user:pass@gimmeproxy.com:80')
   end
 
   def test_client_invalid_proxy_uri
     proxy_uri = 'not_://*a_valid_proxy'
     assert_raise Trolley::Configuration::InvalidProxyAddress.new("Invalid proxy provided to configuration: #{proxy_uri}") do
-      Trolley.client('k', 's', 'production', proxy_uri: proxy_uri)
+      Trolley.client('k', 's', proxy_uri: proxy_uri)
     end
   end
 end