tappay_ruby 0.15.1 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 264a2d799886486e223fc853591b71c289731c9b04b1048c89b6d748e7f19d38
-  data.tar.gz: 8450e797c8886ae57eef4478335c31621eb50260e4e657f04adb329fa8b5e171
+  metadata.gz: 25eb0335ebc15cc3892116340911cc3f4cf3e66c3d0864290bee488765bd8b78
+  data.tar.gz: 303bdd7c63c782f82a05e8708c7e6795210ea9125c8888cf417e5d0b1def1ad3
 SHA512:
-  metadata.gz: 49df27035a8b78c26851c48b71820b246197a8278fa73c04b078471afb286293d745b99a9929d0e80a8318d36b0533110e2d90360b817e0acf6691cd1866f5b0
-  data.tar.gz: c7d73d6633a465b8c9f65ff6da4d26ec4d2c749bdcb27fd9f21c6298904f1e3dc2dcd56401867b696959cc5bd37b99d1403711eb007d4ab95a5f4a922db269f6
+  metadata.gz: d8b7522b914a05d4e15ec16cef8f451a1041ad3bfa2900e527d5a3ed993b506270d35318f4ab4bff5ad90f703cc6c15c07ddd69c42e4027884a61c0d2e268224
+  data.tar.gz: 902bd6ebdee3945d4ae1d7219172041601df018d546e863559611d4afaf79c01423fce4f1c0bc4c8c2cf8050f0e4ae286cfb87051fc3d89dd6627445bf6f943c

data/README.md

@@ -49,27 +49,26 @@ $ gem install tappay_ruby
 
 There are several ways to configure the gem:
 
-### 1. Direct Configuration
-
-The simplest way to configure the gem:
+### Option 1: Using merchant_id
 
 ```ruby
+# Using merchant_id with optional payment-specific merchant IDs
 Tappay.configure do |config|
   config.partner_key = 'YOUR_PARTNER_KEY'
-
-  # Primary merchant identification
-  # You can use either merchant_id or merchant_group_id
   config.merchant_id = 'YOUR_MERCHANT_ID'
-  # OR
-  config.merchant_group_id = 'YOUR_MERCHANT_GROUP_ID'
+  config.jko_pay_merchant_id = 'YOUR_JKO_PAY_MERCHANT_ID'  # Optional, falls back to merchant_id if not set
+  config.line_pay_merchant_id = 'YOUR_LINE_PAY_MERCHANT_ID'  # Optional, falls back to merchant_id if not set
+end
+```
 
-  # Optional merchant IDs for specific payment methods
-  # Note: These will be ignored if merchant_group_id is set
-  config.jko_pay_merchant_id = 'YOUR_JKO_PAY_MERCHANT_ID'
-  config.line_pay_merchant_id = 'YOUR_LINE_PAY_MERCHANT_ID'
-  config.instalment_merchant_id = 'YOUR_INSTALMENT_MERCHANT_ID'
+### Option 2: Using merchant_group_id
 
-  config.mode = :sandbox # or :production
+```ruby
+# Using merchant_group_id (takes precedence over all other merchant IDs)
+Tappay.configure do |config|
+  config.partner_key = 'YOUR_PARTNER_KEY'
+  config.merchant_group_id = 'YOUR_MERCHANT_GROUP_ID'
+  # When merchant_group_id is set, all other merchant IDs will be ignored
 end
 ```
 
@@ -127,7 +126,12 @@ result = Tappay::LinePay::Pay.new(
   amount: 1000,
   details: 'Order Details',
   frontend_redirect_url: 'https://example.com/line_pay/result',
-  backend_notify_url: 'https://example.com/line_pay/notify'
+  backend_notify_url: 'https://example.com/line_pay/notify',
+  cardholder: {
+    phone_number: '0912345678',
+    name: 'Test User',
+    email: 'test@example.com'
+  }
 ).execute
 ```
 
@@ -162,11 +166,15 @@ end
 ```ruby
 payment_options = {
   prime: 'jko_pay_prime',
-  merchant_id: 'YOUR_MERCHANT_ID',
   amount: 1000,
   details: 'Some item',
   frontend_redirect_url: 'https://your-site.com/jko_pay/result',
-  backend_notify_url: 'https://your-site.com/jko_pay/notify'
+  backend_notify_url: 'https://your-site.com/jko_pay/notify',
+  cardholder: {
+    phone_number: '0912345678',
+    name: 'Test User',
+    email: 'test@example.com'
+  }
 }
 
 payment = Tappay::JkoPay::Pay.new(payment_options)

data/lib/tappay/apple_pay/pay.rb

@@ -3,6 +3,7 @@ require 'json'
 module Tappay
   module ApplePay
     class Pay < PaymentBase
+
       def endpoint_url
         Tappay::Endpoints::Payment.pay_by_prime_url
       end

data/lib/tappay/credit_card/instalment.rb

@@ -1,6 +1,11 @@
+# frozen_string_literal: true
+
+require 'tappay/payment_base'
+
 module Tappay
   module CreditCard
-    class Instalment
+    class Instalment < PaymentBase
+
       def self.by_prime(options = {})
         InstalmentByPrime.new(options)
       end
@@ -11,10 +16,6 @@ module Tappay
     end
 
     class InstalmentByPrime < PaymentBase
-      def initialize(options = {})
-        super(options)
-      end
-
       def payment_data
         super.merge(
           prime: options[:prime],
@@ -26,39 +27,14 @@ module Tappay
         Tappay::Endpoints::Payment.pay_by_prime_url
       end
 
-      def validate_options!
-        super
-        validate_result_url_for_instalment!
-      end
-
       private
 
-      def get_merchant_id
-        # If merchant_group_id is set, it takes precedence
-        return nil if Tappay.configuration.merchant_group_id
-        
-        # Otherwise, use instalment_merchant_id or fall back to default merchant_id
-        Tappay.configuration.instalment_merchant_id || super
-      end
-
       def additional_required_options
-        [:prime, :cardholder, :instalment]
-      end
-
-      def validate_result_url_for_instalment!
-        return if options[:result_url] && 
-                 options[:result_url][:frontend_redirect_url] && 
-                 options[:result_url][:backend_notify_url]
-
-        raise ValidationError, "result_url with frontend_redirect_url and backend_notify_url is required for instalment payments"
+        [:prime, :instalment]
       end
     end
 
     class InstalmentByToken < PaymentBase
-      def initialize(options = {})
-        super(options)
-      end
-
       def payment_data
         super.merge(
           card_key: options[:card_key],
@@ -71,32 +47,11 @@ module Tappay
         Tappay::Endpoints::Payment.pay_by_token_url
       end
 
-      def validate_options!
-        super
-        validate_result_url_for_instalment!
-      end
-
       private
 
-      def get_merchant_id
-        # If merchant_group_id is set, it takes precedence
-        return nil if Tappay.configuration.merchant_group_id
-        
-        # Otherwise, use instalment_merchant_id or fall back to default merchant_id
-        Tappay.configuration.instalment_merchant_id || super
-      end
-
       def additional_required_options
         [:card_key, :card_token, :instalment]
       end
-
-      def validate_result_url_for_instalment!
-        return if options[:result_url] && 
-                 options[:result_url][:frontend_redirect_url] && 
-                 options[:result_url][:backend_notify_url]
-
-        raise ValidationError, "result_url with frontend_redirect_url and backend_notify_url is required for instalment payments"
-      end
     end
   end
 end

data/lib/tappay/google_pay/pay.rb

@@ -3,8 +3,9 @@ require 'json'
 module Tappay
   module GooglePay
     class Pay < PaymentBase
-      def initialize(client)
-        super(client)
+
+      def endpoint_url
+        Tappay::Endpoints::Payment.pay_by_prime_url
       end
 
       private

data/lib/tappay/jko_pay/pay.rb

@@ -4,7 +4,7 @@ module Tappay
   module JkoPay
     class Pay < PaymentBase
       def endpoint_url
-        Endpoints::Payment.pay_by_prime_url
+        Tappay::Endpoints::Payment.pay_by_prime_url
       end
 
       private
@@ -21,16 +21,43 @@ module Tappay
         [:prime, :frontend_redirect_url, :backend_notify_url, :cardholder]
       end
 
+      def validate_options!
+        super
+        validate_result_url_format!
+      end
+
+      def validate_result_url_format!
+        # First validate that if result_url is provided, it's a hash with required fields
+        if options.key?(:result_url)
+          raise ValidationError, "result_url must be a hash" unless options[:result_url].is_a?(Hash)
+
+          result_url = options[:result_url]
+          required_fields = %w[frontend_redirect_url backend_notify_url]
+          missing = required_fields.select { |field| result_url[field.to_sym].nil? && result_url[field].nil? }
+
+          if missing.any?
+            raise ValidationError, "result_url must contain both frontend_redirect_url and backend_notify_url"
+          end
+        end
+
+        # Then validate frontend_redirect_url and backend_notify_url are present and not empty
+        if !options[:frontend_redirect_url].to_s.strip.empty? && !options[:backend_notify_url].to_s.strip.empty?
+          return
+        end
+
+        raise ValidationError, "result_url must contain both frontend_redirect_url and backend_notify_url"
+      end
+
       protected
 
       def payment_data
-        data = super
-        data[:result_url] = {
-          frontend_redirect_url: options[:frontend_redirect_url],
-          backend_notify_url: options[:backend_notify_url]
-        }
-        data[:prime] = options[:prime]
-        data
+        super.merge(
+          prime: options[:prime],
+          result_url: {
+            frontend_redirect_url: options[:frontend_redirect_url],
+            backend_notify_url: options[:backend_notify_url]
+          }
+        )
       end
     end
   end

data/lib/tappay/line_pay/pay.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'tappay/payment_base'
-
 module Tappay
   module LinePay
     class Pay < PaymentBase
@@ -23,6 +21,33 @@ module Tappay
         [:prime, :frontend_redirect_url, :backend_notify_url, :cardholder]
       end
 
+      def validate_options!
+        super
+        validate_result_url_format!
+      end
+
+      def validate_result_url_format!
+        # First validate that if result_url is provided, it's a hash with required fields
+        if options.key?(:result_url)
+          raise ValidationError, "result_url must be a hash" unless options[:result_url].is_a?(Hash)
+
+          result_url = options[:result_url]
+          required_fields = %w[frontend_redirect_url backend_notify_url]
+          missing = required_fields.select { |field| result_url[field.to_sym].nil? && result_url[field].nil? }
+
+          if missing.any?
+            raise ValidationError, "result_url must contain both frontend_redirect_url and backend_notify_url"
+          end
+        end
+
+        # Then validate frontend_redirect_url and backend_notify_url are present and not empty
+        if !options[:frontend_redirect_url].to_s.strip.empty? && !options[:backend_notify_url].to_s.strip.empty?
+          return
+        end
+
+        raise ValidationError, "result_url must contain both frontend_redirect_url and backend_notify_url"
+      end
+
       protected
 
       def payment_data

data/lib/tappay/payment_base.rb

@@ -23,7 +23,7 @@ module Tappay
       # Prioritize merchant_group_id from options, then configuration
       merchant_group_id = options[:merchant_group_id] || Tappay.configuration.merchant_group_id
       merchant_id = options[:merchant_id] || get_merchant_id
-      
+
       # Determine which identifier to use
       identifier = if merchant_group_id
         { merchant_group_id: merchant_group_id }
@@ -83,7 +83,7 @@ module Tappay
     def get_merchant_id
       # If merchant_group_id is set, it takes precedence over all other merchant IDs
       return nil if Tappay.configuration.merchant_group_id
-      
+
       # Otherwise, return the default merchant_id
       Tappay.configuration.merchant_id
     end

data/lib/tappay/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tappay
-  VERSION = "0.15.1"
+  VERSION = "0.15.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tappay_ruby
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.3
 platform: ruby
 authors:
 - Zac
 bindir: exe
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -23,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.21.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -37,6 +51,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
+- !ruby/object:Gem::Dependency
+  name: simplecov-cobertura
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +107,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 description: A Ruby library for integrating with TapPay payment services, supporting
   credit card payments, refunds, and transaction queries
 email: