smartpay 0.2.15 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69060f27a2870839a5271eb8718bbb0f7898efee00f70a06231ccc4042643f4
-  data.tar.gz: 739ddc687f25d13c683b7e651ec5f8b6a569d8dcddee74913bd21afbee055bbf
+  metadata.gz: 047abea76f72b96fe9f59b2f7e384ef8871d001ef60ae0e6064f767823f273ba
+  data.tar.gz: bd164be4d8ae9747a3331f68192e65e82061bc0627ec4dcdf79389645c9c1828
 SHA512:
-  metadata.gz: 33edcef309bce743fc835bf3c812d73db904bac4a6407e85072357279d661292ce2b2e9001bfd672cd14c25e42d3fd0c8956ea57f947fed0133ae99150e48f20
-  data.tar.gz: 5f0ad3bef86e42f14ce864605e25505e07dab21ef23e1be1f243474f249f327a0145c742a340345cdde1e3c699ae53e8c05bbabcb4657434f906fdae1906d955
+  metadata.gz: 635fbaaf5b186283fcb438f34176aa925f013576098b8535d1e7e1a9e59431db1acb16a7a545d77434bc114465ff3675768c763e084a5aabd01dd7df4f47be2f
+  data.tar.gz: 053a91da14d3fa5097b3ca70b5106878ab564680769c8ca8a9b70036c5915240980492dd5cecbe7b743c5f843db032311aec0e075b403893b68070e522451358

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 
 Style/StringLiterals:
   Enabled: true

data/lib/smartpay/api.rb

@@ -5,7 +5,7 @@ module Smartpay
     class << self
       def create_checkout_session(payload)
         Responses::CheckoutSession.new(
-          Client.post('/checkout-sessions', Requests::CheckoutSession.new(payload).as_hash)
+          Client.post("/checkout-sessions", Requests::CheckoutSession.new(payload).as_hash)
         )
       end
     end

data/lib/smartpay/client.rb

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
-require 'rest-client'
+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)
+        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
 

data/lib/smartpay/configuration.rb

@@ -6,13 +6,21 @@ module Smartpay
     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'
+    DEFAULT_API_URL = "https://api.smartpay.co/v1"
+    DEFAULT_CHECKOUT_URL = "https://checkout.smartpay.co"
 
     def initialize
       @post_timeout = DEFAULT_TIMEOUT_SETTING
-      @api_url = ENV['SMARTPAY_API_PREFIX'] || DEFAULT_API_URL
-      @checkout_url = DEFAULT_CHECKOUT_URL
+      @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
@@ -20,11 +28,21 @@ module Smartpay
     end
 
     def api_url
-      @api_url || ENV['SMARTPAY_API_PREFIX'] || DEFAULT_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

@@ -5,8 +5,8 @@ module Smartpay
     class CheckoutSession
       attr_accessor :payload
 
-      REQUIREMENT_KEY_NAME = [:successURL, :cancelURL, :customerInfo, :orderData].freeze
-      CAN_FALLBACK_KEYS = [:customerInfo, :orderData].freeze
+      REQUIREMENT_KEY_NAME = [:successUrl, :cancelUrl, :customerInfo, :currency, :items].freeze
+      CAN_FALLBACK_KEYS = [:customerInfo].freeze
 
       def initialize(raw_payload)
         @payload = raw_payload.transform_keys(&:to_sym)
@@ -27,24 +27,21 @@ module Smartpay
       end
 
       def normalize_payload
-        currency = get_currency
-        total_amount = get_total_amount
+        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
 
         {
           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: payload.dig(:shippingInfo) || normalize_shipping(payload.dig(:shipping)),
-            lineItemData: payload.dig(:orderData, :lineItemData) || payload.dig(:items),
-            description: payload.dig(:orderDescription),
-            metadata: payload.dig(:orderMetadata)
-          }),
+          amount: payload.dig(: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),
-          metadata: payload.dig(:metadata),
           successUrl: payload.dig(:successURL),
           cancelUrl: payload.dig(:cancelURL),
           test: payload.dig(:test) || false
@@ -85,110 +82,39 @@ module Smartpay
             postalCode: shipping.dig(:postalCode),
             country: shipping.dig(:country),
           },
-          addressType: shipping.dig(:addressType)
-        }
-      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))
+          addressType: shipping.dig(:addressType),
+          feeAmount: shipping.dig(:feeAmount),
+          feeCurrency: shipping.dig(:feeCurrency),
         }
       end
 
-      def normalize_line_items(data)
+      def normalize_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),
+            label: line_item.dig(:label),
+            name: line_item.dig(:name),
+            description: line_item.dig(:description),
+            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),
-            metadata: line_item.dig(:metadata)
+            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 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
-        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

data/lib/smartpay/responses/checkout_session.rb

@@ -9,8 +9,13 @@ module Smartpay
         @response = response
       end
 
-      def redirect_url
-        URI.escape("#{checkout_url}/login?session-id=#{response[:id]}&public-key=#{public_key}")
+      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

data/lib/smartpay/version.rb

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

data/lib/smartpay.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'json'
+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'
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartpay
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.3.0
 platform: ruby
 authors:
 - Smartpay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -90,7 +90,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