nedbank_api 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 232191d832adf52be4ec8b3819395c3624a33d57
-  data.tar.gz: 1963075ba078b1d5327ad81991767daac2a472cd
+  metadata.gz: 6fb9117ddc2c8216ec72760a551d41982c267fd1
+  data.tar.gz: 242312db170605559aec9b75e24755d8485e4dd8
 SHA512:
-  metadata.gz: 0d1264a544ff92c7d3557428b15084a43f6b5441ebcbaf7452ee1afa66786c615cfa7975ff5ca8aea62e63c78a21b0c83f2b3af2e2bdd214f928c1cb4f0648fa
-  data.tar.gz: 678d7a4f9d708e93cc57300c86b06675e7e3a12f5f723d9c77798467b148c139e8653d9fcead30a6f8ba0d76e05943e78b1d606e43db0360e90bf53a4daeb4e9
+  metadata.gz: 46ce862d9507e3f3f261557295d0f4586145145b87a004c196eb5efb220dee39cef4b486ac1ba8288a1e34bff5f5f6768dc16fe2f0807367cbbee3a1c6a27ffc
+  data.tar.gz: 0ddb5f94ddfe19a3d2287821781cecb05acc25cdd3fa17ccf17afa7e1b43a637c879e3e6c5308c0ccd76c1a32729ca645801d6bcf398752f4db1695590be4235

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nedbank_api (0.2.2)
+    nedbank_api (0.2.5)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,4 +1,4 @@
-# NedbankApi
+# Nedbank API
 
 The purpose of this gem is to streamline development of a Ruby application when using the [Nedbank Marketplace API](https://apim.nedbank.co.za/static/docs).
 
@@ -9,7 +9,7 @@ This gem currently only uses the Authoristaions API and Payments API. If you are
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'nedbank_api', github: 'jono-booth/nedbank_api'
+gem 'nedbank_api'
 ```
 
 And then execute:

data/lib/nedbank_api.rb

@@ -18,8 +18,6 @@ require 'uri'
 require 'securerandom'
 
 module NedbankApi
-  @intent_token = Models::IntentToken.new(Object.new)
-
   class << self
     attr_accessor :intent_token,
       :configuration

data/lib/nedbank_api/api_wrapper.rb

@@ -1,10 +1,6 @@
 module NedbankApi
   class ApiWrapper
     class << self
-      def idempotency_key
-        rand.to_s[2..24]
-      end
-
       def auth_headers(overrides={})
         {
           "Content-Type" => "application/json",
@@ -17,8 +13,12 @@ module NedbankApi
         }.merge(overrides)
       end
 
-      def endpoint(path)
-        NedbankApi.configuration.api_endpoint + path
+      def idempotency_key
+        rand.to_s[2..24]
+      end
+
+      def endpoint(path, suffix: nil)
+        [NedbankApi.configuration.api_endpoint, path, suffix].compact.join('/')
       end
 
       def json_to_object(json)

data/lib/nedbank_api/authentications_api.rb

@@ -1,8 +1,13 @@
 module NedbankApi
   class AuthenticationsApi < ApiWrapper
     class << self
+      API_PATHS = {
+        request_token: 'nboauth/oauth20/token',
+        authorise: 'nboauth/oauth20/authorize'
+      }
+
       def request_token_light
-        http = Http.new(url: endpoint('/nboauth/oauth20/token'))
+        http = Http.new(url: endpoint(API_PATHS[:request_token]))
 
         response = http.post(
           body: URI.encode_www_form({
@@ -21,7 +26,7 @@ module NedbankApi
       end
 
       def request_token_heavy(request_body: {})
-        http = Http.new(url: endpoint('/nboauth/oauth20/token'))
+        http = Http.new(url: endpoint(API_PATHS[:request_token]))
 
         response = http.post(
           body: URI.encode_www_form({
@@ -40,7 +45,7 @@ module NedbankApi
       end
 
       def authorisation_url(request_body: {})
-        url = endpoint('/nboauth/oauth20/authorize')
+        url = endpoint(API_PATHS[:authorise])
 
         body = URI.encode_www_form({
             client_id: NedbankApi.configuration.client_id,

data/lib/nedbank_api/payments_api.rb

@@ -1,8 +1,14 @@
 module NedbankApi
   class PaymentsApi < ApiWrapper
     class << self
-      def create_intent(request_body: {})
-        http = Http.new(url: endpoint('/open-banking/payments'))
+
+      API_PATHS = {
+        payments: 'open-banking/payments',
+        payment_submissions: 'open-banking/payment-submissions'
+      }
+
+      def create_intent(request_body: {}, headers: {})
+        http = Http.new(url: endpoint(API_PATHS[:payments]))
 
         response = http.post(
           headers: auth_headers,
@@ -12,8 +18,8 @@ module NedbankApi
         return Models::Payment.new(json_to_object(response.body))
       end
 
-      def submit_payment(request_body: {})
-        http = Http.new(url: endpoint('/open-banking/payment-submissions'))
+      def submit_payment(request_body: {}, headers: {})
+        http = Http.new(url: endpoint(API_PATHS[:payment_submissions]))
 
         response = http.post(
           headers: auth_headers,
@@ -23,8 +29,8 @@ module NedbankApi
         return Models::PaymentSubmission.new(json_to_object(response.body))
       end
 
-      def get_payment_submission(payment_submission_id:)
-        http = Http.new(url: endpoint('/open-banking/payment-submissions/' + payment_submission_id))
+      def get_payment_submission(payment_submission_id:, headers: {})
+        http = Http.new(url: endpoint(API_PATHS[:payment_submissions], suffix: payment_submission_id))
 
         response = http.get(
           headers: auth_headers

data/lib/nedbank_api/services/http.rb

@@ -4,36 +4,33 @@ module NedbankApi
       @url = URI(url)
     end
 
-    def net_http
-      @net_http ||= Net::HTTP.new(@url.host, @url.port).tap do |http|
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      end
-    end
-
     def get(body: {}, headers: {})
       request = Net::HTTP::Get.new(@url)
-
-      headers.each do |key,value|
-        request[key] = value
-      end
-
-      request.body = body
-      response = net_http.request(request)
-
-      return response
+      make_request(request: request, body: body, headers: headers)
     end
+
     def post(body: {}, headers: {})
       request = Net::HTTP::Post.new(@url)
+      make_request(request: request, body: body, headers: headers)
+    end
 
+    def make_request(request:, body: {}, headers: {})
       headers.each do |key,value|
         request[key] = value
       end
 
       request.body = body
-      response = net_http.request(request)
+      net_http.request(request)
+    end
+
+    private
 
-      return response
+    def net_http
+      @net_http ||= Net::HTTP.new(@url.host, @url.port).tap do |http|
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      end
     end
+
   end
 end

data/lib/nedbank_api/version.rb

@@ -1,3 +1,3 @@
 module NedbankApi
-  VERSION = "0.2.2"
+  VERSION = "0.2.5"
 end

data/nedbank_api.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email = 'jonobth@gmail.com'
   s.metadata = { 'source_code_uri' => 'https://github.com/jono-booth/nedbank_api' }
 
-  s.files = `git ls-files -z`.split("\x0")
+  s.files = `git ls-files -z`.split("\x0").reject{ |f| f.end_with? '.gem' }
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files = s.files.grep(%r{^spec/})
   s.require_paths = ['lib']

data/spec/payments_api_spec.rb

@@ -1,4 +1,8 @@
 RSpec.describe NedbankApi::PaymentsApi do
+  before :each do
+    NedbankApi.intent_token = build(:fake_client)
+  end
+
   describe '.create_intent' do
     let(:request_body) { File.read('spec/support/payment/post_intent_request.json') }
     let(:response_body) { File.read('spec/support/payment/post_intent_response.json') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nedbank_api
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Jono Booth