synapse_pay_rest 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2917b1bf6fcbc242ae675356583c24b0e955b322
-  data.tar.gz: 42c6425c2d7f7db9e2d77634a3a061acb77b84b0
+  metadata.gz: bf13c67916c9560ecd7993d03b00691ea15ca16e
+  data.tar.gz: 4df8ab520d132d23e4196c63a8ea2fdb9bc5cc46
 SHA512:
-  metadata.gz: fee11b10a3b18642ad718684796c2f29ba5d33b453f0e4e1bc5ad22bcc8b443220bf0eabf6edc9bb5c6d9265ad935e82932092af243d6c92e7565751c66da12e
-  data.tar.gz: f2c6a0267dfae1ff7637a25219fcea5b9b5a6a5260f5dd910987d10563363a89cce0633f5cf4c2d45898548210fa6807fb8ec6e9e5e8fe185af0332d92ae5697
+  metadata.gz: eace5ad6f06ecb638f69eaffd0a505e903444d78f0e1324d1a4e19f06d2ef423b40719abbf4b8d23ddf60157a8066428e7abdbfd36f0ce907c4234f3ae98e353
+  data.tar.gz: 10fe666bec184de1cd0b72a5d1ae4ae09e4a1a4a238bddab316c93ea1fc5dcb8558f68b766aef529dc5cdcbd0b19f6d9e9b2fd4fb4766739f4c81ca76900c27b

data/README.md

@@ -60,7 +60,7 @@ To run all tests, execute:
 rake
 ```
 
-To run a specific test or file, install the [m](https://github.com/qrush/m) gem and execute:
+To run a specific file or test, install the [m](https://github.com/qrush/m) gem and execute:
 
 ```bash
 m path/to/file:line_number

data/lib/synapse_pay_rest.rb

@@ -22,7 +22,7 @@ require 'synapse_pay_rest/models/user/question'
 
 # node-related classes
 
-# ancestor of all BaseNodes
+# ancestor of all node classes
 require 'synapse_pay_rest/models/node/base_node'
 
 # BaseNode subclasses
@@ -44,6 +44,8 @@ require 'synapse_pay_rest/models/node/wire_us_node.rb'
 require 'synapse_pay_rest/models/node/wire_int_node.rb'
 # reserve
 require 'synapse_pay_rest/models/node/reserve_us_node.rb'
+# triump subaccount
+require 'synapse_pay_rest/models/node/triumph_subaccount_us_node.rb'
 # iou
 require 'synapse_pay_rest/models/node/iou_node.rb'
 

data/lib/synapse_pay_rest/error.rb

@@ -87,6 +87,7 @@ module SynapsePayRest
       # @param code [Integer]
       # @return [SynapsePayRest::Error]
       def error_from_response(body, code)
+        # require 'pry'; binding.pry
         code = code.to_i
         klass = ERRORS[code] || SynapsePayRest::Error
         message, error_code = parse_error(body)

data/lib/synapse_pay_rest/http_client.rb

@@ -62,6 +62,8 @@ module SynapsePayRest
     # @param ip_address [String,void]
     # 
     # @return [void]
+    # 
+    # @todo logic to update user_id doesn't belong here
     def update_headers(user_id: nil, oauth_key: nil, fingerprint: nil,
                        client_id: nil, client_secret: nil, ip_address: nil)
       self.user_id           = user_id if user_id

data/lib/synapse_pay_rest/models/node/ach_us_node.rb

@@ -30,7 +30,7 @@ module SynapsePayRest
         if response['mfa']
           create_unverified_node(user, response)
         else
-          create_multiple_from_response(user, response['nodes'])
+          multiple_from_response(user, response['nodes'])
         end
       end
 
@@ -39,23 +39,15 @@ module SynapsePayRest
       # Converts args into payload for request JSON.
       def payload_for_create(nickname:, account_number:, routing_number:, 
         account_type:, account_class:, **options)
-        payload = {
-          'type' => 'ACH-US',
-          'info' => {
-            'nickname'    => nickname,
-            'account_num' => account_number,
-            'routing_num' => routing_number,
-            'type'        => account_type,
-            'class'       => account_class
-          }
-        }
-        # optional payload fields
-        extra = {}
-        extra['supp_id']            = options[:supp_id] if options[:supp_id]
-        extra['gateway_restricted'] = options[:gateway_restricted] if options[:gateway_restricted]
-        payload['extra'] = extra if extra.any?
-
-        payload
+        args = {
+          type: 'ACH-US',
+          nickname:       nickname,
+          account_number: account_number,
+          routing_number: routing_number,
+          account_type:   account_type,
+          account_class:  account_class
+        }.merge(options)
+        super(args)
       end
 
       def payload_for_create_via_bank_login(bank_name:, username:, password:)
@@ -98,7 +90,7 @@ module SynapsePayRest
 
       payload = verify_microdeposits_payload(amount1: amount1, amount2: amount2)
       response = user.client.nodes.patch(node_id: id, payload: payload)
-      self.class.create_from_response(user, response)
+      self.class.from_response(user, response)
     end
 
     private

data/lib/synapse_pay_rest/models/node/base_node.rb

@@ -40,7 +40,7 @@ module SynapsePayRest
         payload = payload_for_create(nickname: nickname, **options)
         user.authenticate
         response = user.client.nodes.add(payload: payload)
-        create_from_response(user, response['nodes'].first)
+        from_response(user, response['nodes'].first)
       end
 
       # Queries the API for all nodes belonging to the supplied user (with optional
@@ -66,11 +66,11 @@ module SynapsePayRest
         
         user.authenticate
         response = user.client.nodes.get(page: page, per_page: per_page, type: self.type)
-        create_multiple_from_response(user, response['nodes'])
+        multiple_from_response(user, response['nodes'])
       end
 
       # @note Not meant to be accessed directly on BaseNode but through children.
-      def create_from_response(user, response)
+      def from_response(user, response)
         args = {
           user:            user,
           type:            response['type'],
@@ -92,35 +92,106 @@ module SynapsePayRest
         }
 
         if response['info']['correspondent_info']
-          args[:correspondent_swift]          = response['info']['correspondent_info']['swift']
-          args[:correspondent_bank_name]      = response['info']['correspondent_info']['bank_name']
-          args[:correspondent_routing_number] = response['info']['correspondent_info']['routing_num']
-          args[:correspondent_address]        = response['info']['correspondent_info']['address']
-          args[:correspondent_swift]          = response['info']['correspondent_info']['swift']
+          correspondent_info = response['info']['correspondent_info']
+          args[:correspondent_swift]          = correspondent_info['swift']
+          args[:correspondent_bank_name]      = correspondent_info['bank_name']
+          args[:correspondent_routing_number] = correspondent_info['routing_num']
+          args[:correspondent_address]        = correspondent_info['address']
         end
 
         if response['info']['match_info']
-          args[:email_match]       = response['info']['match_info']['email_match']
-          args[:name_match]        = response['info']['match_info']['name_match']
-          args[:phonenumber_match] = response['info']['match_info']['phonenumber_match']
+          match_info = response['info']['match_info']
+          args[:email_match]       = match_info['email_match']
+          args[:name_match]        = match_info['name_match']
+          args[:phonenumber_match] = match_info['phonenumber_match']
         end
 
         if response['info']['balance']
-          args[:balance]  = response['info']['balance']['amount']
-          args[:currency] = response['info']['balance']['currency']
+          balance = response['info']['balance']
+          args[:balance]  = balance['amount']
+          args[:currency] = balance['currency']
         end
 
         if response['extra']
-          args[:supp_id]            = response['extra']['supp_id']
-          args[:gateway_restricted] = response['extra']['gateway_restricted']
+          extra = response['extra']
+          args[:supp_id]            = extra['supp_id']
+          args[:gateway_restricted] = extra['gateway_restricted']
         end
 
         self.new(**args)
       end
 
       # @note Not meant to be accessed directly on BaseNode but through children.
-      def create_multiple_from_response(user, response)
-        response.map { |node_data| create_from_response(user, node_data)}
+      def multiple_from_response(user, response)
+        response.map { |node_data| from_response(user, node_data)}
+      end
+
+      def payload_for_create(type:, **options)
+        payload = {
+            'type' => type,
+            'info' => {}
+        }
+
+        info_fields = [
+          :swift, :name_on_account, :bank_name, :address, :ifsc,:nickname,
+          :bank_name
+        ]
+        info_fields.each do |field|
+          payload['info'][field.to_s] = options[field] if options[field]
+        end
+
+        # the rest are done individually since they are custom renamed
+        correspondent_info = {}
+        if options[:correspondent_routing_number]
+          correspondent_info['routing_num'] = options[:correspondent_routing_number]
+        end
+        if options[:correspondent_bank_name]
+          correspondent_info['bank_name'] = options[:correspondent_bank_name]
+        end
+        if options[:correspondent_address]
+          correspondent_info['address'] = options[:correspondent_address]
+        end
+        if options[:correspondent_swift]
+          correspondent_info['swift'] = options[:correspondent_swift]
+        end
+        payload['info']['correspondent_info'] = correspondent_info if correspondent_info.any?
+
+        if options[:account_number]
+          payload['info']['account_num'] = options[:account_number]
+        end
+        if options[:routing_number]
+          payload['info']['routing_num'] = options[:routing_number]
+        end
+        if options[:account_type]
+          payload['info']['type'] = options[:account_type]
+        end
+        if options[:account_class]
+          payload['info']['class'] = options[:account_class]
+        end
+        if options[:username]
+          payload['info']['bank_id'] = options[:username]
+        end
+        if options[:password]
+          payload['info']['bank_pw'] = options[:password]
+        end
+
+        balance_fields = [:currency]
+        balance_fields.each do |field|
+          if options[field]
+            payload['info']['balance'] ||= {}
+            payload['info']['balance'][field.to_s] = options[field] if options[field]
+          end
+        end
+
+        extra_fields = [:supp_id, :gateway_restricted]
+        extra_fields.each do |field|
+          if options[field]
+            payload['extra'] ||= {}
+            payload['extra'][field.to_s] = options[field] 
+          end
+        end
+
+        payload
       end
     end
 

data/lib/synapse_pay_rest/models/node/eft_ind_node.rb

@@ -1,18 +1,19 @@
 module SynapsePayRest
   # Represents an Indian bank account for EFT credits.
-  class EftIndNode < EftNode
+  # 
+  # @deprecated
+  class EftIndNode < BaseNode
     class << self
       private
 
       def payload_for_create(nickname:, account_number:, ifsc:, **options)
