smartpay 0.2.7 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56d3e609ce7f1842742670dff4b7eac351f6e653e199362cdd75b6715ec60501
-  data.tar.gz: 35b80a47568eee0755b4335d3aa68922b5b68767ed8e2371c7a45949783b3269
+  metadata.gz: 0353211f9e0231c5524115accebba99be527dd01361f2706d587626d81e8129f
+  data.tar.gz: b96ca9b9bd0aaac4746f5849ea29ef9e098de79f0de59fa4e9acb0f3ebf05a21
 SHA512:
-  metadata.gz: 32ce2b368f3a40956d8fea8929fcf54f3a442688bdc5cb49d3fcb5d1a5b81bb5ba43adcaebd30c0dd1d004fdefa56aeb7e38687bb9912d23157f5d3ead0a33d7
-  data.tar.gz: db3ed60db92f3246636eb173025aefc1aa0f3153e38f67a3a690e4ad381183f6b916d59cc0f88871d0c69544c2f479a85da9eba9d04d06124e9acc1a32b98434
+  metadata.gz: 7778f540af382892db264134748b4e1be41e1bc1292e4ab569393b342fe4e3c7caf55b36b70b1b41a125b99e882ba7b5ef1bea6c38276d76695546cedaa1101c
+  data.tar.gz: cc1a7c500e098b63d5650472f50b5c23c072d88c1569a7e4b457ead20c2bf99434b48a86c59da786d4baa4c6df7d0045a4f4884e6a2b407566b597346cd3d6e4

data/lib/smartpay/configuration.rb

@@ -2,11 +2,11 @@
 
 module Smartpay
   class Configuration
-    attr_accessor :post_timeout
-    attr_accessor :public_key, :secret_key, :api_url, :checkout_url
+    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'
+    DEFAULT_API_URL = 'https://api.smartpay.co/v1'
     DEFAULT_CHECKOUT_URL = 'https://checkout.smartpay.co'
 
     def initialize
@@ -14,5 +14,17 @@ module Smartpay
       @api_url = DEFAULT_API_URL
       @checkout_url = DEFAULT_CHECKOUT_URL
     end
+
+    def post_timeout
+      @post_timeout || DEFAULT_TIMEOUT_SETTING
+    end
+
+    def api_url
+      @api_url || DEFAULT_API_URL
+    end
+
+    def checkout_url
+      @checkout_url || DEFAULT_CHECKOUT_URL
+    end
   end
 end

data/lib/smartpay/requests/checkout_session.rb

@@ -71,6 +71,7 @@ module Smartpay
 
       def normalize_shipping(shipping)
         return if shipping.nil?
+        shipping= shipping.transform_keys(&:to_sym)
         {
           address: shipping.dig(:address) || {
             line1: shipping.dig(:line1),
@@ -164,9 +165,9 @@ module Smartpay
       def get_currency
         currency = payload.dig(:orderData, :currency) || payload.dig(:orderData, 'currency')
         if currency.nil?
-          items = payload.dig(:orderData, :lineItemData, :priceData) || payload.dig(:items)
+          items = get_items
           if !items.nil? && items.count > 0
-            currency = items.first.dig(:currency)
+            currency = items.first.dig(:currency) || items.first.dig('currency')
           end
         end
         currency
@@ -175,13 +176,19 @@ module Smartpay
       def get_total_amount
         total_amount = payload.dig(:orderData, :amount) || payload.dig(:orderData, 'amount')
         if total_amount.nil?
-          items = payload.dig(:orderData, :lineItemData, :priceData) || payload.dig(:items)
+          items = get_items
           if !items.nil? && items.count > 0
-            total_amount = items.inject(0) { |sum, item| sum + (item[:amount] || 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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartpay
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.11
 platform: ruby
 authors:
 - Smartpay