smartpay 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 794e3de526f66e64a6c05638932f2c3c8a3cb7bcea3708f8df266ad9f02e7d4a
-  data.tar.gz: f04b6f575b3be6e2320336a343fa9db842560654c5c7076d6b7bf07b2fcdab70
+  metadata.gz: c0cd94594c52188072ee764c3d9abbab864773af324310b3f0a6e5747570e04e
+  data.tar.gz: 7fe589e25744b8891af1b91786d26c4f7e67e13fcf4ba80c9d847ea31461181f
 SHA512:
-  metadata.gz: 54c1bd5ae7e587b67409e4eb9eed4c50d36690f09958e9003f3b9e9aadf927c429a41dc8c7b9fb18581f5594653f15fa0b3271896486f1276b07c1dd022f8910
-  data.tar.gz: 7cefc78c6463a95317d3f87abfc3e9ccc83cf5aeac7f2efed30194fba42faa2069e8e35ce695720ed9a83cdb523cec27a494b0611d51cee90d92bd62ecefd0a9
+  metadata.gz: 8973913b6c40ddd9fa7449d43696c823b25ac36483f070c3fe1a6cafffe8f030b70171ee2ff7c8ae9876b336a820efaf17b1de85f0bc2b0245b2d6add321f47e
+  data.tar.gz: 6b7e1721a942ace0254e701c23186f0b2c0eaa6d2821e9fd5bf4339b782e58b8eaa9d2b6aa39e40b6c1babbb462c199f964f4bf9a9f2ec4664f8d39b9bef25d8

data/Gemfile

@@ -5,10 +5,14 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in smartpay.gemspec
 gemspec
 
+gem "rest-client", "~> 2.1.0"
+
+gem "securerandom", "~> 0.2.0"
+
+gem "retries", "~> 0.0.5"
+
 gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 
 gem "rubocop", "~> 1.7"
-
-gem "thin"

data/lib/smartpay/api.rb

@@ -5,21 +5,27 @@ 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", params: {}, payload: 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 }))
+        Responses::Base.new(Client.get("/orders", params: { pageToken: page_token, maxResults: max_results, expand: expand }))
       end
 
       def get_order(id, expand: '' )
-        Responses::Base.new(Client.get("/orders/%s" % id, { expand: expand }))
+        Responses::Base.new(Client.get("/orders/%s" % id, params: { expand: expand }))
+      end
+
+      def cancel_order(id)
+        Responses::Base.new(
+          Client.put("/orders/%s/cancellation" % id)
+        )
       end
 
       def create_payment(payload)
         Responses::Base.new(
-          Client.post("/payments", Requests::Payment.new(payload).as_hash)
+          Client.post("/payments", params:{}, payload: Requests::Payment.new(payload).as_hash)
         )
       end
 
@@ -27,9 +33,13 @@ module Smartpay
         create_payment(payload)
       end
 
+      def get_payment(id, expand: '' )
+        Responses::Base.new(Client.get("/payments/%s" % id, params: { expand: expand }))
+      end
+
       def create_refund(payload)
         Responses::Base.new(
-          Client.post("/refunds", Requests::Refund.new(payload).as_hash)
+          Client.post("/refunds", params:{}, payload: Requests::Refund.new(payload).as_hash)
         )
       end
 
@@ -37,6 +47,10 @@ module Smartpay
         create_refund(payload)
       end
 
+      def get_refund(id, expand: '' )
+        Responses::Base.new(Client.get("/refunds/%s" % id, params: { expand: expand }))
+      end
+
     end
   end
 end

data/lib/smartpay/client.rb

@@ -1,27 +1,54 @@
 # frozen_string_literal: true
 
 require "rest-client"
+require "retries"
+require "securerandom"
 
 module Smartpay
   class Client
     class << self
-      def get(path, payload = {})
-        request_payload = default_payload.merge(payload)
+      def get(path, params: {})
+        request_params = default_params.merge(params)
         response = RestClient::Request.execute(method: :get, url: api_url(path),
-                                               headers: headers.merge(params: request_payload),
+                                               headers: headers.merge(params: request_params),
                                                timeout: timeout)
         JSON.parse(response.body, symbolize_names: true)
       end
 
-      def post(path, payload = {})
+      def post(path, params: {}, payload: {})
+        request_params = default_params.merge(params)
+        request_payload = default_payload.merge(payload)
+        idempotency_key = nonce
+        response = with_retries(:max_tries => 1, :rescue => [RestClient::BadRequest, RestClient::BadGateway, RestClient::ServiceUnavailable, RestClient::GatewayTimeout]) do
+          RestClient::Request.execute(method: :post, url: api_url(path),
+                                                params: request_params,
+                                                headers: headers.merge({Idempotency_Key: idempotency_key}).merge(params: request_params),
+                                                timeout: timeout,
+                                                payload: request_payload.to_json)
+        end
+        JSON.parse(response.body, symbolize_names: true)
+      end
+
+      def put(path, params: {}, payload: {})
+        request_params = default_params.merge(params).merge({'Idempotency-Key': nonce})
         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)
+        idempotency_key = nonce
+        response = with_retries(:max_tries => 1, :rescue => [RestClient::InternalServerError, RestClient::BadGateway, RestClient::ServiceUnavailable, RestClient::GatewayTimeout]) do
+          RestClient::Request.execute(method: :put, url: api_url(path),
+                                                params: request_params,
+                                                headers: headers.merge({Idempotency_Key: idempotency_key}).merge(params: request_params),
+                                                timeout: timeout,
+                                                payload: request_payload.to_json)
+        end
         JSON.parse(response.body, symbolize_names: true)
       end
 
       private
 
+      def nonce 
+        SecureRandom.hex
+      end
+
       def api_url(path)
         "#{Smartpay.configuration.api_url}#{path}"
       end
@@ -42,12 +69,16 @@ module Smartpay
         Smartpay.configuration.secret_key
       end
 
-      def default_payload
+      def default_params
         {
           'dev-lang': :ruby,
           'sdk-version': Smartpay::VERSION
         }.freeze
       end
+
+      def default_payload
+        {}.freeze
+      end
     end
   end
 end

data/lib/smartpay/requests/payment.rb

@@ -30,6 +30,7 @@ module Smartpay
           amount: payload.dig(:amount),
           currency: payload.dig(:currency),
           reference: payload.dig(:reference),
+          cancelRemainder: payload.dig(:cancel_remainder),
           description: payload.dig(:description),
           metadata: payload.dig(:metadata) || {},
         }

data/lib/smartpay/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartpay
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Smartpay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: The Smartpay Ruby SDK offers easy access to Smartpay API from applications