rma-payment-gateway 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93083bc4a39780d2b7387e013edf0e71d01bcdd128582383c0805edf8173f461
-  data.tar.gz: 1dbea3526aed562579e070a1cc99470be1ff94d76bce1c2f6fd8780c6b033bbf
+  metadata.gz: bc31ce3ef352488d411e27123665afbe880004be3ae232e18c021e25d2221d87
+  data.tar.gz: 52aaece35817e948239e8a7d7f8184fce8715e928508c8996f310616ab711dfa
 SHA512:
-  metadata.gz: f9f2d09bf865b4b4575fc18e54f990e98cd13f732c53a337a78ccbcc9ae8de7a94cdd9ac52a2b0a91a3191d803672bcd9d6e1fb4464cf883e3c3bd445c3d0f51
-  data.tar.gz: 94d79e7619c070b68d7e29704d27bcc2e6bfca44dd745801e1be6b63ea8220e9bc24629eb4212971364d41268a2f1fb68d5b251f96ba435fef8c05e1c32b59de
+  metadata.gz: fc2689e5f19f3e9a92b7261f529071d3b55cf3cc55e0e9269dce09b267a0e94bb57f083a97e43875001214e37088197df9422f7aad15354d13aac99b48be0912
+  data.tar.gz: 5aa1c1f656d85fd7b5734340910e5e77094f461aace32e70679a3dedd162ad458cc1fb035358b0496ae5c7c30970fa9585da2a3a570dca0b12bd863c0bfc8775

data/lib/rma/payment/gateway/account_inquiry.rb

@@ -41,16 +41,13 @@ module Rma
         private
 
         def account_inquiry_request_body
-          params = {
+          {
             bfs_bfsTxnId: transaction_id,
             bfs_remitterBankId: bank_id,
             bfs_remitterAccNo: account_no,
             bfs_benfId: client.config.beneficiary_id,
             bfs_msgType: "AE"
           }
-
-          # Convert to URL-encoded format
-          URI.encode_www_form(params)
         end
 
         def validate_account_inquiry_response!(response)
@@ -59,9 +56,10 @@ module Rma
             raise AuthenticationError, "Account inquiry failed: #{error_detail}"
           end
 
+          # :nocov:
           return if response["result"]
-
           raise AuthenticationError, "No response data in response"
+          # :nocov:
         end
       end
     end

data/lib/rma/payment/gateway/authorization.rb

@@ -40,7 +40,7 @@ module Rma
         private
 
         def authorization_request_body
-          params = {
+          {
             bfs_benfTxnTime: Utils.generate_timestamp,
             bfs_orderNo: order_no,
             bfs_benfBankCode: "01",
@@ -52,9 +52,6 @@ module Rma
             bfs_msgType: "AR",
             bfs_version: "5.0"
           }
-
-          # Convert to URL-encoded format
-          URI.encode_www_form(params)
         end
 
         def validate_authorization_request!
@@ -70,9 +67,10 @@ module Rma
             raise AuthenticationError, "Authorization failed: #{error_detail}"
           end
 
+          # :nocov:
           return if response["result"]
-
           raise AuthenticationError, "No response data in response"
+          # :nocov:
         end
       end
     end

data/lib/rma/payment/gateway/client.rb

@@ -72,7 +72,7 @@ module Rma
         def connection
           @connection ||= Faraday.new(url: config.base_url) do |conn|
             conn.request :url_encoded
-            conn.response :json, content_type: /\bjson$/
+            conn.response :json
             conn.adapter Faraday.default_adapter
             conn.options.timeout = config.timeout
             conn.options.open_timeout = config.open_timeout
@@ -87,7 +87,7 @@ module Rma
         def handle_response(response)
           case response.status
           when 200..299
-            response.body
+            parse_body(response.body)
           when 400..499
             handle_client_error(response)
           when 500..599
@@ -98,25 +98,32 @@ module Rma
         end
 
         def handle_client_error(response)
-          body = response.body || {}
-          error_message = body["result"]["bfs_responseDesc"] || "Client error"
-
-          raise InvalidParameterError.new(
-            error_message,
-            response_code: body["result"]["bfs_responseCode"],
-            response_detail: body["result"]["bfs_responseDesc"]
-          )
+          body = parse_body(response.body) || {}
+          error_message = body.dig("result", "bfs_responseDesc") || "Client error"
+          raise InvalidParameterError, error_message
         end
 
         def handle_server_error(response)
-          body = response.body || {}
-          error_message = body["result"]["bfs_responseDesc"] || "Server error"
-
-          raise APIError.new(
-            error_message,
-            response_code: body["result"]["bfs_responseCode"],
-            response_description: body["result"]["bfs_responseDesc"]
-          )
+          body = parse_body(response.body) || {}
+          error_message = body.dig("result", "bfs_responseDesc") || "Server error"
+          raise APIError, error_message
+        end
+
+        def parse_body(body)
+          return body if body.is_a?(Hash)
+          return {} if body.nil? || body.empty?
+
+          begin
+            return JSON.parse(body)
+          rescue JSON::ParserError
+            # Not JSON, fall through to URL-encoded parsing
+          end
+
+          parse_url_encoded(body)
+        end
+
+        def parse_url_encoded(query_string)
+          Rack::Utils.parse_nested_query(query_string)
         end
       end
     end

data/lib/rma/payment/gateway/debit_request.rb

@@ -38,15 +38,12 @@ module Rma
         private
 
         def debit_request_body
-          params = {
+          {
             bfs_bfsTxnId: transaction_id,
             bfs_remitterOtp: otp,
             bfs_benfId: client.config.beneficiary_id,
             bfs_msgType: "DR"
           }
-
-          # Convert to URL-encoded format
-          URI.encode_www_form(params)
         end
 
         def validate_debit_request_response!(response)
@@ -55,9 +52,10 @@ module Rma
             raise AuthenticationError, "Debit request failed: #{error_detail}"
           end
 
+          # :nocov:
           return if response["result"]
-
           raise AuthenticationError, "No response data in response"
+          # :nocov:
         end
       end
     end

data/lib/rma/payment/gateway/utils.rb

@@ -21,7 +21,7 @@ module Rma
           return false if account_number.nil? || account_number.empty?
 
           # Account numbers should be numeric and between 8-15 digits
-          account_number.to_s.match?(/^\d{8,15}$/)
+          account_number.to_s.match?(/^\d{8,40}$/)
         end
 
         # Validate phone number format (Bhutan)
@@ -49,7 +49,7 @@ module Rma
         def self.valid_amount?(amount)
           return false if amount.nil?
 
-          amount.is_a?(Numeric) && amount >= 0
+          amount.is_a?(Numeric) && amount > 0
         end
 
         # Format amount to 2 decimal places

data/lib/rma/payment/gateway/version.rb

@@ -3,7 +3,7 @@
 module Rma
   module Payment
     module Gateway
-      VERSION = "1.0.1"
+      VERSION = "1.0.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rma-payment-gateway
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Tashi Dendup