currency_cloud 0.14.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 863888f159fbc69a264fa92eec5beb7e340b452cb2e0c1bcc7a3f3346189f49c
-  data.tar.gz: cf813dadc2ba0a10488e65b749a8e6f74d2bc441bbd5f6d3c95ab0f161ea7cc3
+  metadata.gz: 8de279160095c51a40e0e4880cfcc5909a453cdf2cac7234a3458c230fe70299
+  data.tar.gz: 245c4f7210c6a683e3ef346833c05e0ed3d75c4ed350e03e56e1fe74105635a4
 SHA512:
-  metadata.gz: fda08c6b04b98b6703d1e67c22f13d2d79a862b941f7e5a26b912d132802933fab5c7c7aa88d8b2ea0af29064ccb4723e032a9d793ce826a36076e98e25b9188
-  data.tar.gz: ce286bd78f9287a629ea20b4a29ef15b49aff2f076c73633d19eb3c2c0d784768e613313d87dec24b7a31c4d92fc61a1f9b8f06f3bd2794eac1422d1bf4c7774
+  metadata.gz: 47d718f59102b97dfc980541a1c69eb06957d83d556f978f1aeb95772bd246d908154571fa1de76729015294d0c62a8b1b1faac1058c2bada34344c87d747556
+  data.tar.gz: 345a2bfa8649b55882d09d08e8815b6c4f995c4789b6935d136c83fbf80bddc8dad2960d1d1d76ab3537de2738868c521919cdfdd85fb716e066a2b10bb61538

data/.travis.yml

@@ -4,12 +4,12 @@ script: bundle exec rspec
 cache: bundler
 
 rvm:
-  - 1.9.3
   - 2.2
   - 2.3.4
   - 2.4.1
-  - 2.5.3
-  - 2.6.3
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
   - jruby-19mode
   - jruby-9.1.17.0
   - jruby-9.2.0.0

data/README.md

@@ -16,20 +16,21 @@ you just want to use the library in your application, you should run:
 If you want to build the gem from source:
 
   `gem build currency_cloud.gemspec`
+  
+## Deprecation Announcement
+
+February 2021: Please be aware that __Ruby 2.0, 2.1, 2,2, 2.3 and 2.4__ are now deprecated, it will not be supported from May 2021.  
+Please upgrade to a supported, secure version of Ruby, listed below.  
+
 
 ## Supported Ruby versions
 
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
-* MRI 1.9.3
-* MRI 2.0.0
-* MRI 2.1.0
-* MRI 2.2.0
-* MRI 2.3.4
-* MRI 2.4.1
-* MRI 2.5.3
-* MRI 2.6.3
+* MRI 2.5
+* MRI 2.6
+* MRI 2.7
 * [JRuby][jruby]
 * [Rubinius][rubinius]
 

data/currency_cloud.gemspec

@@ -14,10 +14,16 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9'
 
   s.add_dependency('httparty', '~> 0.14')
-  s.add_dependency('json', '>= 1.8')
+
+  if RUBY_VERSION == '1.9.3'
+    s.add_dependency('json', '>= 1.8', '<= 2.2')
+    s.add_development_dependency('rake', '~> 10.3')
+  else
+    s.add_dependency('json', '~> 2.3')
+    s.add_development_dependency('rake', '~> 12.3.3')
+  end
 
   s.add_development_dependency('addressable', '<= 2.4.0')
-  s.add_development_dependency('rake', '~> 10.3')
   s.add_development_dependency('rspec', '~> 3.1')
   s.add_development_dependency('vcr', '~> 3.0.3')
   s.add_development_dependency('webmock', '~> 2.3.2')

data/lib/currency_cloud/balance.rb

@@ -8,5 +8,10 @@ module CurrencyCloud
     def self.currency(ccy)
       new(client.get(ccy))
     end
+
+    def self.top_up_margin(params)
+      top_up = client.post("top_up_margin", params)
+      MarginBalanceTopUp.new(top_up)
+    end
   end
 end

data/lib/currency_cloud/errors/api_error.rb

@@ -37,8 +37,12 @@ module CurrencyCloud
       return unless errors['error_messages']
 
       errors['error_messages'].each do |field, messages|
