currency_cloud 0.7.2 → 0.8.0

data/lib/currency_cloud/session.rb

@@ -1,17 +1,17 @@
 module CurrencyCloud
   class Session
     ENVIRONMENTS = {
-      :production => 'https://api.thecurrencycloud.com',
-      :demonstration => 'https://devapi.thecurrencycloud.com',
-      :uat => 'https://api-uat1.ccycloud.com'
-    }
+      production: 'https://api.currencycloud.com',
+      demonstration: 'https://devapi.currencycloud.com',
+      uat: 'https://api-uat1.ccycloud.com'
+    }.freeze
 
     attr_reader :environment, :login_id, :api_key
     attr_accessor :token, :on_behalf_of
 
     def self.validate_environment(environment)
       unless ENVIRONMENTS.keys.include?(environment)
-        raise CurrencyCloud::GeneralError, "'#{environment}' is not a valid environment, must be one of: #{ENVIRONMENTS.keys.join(", ")}"
+        raise CurrencyCloud::GeneralError, "'#{environment}' is not a valid environment, must be one of: #{ENVIRONMENTS.keys.join(', ')}"
       end
     end
 
@@ -38,8 +38,8 @@ module CurrencyCloud
 
     def authenticate
       validate
-      params = {:login_id => login_id, :api_key => api_key}
-      CurrencyCloud.token = @token = request.post('authenticate/api', params, :should_retry => false)['auth_token']
+      params = { login_id: login_id, api_key: api_key }
+      CurrencyCloud.token = @token = request.post('authenticate/api', params, should_retry: false)['auth_token']
     end
 
     def reauthenticate
@@ -51,8 +51,8 @@ module CurrencyCloud
 
     def validate
       self.class.validate_environment(environment)
-      raise CurrencyCloud::GeneralError, "login_id must be set using CurrencyCloud.login_id=" unless login_id
-      raise CurrencyCloud::GeneralError, "api_key must be set using CurrencyCloud.api_key=" unless api_key
+      raise CurrencyCloud::GeneralError, 'login_id must be set using CurrencyCloud.login_id=' unless login_id
+      raise CurrencyCloud::GeneralError, 'api_key must be set using CurrencyCloud.api_key=' unless api_key
     end
 
     def request

data/lib/currency_cloud/version.rb

@@ -1,6 +1,6 @@
 # Separate Gem version from 'API version'
 
 module CurrencyCloud
-  API_VERSION = 'v2' # API Version
-  VERSION = '0.7.2' # Gem Version
+  API_VERSION = 'v2'.freeze # API Version
+  VERSION = '0.8.0'.freeze # Gem Version
 end

data/spec/currency_cloud/request_handler_spec.rb

@@ -1,32 +1,32 @@
 require 'spec_helper'
 
 describe 'RequestHandler' do
-  let(:session) { CurrencyCloud::Session.new(:demonstration, nil, nil, '4df5b3e5882a412f148dcd08fa4e5b73')}
+  let(:session) { CurrencyCloud::Session.new(:demonstration, nil, nil, '4df5b3e5882a412f148dcd08fa4e5b73') }
   let(:response) { double('Response', code: 200, body: '{}') }
 
   subject { CurrencyCloud::RequestHandler.new(session) }
 
   describe 'with on_behalf_of parameter' do
-    it "adds it to parameters in HTTP call" do
-      session.on_behalf_of = "d1f7f5c2-4187-41da-88fc-b3ae40fa958f"
+    it 'adds it to parameters in HTTP call' do
+      session.on_behalf_of = 'd1f7f5c2-4187-41da-88fc-b3ae40fa958f'
 
       allow(HTTParty).to receive(:post) do |_, params|
         expect(params).to include(:body)
-        expect(params[:body]).to include(on_behalf_of: "d1f7f5c2-4187-41da-88fc-b3ae40fa958f")
+        expect(params[:body]).to include(on_behalf_of: 'd1f7f5c2-4187-41da-88fc-b3ae40fa958f')
       end.and_return(response)
 
-      subject.post('accounts/create', account_name: "Test Account")
+      subject.post('accounts/create', account_name: 'Test Account')
     end
 
     it "ignores it if it's not a uuid" do
