rails-gp-webpay 0.2.4 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7caabd56b08f1dfb22f11c8adf9ae7203f7168e519f61053e0f6824c8df6de24
-  data.tar.gz: 7407825456302d22c9b805009e3f77d89643c70b09d7627effa57c89b6f82177
+  metadata.gz: a0f327b8f7b609ff6a7a62d97bf0d0a182cfd6513145d2aa8d224600d4daf7e6
+  data.tar.gz: 045ed7d32e3f2289cbf27f93c8ad7e9fee677a6cd4e2be9c2f47324f271ef5fe
 SHA512:
-  metadata.gz: dfa85755e1d2295c46eafe73d280cc1fd4ececb9702931b45e5c0de9ac3dbdc30137eb88a4838ff3e3fab99b06d6618f4189900861635188eb02f15cc2a10239
-  data.tar.gz: c5b76adde49e69714308289a70b3dfd8cd8f08fbdd67d0a0073063b0f0518657fd1c27490b01650780a4d26b0f17d7b74a46928be89e48fa2db5a2b9b45e1724
+  metadata.gz: 203e91a7fe8952ccc3f58924048fc5e57f028c86b19a9217a22b13000911470b55813e77ec5bce4a8dfea3be9b19bd0deb4d325f946e351e03c42a15a77232c5
+  data.tar.gz: 9ccc0518abb878d34a533af017c60b85efe5c0b6b36f2c63bc1ee882d436f11e946d93039bfda4f73b938ecf0968425030f0793e32d09b49930ea3d25154a908

data/changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.2.7
+Pr and Sr codes in stubs
+
+## 0.2.6
+Add merchant number to tests, add default attributes to requests
+
 ## 0.2.4
 Increase savon timeout to 5 minutes
 

data/lib/gp_webpay/configuration.rb

@@ -21,8 +21,7 @@ module GpWebpay
     end
 
     def find_configuration_by_merchant_number(merchant_number)
-
-      config = @configurations.find { |_key, value| puts _key;value.merchant_number.to_s == merchant_number.to_s }
+      config = @configurations.find { |_key, value| value.merchant_number.to_s == merchant_number.to_s }
       return nil if config.blank?
 
       config[-1]

data/lib/gp_webpay/mock/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'savon/mock/spec_helper'
-
+# rubocop:disable Metrics/ParameterLists
 module GpWebpay
   module SpecHelper
     class Interface
@@ -24,20 +24,28 @@ module GpWebpay
       def stub_card_token(token, status: 'VERIFIED', success: true, valid: true)
         allow(GpWebpay::Ws::Services::GetTokenStatus)
           .to receive(:call).with(hash_including(token_data: token, message_id: anything))
-                .and_return(instance_double(GpWebpay::Ws::WsResponse, valid?: valid, success?: success, status: status))
+                .and_return(instance_double(GpWebpay::Ws::WsResponse,
+                                            valid?: valid, success?: success, status: status,
+                                            pr_code: (success ? '0' : '123'), sr_code: (success ? '0' : '4'),
+                                            original_response: { pr_code: 0, sr_code: 0 }))
       end
 
       def stub_master_payment_status(payment_number, status: 'OK', success: true, valid: true)
         allow(GpWebpay::Ws::Services::GetMasterPaymentStatus)
           .to receive(:call).with(hash_including(payment_number: payment_number, message_id: anything))
-                .and_return(instance_double(GpWebpay::Ws::WsResponse, valid?: valid, success?: success, status: status))
+                .and_return(instance_double(GpWebpay::Ws::WsResponse,
+                                            valid?: valid, success?: success, status: status,
+                                            pr_code: (success ? '0' : '123'), sr_code: (success ? '0' : '4'),
+                                            original_response: { pr_code: 0, sr_code: 0 }))
       end
 
-      def stub_payment_status(payment_number, status: 'VERIFIED', sub_status: 'SETTLED', success: true, valid: true)
+      def stub_payment_status(payment_number, merchant_number: nil, status: 'VERIFIED', sub_status: 'SETTLED', success: true, valid: true)
         allow(GpWebpay::Ws::Services::GetPaymentStatus)
-          .to receive(:call).with(hash_including(payment_number: payment_number, message_id: anything))
+          .to receive(:call).with(hash_including(payment_number: payment_number, message_id: anything), merchant_number: merchant_number)
                 .and_return(instance_double(GpWebpay::Ws::WsResponse,
                                             valid?: valid, success?: success, status: status,
+                                            pr_code: success ? '0' : '123', sr_code: success ? '0' : '4',
+                                            original_response: { pr_code: 0, sr_code: 0 },
                                             params: { sub_status: sub_status }))
       end
 
@@ -45,55 +53,58 @@ module GpWebpay
         allow(GpWebpay::Ws::Services::ProcessUsageBasedPayment)
           .to receive(:call).with(
             hash_including(
-              {
-                message_id: anything,
+              { message_id: anything,
                 payment_number: anything,
                 order_number: anything,
                 currency_code: anything,
-                capture_flag: '1'
-              }.merge(attributes)
+                capture_flag: '1' }.merge(attributes)
             ),
-            merchant_number: merchant_number,
+            merchant_number: merchant_number
           ).and_return(instance_double(GpWebpay::Ws::WsResponse,
                                        valid?: valid, success?: success, status: status, result_text: result_text,
                                        pr_code: success ? '0' : '123', sr_code: success ? '0' : '4',
+                                       original_response: { pr_code: 0, sr_code: 0 },
                                        params: { token_data: response_token_data || attributes[:token_data] }))
       end
 
-      def stub_token_revoke(token, valid: true, success: true, status: 'REVOKED', result_text: 'OK')
+      def stub_token_revoke(token, merchant_number: nil, valid: true, success: true, status: 'REVOKED', result_text: 'OK')
         allow(GpWebpay::Ws::Services::ProcessTokenRevoke)
           .to receive(:call).with(
-            hash_including({ message_id: anything }.merge(token_data: token))
+            hash_including({ message_id: anything }.merge(token_data: token)), merchant_number: merchant_number
           ).and_return(instance_double(GpWebpay::Ws::WsResponse,
                                        valid?: valid, success?: success, status: status, result_text: result_text,
-                                       pr_code: success ? '0' : '123', sr_code: success ? '0' : '4'))
+                                       pr_code: (success ? '0' : '123'), sr_code: (success ? '0' : '4'),
+                                       original_response: { pr_code: 0, sr_code: 0 }))
       end
 
-      def stub_refund_payment(attributes, valid: true, success: true, status: '', result_text: 'OK')
+      def stub_refund_payment(attributes, merchant_number: nil, valid: true, success: true, status: '', result_text: 'OK')
         allow(GpWebpay::Ws::Services::ProcessRefundPayment)
           .to receive(:call).with(
-            hash_including({ message_id: anything }.merge(attributes))
+            hash_including({ message_id: anything }.merge(attributes)), merchant_number: merchant_number
           ).and_return(instance_double(GpWebpay::Ws::WsResponse,
                                        valid?: valid, success?: success, status: status, result_text: result_text,
-                                       pr_code: success ? '0' : '123', sr_code: success ? '0' : '4'))
+                                       pr_code: success ? '0' : '123', sr_code: success ? '0' : '4',
+                                       original_response: { pr_code: 0, sr_code: 0 }))
       end
 