-        args = {
+        payload = {
           type: 'EFT-IND',
           nickname: nickname,
-          account_number: account_number
+          account_number: account_number,
+          ifsc: ifsc
         }.merge(options)
-        payload = super(args)
-        payload['info']['ifsc'] = ifsc
-        payload
+        super(payload)
       end
     end
   end

data/lib/synapse_pay_rest/models/node/eft_np_node.rb

@@ -1,6 +1,6 @@
 module SynapsePayRest
   # Represents a Nepali bank account for EFT credits.
-  class EftNpNode < EftNode
+  class EftNpNode < BaseNode
     class << self
       private
 
@@ -8,11 +8,10 @@ module SynapsePayRest
         args = {
           type: 'EFT-NP',
           nickname: nickname,
+          bank_name: bank_name,
           account_number: account_number
         }.merge(options)
-        payload = super(args)
-        payload['info']['bank_name'] = bank_name
-        payload
+        super(args)
       end
     end
   end

data/lib/synapse_pay_rest/models/node/iou_node.rb

@@ -6,21 +6,12 @@ module SynapsePayRest
       private
 
       def payload_for_create(nickname:, currency:, **options)
-        payload = {
-          'type' => 'IOU',
-          'info' => {
-            'nickname' => nickname,
-            'balance'  => {
-              'currency' => currency
-            }
-          }
-        }
-        # optional payload fields
-        extra = {}
-        extra['supp_id']            = options[:supp_id] if options[:supp_id]
-        extra['gateway_restricted'] = options[:gateway_restricted] if options[:gateway_restricted]
-        payload['extra'] = extra if extra.any?
-        payload
+        args = {
+          type: 'IOU',
+          nickname: nickname,
+          currency: currency
+        }.merge(options)
+        super(args)
       end
     end
   end

data/lib/synapse_pay_rest/models/node/node.rb

@@ -6,16 +6,17 @@ module SynapsePayRest
 
     # Node type to node class mappings.
     NODE_TYPES_TO_CLASSES = {
-      'ACH-US'      => AchUsNode,
-      'EFT-NP'      => EftNpNode,
-      'EFT-IND'     => EftIndNode,
-      'IOU'         => IouNode,
-      'RESERVE-US'  => ReserveUsNode,
-      'SYNAPSE-IND' => SynapseIndNode,
-      'SYNAPSE-NP'  => SynapseNpNode,
-      'SYNAPSE-US'  => SynapseUsNode,
-      'WIRE-INT'    => WireIntNode,
-      'WIRE-US'     => WireUsNode
+      'ACH-US'                 => AchUsNode,
+      'EFT-NP'                 => EftNpNode,
+      'EFT-IND'                => EftIndNode,
+      'IOU'                    => IouNode,
+      'RESERVE-US'             => ReserveUsNode,
+      'SYNAPSE-IND'            => SynapseIndNode,
+      'SYNAPSE-NP'             => SynapseNpNode,
+      'SYNAPSE-US'             => SynapseUsNode,
+      'TRIUMPH-SUBACCOUNT-US'  => TriumphSubaccountUsNode,
+      'WIRE-INT'               => WireIntNode,
+      'WIRE-US'                => WireUsNode
     }.freeze
 
     class << self
@@ -34,7 +35,7 @@ module SynapsePayRest
 
         user.authenticate
         response = user.client.nodes.get(user_id: user.id, node_id: id)
-        create_from_response(user, response)
+        from_response(user, response)
       end
 
       # Queries the API for all nodes belonging to the supplied user (with optional
@@ -62,7 +63,7 @@ module SynapsePayRest
 
         user.authenticate
         response = user.client.nodes.get(page: page, per_page: per_page, type: type)
-        create_multiple_from_response(user, response['nodes'])
+        multiple_from_response(user, response['nodes'])
       end
 
       # Queries the API for all nodes belonging to the supplied user (with optional
@@ -85,14 +86,14 @@ module SynapsePayRest
 
       # determines the proper node type to instantiate from the response
       # implemented differently in each BaseNode subclass
-      def create_from_response(user, response)
-        klass = NODE_TYPES_TO_CLASSES.fetch(response['type'])
-        klass.create_from_response(user, response)
+      def from_response(user, response)
+        klass = NODE_TYPES_TO_CLASSES.fetch(response['type']) || BaseNode
+        klass.from_response(user, response)
       end
 
-      def create_multiple_from_response(user, response)
+      def multiple_from_response(user, response)
         return [] if response.empty?
-        response.map { |node_data| create_from_response(user, node_data)}
+        response.map { |node_data| from_response(user, node_data)}
       end
     end
   end

data/lib/synapse_pay_rest/models/node/reserve_us_node.rb

@@ -6,17 +6,11 @@ module SynapsePayRest
       private
 
       def payload_for_create(nickname:, **options)
-        payload = {
-          'type' => 'RESERVE-US',
-          'info' => {
-            'nickname'        => nickname,
-          }
-        }
-        extra = {}
-        extra['supp_id']            = options[:supp_id] if options[:supp_id]
-        extra['gateway_restricted'] = options[:gateway_restricted] if options[:gateway_restricted]
-        payload['extra'] = extra if extra.any?
-        payload
+        args = {
+          type: 'RESERVE-US',
+          nickname: nickname
+        }.merge(options)
+        super(args)
       end
     end
   end

data/lib/synapse_pay_rest/models/node/synapse_ind_node.rb

@@ -1,6 +1,8 @@
 module SynapsePayRest
   # Represents a Synapse node allowing any user to hold Indian Rupees.
-  class SynapseIndNode < SynapseNode
+  # 
+  # @deprecated
+  class SynapseIndNode < BaseNode
     class << self
       private
 
@@ -9,13 +11,7 @@ module SynapsePayRest
           type: 'SYNAPSE-IND',
           nickname: nickname
         }.merge(options)
-        payload = super(args)
-        # optional payload fields
-        extra = {}
-        extra['supp_id']            = options[:supp_id] if options[:supp_id]
-        extra['gateway_restricted'] = options[:gateway_restricted] if options[:gateway_restricted]
-        payload['extra'] = extra if extra.any?
-        payload
+        super(args)
       end
     end
   end

data/lib/synapse_pay_rest/models/node/synapse_np_node.rb

@@ -1,6 +1,6 @@
 module SynapsePayRest
   # Represents a Synapse node allowing any user to hold Nepali Rupees.
-  class SynapseNpNode < SynapseNode
+  class SynapseNpNode < BaseNode
     class << self
       private
 
@@ -9,13 +9,7 @@ module SynapsePayRest
           type: 'SYNAPSE-NP',
           nickname: nickname
         }.merge(options)
-        payload = super(args)
-        # optional payload fields
-        extra = {}
-        extra['supp_id']            = options[:supp_id] if options[:supp_id]
-        extra['gateway_restricted'] = options[:gateway_restricted] if options[:gateway_restricted]
-        payload['extra'] = extra if extra.any?
-        payload
+        super(args)
       end
     end
   end