currency_cloud 0.7.1 → 0.7.2

data/spec/currency_cloud/resource_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe 'Resource' do
   before(:all) do
-    class Person < CurrencyCloud::Resource
+    class Person
+      include CurrencyCloud::Resource
       resource :people
       actions :update, :delete
     end
@@ -11,16 +12,16 @@ describe 'Resource' do
   describe "#save" do
     it "only updates changed records" do
       person = Person.new(id: 1, name: 'Richard', surname: 'Nienaber')
-      allow(person).to receive(:post).with(1, name: 'John')
+      allow(Person.client).to receive(:post).with(1, name: 'John').and_return(id: 1, name: 'John', surname: 'Nienaber')
       person.name = 'John'
-      
+
       expect(person.save).to eq(person)
       expect(person.changed_attributes).to eq(Set.new)
     end
 
     it "does nothing if nothing has changed" do
       person = Person.new(id: 1, name: 'Richard', surname: 'Nienaber')
-      
+
       expect(person.save).to eq(person)
       expect(person.changed_attributes).to eq(Set.new)
     end
@@ -29,7 +30,8 @@ describe 'Resource' do
   describe "#delete" do
     it 'removes resource' do
       person = Person.new(id: 1, name: 'Richard', surname: 'Nienaber')
-      allow(Person).to receive(:post).with('1/delete')
+      # Uses the class method to perform the deletion
+      allow(Person).to receive(:delete).with(1)
 
       expect(person.delete).to eq(person)
     end

data/spec/integration/actions_spec.rb

@@ -55,7 +55,7 @@ describe 'Actions', :vcr => true do
     beneficiaries = CurrencyCloud::Beneficiary.find
     expect(beneficiaries).to_not be_empty
     expect(beneficiaries.length).to eq(1)
-    
+
     beneficiaries.each do |b|
       expect(b).to_not be_nil
       expect(b).to be_a_kind_of(CurrencyCloud::Beneficiary)
@@ -69,7 +69,7 @@ describe 'Actions', :vcr => true do
     expect(pagination.previous_page).to eq(-1)
     expect(pagination.next_page).to eq(-1)
     expect(pagination.order).to eq('created_at')
-    expect(pagination.order_asc_desc).to eq('asc')    
+    expect(pagination.order_asc_desc).to eq('asc')
   end
 
   it "can #update" do
@@ -126,4 +126,4 @@ describe 'Actions', :vcr => true do
     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')
   end
-end
+end

data/spec/integration/authentication_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Authentication', :vcr => true do
-  before(:each) do
+  before do
     CurrencyCloud.reset_session
     CurrencyCloud.environment = :demonstration
     CurrencyCloud.login_id = 'rjnienaber@gmail.com'
@@ -24,7 +24,7 @@ describe 'Authentication', :vcr => true do
   end
 
   it 'can be closed' do
-    CurrencyCloud.session 
+    CurrencyCloud.session
     expect(CurrencyCloud.close_session).to eq(true)
   end
 
@@ -37,4 +37,4 @@ describe 'Authentication', :vcr => true do
     #should have changed after reauthentication
     expect(CurrencyCloud.token).to eq('038022bcd2f372cac7bab448db7b5c3b')
   end
-end
+end

data/spec/integration/errors_spec.rb

@@ -141,10 +141,10 @@ inner_error: Timeout::Error
     CurrencyCloud.token = '656485646b068f6e9c81e3d885fa54f5'
     error = nil
     begin
-      CurrencyCloud::Beneficiary.retrieve('081596c9-02de-483e-9f2a-4cf55dcdf98c') 
+      CurrencyCloud::Beneficiary.retrieve('081596c9-02de-483e-9f2a-4cf55dcdf98c')
       raise 'Should fail'
     rescue CurrencyCloud::NotFoundError => error
-    end 
+    end
 
     expect(error.code).to eq('beneficiary_not_found')
     expect(error.raw_response).to_not be_nil
@@ -157,7 +157,7 @@ inner_error: Timeout::Error
     expect(error_message.message).to eq('Beneficiary was not found for this id')
     expect(error_message.params).to be_empty
   end
-  
+
   it 'is raised on an internal server error' do
 
     error = nil
@@ -178,14 +178,14 @@ inner_error: Timeout::Error
     expect(error_message.message).to eq('A general application error occurred')
     expect(error_message.params).to include("request_id" => 2771875643610572878)
   end
-  
+
   it 'is raised when too many requests have been issued' do
     CurrencyCloud.login_id = 'rjnienaber@gmail.com2'
 
     error = nil
     begin
       CurrencyCloud.session
-      
+
       raise 'Should have failed'
     rescue CurrencyCloud::TooManyRequestsError => error
     end
@@ -201,4 +201,4 @@ inner_error: Timeout::Error
     expect(error_message.message).to eq('Too many requests have been made to the api. Please refer to the Developer Center for more information')
     expect(error_message.params).to be_empty
   end
-end
+end

data/spec/integration/rates_spec.rb

@@ -15,7 +15,7 @@ describe 'Rates', :vcr => true do
 
     currencies = rates.currencies
     expect(currencies.length).to eq(2)
-    
+
     currencies.each do |b|
       expect(b).to_not be_nil
       expect(b).to be_a_kind_of(CurrencyCloud::Rate)
@@ -27,7 +27,7 @@ describe 'Rates', :vcr => true do
     expect(rate.offer).to eq('0.71508')
 
     expect(rates.unavailable).to be_empty
-  end 
+  end
 
   it 'can provided #detailed rate' do
     detailed_rate = CurrencyCloud::Rate.detailed(buy_currency: 'GBP', sell_currency: 'USD', fixed_side: 'buy', amount: '10000')
@@ -36,4 +36,4 @@ describe 'Rates', :vcr => true do
     expect(detailed_rate.client_sell_amount).to eq('15234.00')
     expect(detailed_rate.settlement_cut_off_time).to eq('2015-04-29T14:00:00Z')
   end
-end
+end

data/spec/integration/reference_spec.rb

@@ -22,7 +22,7 @@ describe 'Reference', :vcr => true do
     expect(details["beneficiary_last_name"]).to eq("^.{1,255}")
     expect(details["acct_number"]).to eq("^[0-9A-Z]{1,50}$")
     expect(details["sort_code"]).to eq("^\\d{6}$")
-  end 
+  end
 
   it 'can retrieve #conversion_dates' do
     dates = CurrencyCloud::Reference.conversion_dates(:conversion_pair => 'GBPUSD')
@@ -32,7 +32,7 @@ describe 'Reference', :vcr => true do
     expect(invalid_conversion_date).to eq(["2015-05-02", "No trading on Saturday"])
     expect(dates.first_conversion_date).to eq('2015-04-30')
     expect(dates.default_conversion_date).to eq('2015-04-30')
-  end 
+  end
 
   it 'can retrieve #currencies' do
     currencies = CurrencyCloud::Reference.currencies
@@ -43,7 +43,7 @@ describe 'Reference', :vcr => true do
     expect(currency.code).to eq('AED')
     expect(currency.name).to eq('United Arab Emirates Dirham')
     expect(currency.decimal_places).to eq(2)
-  end 
+  end
 
   it 'can retrieve #settlement_accounts' do
     settlement_accounts = CurrencyCloud::Reference.settlement_accounts(:currency => 'GBP')
@@ -53,5 +53,5 @@ describe 'Reference', :vcr => true do
     expect(settlement_account).to be_a_kind_of(CurrencyCloud::SettlementAccount)
     expect(settlement_account.bank_account_holder_name).to eq("The Currency Cloud GBP - Client Seg A/C")
     expect(settlement_account.bank_address).to be_empty
-  end 
-end
+  end
+end

data/spec/integration/settlements_spec.rb

@@ -14,7 +14,7 @@ describe 'Settlements', :vcr => true do
       reason: 'mortgage payment',
       term_agreement: true
     }
-    
+
   end
 
   it 'can #add_conversion' do
@@ -24,7 +24,7 @@ describe 'Settlements', :vcr => true do
     updated_settlement = settlement.add_conversion(conversion.id)
 
     expect(settlement).to eq(updated_settlement)
-    
+
     expect(settlement.conversion_ids).to eq( ["24d2ee7f-c7a3-4181-979e-9c58dbace992"])
     expect(settlement.entries).to_not be_empty
 
@@ -44,7 +44,7 @@ describe 'Settlements', :vcr => true do
     expect(deleted_settlement).to_not be_nil
     expect(deleted_settlement.type).to eq('bulk')
     expect(deleted_settlement.created_at).to eq('2015-05-04T20:29:16+00:00')
-    expect(deleted_settlement.status).to eq('open') 
+    expect(deleted_settlement.status).to eq('open')
   end
 
   it 'can #release' do
@@ -52,8 +52,8 @@ describe 'Settlements', :vcr => true do
     released_settlement = settlement.release
 
     expect(released_settlement).to eq(settlement)
-    expect(released_settlement.released_at).to eq('2015-05-04T21:44:23+00:00') 
-    expect(released_settlement.status).to eq('released') 
+    expect(released_settlement.released_at).to eq('2015-05-04T21:44:23+00:00')
+    expect(released_settlement.status).to eq('released')
   end
 
   it 'can #unrelease' do