-        messages.each do |message|
-          @messages << ApiErrorMessage.new(field, message)
+        if messages.is_a?(Array)
+          messages.each do |message|
+            @messages << ApiErrorMessage.new(field, message)
+          end
+        else
+          @messages << ApiErrorMessage.new(field, messages)
         end
       end
     end

data/lib/currency_cloud/funding_account.rb

@@ -0,0 +1,8 @@
+module CurrencyCloud
+  class FundingAccount
+    include CurrencyCloud::Resource
+
+    resource :funding_accounts
+    actions :find
+  end
+end

data/lib/currency_cloud/margin_balance_top_up.rb

@@ -0,0 +1,5 @@
+module CurrencyCloud
+  class MarginBalanceTopUp
+    include CurrencyCloud::Resource
+  end
+end

data/lib/currency_cloud/payment.rb

@@ -30,5 +30,9 @@ module CurrencyCloud
       QuotePaymentFee.new(result)
     end
 
+    def self.tracking_info(id)
+      result = client.get("#{id}/tracking_info")
+      PaymentTrackingInfo.new(result)
+    end
   end
 end

data/lib/currency_cloud/payment_tracking_info.rb

@@ -0,0 +1,5 @@
+module CurrencyCloud
+  class PaymentTrackingInfo
+    include CurrencyCloud::Resource
+  end
+end

data/lib/currency_cloud/version.rb

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

data/lib/currency_cloud/withdrawal_account.rb

@@ -0,0 +1,17 @@
+module CurrencyCloud
+  class WithdrawalAccount
+    include CurrencyCloud::Resource
+
+    resource :withdrawal_accounts
+
+    def self.find(params = {})
+      result = client.get("/", params)
+      WithdrawalAccounts.new(:withdrawal_accounts, self, result)
+    end
+
+    def self.pull_funds(withdrawal_account_id, params = {})
+      result = client.post("#{withdrawal_account_id}/pull_funds", params)
+      WithdrawalAccountFunds.new(result)
+    end
+  end
+end

data/lib/currency_cloud/withdrawal_account_funds.rb

@@ -0,0 +1,5 @@
+module CurrencyCloud
+  class WithdrawalAccountFunds
+    include CurrencyCloud::Resource
+  end
+end

data/lib/currency_cloud/withdrawal_accounts.rb

@@ -0,0 +1,6 @@
+require "currency_cloud/resourceful_collection"
+
+module CurrencyCloud
+  class WithdrawalAccounts < CurrencyCloud::ResourcefulCollection
+  end
+end

data/spec/integration/actions_spec.rb

@@ -126,4 +126,15 @@ 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
+
+  it 'can top up margin balance' do
+    top_up = CurrencyCloud::Balance.top_up_margin(currency: 'GBP', amount: 450)
+
+    expect(top_up).to be_a_kind_of(CurrencyCloud::MarginBalanceTopUp)
+
+    expect(top_up.account_id).to eq('6c046c51-2387-4004-8e87-4bf97102e36d')
+    expect(top_up.transferred_amount).to eq('450.0')
+    expect(top_up.currency).to eq('GBP')
+    expect(top_up.transfer_completed_at).to eq('2007-11-19T08:37:48-06:00')
+  end
 end

data/spec/integration/funding_account_spec.rb

@@ -0,0 +1,62 @@
+require "spec_helper"
+
+describe "FundingAccounts", vcr: true do
+  before do
+    CurrencyCloud.login_id = "development@currencycloud.com"
+    CurrencyCloud.api_key = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef"
+    CurrencyCloud.environment = :demonstration
+    CurrencyCloud.reset_session
+  end
+  it 'can #find' do
+
+    accounts = CurrencyCloud::FundingAccount.find(currency: 'GBP', per_page: 5)
+    expect(accounts.length).to eq 1
+
+    account = accounts[0]
+    expect(account).to be_a(CurrencyCloud::FundingAccount)
+    expect(account.id).to eq "b7981972-8e29-485b-8a4a-9643fc6ae3sa"
+    expect(account.account_id).to eq "8d98bdc8-e8e3-47dc-bd08-3dd0f4f7ea7b"
+    expect(account.account_number).to eq "012345678"
+    expect(account.account_number_type).to eq "account_number"
+    expect(account.account_holder_name).to eq "Jon Doe"
+    expect(account.bank_name).to eq "Starling"
+    expect(account.bank_address).to eq "3rd floor, 2 Finsbury Avenue, London, EC2M 2PP, GB"
+    expect(account.bank_country).to eq "UK"
+    expect(account.currency).to eq "GBP"
+    expect(account.payment_type).to eq "regular"
+    expect(account.routing_code).to eq "010203"
+    expect(account.routing_code_type).to eq "sort_code"
+    expect(account.created_at).to eq "2018-05-14T14:18:30+00:00"
+    expect(account.updated_at).to eq "2018-05-14T14:19:30+00:00"
+  end
+
+  it "can find #missing_currency" do
+    begin
+      accounts = CurrencyCloud::FundingAccount.find()
+    rescue CurrencyCloud::BadRequestError => error
+      # All Good. Expected
+      expect(error.messages.length).to eq 1
+      expect(error.messages[0].code).to eq "currency_is_required"
+    end
+  end
+
+  it "can find #bad_request" do
+    begin
+      accounts = CurrencyCloud::FundingAccount.find(currency: "a", payment_type: "x", account_id: "x")
+    rescue CurrencyCloud::BadRequestError => error
+      # All Good. Expected
+      expect(error.messages.length).to eq 3
+    end
+  end
+
+  it "can find #unauthorized" do
+    begin
+      accounts = CurrencyCloud::FundingAccount.find(currency: "GBP")
+    rescue CurrencyCloud::AuthenticationError => error
+      # All Good. Expected
+      expect(error.messages.length).to eq 1
+      expect(error.messages[0].code).to eq "invalid_supplied_credentials"
+    end
+  end
+
+end

data/spec/integration/payments_spec.rb

@@ -107,4 +107,33 @@ describe 'Payments', vcr: true do
     expect(quote_payment_fee.payment_type).to eq("regular")
     expect(quote_payment_fee.charge_type).to be_nil
   end
+
+  it "can retrieve #payment_tracking_info" do
+    payment_tracking_info = CurrencyCloud::Payment.tracking_info("46ed4827-7b6f-4491-a06f-b548d5a7512d")
+
+    expect(payment_tracking_info).to be_a(CurrencyCloud::PaymentTrackingInfo)
+    expect(payment_tracking_info.uetr).to eq("46ed4827-7b6f-4491-a06f-b548d5a7512d")
+    expect(payment_tracking_info.transaction_status["status"]).to eq("processing")
+    expect(payment_tracking_info.transaction_status["reason"]).to eq("transferred_and_tracked")
+    expect(payment_tracking_info.initiation_time).to eq("2019-07-09T13:20:30+00:00")
+    expect(payment_tracking_info.completion_time).to be_nil
+    expect(payment_tracking_info.last_update_time).to eq("2019-07-10T15:39:08+00:00")
+    expect(payment_tracking_info.payment_events.length).to eq(7)
+    expect(payment_tracking_info.payment_events[6]["tracker_event_type"]).to eq("customer_credit_transfer_payment")
+    expect(payment_tracking_info.payment_events[6]["instructed_amount"]["amount"]).to eq("745437.57")
+  end
+
+  it 'can create #bad_request' do
+    begin
+      payment = CurrencyCloud::Payment.create()
+    rescue CurrencyCloud::BadRequestError => error
+      #All Good. Expected
+      expect(error.messages.length).to eq 10
+      expect(error.messages[0].field).to eq "currency"
+      expect(error.messages[0].code).to eq "currency_is_required"
+      expect(error.messages[2].field).to eq "beneficiary_id"
+      expect(error.messages[2].code).to eq "beneficiary_id_is_required"
+    end
+  end
+
 end

data/spec/integration/rates_spec.rb

@@ -36,4 +36,12 @@ 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
+
+  it 'can provided #detailed rate with conversion date preference' do
+    detailed_rate = CurrencyCloud::Rate.detailed(buy_currency: 'GBP', sell_currency: 'USD', fixed_side: 'buy', amount: '10000', conversion_date_preference: 'optimize_liquidity')
+
+    expect(detailed_rate).to be_a_kind_of(CurrencyCloud::Rate)
+    expect(detailed_rate.client_sell_amount).to eq('14081.00')
+    expect(detailed_rate.settlement_cut_off_time).to eq('2020-05-21T14:00:00Z')
+  end
 end

data/spec/integration/reference_spec.rb

@@ -24,9 +24,11 @@ describe 'Reference', vcr: true do
 
     expect(dates.invalid_conversion_dates).to_not be_empty
     invalid_conversion_date = dates.invalid_conversion_dates.first
-    expect(invalid_conversion_date).to eq(['2018-07-21', 'No trading on Saturday'])
-    expect(dates.first_conversion_date).to eq('2018-07-16')
-    expect(dates.default_conversion_date).to eq('2018-07-18')
+    expect(invalid_conversion_date).to eq(["2020-11-11", "Veterans' Day"])
+    expect(dates.first_conversion_date).to eq("2020-11-10")
+    expect(dates.default_conversion_date).to eq("2020-11-12")
+    expect(dates.first_conversion_cutoff_datetime).to eq("2020-11-10T15:30:00+00:00")
+    expect(dates.optimize_liquidity_conversion_date).to eq("2020-11-12")
   end
 
   it 'can retrieve #currencies' do

data/spec/integration/withdrawal_accounts_spec.rb

@@ -0,0 +1,69 @@
+require "spec_helper"
+
+describe "WithdrawalAccounts", vcr: true do
+  before do
+    CurrencyCloud.login_id = "development@currencycloud.com"
+    CurrencyCloud.api_key = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef"
+    CurrencyCloud.environment = :demonstration
+    CurrencyCloud.reset_session
+  end
+
+  it "can find #withdrawal_accounts" do
+    withdrawal_accounts = CurrencyCloud::WithdrawalAccount.find(
+        account_id: "72970a7c-7921-431c-b95f-3438724ba16f"
+    )
+    expect(withdrawal_accounts.length).to eq(1)
+
+    withdrawal_account = withdrawal_accounts[0]
+    expect(withdrawal_account).to be_a(CurrencyCloud::WithdrawalAccount)
+    expect(withdrawal_account.id).to eq("0886ac00-6ab6-41a6-b0e1-8d3faf2e0de2")
+    expect(withdrawal_account.account_name).to eq("currencycloud")
+    expect(withdrawal_account.account_holder_name).to eq("The Currency Cloud")
+    expect(withdrawal_account.account_holder_dob).to be_nil
+    expect(withdrawal_account.routing_code).to eq("123456789")
+    expect(withdrawal_account.account_number).to eq("01234567890")
+    expect(withdrawal_account.currency).to eq("USD")
+    expect(withdrawal_account.account_id).to eq("72970a7c-7921-431c-b95f-3438724ba16f")
+  end
+
+  it "can find #withdrawal_accounts2" do
+    withdrawal_accounts = CurrencyCloud::WithdrawalAccount.find()
+    expect(withdrawal_accounts.length).to eq(2)
+
+    withdrawal_account1 = withdrawal_accounts[0]
+    expect(withdrawal_account1).to be_a(CurrencyCloud::WithdrawalAccount)
+    expect(withdrawal_account1.id).to eq("0886ac00-6ab6-41a6-b0e1-8d3faf2e0de2")
+    expect(withdrawal_account1.account_name).to eq("currencycloud")
+    expect(withdrawal_account1.account_holder_name).to eq("The Currency Cloud")
+    expect(withdrawal_account1.account_holder_dob).to be_nil
+    expect(withdrawal_account1.routing_code).to eq("123456789")
+    expect(withdrawal_account1.account_number).to eq("01234567890")
+    expect(withdrawal_account1.currency).to eq("USD")
+    expect(withdrawal_account1.account_id).to eq("72970a7c-7921-431c-b95f-3438724ba16f")
+
+    withdrawal_account2 = withdrawal_accounts[1]
+    expect(withdrawal_account2).to be_a(CurrencyCloud::WithdrawalAccount)
+    expect(withdrawal_account2.id).to eq("0886ac00-6ab6-41a6-b0e1-8d3faf2e0de3")
+    expect(withdrawal_account2.account_name).to eq("currencycloud2")
+    expect(withdrawal_account2.account_holder_name).to eq("The Currency Cloud 2")
+    expect(withdrawal_account2.account_holder_dob).to eq("1990-07-20")
+    expect(withdrawal_account2.routing_code).to eq("223456789")
+    expect(withdrawal_account2.account_number).to eq("01234567892")
+    expect(withdrawal_account2.currency).to eq("GBP")
+    expect(withdrawal_account2.account_id).to eq("72970a7c-7921-431c-b95f-3438724ba16e")
+  end
+
+  it "can pull funds" do
+    withdrawal_account_funds = CurrencyCloud::WithdrawalAccount.pull_funds(
+        "0886ac00-6ab6-41a6-b0e1-8d3faf2e0de2",
+        reference: "PullFunds1",
+        amount: 100.0
+    )
+    expect(withdrawal_account_funds).to be_a(CurrencyCloud::WithdrawalAccountFunds)
+    expect(withdrawal_account_funds.id).to eq("e2e6b7aa-c9e8-4625-96a6-b97d4baab758")
+    expect(withdrawal_account_funds.withdrawal_account_id).to eq("0886ac00-6ab6-41a6-b0e1-8d3faf2e0de2")
+    expect(withdrawal_account_funds.reference).to eq("PullFunds1")
+    expect(withdrawal_account_funds.amount).to eq("100.00")
+    expect(withdrawal_account_funds.created_at).to eq("2020-06-29T08:02:31+00:00")
+  end
+end

data/spec/support/vcr_cassettes/Accounts/can_retrieve_account_payment_charges_settings.yml

@@ -8,7 +8,7 @@ http_interactions:
         string: login_id=development%40currencycloud.com&api_key=deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef
       headers:
         User-Agent:
-          - CurrencyCloudSDK/2.0 Ruby/0.14.2
+          - CurrencyCloudSDK/2.0 Ruby/1.1.4
     response:
       status:
         code: 200
@@ -58,7 +58,7 @@ http_interactions:
         X-Auth-Token:
           - deadbeefdeadbeefdeadbeefdeadbeef
         User-Agent:
-          - CurrencyCloudSDK/2.0 Ruby/0.14.2
+          - CurrencyCloudSDK/2.0 Ruby/1.1.4
     response:
       status:
         code: 200

data/spec/support/vcr_cassettes/Accounts/can_update_account_payment_charges_settings.yml

@@ -8,7 +8,7 @@ http_interactions:
         string: login_id=development%40currencycloud.com&api_key=deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef
       headers:
         User-Agent:
-          - CurrencyCloudSDK/2.0 Ruby/0.14.2
+          - CurrencyCloudSDK/2.0 Ruby/1.1.4
     response:
       status:
         code: 200
@@ -58,7 +58,7 @@ http_interactions:
         X-Auth-Token:
           - deadbeefdeadbeefdeadbeefdeadbeef
         User-Agent:
-          - CurrencyCloudSDK/2.0 Ruby/0.14.2
+          - CurrencyCloudSDK/2.0 Ruby/1.1.4
     response:
       status:
         code: 200

data/spec/support/vcr_cassettes/Actions/can_top_up_margin_balance.yml

@@ -0,0 +1,39 @@
+---
+http_interactions:
+  - request:
+      method: post
+      uri: https://devapi.currencycloud.com/v2/balances/top_up_margin
+      body:
+        encoding: UTF-8
+        string: currency=GBP&amount=450
+      headers:
+        X-Auth-Token:
+          - 4df5b3e5882a412f148dcd08fa4e5b73
+    response:
+      status:
+        code: 200
+        message: OK
+      headers:
+        Server:
+          - nginx
+        Date:
+          - Fri, 03 Jan 2020 11:01:36 GMT
+        Content-Type:
+          - application/json;charset=utf-8
+        Content-Length:
+          - '1021'
+        Connection:
+          - keep-alive
+        X-Request-Id:
+          - '2771999306691376475'
+        X-Content-Type-Options:
+          - nosniff
+      body:
+        encoding: UTF-8
+        string: '{"account_id": "6c046c51-2387-4004-8e87-4bf97102e36d",
+                  "currency": "GBP",
+                  "transferred_amount": "450.0",
+                  "transfer_completed_at": "2007-11-19T08:37:48-06:00"}'
+      http_version:
+    recorded_at: Fri, 03 Jan 2020 11:01:36 GMT
+recorded_with: VCR 2.9.3