-      session.on_behalf_of = "nonsense variable"
+      session.on_behalf_of = 'nonsense variable'
 
       allow(HTTParty).to receive(:post) do |_, params|
         expect(params).to include(:body)
-        expect(params[:body]).to eq(account_name: "Test Account")
+        expect(params[:body]).to eq(account_name: 'Test Account')
       end.and_return(response)
 
-      subject.post('accounts/create', account_name: "Test Account")
+      subject.post('accounts/create', account_name: 'Test Account')
     end
   end
 end

data/spec/currency_cloud/resource_spec.rb

@@ -9,8 +9,8 @@ describe 'Resource' do
     end
   end
 
-  describe "#save" do
-    it "only updates changed records" do
+  describe '#save' do
+    it 'only updates changed records' do
       person = Person.new(id: 1, name: 'Richard', surname: 'Nienaber')
       allow(Person.client).to receive(:post).with(1, name: 'John').and_return(id: 1, name: 'John', surname: 'Nienaber')
       person.name = 'John'
@@ -19,7 +19,7 @@ describe 'Resource' do
       expect(person.changed_attributes).to eq(Set.new)
     end
 
-    it "does nothing if nothing has changed" do
+    it 'does nothing if nothing has changed' do
       person = Person.new(id: 1, name: 'Richard', surname: 'Nienaber')
 
       expect(person.save).to eq(person)
@@ -27,7 +27,7 @@ describe 'Resource' do
     end
   end
 
-  describe "#delete" do
+  describe '#delete' do
     it 'removes resource' do
       person = Person.new(id: 1, name: 'Richard', surname: 'Nienaber')
       # Uses the class method to perform the deletion

data/spec/currency_cloud_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe CurrencyCloud do
-
   before do
     CurrencyCloud.environment = nil
     CurrencyCloud.login_id = nil
@@ -9,95 +8,88 @@ describe CurrencyCloud do
     CurrencyCloud.reset_session
   end
 
-  describe "#environment" do
-
-    it "can set the environment" do
+  describe '#environment' do
+    it 'can set the environment' do
       CurrencyCloud.environment = :development
       expect(CurrencyCloud.environment).to eq(:development)
     end
-
   end
 
-  describe "#login_id" do
-
-    it "can set the login_id" do
+  describe '#login_id' do
+    it 'can set the login_id' do
       CurrencyCloud.login_id = 'test@example.com'
       expect(CurrencyCloud.login_id).to eq('test@example.com')
     end
-
   end
 
-  describe "#api_key" do
-
-    it "can set the api_key" do
+  describe '#api_key' do
+    it 'can set the api_key' do
       CurrencyCloud.api_key = 'e3b0d6895f91f46d9eaf5c95aa0f64dca9007b7ab0778721b6cdc0a8bc7c563b'
       expect(CurrencyCloud.api_key).to eq('e3b0d6895f91f46d9eaf5c95aa0f64dca9007b7ab0778721b6cdc0a8bc7c563b')
     end
-
   end
 
-  describe "#session" do
-
-    it "returns a session object" do
+  describe '#session' do
+    it 'returns a session object' do
       CurrencyCloud.environment = :demonstration
       CurrencyCloud.login_id = 'test@example.com'
       CurrencyCloud.api_key = 'e3b0d6895f91f46d9eaf5c95aa0f64dca9007b7ab0778721b6cdc0a8bc7c563b'
 
       request_handler = double('RequestHandler')
-      expect(request_handler).to receive(:post).and_return({'auth_token' => '123'})
+      expect(request_handler).to receive(:post).and_return('auth_token' => '123')
       expect(CurrencyCloud::RequestHandler).to receive(:new).and_return(request_handler)
 
       expect(CurrencyCloud.session).to be_a(CurrencyCloud::Session)
     end
 
-    it "raises an error if the environment is not set" do
+    it 'raises an error if the environment is not set' do
       CurrencyCloud.environment = nil
       expect { CurrencyCloud.session }
-       .to raise_error(CurrencyCloud::GeneralError, "'' is not a valid environment, must be one of: production, demonstration, uat")
+        .to raise_error(CurrencyCloud::GeneralError, "'' is not a valid environment, must be one of: production, demonstration, uat")
     end
 
-    it "raises an error if the environment is invalid" do
+    it 'raises an error if the environment is invalid' do
       CurrencyCloud.environment = :invalid
       expect { CurrencyCloud.session }
-       .to raise_error(CurrencyCloud::GeneralError, "'invalid' is not a valid environment, must be one of: production, demonstration, uat")
+        .to raise_error(CurrencyCloud::GeneralError, "'invalid' is not a valid environment, must be one of: production, demonstration, uat")
     end
 
-    it "raises an error if the login_id is not set" do
+    it 'raises an error if the login_id is not set' do
       CurrencyCloud.environment = :demonstration
       expect { CurrencyCloud.session }
-       .to raise_error(CurrencyCloud::GeneralError, "login_id must be set using CurrencyCloud.login_id=")
+        .to raise_error(CurrencyCloud::GeneralError, 'login_id must be set using CurrencyCloud.login_id=')
     end
 
-    it "raises an error if the api_key is not set" do
+    it 'raises an error if the api_key is not set' do
       CurrencyCloud.environment = :demonstration
       CurrencyCloud.login_id = 'test@example.com'
       expect { CurrencyCloud.session }
-       .to raise_error(CurrencyCloud::GeneralError, "api_key must be set using CurrencyCloud.api_key=")
+        .to raise_error(CurrencyCloud::GeneralError, 'api_key must be set using CurrencyCloud.api_key=')
     end
   end
 
-  describe "#on_behalf_of" do
+  describe '#on_behalf_of' do
     before do
       CurrencyCloud.environment = :demonstration
       CurrencyCloud.token = '4df5b3e5882a412f148dcd08fa4e5b73'
       CurrencyCloud.session.on_behalf_of = nil
     end
 
-    it "sets the value on the session, and removes it when done" do
+    it 'sets the value on the session, and removes it when done' do
       CurrencyCloud.on_behalf_of('c6ece846-6df1-461d-acaa-b42a6aa74045') do
         expect(CurrencyCloud.session.on_behalf_of).to eq('c6ece846-6df1-461d-acaa-b42a6aa74045')
       end
       expect(CurrencyCloud.session.on_behalf_of).to be_nil
     end
 
-    it "still removes the value from the session on error" do
-      expect do 
+    it 'still removes the value from the session on error' do
+      expect do
         CurrencyCloud.on_behalf_of('c6ece846-6df1-461d-acaa-b42a6aa74045') do
           expect(CurrencyCloud.session.on_behalf_of).to eq('c6ece846-6df1-461d-acaa-b42a6aa74045')
           raise 'Completed Expected error'
         end
       end.to raise_error('Completed Expected error')
-      
+
       expect(CurrencyCloud.session.on_behalf_of).to be_nil
     end
 
@@ -105,18 +97,18 @@ describe CurrencyCloud do
       expect do
         CurrencyCloud.on_behalf_of('c6ece846-6df1-461d-acaa-b42a6aa74045') do
           CurrencyCloud.on_behalf_of('f57b2d33-652c-4589-a8ff-7762add2706d') do
-            raise "Should raise exception"
+            raise 'Should raise exception'
           end
         end
-      end.to raise_error(CurrencyCloud::GeneralError, "#on_behalf_of has already been set")
+      end.to raise_error(CurrencyCloud::GeneralError, '#on_behalf_of has already been set')
     end
 
     it 'prevents reentrant usage' do
       expect do
         CurrencyCloud.on_behalf_of('Richard Nienaber') do
-          raise "Should raise exception"
+          raise 'Should raise exception'
         end
-      end.to raise_error(CurrencyCloud::GeneralError, "contact id for on behalf of is not a UUID")
-    end    
+      end.to raise_error(CurrencyCloud::GeneralError, 'contact id for on behalf of is not a UUID')
+    end
   end
-end
+end

data/spec/integration/actions_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
-describe 'Actions', :vcr => true do
+describe 'Actions', vcr: true do
   before do
     CurrencyCloud.reset_session
     CurrencyCloud.environment = :demonstration
     CurrencyCloud.token = '4df5b3e5882a412f148dcd08fa4e5b73'
   end
 
-  it "can #create" do
+  it 'can #create' do
     params = {
-      :bank_account_holder_name => 'Test User',
-      :bank_country => 'GB',
-      :currency => 'GBP',
-      :name => 'Test User',
-      :account_number => '12345678',
-      :routing_code_type_1 => 'sort_code',
-      :routing_code_value_1 => '123456',
-      :payment_types => ['regular']
+      bank_account_holder_name: 'Test User',
+      bank_country: 'GB',
+      currency: 'GBP',
+      name: 'Test User',
+      account_number: '12345678',
+      routing_code_type_1: 'sort_code',
+      routing_code_value_1: '123456',
+      payment_types: ['regular']
     }
 
     beneficiary = CurrencyCloud::Beneficiary.create(params)
@@ -29,7 +29,7 @@ describe 'Actions', :vcr => true do
     expect(beneficiary.updated_at).to eq('2015-04-25T09:21:00+00:00')
   end
 
-  it "can #retrieve" do
+  it 'can #retrieve' do
     beneficiary = CurrencyCloud::Beneficiary.retrieve('081596c9-02de-483e-9f2a-4cf55dcdf98c')
     expect(beneficiary).to be_a_kind_of(CurrencyCloud::Beneficiary)
 
@@ -40,8 +40,8 @@ describe 'Actions', :vcr => true do
     expect(beneficiary.updated_at).to eq('2015-04-25T09:21:00+00:00')
   end
 
-  it "can #first" do
-    beneficiary = CurrencyCloud::Beneficiary.first(:bank_account_holder_name => 'Test User')
+  it 'can #first' do
+    beneficiary = CurrencyCloud::Beneficiary.first(bank_account_holder_name: 'Test User')
     expect(beneficiary).to be_a_kind_of(CurrencyCloud::Beneficiary)
 
     expect(beneficiary.id).to eq('081596c9-02de-483e-9f2a-4cf55dcdf98c')
@@ -51,7 +51,7 @@ describe 'Actions', :vcr => true do
     expect(beneficiary.updated_at).to eq('2015-04-25T10:58:21+00:00')
   end
 
-  it "can #find" do
+  it 'can #find' do
     beneficiaries = CurrencyCloud::Beneficiary.find
     expect(beneficiaries).to_not be_empty
     expect(beneficiaries.length).to eq(1)
@@ -72,13 +72,13 @@ describe 'Actions', :vcr => true do
     expect(pagination.order_asc_desc).to eq('asc')
   end
 
-  it "can #update" do
-    beneficiary = CurrencyCloud::Beneficiary.update('081596c9-02de-483e-9f2a-4cf55dcdf98c', :bank_account_holder_name => 'Test User 2')
+  it 'can #update' do
+    beneficiary = CurrencyCloud::Beneficiary.update('081596c9-02de-483e-9f2a-4cf55dcdf98c', bank_account_holder_name: 'Test User 2')
     expect(beneficiary).to be_a_kind_of(CurrencyCloud::Beneficiary)
     expect(beneficiary.bank_account_holder_name).to eq('Test User 2')
   end
 
-  it "can #delete" do
+  it 'can #delete' do
     beneficiary = CurrencyCloud::Beneficiary.delete('081596c9-02de-483e-9f2a-4cf55dcdf98c')
     expect(beneficiary).to be_a_kind_of(CurrencyCloud::Beneficiary)
 
@@ -89,7 +89,7 @@ describe 'Actions', :vcr => true do
     expect(beneficiary.updated_at).to eq('2015-04-25T11:06:27+00:00')
   end
 
-  it "can #current" do
+  it 'can #current' do
     account = CurrencyCloud::Account.current
 
     expect(account).to be_a_kind_of(CurrencyCloud::Account)
@@ -99,14 +99,14 @@ describe 'Actions', :vcr => true do
     expect(account.updated_at).to eq('2015-04-24T15:57:55+00:00')
   end
 
-  it "can #validate beneficiaries" do
+  it 'can #validate beneficiaries' do
     params = {
-      :bank_country => 'GB',
-      :currency => 'GBP',
-      :account_number => '12345678',
-      :routing_code_type_1 => 'sort_code',
-      :routing_code_value_1 => '123456',
-      :payment_types => ['regular']
+      bank_country: 'GB',
+      currency: 'GBP',
+      account_number: '12345678',
+      routing_code_type_1: 'sort_code',
+      routing_code_value_1: '123456',
+      payment_types: ['regular']
     }
 
     beneficiary = CurrencyCloud::Beneficiary.validate(params)
@@ -116,12 +116,12 @@ describe 'Actions', :vcr => true do
     expect(beneficiary.payment_types).to include('regular')
   end
 
-  it "can use #currency to retrieve balance" do
+  it 'can use #currency to retrieve balance' do
     balance = CurrencyCloud::Balance.currency('GBP')
 
     expect(balance).to be_a_kind_of(CurrencyCloud::Balance)
 
-    expect(balance.id).to eq("5a998e06-3eb7-46d6-ba58-f749864159ce")
+    expect(balance.id).to eq('5a998e06-3eb7-46d6-ba58-f749864159ce')
     expect(balance.amount).to eq('999866.78')
     expect(balance.created_at).to eq('2014-12-04T09:50:35+00:00')
     expect(balance.updated_at).to eq('2015-03-23T14:33:37+00:00')

data/spec/integration/authentication_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Authentication', :vcr => true do
+describe 'Authentication', vcr: true do
   before do
     CurrencyCloud.reset_session
     CurrencyCloud.environment = :demonstration
@@ -34,7 +34,7 @@ describe 'Authentication', :vcr => true do
     response = CurrencyCloud::Beneficiary.find
     expect(response).to_not be_nil
 
-    #should have changed after reauthentication
+    # should have changed after reauthentication
     expect(CurrencyCloud.token).to eq('038022bcd2f372cac7bab448db7b5c3b')
   end
 end

data/spec/integration/errors_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'net/http'
 
-describe 'Error', :vcr => true do
+describe 'Error', vcr: true do
   before(:each) do
     CurrencyCloud.reset_session
     CurrencyCloud.environment = :demonstration
@@ -21,7 +21,7 @@ describe 'Error', :vcr => true do
     rescue CurrencyCloud::BadRequestError => error
     end
 
-    expected_error = %Q{CurrencyCloud::BadRequestError
+    expected_error = %{CurrencyCloud::BadRequestError
 ---
 platform: #{error.platform}
 request:
@@ -29,7 +29,7 @@ request:
     login_id: non-existent-login-id
     api_key: ef0fd50fca1fb14c1fab3a8436b9ecb57528f0
   verb: post
-  url: https://devapi.thecurrencycloud.com/v2/authenticate/api
+  url: https://devapi.currencycloud.com/v2/authenticate/api
 response:
   status_code: 400
   date: Wed, 29 Apr 2015 22:46:53 GMT
@@ -64,7 +64,7 @@ errors:
     expect(error_message.field).to eq('api_key')
     expect(error_message.code).to eq('api_key_length_is_invalid')
     expect(error_message.message).to eq('api_key should be 64 character(s) long')
-    expect(error_message.params).to include("length" => 64)
+    expect(error_message.params).to include('length' => 64)
   end
 
   it 'is raised on incorrect authentication details' do
@@ -100,7 +100,7 @@ errors:
     rescue CurrencyCloud::UnexpectedError => error
     end
 
-        expected_error = %Q{CurrencyCloud::UnexpectedError
+    expected_error = %(CurrencyCloud::UnexpectedError
 ---
 platform: #{error.platform}
 request:
@@ -108,9 +108,9 @@ request:
     login_id: rjnienaber@gmail.com
     api_key: ef0fd50fca1fb14c1fab3a8436b9ecb65f02f129fd87eafa45ded8ae257528f0
   verb: post
-  url: https://devapi.thecurrencycloud.com/v2/authenticate/api
+  url: https://devapi.currencycloud.com/v2/authenticate/api
 inner_error: Timeout::Error
-}
+)
 
     expect(error.to_s).to eq(expected_error)
     expect(error.inner_error).to_not be_nil
@@ -159,7 +159,6 @@ inner_error: Timeout::Error
   end
 
   it 'is raised on an internal server error' do
-
     error = nil
     begin
       CurrencyCloud.session
@@ -176,7 +175,7 @@ inner_error: Timeout::Error
     expect(error_message.field).to eq('base')
     expect(error_message.code).to eq('internal_application_error')
     expect(error_message.message).to eq('A general application error occurred')
-    expect(error_message.params).to include("request_id" => 2771875643610572878)
+    expect(error_message.params).to include('request_id' => 2771875643610572878)
   end
 
   it 'is raised when too many requests have been issued' do