mpesarb 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f58f3c8c8bb861948c8c2418733a9dea0ab7d51de6be5a8366503c4d778c9949
-  data.tar.gz: 79cdd313fc5da2e6aa4d01cbc399a4756726949d353285991ed6ec7a6a75d33b
+  metadata.gz: 21c94fd454abe3e4127f6c716ee39c4f574924018af8d6daedafc0c1f1bee5d1
+  data.tar.gz: e68131c8d3f8d1531abd3c7419c9dfacc70331a555ecd48b881cf9f290239acf
 SHA512:
-  metadata.gz: 1c8ca8bbf672b89f9fc73516000e487397f9e5aec26c35e0d12131a5e1e9a28519adc3f4bd4dad5d29304794f2052c765a68009d7ce1e47e2e91a557735629e8
-  data.tar.gz: bff2fd36423ad9d2601a4b5f733c1644dc00cc82ba5a33c5b49e87c3f5916533cf75496d80a72476d4cc4fb7c4bff5468175affd9f5891053f963be96402c77c
+  metadata.gz: bf9183f955f48501ab1fbb634145bf2f0116b98cad63613b56bdf832ceedef03eabfa8e5e0cccb55161226af04149208c16afe75eaa986c4971c24e07f053d43
+  data.tar.gz: 599eaf780d0efc0e141218ef6848e21454e12a379f66ffe64d1b1bffe8ab6aaccb87f177f418c08848321f097efc3513ab9ee3d71e7d1eefb41dfbebf3a081ff

data/.gitpod.yml

@@ -0,0 +1,8 @@
+# This configuration file was automatically generated by Gitpod.
+# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
+# and commit this file to your remote git repository to share the goodness with others.
+
+tasks:
+  - init: bin/setup
+
+

data/README.md

@@ -42,6 +42,7 @@ Optional
 - `adapter` - Faraday HTTP adapter. Default `:net_http`
 - `shortcode` - Mpesa shortcode
 - `pass_key` - LPNMO pass Key( used by STK API)
+- `raise_errors` - `Boolean` raise errors if response status code is not 200. Default: `true`
 
 
 ### Register Urls
@@ -118,7 +119,7 @@ response.ConversationID
 response.ResponseCode
 ```
 
-### Reversal 
+### Reversal
 Initiate a reversal
 
 ```

data/lib/mpesa/client.rb

@@ -5,15 +5,16 @@ require 'faraday_middleware'
 
 module Mpesa
   class Client
-    attr_reader :key, :secret, :env, :adapter, :shortcode, :pass_key
+    attr_reader :key, :secret, :env, :adapter, :shortcode, :pass_key, :raise_errors
 
-    def initialize(key:, secret:, shortcode: nil, pass_key: nil, env: 'production', adapter: Faraday.default_adapter)
+    def initialize(key:, secret:, shortcode: nil, pass_key: nil, env: 'production', adapter: Faraday.default_adapter, raise_errors: true)
       @key = key
       @secret = secret
       @env = env
       @adapter = adapter
       @pass_key = pass_key
       @shortcode = shortcode
+      @raise_errors = raise_errors
     end
 
     def auth

data/lib/mpesa/resource.rb

@@ -18,6 +18,8 @@ module Mpesa
     end
 
     def handle_response(response)
+      return response unless client.raise_errors
+
       case response.status
       when 400
         raise Error, "Your request was malformed. #{response.body['errorMessage']}"
@@ -32,5 +34,12 @@ module Mpesa
       end
       response
     end
+
+    def format_phone(phone)
+      phone = phone.to_s
+      return phone if phone.match?(/\A254/)
+
+      phone.sub(/\A[+0]?(254)?(\d+)/, '254\2')
+    end
   end
 end

data/lib/mpesa/resources/payout.rb

@@ -15,7 +15,7 @@ module Mpesa
         'CommandID': args[:command_id],
         'Amount': args[:amount],
         'PartyA': client.shortcode || args[:shortcode],
-        'PartyB': args[:phone],
+        'PartyB': format_phone(args[:phone]),
         'Remarks': args[:remarks],
         'QueueTimeOutURL': args[:timeout_url],
         'ResultURL': args[:result_url],

data/lib/mpesa/resources/stk.rb

@@ -14,12 +14,12 @@ module Mpesa
       {
         'BusinessShortCode': shortcode,
         'Password': password,
-        'Timestamp': timestamp.to_s,
+        'Timestamp': timestamp,
         'TransactionType': 'CustomerPayBillOnline',
         'Amount': args[:amount],
-        'PartyA': args[:phone],
+        'PartyA': format_phone(args[:phone]),
         'PartyB': shortcode,
-        'PhoneNumber': args[:phone],
+        'PhoneNumber': format_phone(args[:phone]),
         'CallBackURL': args[:callback_url],
         'AccountReference': args[:reference],
         'TransactionDesc': args[:trans_desc]
@@ -31,7 +31,7 @@ module Mpesa
     end
 
     def timestamp
-      Time.now.strftime('%Y%m%d%H%M%S').to_i
+      Time.now.strftime('%Y%m%d%H%M%S')
     end
 
     def shortcode

data/lib/mpesa/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mpesa
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mpesarb
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Moses Gathuku
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -201,6 +201,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/mpesa.yml"
 - ".gitignore"
+- ".gitpod.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -253,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: a simple gem to integrate ruby with mpesa Apis