-      def stub_capture_reverse(attributes, valid: true, success: true, status: '', result_text: 'OK')
+      def stub_capture_reverse(attributes, merchant_number: nil, valid: true, success: true, status: '', result_text: 'OK')
         allow(GpWebpay::Ws::Services::ProcessCaptureReverse)
           .to receive(:call).with(
-            hash_including({ message_id: anything }.merge(attributes))
+            hash_including({ message_id: anything }.merge(attributes)), merchant_number: merchant_number
           ).and_return(instance_double(GpWebpay::Ws::WsResponse,
                                        valid?: valid, success?: success, status: status, result_text: result_text,
-                                       pr_code: success ? '0' : '123', sr_code: success ? '0' : '4'))
+                                       pr_code: success ? '0' : '123', sr_code: success ? '0' : '4',
+                                       original_response: { pr_code: 0, sr_code: 0 }))
       end
 
-      def stub_cancel_capture(attributes, valid: true, success: true, status: '', result_text: 'OK')
+      def stub_cancel_capture(attributes, merchant_number: nil, valid: true, success: true, status: '', result_text: 'OK')
         allow(GpWebpay::Ws::Services::ProcessCancelCapture)
           .to receive(:call).with(
-            hash_including({ message_id: anything }.merge(attributes))
+            hash_including({ message_id: anything }.merge(attributes)), merchant_number: merchant_number
           ).and_return(instance_double(GpWebpay::Ws::WsResponse,
                                        valid?: valid, success?: success, status: status, result_text: result_text,
-                                       pr_code: success ? '0' : '123', sr_code: success ? '0' : '4'))
+                                       pr_code: success ? '0' : '123', sr_code: success ? '0' : '4',
+                                       original_response: { pr_code: 0, sr_code: 0 }))
       end
     end
 
@@ -102,3 +113,4 @@ module GpWebpay
     end
   end
 end
+# rubocop:enable Metrics/ParameterLists

data/lib/gp_webpay/version.rb

@@ -1,3 +1,3 @@
 module GpWebpay
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.8'.freeze
 end

data/lib/gp_webpay/ws/base_signed_request.rb

@@ -23,6 +23,7 @@ module GpWebpay
       RESPONSE_NAME = 'override_me'.freeze
       RESPONSE_ENTITY_NAME = 'override_me'.freeze
       SERVICE_EXCEPTION = :service_exception
+      DEFAULT_ATTRIBUTES = {}.freeze
 
       def initialize(attributes, merchant_number: :default)
         @attributes = attributes
@@ -32,9 +33,10 @@ module GpWebpay
       end
 
       def call
-        attrs = WsRequest.new(attributes.merge(provider: config.provider, merchant_number: config.merchant_number)).to_gpwebpay
+        attrs = WsRequest.new(final_attributes).to_gpwebpay
 
-        res = client.call(self.class::OPERATION_NAME, message: { self.class::REQUEST_NAME => attributes_with_signature(attrs) })
+        Rails.logger.debug([self.class::OPERATION_NAME, { message: { self.class::REQUEST_NAME => attributes_with_signature(attrs) } }])
+        res = client.call(self.class::OPERATION_NAME, { message: { self.class::REQUEST_NAME => attributes_with_signature(attrs) } })
         WsResponse.from_success(res.body, self.class::RESPONSE_NAME, self.class::RESPONSE_ENTITY_NAME, config.merchant_number)
       rescue Savon::HTTPError => e
         rescue_from_http(e)
@@ -44,6 +46,12 @@ module GpWebpay
 
       protected
 
+      def final_attributes
+        {}.merge(self.class::DEFAULT_ATTRIBUTES,
+                 attributes,
+                 { provider: config.provider, merchant_number: config.merchant_number })
+      end
+
       def digest_text(attrs)
         attrs.values.join('|')
       end

data/lib/gp_webpay/ws/services/process_capture_reverse.rb

@@ -14,6 +14,7 @@ module GpWebpay
         REQUEST_NAME = :capture_reverse_request
         RESPONSE_NAME = :process_capture_reverse_response
         RESPONSE_ENTITY_NAME = :capture_reverse_response
+        DEFAULT_ATTRIBUTES = { capture_number: 1 }.freeze # 1 is recommended
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-gp-webpay
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.8
 platform: ruby
 authors:
 - Lubomir Vnenk
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport