Add validations

Author: NLSanyu

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    momoapi-ruby (0.1.0)
+    momoapi-ruby (0.1.1)
 
 GEM
   remote: https://rubygems.org/

README.md

@@ -83,7 +83,7 @@ require 'momoapi-ruby'
 
 collection = Momoapi::Collection.new
 collection.request_to_pay(
-    mobile="256772123456", amount="600", external_id="123456789", payee_note="dd", payer_message="dd", currency="EUR")
+    phone_number="256772123456", amount=600, external_id="123456789", payee_note="dd", payer_message="dd", currency="EUR")
 ```
 An extra argument, `callback_url`, can be passed to this method, denoting the URL to the server where the callback should be sent.
 
@@ -123,7 +123,7 @@ require 'momoapi-ruby'
 
 disbursement = Momoapi::Disbursement.new
 disbursement.transfer(
-    mobile="256772123456", amount="600", external_id="123456789", payee_note="dd", payer_message="dd", currency="EUR")
+    phone_number="256772123456", amount=600, external_id="123456789", payee_note="dd", payer_message="dd", currency="EUR")
 ```
 An extra argument, `callback_url`, can be passed to this method, denoting the URL to the server where the callback should be sent.
 
@@ -163,7 +163,7 @@ require 'momoapi-ruby'
 
 remittance = Momoapi::Remittance.new
 remittance.transfer(
-    mobile="256772123456", amount="600", external_id="123456789", payee_note="dd", payer_message="dd", currency="EUR")
+    phone_number="256772123456", amount=600, external_id="123456789", payee_note="dd", payer_message="dd", currency="EUR")
 ```
 An extra argument, `callback_url`, can be passed to this method, denoting the URL to the server where the callback should be sent.
 

lib/momoapi-ruby/cli.rb

@@ -32,7 +32,7 @@ def create_sandbox_user
       end
 
       unless response.status == 201
-        raise Error::APIError.new(response.body, response.status)
+        raise Momoapi::Error.new(response.body, response.status)
       end
 
       generate_api_key
@@ -46,7 +46,7 @@ def generate_api_key
       end
 
       unless response.status == 201
-        raise Error::APIError.new(response.body, response.status)
+        raise Momoapi::Error.new(response.body, response.status)
       end
 
       key = JSON.parse(response.body)

lib/momoapi-ruby/client.rb

@@ -12,16 +12,20 @@
 module Momoapi
   class Client
     def send_request(method, path, headers, body = {})
-      auth_token = get_auth_token['access_token']
-      conn = Faraday.new(url: Momoapi.config.base_url)
-      conn.headers = headers
-      conn.authorization(:Bearer, auth_token)
+      begin
+        auth_token = get_auth_token['access_token']
+        conn = Faraday.new(url: Momoapi.config.base_url)
+        conn.headers = headers
+        conn.authorization(:Bearer, auth_token)
 
-      case method
-      when 'get'
-        response = conn.get(path)
-      when 'post'
-        response = conn.post(path, body.to_json)
+        case method
+        when 'get'
+          response = conn.get(path)
+        when 'post'
+          response = conn.post(path, body.to_json)
+        end
+      rescue ArgumentError
+        raise "Missing configuration key(s) for #{@product.capitalize}s"
       end
       interpret_response(response)
     end
@@ -35,11 +39,11 @@ def interpret_response(resp)
       unless resp.status >= 200 && resp.status < 300
         handle_error(response[:body], response[:code])
       end
-      response
+      body
     end
 
     def handle_error(response_body, response_code)
-      raise Error::APIError.new(response_body, response_code)
+      raise Momoapi::Error.new(response_body, response_code)
     end
 
     # Create an  access token which can then be used to
@@ -51,8 +55,8 @@ def get_auth_token(path, subscription_key)
       url = Momoapi.config.base_url
       conn = Faraday.new(url: url)
       conn.headers = headers
-      product = path.split('/')[0]
-      get_credentials(product)
+      @product = path.split('/')[0]
+      get_credentials(@product)
       conn.basic_auth(@username, @password)
       response = conn.post(path)
       begin

lib/momoapi-ruby/collection.rb

@@ -6,6 +6,7 @@
 
 require 'momoapi-ruby/config'
 require 'momoapi-ruby/client'
+require 'momoapi-ruby/validate'
 
 module Momoapi
   class Collection < Client
@@ -34,6 +35,7 @@ def get_transaction_status(transaction_id)
     def request_to_pay(phone_number, amount, external_id,
                        payee_note = '', payer_message = '',
                        currency = 'EUR', callback_url = '')
+      Momoapi::Validate.new.validate(phone_number, amount, currency)
       uuid = SecureRandom.uuid
       headers = {
         "X-Target-Environment": Momoapi.config.environment || 'sandbox',

lib/momoapi-ruby/disbursement.rb

@@ -29,6 +29,7 @@ def get_transaction_status(transaction_id)
     def transfer(phone_number, amount, external_id,
                  payee_note = '', payer_message = '',
                  currency = 'EUR', callback_url = '')
+      Momoapi::Validate.new.validate(phone_number, amount, currency)
       uuid = SecureRandom.uuid
       headers = {
         "X-Target-Environment": Momoapi.config.environment || 'sandbox',

lib/momoapi-ruby/errors.rb

@@ -2,11 +2,17 @@
 
 # Error handling for unsuccessful responses from the MTN Momo API
 
-module Error
-  class APIError < StandardError
+module Momoapi
+  class Error < StandardError
     def initialize(message, code)
       @code = code
       super("Error code #{code} #{message}")
     end
   end
+
+  class ValidationError < StandardError
+    def initialize(msg = message)
+      super(msg)
+    end
+  end
 end

lib/momoapi-ruby/remittance.rb

@@ -29,6 +29,7 @@ def get_transaction_status(transaction_id)
     def transfer(phone_number, amount, external_id,
                  payee_note = '', payer_message = '',
                  currency = 'EUR', callback_url = '')
+      Momoapi::Validate.new.validate(phone_number, amount, currency)
       uuid = SecureRandom.uuid
       headers = {
         "X-Target-Environment": Momoapi.config.environment || 'sandbox',

lib/momoapi-ruby/validate.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+# Validations for parameters passed into client methods
+
+require 'momoapi-ruby/errors'
+
+module Momoapi
+  class Validate
+    def validate(phone_number, amount, currency)
+      validate_string?(phone_number, 'Phone number')
+      validate_numeric?(amount, 'Amount')
+      validate_string?(currency, 'Currency')
+    end
+
+    def validate_numeric?(num, field)
+      return true if num.is_a? Numeric
+
+      raise Momoapi::ValidationError, "#{field} should be a number"
+    end
+
+    def validate_string?(str, field)
+      return true if str.is_a? String
+
+      raise Momoapi::ValidationError, "#{field} should be a string"
+    end
+  end
+end

lib/momoapi-ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Momoapi
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end