@@ -61,7 +61,7 @@ describe 'Settlements', :vcr => true do
     unreleased_settlement = settlement.unrelease
 
     expect(unreleased_settlement).to eq(settlement)
-    expect(unreleased_settlement.released_at).to eq('') 
-    expect(unreleased_settlement.status).to eq('open') 
+    expect(unreleased_settlement.released_at).to eq('')
+    expect(unreleased_settlement.status).to eq('open')
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: currency_cloud
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Liam McAndrew
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -104,8 +104,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Guardfile
@@ -115,34 +113,41 @@ files:
 - currency_cloud.gemspec
 - examples/server.rb
 - lib/currency_cloud.rb
+- lib/currency_cloud/account.rb
+- lib/currency_cloud/actions.rb
 - lib/currency_cloud/actions/create.rb
 - lib/currency_cloud/actions/current.rb
 - lib/currency_cloud/actions/delete.rb
 - lib/currency_cloud/actions/find.rb
+- lib/currency_cloud/actions/instance_delete.rb
 - lib/currency_cloud/actions/retrieve.rb
 - lib/currency_cloud/actions/save.rb
 - lib/currency_cloud/actions/update.rb
+- lib/currency_cloud/balance.rb
+- lib/currency_cloud/beneficiary.rb
+- lib/currency_cloud/client.rb
+- lib/currency_cloud/contact.rb
+- lib/currency_cloud/conversion.rb
+- lib/currency_cloud/conversion_dates.rb
+- lib/currency_cloud/currency.rb
 - lib/currency_cloud/errors/api_error.rb
 - lib/currency_cloud/errors/error_utils.rb
 - lib/currency_cloud/errors/general_error.rb
 - lib/currency_cloud/errors/unexpected_error.rb
 - lib/currency_cloud/pagination.rb
+- lib/currency_cloud/payer.rb
+- lib/currency_cloud/payment.rb
+- lib/currency_cloud/rate.rb
+- lib/currency_cloud/rates.rb
+- lib/currency_cloud/reference.rb
 - lib/currency_cloud/request_handler.rb
 - lib/currency_cloud/resource.rb
 - lib/currency_cloud/resourceful_collection.rb
-- lib/currency_cloud/resources/account.rb
-- lib/currency_cloud/resources/balance.rb
-- lib/currency_cloud/resources/beneficiary.rb
-- lib/currency_cloud/resources/contact.rb
-- lib/currency_cloud/resources/conversion.rb
-- lib/currency_cloud/resources/payer.rb
-- lib/currency_cloud/resources/payment.rb
-- lib/currency_cloud/resources/rate.rb
-- lib/currency_cloud/resources/reference.rb
-- lib/currency_cloud/resources/settlement.rb
-- lib/currency_cloud/resources/transaction.rb
 - lib/currency_cloud/response_handler.rb
 - lib/currency_cloud/session.rb
+- lib/currency_cloud/settlement.rb
+- lib/currency_cloud/settlement_account.rb
+- lib/currency_cloud/transaction.rb
 - lib/currency_cloud/version.rb
 - spec/currency_cloud/request_handler_spec.rb
 - spec/currency_cloud/resource_spec.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-currencycloud-ruby

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.2.0

data/lib/currency_cloud/resources/rate.rb

@@ -1,21 +0,0 @@
-module CurrencyCloud
-  class Rates < Resource; end
-
-  class Rate < Resource
-    resource :rates
-    
-    def self.find(params)
-      response = request.get("#{self.resource}/find", params)
-
-      rates = response['rates'].map do |currency_pair, bid_offer|
-                new(currency_pair: currency_pair, bid: bid_offer[0], offer: bid_offer[1])
-              end
-
-      Rates.new(currencies: rates, unavailable: response['unavailable'])
-    end
-
-    def self.detailed(params)
-      get('detailed', params)
-    end
-  end
-end

data/lib/currency_cloud/resources/reference.rb

@@ -1,29 +0,0 @@
-module CurrencyCloud
-  
-  class Currency < Resource; end
-  class ConversionDates < Resource; end
-  class SettlementAccount < Resource; end
-
-  class Reference < Resource
-    
-    resource :reference
-
-    def self.currencies
-      response = request.get(build_url("currencies"))
-      response['currencies'].map { |c| Currency.new(c)}
-    end
-
-    def self.beneficiary_required_details(params={})
-      request.get(build_url("beneficiary_required_details"), params)['details']
-    end
-
-    def self.conversion_dates(params)
-      ConversionDates.new(request.get(build_url("conversion_dates"), params))
-    end
-
-    def self.settlement_accounts(params={})
-      response = request.get(build_url("settlement_accounts"), params)
-      response['settlement_accounts'].map { |s| SettlementAccount.new(s)}
-    end
-  end
-end