rails-gp-webpay 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52882ed499ad728c9d62bac6f924422d0b15518c85bc965944b9e0d0332e13cf
-  data.tar.gz: 3218bcd7f60ff9ba26778cdaa7ad9b33ade27e7f3b627eda6001d4a2b981ee99
+  metadata.gz: 557be3e38c554946e0fe2839549b752342205f2bfaa911a4861a3f1ea268c1a3
+  data.tar.gz: e48dd123da0ac8e2180d43917e3b3c2e63e8afe56cb17b08127824f65faf4f24
 SHA512:
-  metadata.gz: db6879b751fddb1af35073ea7cf40ccda2200379a9547be32b9de979e6a755dc81290d83565dadbc4411e5b3af6cbec4958372b7b55b93eea30206e665d41345
-  data.tar.gz: 3c432d0befc7f32b069d57d65dfdb2eaf63f1f824cb90b4eab40c80795cf0f0cd22b97274b06436aa9731c5aa5c5a1e5d43019129c31046ea10767a4d7f45481
+  metadata.gz: ae3c2c5e04ae5cb2230e28a87d732f8769679b48f2ee0f1eb0f0c2b00e553a69cdaecad3201e0cf6368a0e359ca8f99b970939204160c4b98d1d6869af79ed7e
+  data.tar.gz: ce49aa4b92af16bfb9aff3cec47c2baf190c5361045bbf7acb134a61a2f93626c005725bc80cf854bb592ce3e109b35900234c6841bb365f7b2dc46faf8256fc

data/changelog.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.2.6
+Add merchant number to tests, add default attributes to requests
+
+## 0.2.4
+Increase savon timeout to 5 minutes
+
+## 0.2.2
+Add merchant number to stubs
+
 ## 0.2
 Add spec helpers
 

data/lib/gp_webpay/configuration.rb

@@ -15,7 +15,16 @@ module GpWebpay
     end
 
     def [](config_name)
-      @configurations[config_name]
+      return if config_name.blank?
+
+      @configurations[config_name] || find_configuration_by_merchant_number(config_name)
+    end
+
+    def find_configuration_by_merchant_number(merchant_number)
+      config = @configurations.find { |_key, value| value.merchant_number.to_s == merchant_number.to_s }
+      return nil if config.blank?
+
+      config[-1]
     end
 
     def add_configuration(merchant_number:, default: false)
@@ -25,7 +34,7 @@ module GpWebpay
     end
 
     def remove_configuration(merchant_number:)
-      @configurations[merchant_number] = nil
+      @configurations.delete(merchant_number)
       @configurations[:default] = @configurations[@configurations.keys[0]]
     end
 

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
@@ -33,26 +33,25 @@ module GpWebpay
                 .and_return(instance_double(GpWebpay::Ws::WsResponse, valid?: valid, success?: success, status: status))
       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,
                                             params: { sub_status: sub_status }))
       end
 
-      def stub_usage_based_payment(attributes, valid: true, success: true, status: '', result_text: 'OK', response_token_data: nil)
+      def stub_usage_based_payment(attributes, merchant_number:, valid: true, success: true, status: '', result_text: 'OK', response_token_data: nil)
         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
           ).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',
@@ -68,28 +67,28 @@ module GpWebpay
                                        pr_code: success ? '0' : '123', sr_code: success ? '0' : '4'))
       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'))
       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'))
       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'))
@@ -101,3 +100,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.1'.freeze
+  VERSION = '0.2.6'.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
@@ -54,7 +62,11 @@ module GpWebpay
       end
 
       def client
-        @client ||= Savon.client(wsdl: config.wsdl_file, endpoint: config.ws_url, pretty_print_xml: true)
+        @client ||= Savon.client(wsdl: config.wsdl_file,
+                                 endpoint: config.ws_url,
+                                 pretty_print_xml: true,
+                                 open_timeout: 300,
+                                 read_timeout: 300)
       end
 
       def rescue_from_http(error)

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.1
+  version: 0.2.6
 platform: ruby
 authors:
 - Lubomir Vnenk
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-22 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport