rails-gp-webpay 0.1.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7594fc71523b5d85a28d0a09f2e9c026dfba4e4fe7c43514fdd58f67fa5f149f
-  data.tar.gz: e0dc36655ec80dacf065b1227b87f477059fdb9d515aa9d7c3ccc707e43b118a
+  metadata.gz: 5dc1dfcd0fd2a4f7fcb8cb988aab6d4fe9a97c25c583bae6b1152cc60a96d351
+  data.tar.gz: 30b30ee89e2fff8b84f33e60f34c321c647b479b2c7605e2766213a3f334df53
 SHA512:
-  metadata.gz: b2ef81c8629b7c685317e3edf73f3f8a45386f4e891004118516ad91f82918b1be742e6c1188c38639cdaed7f673489f453cdd587b5a72eca452edd56a7af6ae
-  data.tar.gz: edb5588491e3263b9c464c00e20c87cdfb6d03ea0a7c1fe59a2ddaac15b6b95df924acc68ff035063a2584a206cfc303066169fd1f9d1d98a193d2123cfd4014
+  metadata.gz: c161135d1e53f089f7d85f9bb564630c61aec1389fd5d2b8a4a3bcbe3fa222780b34f3b674682cb050aa6c605e37e75105aa93690d996b4ea4af284fb8a0f116
+  data.tar.gz: d12a30aea8d02467d5e489b2bc819368b3ac9e6bd96265ce233ed377651a885006816b4baa2ecc979a5c5c51374fd7f07249d26ed56e89ffceca13fafcb4d022

data/app/controllers/gp_webpay_controller.rb

@@ -1,5 +1,5 @@
 class GpWebpayController < GpWebpay.config.parent_controller.constantize
-  skip_before_action :verify_authenticity_token if defined?(verify_authenticity_token)
+  skip_before_action :verify_authenticity_token if defined?(:verify_authenticity_token)
   prepend_before_action :set_external_order_number
   prepend_before_action :validate_gpwebpay_response
   prepend_before_action :set_gpwebpay_response

data/changelog.md

@@ -1,4 +1,10 @@
 # Changelog
 
+## 0.2.2
+Add merchant number to stubs
+
+## 0.2
+Add spec helpers
+
 ## 0.1
 Init

data/lib/gp_webpay/configuration.rb

@@ -15,7 +15,17 @@ 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| puts _key;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 +35,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/http/{create_order.rb → services/create_order.rb}

@@ -9,15 +9,17 @@
 
 module GpWebpay
   module Http
-    class CreateOrder < BaseSignedRequest
-      def initialize(attributes, locale, merchant_number: nil, url_attributes: {})
-        super(attributes, locale, 'CREATE_ORDER', merchant_number: merchant_number, url_attributes: url_attributes)
-      end
+    module Services
+      class CreateOrder < BaseSignedRequest
+        def initialize(attributes, locale, merchant_number: nil, url_attributes: {})
+          super(attributes, locale, 'CREATE_ORDER', merchant_number: merchant_number, url_attributes: url_attributes)
+        end
 
-      protected
+        protected
 
-      def callback_url
-        GpWebpay::Engine.routes.url_helpers.gp_webpay_orders_path({ merchant_number: config.merchant_number, locale: locale }.merge(url_attributes))
+        def callback_url
+          GpWebpay::Engine.routes.url_helpers.gp_webpay_orders_url({ merchant_number: config.merchant_number, locale: locale }.merge(url_attributes))
+        end
       end
     end
   end

data/lib/gp_webpay/http/services/verify_card.rb

@@ -0,0 +1,20 @@
+##
+# Service object creates request data for GP Webpay CARD_VERIFICATION operation.
+
+module GpWebpay
+  module Http
+    module Services
+      class VerifyCard < BaseSignedRequest
+        def initialize(attributes, locale, merchant_number: nil, url_attributes: {})
+          super(attributes, locale, 'CARD_VERIFICATION', merchant_number: merchant_number, url_attributes: url_attributes)
+        end
+
+        protected
+
+        def callback_url
+          GpWebpay::Engine.routes.url_helpers.gp_webpay_cards_url({ merchant_number: config.merchant_number, locale: locale }.merge(url_attributes))
+        end
+      end
+    end
+  end
+end

data/lib/gp_webpay/mock/spec_helper.rb

@@ -0,0 +1,104 @@
+require 'savon/mock/spec_helper'
+
+module GpWebpay
+  module SpecHelper
+    class Interface
+      include Savon::SpecHelper
+      include RSpec::Mocks::ExampleMethods
+
+      def params_with_digest(params, merchant_number = :default)
+        config = GpWebpay.config[merchant_number] || GpWebpay.config.default
+        params.merge(
+          'DIGEST' => GpWebpay::OpensslSecurity.generate_digest(config, params.values.join('|'))
+        )
+      end
+
+      def params_with_both_digests(params, merchant_number = :default)
+        config = GpWebpay.config[merchant_number] || GpWebpay.config.default
+        params.merge(
+          'DIGEST' => GpWebpay::OpensslSecurity.generate_digest(config, params.values.join('|')),
+          'DIGEST1' => GpWebpay::OpensslSecurity.generate_digest(config, "#{params.values.join('|')}|#{config.merchant_number}")
+        )
+      end
+
+      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))
+      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))
+      end
+
+      def stub_payment_status(payment_number, 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))
+                .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, 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,
+                payment_number: anything,
+                order_number: anything,
+                currency_code: anything,
+                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',
+                                       params: { token_data: response_token_data || attributes[:token_data] }))
+      end
+
+      def stub_token_revoke(token, 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))
+          ).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_refund_payment(attributes, valid: true, success: true, status: '', result_text: 'OK')
+        allow(GpWebpay::Ws::Services::ProcessRefundPayment)
+          .to receive(:call).with(
+            hash_including({ message_id: anything }.merge(attributes))
+          ).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')
+        allow(GpWebpay::Ws::Services::ProcessCaptureReverse)
+          .to receive(:call).with(
+            hash_including({ message_id: anything }.merge(attributes))
+          ).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')
+        allow(GpWebpay::Ws::Services::ProcessCancelCapture)
+          .to receive(:call).with(
+            hash_including({ message_id: anything }.merge(attributes))
+          ).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
+    end
+
+    def gp_webpay
+      @gp_webpay ||= Interface.new
+    end
+  end
+end

data/lib/gp_webpay/version.rb

@@ -1,3 +1,3 @@
 module GpWebpay
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.3'.freeze
 end

data/lib/gp_webpay/ws/base_signed_request.rb

@@ -11,7 +11,7 @@
 #
 # @param [Hash] attributes for GP Webpay
 #
-# @return [GpwebpayWsResponse] response value object
+# @return [GpWebpay::Ws::WsResponse] response value object
 
 module GpWebpay
   module Ws

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

@@ -5,7 +5,7 @@
 #
 # @param [Hash] attributes for GP Webpay
 #
-# @return [GpwebpayWsResponse] response value object
+# @return [GpWebpay::Ws::WsResponse] response value object
 
 module GpWebpay
   module Ws

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

@@ -3,7 +3,7 @@
 #
 # @param [Hash] attributes for GP Webpay
 #
-# @return [GpwebpayWsResponse] response value object
+# @return [GpWebpay::Ws::WsResponse] response value object
 
 module GpWebpay
   module Ws

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

@@ -5,7 +5,7 @@
 #
 # @param [Hash] attributes for GP Webpay
 #
-# @return [GpwebpayWsResponse] response value object
+# @return [GpWebpay::Ws::WsResponse] response value object
 
 module GpWebpay
   module Ws

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

@@ -4,7 +4,7 @@
 #
 # @param [Hash] attributes for GP Webpay
 #
-# @return [GpwebpayWsResponse] response value object
+# @return [GpWebpay::Ws::WsResponse] response value object
 
 module GpWebpay
   module Ws

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

@@ -4,7 +4,7 @@
 #
 # @param [Hash] attributes for GP Webpay
 #
-# @return [GpwebpayWsResponse] response value object
+# @return [GpWebpay::Ws::WsResponse] response value object
 
 module GpWebpay
   module Ws

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

@@ -4,7 +4,7 @@
 #
 # @param [Hash] attributes for GP Webpay
 #
-# @return [GpwebpayWsResponse] response value object
+# @return [GpWebpay::Ws::WsResponse] response value object
 
 module GpWebpay
   module Ws
@@ -16,14 +16,22 @@ module GpWebpay
         RESPONSE_ENTITY_NAME = :card_on_file_payment_response
         SERVICE_EXCEPTION = :card_on_file_payment_service_exception
 
+        def initialize(attributes, merchant_number: :default)
+          config = GpWebpay.config[merchant_number] || GpWebpay.config.default
+          merged_attributes = {
+            return_url: GpWebpay::Engine.routes.url_helpers.gp_webpay_orders_url({ merchant_number: config.merchant_number })
+          }.merge(attributes)
+          super(merged_attributes, merchant_number: merchant_number)
+        end
+
         def rescue_from_soap(exception)
           response = WsResponse.from_fault_error(exception.to_hash, self.class::SERVICE_EXCEPTION, config.merchant_number)
 
           if response.valid? && response.params[:authentication_link].present?
             raise GpWebpayConfirmationRequired.new('GP Webpay requires authentication', response.params[:authentication_link])
-          else
-            response
           end
+
+          response
         end
 
         class GpWebpayConfirmationRequired < GpWebpay::Error

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

@@ -4,7 +4,7 @@
 #
 # @param [Hash] attributes for GP Webpay
 #
-# @return [GpwebpayWsResponse] response value object
+# @return [GpWebpay::Ws::WsResponse] response value object
 
 module GpWebpay
   module Ws

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

@@ -4,7 +4,7 @@
 #
 # @param [Hash] attributes for GP Webpay
 #
-# @return [GpwebpayWsResponse] response value object
+# @return [GpWebpay::Ws::WsResponse] response value object
 
 module GpWebpay
   module Ws

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

@@ -4,7 +4,7 @@
 #
 # @param [Hash] attributes for GP Webpay
 #
-# @return [GpwebpayWsResponse] response value object
+# @return [GpWebpay::Ws::WsResponse] response value object
 
 module GpWebpay
   module Ws

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

@@ -4,7 +4,7 @@
 #
 # @param [Hash] attributes for GP Webpay
 #
-# @return [GpwebpayWsResponse] response value object
+# @return [GpWebpay::Ws::WsResponse] response value object
 
 module GpWebpay
   module Ws
@@ -16,9 +16,8 @@ module GpWebpay
         RESPONSE_ENTITY_NAME = :token_payment_response
         SERVICE_EXCEPTION = :payment_service_exception
 
-        def initialize(attributes)
-          super
-          @attributes = attributes.except(:return_url)
+        def initialize(attributes, merchant_number: :default)
+          super(attributes.except(:return_url), merchant_number: merchant_number)
         end
       end
     end

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

@@ -4,7 +4,7 @@
 #
 # @param [Hash] attributes for GP Webpay
 #
-# @return [GpwebpayWsResponse] response value object
+# @return [GpWebpay::Ws::WsResponse] response value object
 
 module GpWebpay
   module Ws

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

@@ -4,7 +4,7 @@
 #
 # @param [Hash] attributes for GP Webpay
 #
-# @return [GpwebpayWsResponse] response value object
+# @return [GpWebpay::Ws::WsResponse] response value object
 
 module GpWebpay
   module Ws
@@ -15,6 +15,14 @@ module GpWebpay
         RESPONSE_NAME = :process_usage_based_payment_response
         RESPONSE_ENTITY_NAME = :usage_based_payment_response
         SERVICE_EXCEPTION = :payment_service_exception
+
+        def initialize(attributes, merchant_number: :default)
+          config = GpWebpay.config[merchant_number] || GpWebpay.config.default
+          merged_attributes = {
+            return_url: GpWebpay::Engine.routes.url_helpers.gp_webpay_orders_url({ merchant_number: config.merchant_number })
+          }.merge(attributes)
+          super(merged_attributes, merchant_number: merchant_number)
+        end
       end
     end
   end

data/lib/gp_webpay/ws/ws_response.rb

@@ -1,8 +1,6 @@
 module GpWebpay
   module Ws
     class WsResponse < Response
-      attr_accessor :validation_response
-
       def self.from_success(hash, response_name, response_entity_name, merchant_number)
         validation_response = hash.dig(response_name, response_entity_name)
         new(

data/lib/{gp_webpay.rb → rails-gp-webpay.rb}

@@ -15,9 +15,9 @@ require 'gp_webpay/http/base_signed_request'
 require 'gp_webpay/http/external_url'
 require 'gp_webpay/http/http_response'
 require 'gp_webpay/http/http_request'
-require 'gp_webpay/http/create_order'
-require 'gp_webpay/http/verify_card'
 require 'gp_webpay/http/validate_result'
+require 'gp_webpay/http/services/verify_card'
+require 'gp_webpay/http/services/create_order'
 
 require 'gp_webpay/ws/ws_request'
 require 'gp_webpay/ws/validate_result'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-gp-webpay
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Lubomir Vnenk
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -74,17 +74,17 @@ files:
 - config/wsdl/GPwebpayAdditionalInfoResponse_v1.xsd
 - config/wsdl/cws_v1.wsdl
 - config/wsdl/swaref.xsd
-- lib/gp_webpay.rb
 - lib/gp_webpay/configuration.rb
 - lib/gp_webpay/engine.rb
 - lib/gp_webpay/error.rb
 - lib/gp_webpay/http/base_signed_request.rb
-- lib/gp_webpay/http/create_order.rb
 - lib/gp_webpay/http/external_url.rb
 - lib/gp_webpay/http/http_request.rb
 - lib/gp_webpay/http/http_response.rb
+- lib/gp_webpay/http/services/create_order.rb
+- lib/gp_webpay/http/services/verify_card.rb
 - lib/gp_webpay/http/validate_result.rb
-- lib/gp_webpay/http/verify_card.rb
+- lib/gp_webpay/mock/spec_helper.rb
 - lib/gp_webpay/openssl_security.rb
 - lib/gp_webpay/response.rb
 - lib/gp_webpay/service.rb
@@ -106,6 +106,7 @@ files:
 - lib/gp_webpay/ws/validate_result.rb
 - lib/gp_webpay/ws/ws_request.rb
 - lib/gp_webpay/ws/ws_response.rb
+- lib/rails-gp-webpay.rb
 homepage: https://github.com/lubosch/gp_webpay
 licenses:
 - MIT

data/lib/gp_webpay/http/verify_card.rb

@@ -1,18 +0,0 @@
-##
-# Service object creates request data for GP Webpay CARD_VERIFICATION operation.
-
-module GpWebpay
-  module Http
-    class VerifyCard < BaseSignedRequest
-      def initialize(attributes, locale, merchant_number: nil, url_attributes: {})
-        super(attributes, locale, 'CARD_VERIFICATION', merchant_number: merchant_number, url_attributes: url_attributes)
-      end
-
-      protected
-
-      def callback_url
-        GpWebpay::Engine.routes.url_helpers.gp_webpay_cards_path({ merchant_number: config.merchant_number, locale: locale }.merge(url_attributes))
-      end
-    end
-  end
-end