bloom_remit2 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9fe3102c89ee58605e86339d9a9b4f642b475ffb6efa9e6dfdf4ee6480506de
-  data.tar.gz: 7103274c649289b34227eabedd51437675f2afed4695988573b19df98c16034c
+  metadata.gz: 04fe85ab82a87f635a07f9b53a34834f9148dcf848d54425de8a381825def564
+  data.tar.gz: 49dc8fd1d1507677577aca8458f6339ca1442141bf61bc9b61d66ebd54cc12cf
 SHA512:
-  metadata.gz: 9899e21a046843bb50059265f37d2ac9a606b87dc96122419d5c77b551bb0f0e9645368029a19cd5bdd3a5dca46f807d5c6ba609e7479c32233f576228ebc30a
-  data.tar.gz: 06dbce27bfa38b8e5eb919ca9342899d4e79f08bb39d2de3736a6311edd2b9d1eb4dedbc5b7ecad0b5567c6f621633ec4e2a8e4876c57368580b64f899bb4f86
+  metadata.gz: 4706edc255e3764d4f93d2a6a7a93f488af516ccb8af74a5728711df0231b6a2692813b0969ce57d03bdb5c9386f608847927103db8dd2d5669a769800da8e70
+  data.tar.gz: e7de7a5fe4d1092d2cafcc56aef681eda4d0199afb1489abdbbbb3f69d2acfd88353aadc417517a8dce36697def82927ca1455f9caf3c3a6e15b46a9c6c18195

data/CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic
 Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## 0.1.1
+### Added
+- Fix BloomRemit2::Remittance.execute & add test
+- Remove BloomRemit2::Remittance.calculate
+
+## 0.1.0
 ### Added
 - Initial release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bloom_remit2 (0.1.0)
+    bloom_remit2 (0.1.1)
       activesupport
       gem_config
       httparty

data/README.md

@@ -152,8 +152,7 @@ sender_id = 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
 BloomRemit2::Recipient.list(sender_id)
 ```
 
-### Show details about a recipient of a given user, and their associated remittance
-IDs
+### Show details about a recipient of a given user, and their associated remittance IDs
 ```ruby
 # GET /api/v1/partners/:api_token/senders/:sender_id/recipients/:id
 
@@ -204,7 +203,7 @@ BloomRemit2::Remittance.list(sender_id)
 ```
 
 ### Initiate a new money transfer by providing a recipient_id and a remittance hash
-**TODO: Need to add tests**
+Use either `paid_in_orig_currency` or `receivable_in_dest_currency` and not both as this will result in a 500 Internal Server error.
 ```ruby
 # POST /api/v1/partners/:api_token/senders/:sender_id/remittances
 
@@ -221,7 +220,7 @@ BloomRemit2::Remittance.execute(
       flat_fee_in_orig_currency: 0,
       forex_margin: 0,
       orig_currency: 'PHP',
-      paid_in_orig_currency: 0,
+      # paid_in_orig_currency: 0,
       payout_method: 'BPI',
       receivable_in_dest_currency: 25000
     }
@@ -254,40 +253,6 @@ BloomRemit2::Remittance.cancel(sender_id, remittance_id)
 => remittance_hash, not a BloomRemit2::Remittance
 ```
 
-### Returns the total fees for a remittance amount and payout method
-**TODO: Needs to be implemented; this returns a 500 Internal Server error**
-
-In order to calculate the cost of a given remittance, you will need to provide
-an amount, a currency, and a payout_method. You may provide either the
-origin_amount (the money paid by the sender), or the destination_amount (the
-money received by the beneficiary), and the calculator will compute the fees
-automatically.
-
-If you provide the origin_amount, the calculator will give you the amount
-receivable at the destination of the remittance. If you provide the
-destination_amount, the calculator will give you the amount that must be paid by
-the sender at the point of origin.
-```ruby
-# POST /api/v1/partners/:api_token/remittances/calculate
-
-BloomRemit2::Remittance.calculate(
-  origin_amount: 15000,
-  origin_currency: 'PHP',
-  payout_method: 'BPI'
-)
-
-BloomRemit2::Remittance.calculate(
-  destination_amount: 10000,
-  destination_currency: 'PHP',
-  payout_method: 'BPI'
-)
-
-BloomRemit2::Remittance.calculate(
-  origin_amount: 125000,
-  payout_method: 'BPI'
-)
-```
-
 ## Sender uploads
 
 **TODO: Needs to be implemented**

data/lib/bloom_remit2/client.rb

@@ -3,20 +3,28 @@ require 'httparty'
 module BloomRemit2
   class Client
     class << self
-      def get(path, headers = default_get_headers, query: {})
-        HTTParty.get(url(path), { query: query, headers: headers })
+      def get(path, headers = default_get_headers, query: {}, staging: false)
+        the_url = url(path)
+        the_url = staging_url(path) if staging
+        HTTParty.get(the_url, { query: query, headers: headers })
       end
 
-      def post(path, body = {}, headers = default_post_headers)
-        HTTParty.post(url(path), { body: body.to_json, headers: headers })
+      def post(path, body = {}, staging = false, headers = default_post_headers)
+        the_url = url(path)
+        the_url = staging_url(path) if staging
+        HTTParty.post(the_url, { body: body.to_json, headers: headers })
       end
 
-      def put(path, body = [], headers = default_put_headers)
-        HTTParty.put(url(path), { body: URI.encode_www_form(body), headers: headers })
+      def put(path, body = [], headers = default_put_headers, staging: false)
+        the_url = url(path)
+        the_url = staging_url(path) if staging
+        HTTParty.put(the_url, { body: URI.encode_www_form(body), headers: headers })
       end
 
-      def delete(path, headers = default_get_headers)
-        HTTParty.delete(url(path), { headers: headers })
+      def delete(path, headers = default_get_headers, staging: false)
+        the_url = url(path)
+        the_url = staging_url(path) if staging
+        HTTParty.delete(the_url, { headers: headers })
       end
 
       private
@@ -25,6 +33,10 @@ module BloomRemit2
         'https://www.bloomremit.net'
       end
 
+      def staging_url(path)
+        "https://staging.bloomremit.net/#{path}"
+      end
+
       def url(path)
         "#{base_url}/#{path}"
       end

data/lib/bloom_remit2/remittance.rb

@@ -2,8 +2,38 @@ module BloomRemit2
   class Remittance
     class << self
       # Initiate a new money transfer by providing a recipient_id and remittance hash
-      def execute(sender_id, remittance_hash)
-        remittance = Client.post(path(sender_id))
+      def execute(sender_id, remittance_hash, staging: false)
+        result = Client.post(path(sender_id), remittance_hash, staging)
+        remittance = result['remittance'].with_indifferent_access
+        new(
+          remittance[:id],
+          remittance[:partner_id],
+          remittance[:orig_currency],
+          remittance[:dest_currency],
+          remittance[:paid_in_orig_currency],
+          remittance[:forex_margin],
+          remittance[:flat_fee_in_orig_currency],
+          remittance[:payout_method],
+          remittance[:status],
+          remittance[:account_name],
+          remittance[:account_number],
+          remittance[:teller_id],
+          remittance[:sender_id],
+          remittance[:client_external_id],
+          recipient: Recipient.new(
+            remittance[:recipient_id],
+            remittance[:sender_id],
+            nil,
+            nil,
+            nil,
+            nil,
+            nil,
+            nil,
+            nil,
+            nil,
+            nil
+          )
+        )
       end
 
       # Cancel a remittance
@@ -69,19 +99,6 @@ module BloomRemit2
         )
       end
 
-      # TODO: Returns 500 Internal Server Error
-      # Returns the total fees for a given remittance amount and payout method
-      # def calculate_fees(payout_method, origin_amount: nil, origin_currency: nil, destination_amount: nil, destination_currency: nil)
-      #   remittance = Client.post(path_for_calculate, fees_hash)
-      # end
-
-      private
-
-      # TODO: Uncomment when implementing .calculate_fees
-      # def path_for_calculate
-      #   "api/v1/partners/#{BloomRemit2.configuration.api_token}/remittances/calculate"
-      # end
-
       def path(sender_id)
         "api/v1/partners/#{BloomRemit2.configuration.api_token}/senders/#{sender_id}/remittances"
       end
@@ -123,9 +140,9 @@ module BloomRemit2
       @flat_fee_in_orig_currency = flat_fee_in_orig_currency
       @payout_method = payout_method 
       @status = status
-      @account_name = account_name,
-      @account_number = account_number,
-      @teller_id = teller_id,
+      @account_name = account_name
+      @account_number = account_number
+      @teller_id = teller_id
       @sender_id = sender_id
       @client_external_id = client_external_id
       @recipient = recipient

data/lib/bloom_remit2/version.rb

@@ -1,3 +1,3 @@
 module BloomRemit2
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bloom_remit2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Xavi Ablaza
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport