smartpay 0.2.17 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d28befc09bec0649be0542e440f1acbcde630f38984e375986809f94a9bedec
-  data.tar.gz: 7888dac202c056b57e476039d731a3b297833eacde05b98631300d0de1258270
+  metadata.gz: 794e3de526f66e64a6c05638932f2c3c8a3cb7bcea3708f8df266ad9f02e7d4a
+  data.tar.gz: f04b6f575b3be6e2320336a343fa9db842560654c5c7076d6b7bf07b2fcdab70
 SHA512:
-  metadata.gz: 7c7fe94acaa28d87d3568c3e5fedc49fb61ae7ab85b401fbbbf985bda50664620c5afa8a194d6f7cb2d503fe8f7298bb782cdd7cd067a8a106e1b48d928578a0
-  data.tar.gz: cb754e4460b339788a8cec5e688b08725dfb684156651539cf005b4b8dbe6950d5ffb22f852c0ec6035496a40d8194d80d81b6cbc44c6b10ddc2cb3a2874817f
+  metadata.gz: 54c1bd5ae7e587b67409e4eb9eed4c50d36690f09958e9003f3b9e9aadf927c429a41dc8c7b9fb18581f5594653f15fa0b3271896486f1276b07c1dd022f8910
+  data.tar.gz: 7cefc78c6463a95317d3f87abfc3e9ccc83cf5aeac7f2efed30194fba42faa2069e8e35ce695720ed9a83cdb523cec27a494b0611d51cee90d92bd62ecefd0a9

data/.rubocop.yml

@@ -1,13 +1,13 @@
-AllCops:
-  TargetRubyVersion: 2.5
-
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Style/StringLiteralsInInterpolation:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Layout/LineLength:
-  Max: 120
+AllCops:
+  TargetRubyVersion: 2.5
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Layout/LineLength:
+  Max: 120

data/Gemfile

@@ -10,3 +10,5 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 
 gem "rubocop", "~> 1.7"
+
+gem "thin"

data/lib/generators/smartpay/templates/controller.rb

@@ -36,8 +36,8 @@ class SmartpaysController < ApplicationController
         country: "JP"
       },
       reference: "order_ref_1234567",
-      successURL: "https://docs.smartpay.co/example-pages/checkout-successful",
-      cancelURL: "https://docs.smartpay.co/example-pages/checkout-canceled",
+      successUrl: "https://docs.smartpay.co/example-pages/checkout-successful",
+      cancelUrl: "https://docs.smartpay.co/example-pages/checkout-canceled",
       test: true
     })
     redirect_to session.redirect_url

data/lib/smartpay/api.rb

@@ -1,13 +1,42 @@
-# frozen_string_literal: true
-
-module Smartpay
-  class Api
-    class << self
-      def create_checkout_session(payload)
-        Responses::CheckoutSession.new(
-          Client.post("/checkout-sessions", Requests::CheckoutSession.new(payload).as_hash)
-        )
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Smartpay
+  class Api
+    class << self
+      def create_checkout_session(payload)
+        Responses::CheckoutSession.new(
+          Client.post("/checkout-sessions", Requests::CheckoutSession.new(payload).as_hash)
+        )
+      end
+
+      def get_orders(page_token: nil, max_results: nil, expand: '' )
+        Responses::Base.new(Client.get("/orders", { pageToken: page_token, maxResults: max_results, expand: expand }))
+      end
+
+      def get_order(id, expand: '' )
+        Responses::Base.new(Client.get("/orders/%s" % id, { expand: expand }))
+      end
+
+      def create_payment(payload)
+        Responses::Base.new(
+          Client.post("/payments", Requests::Payment.new(payload).as_hash)
+        )
+      end
+
+      def capture(payload)
+        create_payment(payload)
+      end
+
+      def create_refund(payload)
+        Responses::Base.new(
+          Client.post("/refunds", Requests::Refund.new(payload).as_hash)
+        )
+      end
+
+      def refund(payload)
+        create_refund(payload)
+      end
+
+    end
+  end
+end

data/lib/smartpay/client.rb

@@ -1,45 +1,53 @@
-# frozen_string_literal: true
-
-require "rest-client"
-
-module Smartpay
-  class Client
-    class << self
-      def post(path, payload = {})
-        request_payload = default_payload.merge(payload)
-        response = RestClient::Request.execute(method: :post, url: api_url(path), headers: headers, timeout: timeout,
-                                               payload: request_payload.to_json)
-        JSON.parse(response.body, symbolize_names: true)
-      end
-
-      private
-
-      def api_url(path)
-        "#{Smartpay.configuration.api_url}#{path}"
-      end
-
-      def timeout
-        Smartpay.configuration.post_timeout
-      end
-
-      def headers
-        {
-          accept: :json,
-          content_type: :json,
-          Authorization: "Basic #{secret_key}"
-        }
-      end
-
-      def secret_key
-        Smartpay.configuration.secret_key
-      end
-
-      def default_payload
-        {
-          'dev-lang': :ruby,
-          'sdk-version': Smartpay::VERSION
-        }.freeze
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "rest-client"
+
+module Smartpay
+  class Client
+    class << self
+      def get(path, payload = {})
+        request_payload = default_payload.merge(payload)
+        response = RestClient::Request.execute(method: :get, url: api_url(path),
+                                               headers: headers.merge(params: request_payload),
+                                               timeout: timeout)
+        JSON.parse(response.body, symbolize_names: true)
+      end
+
+      def post(path, payload = {})
+        request_payload = default_payload.merge(payload)
+        response = RestClient::Request.execute(method: :post, url: api_url(path), headers: headers, timeout: timeout,
+                                               payload: request_payload.to_json)
+        JSON.parse(response.body, symbolize_names: true)
+      end
+
+      private
+
+      def api_url(path)
+        "#{Smartpay.configuration.api_url}#{path}"
+      end
+
+      def timeout
+        Smartpay.configuration.post_timeout
+      end
+
+      def headers
+        {
+          accept: :json,
+          content_type: :json,
+          Authorization: "Basic #{secret_key}"
+        }
+      end
+
+      def secret_key
+        Smartpay.configuration.secret_key
+      end
+
+      def default_payload
+        {
+          'dev-lang': :ruby,
+          'sdk-version': Smartpay::VERSION
+        }.freeze
+      end
+    end
+  end
+end

data/lib/smartpay/configuration.rb

@@ -1,48 +1,48 @@
-# frozen_string_literal: true
-
-module Smartpay
-  class Configuration
-    attr_accessor :public_key, :secret_key
-    attr_writer :post_timeout, :api_url, :checkout_url
-
-    DEFAULT_TIMEOUT_SETTING = 30
-    DEFAULT_API_URL = "https://api.smartpay.co/v1"
-    DEFAULT_CHECKOUT_URL = "https://checkout.smartpay.co"
-
-    def initialize
-      @post_timeout = DEFAULT_TIMEOUT_SETTING
-      @api_url = if in_development_mode?
-                   ENV["SMARTPAY_API_PREFIX"].downcase || DEFAULT_API_URL
-                 else
-                   DEFAULT_API_URL
-                 end
-      @checkout_url = if in_development_mode? && ENV["SMARTPAY_CHECKOUT_URL"].is_a?(String)
-                        ENV["SMARTPAY_CHECKOUT_URL"].downcase || DEFAULT_CHECKOUT_URL
-                      else
-                        DEFAULT_CHECKOUT_URL
-                      end
-    end
-
-    def post_timeout
-      @post_timeout || DEFAULT_TIMEOUT_SETTING
-    end
-
-    def api_url
-      if in_development_mode?
-        @api_url || ENV["SMARTPAY_API_PREFIX"].downcase || DEFAULT_API_URL
-      else
-        @api_url || DEFAULT_API_URL
-      end
-    end
-
-    def checkout_url
-      @checkout_url || DEFAULT_CHECKOUT_URL
-    end
-
-    private
-
-    def in_development_mode?
-      ENV["SMARTPAY_API_PREFIX"].downcase.include?("api.smartpay") if ENV["SMARTPAY_API_PREFIX"].is_a?(String)
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Smartpay
+  class Configuration
+    attr_accessor :public_key, :secret_key
+    attr_writer :post_timeout, :api_url, :checkout_url
+
+    DEFAULT_TIMEOUT_SETTING = 30
+    DEFAULT_API_URL = "https://api.smartpay.co/v1"
+    DEFAULT_CHECKOUT_URL = "https://checkout.smartpay.co"
+
+    def initialize
+      @post_timeout = DEFAULT_TIMEOUT_SETTING
+      @api_url = if in_development_mode?
+                   ENV["SMARTPAY_API_PREFIX"].downcase || DEFAULT_API_URL
+                 else
+                   DEFAULT_API_URL
+                 end
+      @checkout_url = if in_development_mode? && ENV["SMARTPAY_CHECKOUT_URL"].is_a?(String)
+                        ENV["SMARTPAY_CHECKOUT_URL"].downcase || DEFAULT_CHECKOUT_URL
+                      else
+                        DEFAULT_CHECKOUT_URL
+                      end
+    end
+
+    def post_timeout
+      @post_timeout || DEFAULT_TIMEOUT_SETTING
+    end
+
+    def api_url
+      if in_development_mode?
+        @api_url || ENV["SMARTPAY_API_PREFIX"].downcase || DEFAULT_API_URL
+      else
+        @api_url || DEFAULT_API_URL
+      end
+    end
+
+    def checkout_url
+      @checkout_url || DEFAULT_CHECKOUT_URL
+    end
+
+    private
+
+    def in_development_mode?
+      ENV["SMARTPAY_API_PREFIX"].downcase.include?("api.smartpay") if ENV["SMARTPAY_API_PREFIX"].is_a?(String)
+    end
+  end
+end

data/lib/smartpay/requests/checkout_session.rb

@@ -1,209 +1,140 @@
-# frozen_string_literal: true
-
-module Smartpay
-  module Requests
-    class CheckoutSession
-      attr_accessor :payload
-
-      REQUIREMENT_KEY_NAME = [:successURL, :cancelURL, :customerInfo, :orderData].freeze
-      CAN_FALLBACK_KEYS = [:customerInfo, :orderData].freeze
-
-      def initialize(raw_payload)
-        @payload = raw_payload.transform_keys(&:to_sym)
-      end
-
-      def as_hash
-        check_requirement!
-        normalize_payload
-      end
-
-      private
-
-      def check_requirement!
-        REQUIREMENT_KEY_NAME.each do |key_name|
-          next if CAN_FALLBACK_KEYS.include?(key_name)
-          raise Errors::InvalidRequestPayloadError, key_name unless payload.include?(key_name)
-        end
-      end
-
-      def normalize_payload
-        currency = get_currency
-        total_amount = get_total_amount
-        shippingInfo = payload.dig(:shippingInfo) || normalize_shipping(payload.dig(:shipping))
-        shippingInfo[:feeCurrency] = currency if shippingInfo && shippingInfo[:feeCurrency].nil? && !(shippingInfo[:feeAmount].nil?)
-
-        {
-          customerInfo: normalize_customer_info(payload.dig(:customerInfo) || payload.dig(:customer) || {}),
-          orderData: normalize_order_data(payload.dig(:orderData) || {
-            amount: total_amount,
-            currency: currency,
-            captureMethod: payload.dig(:captureMethod),
-            confirmationMethod: payload.dig(:confirmationMethod),
-            coupons: payload.dig(:coupons),
-            shippingInfo: shippingInfo,
-            lineItemData: payload.dig(:orderData, :lineItemData) || payload.dig(:items),
-            description: payload.dig(:orderDescription),
-            metadata: payload.dig(:orderMetadata),
-            reference: payload.dig(:reference),
-          }),
-          successUrl: payload.dig(:successURL),
-          cancelUrl: payload.dig(:cancelURL),
-          test: payload.dig(:test) || false
-        }
-      end
-
-      def normalize_customer_info(info)
-        return if info.nil?
-        customer = info.transform_keys(&:to_sym)
-        {
-          accountAge: customer.dig(:accountAge),
-          emailAddress: customer.dig(:emailAddress) || customer.dig(:email),
-          firstName: customer.dig(:firstName),
-          lastName: customer.dig(:lastName),
-          firstNameKana: customer.dig(:firstNameKana),
-          lastNameKana: customer.dig(:lastNameKana),
-          address: customer.dig(:address),
-          phoneNumber: customer.dig(:phoneNumber) || customer.dig(:phone),
-          dateOfBirth: customer.dig(:dateOfBirth),
-          legalGender: customer.dig(:legalGender) || customer.dig(:gender),
-          reference: customer.dig(:reference)
-        }
-      end
-
-      def normalize_shipping(shipping)
-        return if shipping.nil?
-        shipping= shipping.transform_keys(&:to_sym)
-        {
-          address: shipping.dig(:address) || {
-            line1: shipping.dig(:line1),
-            line2: shipping.dig(:line2),
-            line3: shipping.dig(:line3),
-            line4: shipping.dig(:line4),
-            line5: shipping.dig(:line5),
-            subLocality: shipping.dig(:subLocality),
-            locality: shipping.dig(:locality),
-            administrativeArea: shipping.dig(:administrativeArea),
-            postalCode: shipping.dig(:postalCode),
-            country: shipping.dig(:country),
-          },
-          addressType: shipping.dig(:addressType),
-          feeAmount: shipping.dig(:feeAmount),
-          feeCurrency: shipping.dig(:feeCurrency),
-        }
-      end
-
-      def normalize_order_data(order)
-        return if order.nil?
-        order = order.transform_keys(&:to_sym)
-        {
-          amount: order.dig(:amount),
-          currency: order.dig(:currency),
-          captureMethod: order.dig(:captureMethod),
-          confirmationMethod: order.dig(:confirmationMethod),
-          coupons: order.dig(:coupons),
-          shippingInfo: order.dig(:shippingInfo),
-          lineItemData: normalize_line_items(order.dig(:lineItemData) || order.dig(:items)),
-          metadata: order.dig(:metadata) || {},
-          reference: order.dig(:reference)
-        }
-      end
-
-      def normalize_line_items(data)
-        return [] if data.nil?
-
-        data.map do |item|
-          line_item = item.transform_keys(&:to_sym)
-          {
-            price: line_item.dig(:price),
-            priceData: normalize_price_data(line_item.dig(:priceData) || {
-              productData: {
-                name: line_item.dig(:name),
-                brand: line_item.dig(:brand),
-                categories: line_item.dig(:categories),
-                gtin: line_item.dig(:gtin),
-                images: line_item.dig(:images),
-                reference: line_item.dig(:reference),
-                url: line_item.dig(:url),
-                description: line_item.dig(:productDescription),
-                metadata: line_item.dig(:productMetadata)
-              },
-              amount: line_item.dig(:amount),
-              currency: line_item.dig(:currency),
-              label: line_item.dig(:label),
-              description: line_item.dig(:priceDescription),
-              metadata: line_item.dig(:priceMetadata)
-            }),
-            quantity: line_item.dig(:quantity),
-            description: line_item.dig(:description),
-            metadata: line_item.dig(:metadata)
-          }
-        end
-      end
-
-      def normalize_price_data(data)
-        return if data.nil?
-        data = data.transform_keys(&:to_sym)
-        {
-          productData: normalize_product_data(data.dig(:productData) || {}),
-          amount: data.dig(:amount),
-          currency: data.dig(:currency),
-          metadata: data.dig(:metadata)
-        }
-      end
-
-      def normalize_product_data(product)
-        return if product.nil?
-        product = product.transform_keys(&:to_sym)
-        {
-          name: product.dig(:name),
-          brand: product.dig(:brand),
-          categories: product.dig(:categories),
-          description: product.dig(:description),
-          gtin: product.dig(:gtin),
-          images: product.dig(:images),
-          reference: product.dig(:reference),
-          url: product.dig(:url),
-          metadata: product.dig(:metadata)
-        }
-      end
-
-      def get_currency
-        currency = payload.dig(:orderData, :currency) || payload.dig(:orderData, 'currency')
-        if currency.nil?
-          items = get_items
-          if !items.nil? && items.count > 0
-            currency = items.first.dig(:currency) || items.first.dig('currency')
-          end
-        end
-        currency
-      end
-
-      def get_total_amount
-        total_amount = payload.dig(:orderData, :amount) || payload.dig(:orderData, 'amount')
-        
-        if total_amount.nil?
-          items = get_items
-          
-          if !items.nil? && items.count > 0
-            total_amount = items.inject(0) { |sum, item| sum + (item[:amount] || item['amount'] || 0) }
-          end
-
-          shipping_fee = payload.dig(:orderData, :shippingInfo, :feeAmount) ||
-                          payload.dig(:orderData, :shippingInfo, 'feeAmount') ||
-                          payload.dig(:shipping, :feeAmount) ||
-                          payload.dig(:shipping, 'feeAmount') ||
-                          0
-          total_amount = shipping_fee + (total_amount || 0)
-        end
-
-        total_amount
-      end
-
-      def get_items
-        @items ||= payload.dig(:orderData, :lineItemData, :priceData) ||
-          payload.dig(:orderData, 'lineItemData', 'priceData') ||
-          payload.dig(:items)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Smartpay
+  module Requests
+    class CheckoutSession
+      attr_accessor :payload
+
+      REQUIREMENT_KEY_NAME = [:successUrl, :cancelUrl, :customer, :currency, :items].freeze
+      CAN_FALLBACK_KEYS = [:customer].freeze
+
+      def initialize(raw_payload)
+        @payload = raw_payload.transform_keys(&:to_sym)
+      end
+
+      def as_hash
+        check_requirement!
+        normalize_payload
+      end
+
+      private
+
+      def check_requirement!
+        REQUIREMENT_KEY_NAME.each do |key_name|
+          next if CAN_FALLBACK_KEYS.include?(key_name)
+          raise Errors::InvalidRequestPayloadError, key_name unless payload.include?(key_name)
+        end
+      end
+
+      def normalize_payload
+        shipping_info = payload.dig(:shippingInfo) || normalize_shipping(payload.dig(:shipping))
+        if shipping_info && shipping_info[:feeCurrency].nil? && !(shipping_info[:feeAmount].nil?)
+          shipping_info[:feeCurrency] = payload.dig(:currency)
+        end
+
+        total_amount = get_total_amount
+
+        {
+          customerInfo: normalize_customer_info(payload.dig(:customerInfo) || payload.dig(:customer) || {}),
+          amount: total_amount,
+          captureMethod: payload.dig(:captureMethod),
+          currency: payload.dig(:currency),
+          description: payload.dig(:description),
+          shippingInfo: shipping_info,
+          items: normalize_items(payload.dig(:items)),
+          metadata: payload.dig(:metadata) || {},
+          reference: payload.dig(:reference),
+          successUrl: payload.dig(:successUrl),
+          cancelUrl: payload.dig(:cancelUrl),
+        }
+      end
+
+      def normalize_customer_info(info)
+        return if info.nil?
+        customer = info.transform_keys(&:to_sym)
+        {
+          accountAge: customer.dig(:accountAge),
+          emailAddress: customer.dig(:emailAddress) || customer.dig(:email),
+          firstName: customer.dig(:firstName),
+          lastName: customer.dig(:lastName),
+          firstNameKana: customer.dig(:firstNameKana),
+          lastNameKana: customer.dig(:lastNameKana),
+          address: customer.dig(:address),
+          phoneNumber: customer.dig(:phoneNumber) || customer.dig(:phone),
+          dateOfBirth: customer.dig(:dateOfBirth),
+          legalGender: customer.dig(:legalGender) || customer.dig(:gender),
+          reference: customer.dig(:reference)
+        }
+      end
+
+      def normalize_shipping(shipping)
+        return if shipping.nil?
+        shipping= shipping.transform_keys(&:to_sym)
+        {
+          address: shipping.dig(:address) || {
+            line1: shipping.dig(:line1),
+            line2: shipping.dig(:line2),
+            line3: shipping.dig(:line3),
+            line4: shipping.dig(:line4),
+            line5: shipping.dig(:line5),
+            subLocality: shipping.dig(:subLocality),
+            locality: shipping.dig(:locality),
+            administrativeArea: shipping.dig(:administrativeArea),
+            postalCode: shipping.dig(:postalCode),
+            country: shipping.dig(:country),
+          },
+          addressType: shipping.dig(:addressType),
+          feeAmount: shipping.dig(:feeAmount),
+          feeCurrency: shipping.dig(:feeCurrency),
+        }
+      end
+
+      def normalize_items(data)
+        return [] if data.nil?
+
+        data.map do |item|
+          line_item = item.transform_keys(&:to_sym)
+          {
+            quantity: line_item.dig(:quantity),
+            label: line_item.dig(:label),
+            name: line_item.dig(:name),
+            amount: line_item.dig(:amount),
+            currency: line_item.dig(:currency),
+            brand: line_item.dig(:brand),
+            categories: line_item.dig(:categories),
+            gtin: line_item.dig(:gtin),
+            images: line_item.dig(:images),
+            reference: line_item.dig(:reference),
+            url: line_item.dig(:url),
+            description: line_item.dig(:description),
+            priceDescription: line_item.dig(:priceDescription),
+            productDescription: line_item.dig(:productDescription),
+            metadata: line_item.dig(:metadata),
+            productMetadata: line_item.dig(:productMetadata),
+            priceMetadata: line_item.dig(:priceMetadata)
+          }
+        end
+      end
+
+
+      def get_total_amount
+        total_amount = payload.dig(:amount) || payload.dig('amount')
+
+        if total_amount.nil?
+          items = payload.dig(:items)
+
+          if !items.nil? && items.count > 0
+            total_amount = items.inject(0) { |sum, item| sum + (item[:amount] || item['amount'] || 0) }
+          end
+
+          shipping_fee = payload.dig(:shippingInfo, :feeAmount) ||
+                          payload.dig(:shippingInfo, 'feeAmount') ||
+                          0
+          total_amount = shipping_fee + (total_amount || 0)
+        end
+
+        total_amount
+      end
+    end
+  end
+end

data/lib/smartpay/requests/payment.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Smartpay
+  module Requests
+    class Payment
+      attr_accessor :payload
+
+      REQUIREMENT_KEY_NAME = [:order, :amount, :currency].freeze
+
+      def initialize(raw_payload)
+        @payload = raw_payload.transform_keys(&:to_sym)
+      end
+
+      def as_hash
+        check_requirement!
+        normalize_payload
+      end
+
+      private
+
+      def check_requirement!
+        REQUIREMENT_KEY_NAME.each do |key_name|
+          raise Errors::InvalidRequestPayloadError, key_name unless payload.include?(key_name)
+        end
+      end
+
+      def normalize_payload
+        {
+          order: payload.dig(:order),
+          amount: payload.dig(:amount),
+          currency: payload.dig(:currency),
+          reference: payload.dig(:reference),
+          description: payload.dig(:description),
+          metadata: payload.dig(:metadata) || {},
+        }
+      end
+    end
+  end
+end

data/lib/smartpay/requests/refund.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Smartpay
+  module Requests
+    class Refund
+      attr_accessor :payload
+
+      REQUIREMENT_KEY_NAME = [:payment, :amount, :currency].freeze
+
+      def initialize(raw_payload)
+        @payload = raw_payload.transform_keys(&:to_sym)
+      end
+
+      def as_hash
+        check_requirement!
+        normalize_payload
+      end
+
+      private
+
+      def check_requirement!
+        REQUIREMENT_KEY_NAME.each do |key_name|
+          raise Errors::InvalidRequestPayloadError, key_name unless payload.include?(key_name)
+        end
+      end
+
+      def normalize_payload
+        {
+          payment: payload.dig(:payment),
+          amount: payload.dig(:amount),
+          currency: payload.dig(:currency),
+          reason: payload.dig(:reason),
+          reference: payload.dig(:reference),
+          description: payload.dig(:description),
+          metadata: payload.dig(:metadata) || {},
+        }
+      end
+    end
+  end
+end

data/lib/smartpay/responses/base.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Smartpay
+  module Responses
+    class Base
+      attr_reader :response
+
+      def initialize(response)
+        @response = response
+      end
+
+      def as_hash
+        @response
+      end
+
+      def as_json
+        @response.to_json
+      end
+    end
+  end
+end

data/lib/smartpay/responses/checkout_session.rb

@@ -1,40 +1,30 @@
-# frozen_string_literal: true
-
-module Smartpay
-  module Responses
-    class CheckoutSession
-      attr_reader :response
-
-      def initialize(response)
-        @response = response
-      end
-
-      def redirect_url(options = {})
-        url = "#{checkout_url}/login"
-        promotion_code = options[:promotion_code] || response[:metadata][:__promotion_code__] || nil
-        qs = "session-id=#{URI.encode_www_form_component(response[:id])}&public-key=#{URI.encode_www_form_component(public_key)}"
-        qs = "#{qs}&promotion-code=#{URI.encode_www_form_component(promotion_code)}" if promotion_code
-        
-        "#{url}?#{qs}"
-      end
-
-      def as_hash
-        @response
-      end
-
-      def as_json
-        @response.to_json
-      end
-
-      private
-
-      def checkout_url
-        Smartpay.configuration.checkout_url
-      end
-
-      def public_key
-        Smartpay.configuration.public_key
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Smartpay
+  module Responses
+    class CheckoutSession < Base
+
+      def redirect_url(options = {})
+        url = response[:url]
+
+        if options && options[:promotionCode]
+          qs = "?promotion-code=#{options[:promotionCode]}"
+
+          return "#{url}#{qs}"
+        end
+        
+        url
+      end
+
+      private
+
+      def checkout_url
+        Smartpay.configuration.checkout_url
+      end
+
+      def public_key
+        Smartpay.configuration.public_key
+      end
+    end
+  end
+end

data/lib/smartpay/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Smartpay
-  VERSION = "0.2.17"
+  VERSION = "0.4.0"
 end

data/lib/smartpay.rb

@@ -1,25 +1,31 @@
-# frozen_string_literal: true
-
-require "json"
-
-require_relative "smartpay/version"
-require_relative "smartpay/configuration"
-require_relative "smartpay/client"
-require_relative "smartpay/api"
-require_relative "smartpay/errors/invalid_request_payload_error"
-require_relative "smartpay/requests/checkout_session"
-require_relative "smartpay/responses/checkout_session"
-
-module Smartpay
-  class << self
-    attr_accessor :configuration
-
-    def configuration
-      @configuration ||= Smartpay::Configuration.new
-    end
-
-    def configure
-      yield(configuration)
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "json"
+
+require_relative "smartpay/version"
+require_relative "smartpay/configuration"
+require_relative "smartpay/client"
+require_relative "smartpay/api"
+require_relative "smartpay/errors/invalid_request_payload_error"
+require_relative "smartpay/requests/checkout_session"
+require_relative "smartpay/requests/payment"
+require_relative "smartpay/requests/refund"
+require_relative "smartpay/responses/base"
+require_relative "smartpay/responses/checkout_session"
+
+module Smartpay
+  REJECT_REQUEST_BY_CUSTOMER = 'requested_by_customer'
+  REJECT_FRAUDULENT = 'fraudulent'
+
+  class << self
+    attr_accessor :configuration
+
+    def configuration
+      @configuration ||= Smartpay::Configuration.new
+    end
+
+    def configure
+      yield(configuration)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartpay
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.4.0
 platform: ruby
 authors:
 - Smartpay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -66,6 +66,9 @@ files:
 - lib/smartpay/configuration.rb
 - lib/smartpay/errors/invalid_request_payload_error.rb
 - lib/smartpay/requests/checkout_session.rb
+- lib/smartpay/requests/payment.rb
+- lib/smartpay/requests/refund.rb
+- lib/smartpay/responses/base.rb
 - lib/smartpay/responses/checkout_session.rb
 - lib/smartpay/version.rb
 homepage: https://smartpay.co
@@ -90,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: The Smartpay Ruby SDK offers easy access to Smartpay API from applications