vpos 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8370f4a90ad50fe5d01bfac9624ab58308ed93162e89f812d3c079666bcfe34d
-  data.tar.gz: 52eaab59d6381acd36fe3123838e044eb245d233d6dee5a512e37023e66b4287
+  metadata.gz: e865b5fffb4fe4f2e13e6bb282439885fd0a56274d3c4bc84c7ae45d90ef07e2
+  data.tar.gz: d83b8a685d97e8b8141c2cf5d9e43378dbdd0c955691e89ec9a130d036467033
 SHA512:
-  metadata.gz: c58b139c3f768eebe04c2c97fe5398ce1a9cb94c2e8fbaa04eff8449ff069493b26900c5cb7937beea387b0820fd594293aeed96f27d86b693bf28e04946fb54
-  data.tar.gz: bc3e0f3b9991fa73dbe7002bb73d14cbb3e52a6d3d0d2e4b632962784081da33ebf3113504f934478cc86f16e0c1e5f3d12c7f9ced3756d181cb600ab0831534
+  metadata.gz: 168cffa759c19a468b376b57c62dafffd2fcd1890fa3df9bdac4f9f8f7725b1f3362cee3f6b8791bdde808df7fc3c0418b658ec19f514be806ae59928617669b
+  data.tar.gz: 2a9af917900e0d8342db0e8bc9f5433d005d33d2865308a3eb407c9b943bb5d67c345b5377c9cc7dc27590d9cd6359ef26c5d171578ead1f288f2b39e1a6f0ed

data/.gitignore

@@ -24,3 +24,4 @@ test/version_tmp
 tmp
 example.rb
 .idea
+vendor/*

data/.ruby-version

@@ -1 +1 @@
-2.5.8
+3.0.2

data/Gemfile.lock

@@ -1,37 +1,33 @@
 PATH
   remote: .
   specs:
-    vpos (1.0.2)
-      concurrent-ruby
-      httparty (~> 0.18.1)
-      rspec (~> 3.9, >= 3.9.0)
+    vpos (2.0.0)
+      faraday (~> 2.3)
+      rspec (~> 3.11, >= 3.11.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    httparty (0.18.1)
-      mime-types (~> 3.0)
-      multi_xml (>= 0.5.2)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
-    multi_xml (0.6.0)
+    diff-lcs (1.5.0)
+    faraday (2.3.0)
+      faraday-net_http (~> 2.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (2.0.3)
     rake (12.3.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    ruby2_keywords (0.0.5)
 
 PLATFORMS
   ruby

data/README.md

@@ -23,7 +23,7 @@ See our documentation on [developer.vpos.ao](https://developer.vpos.ao)
 
 ## Installation
 ```ruby
-gem 'vpos', '~> 1.0.0'
+gem 'vpos', '~> 2.0.0'
 ```
 
 or 
@@ -52,17 +52,16 @@ The next section will show the various actions that can be performed by you, the
 require 'vpos'
 
 # use the default environment variables option
-merchant = Vpos.new
+vpos = Vpos.new
 
 # or use optional arguments option
-merchant = Vpos.new(token: 'your_token_here', environment: 'PRD')
+vpos = Vpos.new(token: 'your_token_here')
 ```
 
 #### Environment variables
 | Variable | Description | Required |
 | --- | --- | --- |
 | `GPO_POS_ID` | The Point of Sale ID provided by EMIS | true |
-| `GPO_SUPERVISOR_CARD` | The Supervisor card ID provided by EMIS | true |
 | `MERCHANT_VPOS_TOKEN` | The API token provided by vPOS | true |
 | `PAYMENT_CALLBACK_URL` | The URL that will handle payment notifications | false |
 | `REFUND_CALLBACK_URL` | The URL that will handle refund notifications | false |
@@ -74,65 +73,94 @@ or using one of the optional arguments
 | --- | --- | --- |
 | `token` | Token generated at [vPOS](https://merchant.vpos.ao) dashboard | `string`
 | `pos_id` | Merchant POS ID provided by EMIS | `string`
-| `supervisor_card` | Merchant Supervisor Card number provided by EMIS | `string`
 | `payment_callback_url` | Merchant application JSON endpoint to accept the callback payment response | `string`
 | `refund_callback_url` | Merchant application JSON endpoint to accept the callback refund response | `string`
-| `environment` | The vPOS environment, leave empty for `sandbox` mode and use `"PRD"` for `production`.  | `string` |
 
-### Get all Transactions
-This endpoint retrieves all transactions.
+### Get a specific Transaction
+Retrieves a transaction given a valid transaction ID using a env variable token.
 
 ```ruby
-transaction = merchant.get_transactions
+transaction = merchant.get_transaction(transaction_id: '1jHbXEbRTIbbwaoJ6w06nLcRG7X')
 ```
 
-### Get a specific Transaction
-Retrieves a transaction given a valid transaction ID.
+or
+
+Using a explicitly stated token
 
 ```ruby
-transaction = merchant.get_transaction('1jHbXEbRTIbbwaoJ6w06nLcRG7X')
+transaction = merchant.get_transaction(transaction_id: '1jHbXEbRTIbbwaoJ6w06nLcRG7X', token: 'EbRTIbb1jHbXEbRTIbbwaoJ6w06nLcRG7X')
 ```
 
-| Argument | Description | Type |
+| Argument | Description | Type | Required |
 | --- | --- | --- |
-| `id` | An existing Transaction ID | `string`
+| `transaction_id` | An existing Transaction ID | `string` | Yes |
+| `token` | Merchant token generated at vPOS merchant portal | `string` | No (if set as env variable) |
 
 ### New Payment Transaction
 Creates a new payment transaction given a valid mobile number associated with a `MULTICAIXA` account
-and a valid amount.
+and a valid amount using a env variable token.
 
 ```ruby
-payment = merchant.new_payment('900111222', '123.45')
+payment = merchant.new_payment(customer: '900111222', amount: '123.45')
 ```
 
-| Argument | Description | Type |
+or
+
+Using a explicitly stated token
+
+```ruby
+payment = merchant.new_payment(customer: '900111222', amount: '123.45', token: 'EbRTIbb1jHbXEbRTIbbwaoJ6w06nLcRG7X')
+```
+
+| Argument | Description | Type | Required |
 | --- | --- | --- |
-| `mobile` | The mobile number of the client who will pay | `string`
-| `amount` | The amount the client should pay, eg. "259.99", "259000.00" | `string`
+| `customer` | The mobile number of the client who will pay | `string` | Yes |
+| `amount` | The amount the client should pay, eg. "259.99", "259000.00" | `string` | Yes |
+| `token` | Merchant token generated at vPOS merchant portal | `string` | No (if set as env variable) |
+| `callback_url` | A valid https url where vPOS is going to callback as soon he finishes to process | `string` | No |
 
 ### Request Refund
-Given an existing `parent_transaction_id`, request a refund.
+Given an existing `parent_transaction_id`, request a refund using a env variable token.
 
 ```ruby
-refund = merchant.new_refund('1kTFGhJH8i58uD9MdJpMjWnoE')
+refund = merchant.new_refund(parent_transaction_id: '1kTFGhJH8i58uD9MdJpMjWnoE')
 ```
 
-| Argument | Description | Type |
+or
+
+Using a explicitly stated token
+
+```ruby
+refund = merchant.new_refund(parent_transaction_id: '1kTFGhJH8i58uD9MdJpMjWnoE', token: 'EbRTIbb1jHbXEbRTIbbwaoJ6w06nLcRG7X')
+```
+
+| Argument | Description | Type | Required |
 | --- | --- | --- |
 | `parent_transaction_id` | The ID of transaction you wish to refund | `string`
+| `token` | Merchant token generated at vPOS merchant portal | `string` | No (if set as env variable) |
+| `callback_url` | A valid https url where vPOS is going to callback as soon he finishes to process | `string` | No |
 
 ### Poll Transaction Status
-Poll the status of a transaction given a valid `request_id`. 
+Poll the status of a transaction given a valid `request_id` using a env variable token. 
 
 Note: The `request_id` in this context is essentially the `transaction_id` of an existing request. 
 
 ```ruby
-transaction = merchant.get_request('1jHbXEbRTIbbwaoJ6w06nLcRG7X')
+transaction = merchant.get_request(request_id: '1jHbXEbRTIbbwaoJ6w06nLcRG7X')
 ```
 
-| Argument | Description | Type |
+or
+
+Using a explicitly stated token
+
+```ruby
+transaction = merchant.get_request(request_id: '1jHbXEbRTIbbwaoJ6w06nLcRG7X', token: 'EbRTIbb1jHbXEbRTIbbwaoJ6w06nLcRG7X')
+```
+
+| Argument | Description | Type | Required? |
 | --- | --- | --- |
-| `request_id` | The ID of transaction you wish to poll | `string`
+| `request_id` | The ID of transaction you wish to poll | `string` | Yes |
+| `token` | Merchant token generated at vPOS merchant portal | `string` | No (if set as env variable) |
 
 ### Have any doubts?
 In case of any doubts, bugs, or the like, please leave an issue. We would love to help.

data/bin/.ruby-version

@@ -0,0 +1 @@
+3.0.2

data/lib/vpos/version.rb

@@ -1,3 +1,3 @@
 module VposModule
-  VERSION = "1.0.3"
+  VERSION = "2.0.0"
 end

data/lib/vpos.rb

@@ -1,40 +1,40 @@
 require_relative "vpos_module"
-require "concurrent"
 
 class Vpos
   include VposModule
-  include Concurrent::Async
 
-  def initialize(token: set_token, pos_id: default_pos_id, supervisor_card: default_supervisor_card, payment_callback_url: default_payment_callback_url, refund_callback_url: default_refund_callback_url)
+  def initialize(token: set_token, pos_id: default_pos_id, payment_callback_url: default_payment_callback_url, refund_callback_url: default_refund_callback_url)
     @token = token
     @pos_id = pos_id
-    @supervisor_card = supervisor_card
     @payment_callback_url = payment_callback_url
     @refund_callback_url = refund_callback_url
   end
 
   private
-
-  def default_pos_id
-    pos_id = ENV['GPO_POS_ID']
-    "#{pos_id}".to_i
-  end
-
-  def default_supervisor_card
-    supervisor_card = ENV['GPO_SUPERVISOR_CARD']
-    "#{supervisor_card}"
-  end
-
-  def set_token
-    token = ENV['MERCHANT_VPOS_TOKEN']
-    "Bearer #{token}"
-  end
-
-  def default_payment_callback_url
-    ENV['PAYMENT_CALLBACK_URL']
-  end
-
-  def default_refund_callback_url
-    ENV['REFUND_CALLBACK_URL']
-  end
+    def default_pos_id
+      pos_id = ENV['GPO_POS_ID']
+      unless !pos_id.nil?
+        return 111
+      end
+      "#{pos_id}".to_i
+    end
+
+    def set_token
+      token = ENV['MERCHANT_VPOS_TOKEN']
+      "Bearer #{token}"
+    end
+
+    def default_payment_callback_url
+      url = ENV['PAYMENT_CALLBACK_URL']
+      unless !url.nil?
+        return ""
+      end
+    end
+
+    def default_refund_callback_url
+      url = ENV['REFUND_CALLBACK_URL']
+      unless !url.nil?
+        return ""
+      end
+    end
 end

data/lib/vpos_module.rb

@@ -1,34 +1,49 @@
 require "vpos/version"
-require "httparty"
+require "faraday"
+require "json"
 require "securerandom"
 
 module VposModule
   class Error < StandardError; end
-  include HTTParty
-  follow_redirects false
 
-  def new_payment(customer, amount, pos_id: @pos_id, callback_url: @payment_callback_url)
-    content = set_headers
-    content[:body] = {type:"payment", pos_id: pos_id, mobile: customer, amount: amount, callback_url: callback_url}.to_json
-    request = HTTParty.post("#{host}/transactions", content)
-    return_vpos_object(request)
+  def new_payment(
+    customer: required,
+    amount: required,
+    pos_id: @pos_id,
+    callback_url: @payment_callback_url,
+    token: @token
+  )
+    conn = connection
+    response = conn.post('transactions') do |req|
+      req.headers['Authorization'] = token
+      req.body = { type: "payment", pos_id: pos_id, mobile: customer, amount: amount, callback_url: callback_url }.to_json
+    end
+    return_vpos_object(response)
   end
 
-  def new_refund(transaction_id, supervisor_card: @supervisor_card, callback_url: @refund_callback_url)
-    content = set_headers
-    content[:body] = {type: "refund", parent_transaction_id: transaction_id, supervisor_card: supervisor_card, callback_url: callback_url}.to_json
-    request = HTTParty.post("#{host}/transactions", content)
-    return_vpos_object(request)
+  def new_refund(parent_transaction_id: required, token: @token, callback_url: @refund_callback_url)
+    conn = connection
+    response = conn.post('transactions') do |req|
+      req.headers['Authorization'] = token
+      req.body = { type: "refund", parent_transaction_id: parent_transaction_id, callback_url: callback_url }.to_json
+    end
+    return_vpos_object(response)
   end
 
-  def get_transaction(transaction_id)
-    request = HTTParty.get("#{host}/transactions/#{transaction_id}", set_headers)
-    return_vpos_object(request)
+  def get_transaction(transaction_id: required, token: @token)
+    conn = connection
+    response = conn.get("transactions/#{transaction_id}") do |req|
+      req.headers['Authorization'] = token
+    end
+    return_vpos_object(response)
   end
 
   def get_request_id(response)
     if response[:location].nil?
-      HTTParty.get("#{host}/references/invalid", set_headers)
+      conn = connection
+      response = conn.get("references/invalid") do |req|
+        req.headers['Authorization'] = token
+      end
     else
       if response[:status_code] == 202
         response[:location].gsub("/api/v1/requests/", "")
@@ -38,31 +53,55 @@ module VposModule
     end
   end
 
-  def get_request(request_id)
-    request = HTTParty.get("#{host}/requests/#{request_id}", set_headers)
-    return_vpos_object(request)
+  def get_request(request_id: required, token: @token)
+    conn = connection
+    response = conn.get("requests/#{request_id}") do |req|
+      req.headers['Authorization'] = token
+    end
+    return_vpos_object(response)
   end
 
   private
-    def return_vpos_object(request)
-      case request.response.code.to_i
-      when 200, 201
-        return {status_code: request.response.code.to_i, message: request.response.message, data: request.parsed_response}
+    def return_vpos_object(response)
+      case response.status
+      when 200
+        return { status_code: response.status, message: 'OK', data: JSON.parse(response.body).transform_keys(&:to_sym) }
+      when 201
+        return { status_code: response.status, message: 'CREATED', data: response.body }
       when 202, 303
-        return {status_code: request.response.code.to_i, message: request.response.message, location: request.headers["location"]}
+        return { status_code: response.status, message: 'ACCEPTED', location: response.headers["location"]}
+      when 401
+        return { status_code: response.status, message: 'UNAUTHORIZED' }
+      when 404
+        return { status_code: response.status, message: 'NOT FOUND' }
       else
-        return {status_code: request.response.code.to_i, message: request.response.message, details: request.parsed_response["errors"]}
+        return { status_code: response.status, message: response.status, details: JSON.parse(response.body).transform_keys(&:to_sym) }
       end
     end
 
     def set_headers
-      content = {}
-      headers = {'Content-Type' => "application/json", 'Accept' => "application/json", 'Authorization' => @token, 'Idempotency-Key' => SecureRandom.uuid}
-      content[:headers] = headers
-      content
+      headers = {'Content-Type' => "application/json", 'Accept' => "application/json", 'Idempotency-Key' => SecureRandom.uuid}
     end
 
     def host
-      "https://api.vpos.ao/api/v1"
+      "https://vpos.ao/api/v1"
+    end
+
+    def params
+      params = {}
+    end
+
+    def connection
+      conn = Faraday.new(
+        url: host,
+        params: params,
+        headers: set_headers
+      )
+    end
+
+    def required
+      method = caller_locations(1,1)[0].label
+      raise ArgumentError,
+        "A required keyword argument was not specified when calling '#{method}'"
     end
 end

data/vpos.gemspec

@@ -22,9 +22,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.3'
+  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.3.14'
   spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
-  spec.add_dependency 'httparty', '~> 0.18.1'
-  spec.add_dependency 'concurrent-ruby'
-  spec.add_dependency 'rspec', '~> 3.9', ">= 3.9.0"
-end
+  spec.add_dependency 'faraday', '~> 2.3'
+  spec.add_dependency 'rspec', '~> 3.11', ">= 3.11.0"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vpos
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Sergio Maziano
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -19,7 +19,7 @@ dependencies:
         version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.3.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.3.14
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -51,53 +51,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.11.0
 description: The one stop shop for online payments in Angola, allowing you to process
   payments requests from EMIS GPO through vPOS.
 email:
@@ -114,6 +100,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/.ruby-version
 - bin/console
 - bin/setup
 - lib/vpos.rb
@@ -125,7 +112,7 @@ homepage: https://github.com/v-pos/vpos-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -140,9 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
-signing_key:
+rubygems_version: 3.2.22
+signing_key: 
 specification_version: 4
 summary: The one stop shop for online payments in Angola.
 test_files: []