paynl 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66eee66c94170b3de1f74c75654ad1fe49556e3d6c572d78a2f6a5c78275d113
-  data.tar.gz: dc6bb8747cc2640cc0c2b134bbc65785f4bd8f5ae46f554e6fbe5ca37ef5b0bd
+  metadata.gz: 4519098345b93aafef2fdca13a3db5539c1409d8c90fba79b93ec20e27e9b4a7
+  data.tar.gz: 206a0cf8f40ab3680af5b28f6d9a890384d2b1a064f0026af89ea2b2b8efc78d
 SHA512:
-  metadata.gz: 4e5f855742aeab5b994164fb0e2a57e68ac5d04c1b2026b70ad3210404239b30a75a29f2e6a4b4dc4a75a6abd2f43b6f34bbf82f3002e9c2c0955d464017e010
-  data.tar.gz: 4fd2b5d003733dbbb22c33ce9766124057bd0e499904b1b435e5da809851aa0f269282c6cd64c69389a74e6658b158816c3a4380911eb06110317f7c7d8099a8
+  metadata.gz: 4a696a0a1a098a624d4c6783bc297eeb3344cfdd7f7a438e277fe2df22763779d68d2401bf89de756ccee6d763fb3bd88c8f87dfad0c0b6f2b6fe15dfcfdf8e8
+  data.tar.gz: cac50aea97db25bbc4ba871431153d332d97856de07a0a49d6f55c2c33c988710b778f1f6da0069046ee7461cdf3962ac400420dc96b6b10e8b8167b1d611375

data/.gitlab-ci.yml

@@ -0,0 +1,41 @@
+image: "ruby:2.7"
+
+
+before_script:
+  - ruby -v  # Print out ruby version for debugging
+  - bundle install
+  - gem install rspec
+  - mkdir ~/.gem || true
+  - touch ~/.gem/credentials || true
+  - url_host=`git remote get-url origin | sed -e "s/https:\/\/gitlab-ci-token:.*@//g"`
+    # runner runs on a detached HEAD, checkout current branch for editing
+  - git reset --hard
+  - git clean -fd
+  - git checkout $CI_COMMIT_REF_NAME
+  - git pull origin $CI_COMMIT_REF_NAME
+  - |-
+     echo "---
+     :rubygems_api_key: $RUBYGEM_KEY" > ~/.gem/credentials
+  - chmod 600 ~/.gem/credentials
+
+rspec:
+  stage: test
+  script:
+    - rspec spec
+
+build:
+  stage: build
+  script:
+    - rake build
+
+prepare_deployment:
+  stage: deploy
+  only:
+    - web
+  script:
+    - rake spec
+    - rake build
+    - git config --global user.email "sebastian@sebsoft.nl"
+    - git config --global user.name "Sebastian Berm"
+    - git remote set-url origin "https://$GIT_ACCESS_USER:$GIT_ACCESS_PASSWORD@${url_host}"
+    - rake release

data/README.md

@@ -30,8 +30,8 @@ Or install it yourself as:
     $ gem install paynl
 
 ## Requirements
-This gem requires Ruby 1.9.2+.
-We have tested this gem with Ruby 2.2.1.
+This gem requires Ruby 2.5+.
+We have tested this gem with Ruby 2.5, 2.6 and 2.7.
 
 ## Usage
 
@@ -46,6 +46,7 @@ require 'paynl'
 
 Paynl::Config::setApiToken('e41f83b246b706291ea9ad798ccfd9f0fee5e0ab')
 Paynl::Config::setServiceId('SL-3490-4320')
+Paynl::Config::setTokenCode('AT-code-here')
 ```
 
 Getting a list of available payment methods for your site:
@@ -54,6 +55,7 @@ require 'paynl'
 
 Paynl::Config::setApiToken('e41f83b246b706291ea9ad798ccfd9f0fee5e0ab')
 Paynl::Config::setServiceId('SL-3490-4320')
+Paynl::Config::setTokenCode('AT-code-here')
 api = Paynl::Paymentmethods.new
 options = Hash.new
 puts api.getList(options)
@@ -65,6 +67,7 @@ require 'paynl'
 
 Paynl::Config::setApiToken('e41f83b246b706291ea9ad798ccfd9f0fee5e0ab')
 Paynl::Config::setServiceId('SL-3490-4320')
+Paynl::Config::setTokenCode('AT-code-here')
 
 data = Paynl::Transaction.new
 options = Hash.new
@@ -147,6 +150,7 @@ require 'paynl'
 
 Paynl::Config::setApiToken('e41f83b246b706291ea9ad798ccfd9f0fee5e0ab')
 Paynl::Config::setServiceId('SL-3490-4320')
+Paynl::Config::setTokenCode('AT-code-here')
 
 data = Paynl::Transaction.new
 result = data.getTransaction(transactionId)
@@ -163,6 +167,7 @@ require 'paynl'
 
 Paynl::Config::setApiToken('e41f83b246b706291ea9ad798ccfd9f0fee5e0ab')
 Paynl::Config::setServiceId('SL-3490-4320')
+Paynl::Config::setTokenCode('AT-code-here')
 
 data = Paynl::Transaction.new
 result = data.getTransaction(transactionId)

data/lib/paynl.rb

@@ -1,21 +1,21 @@
 require 'yaml'
 require 'typhoeus'
 require 'json'
-require 'paynl/api/api'
-require 'paynl/error/required/serviceiderror'
-require 'paynl/error/required/apitokenerror'
-require 'paynl/error/requirederror'
-require 'paynl/helper'
-require 'paynl/version'
-require 'paynl/api/validate/is_pay_server_ip'
-require 'paynl/api/validate/get_pay_server_ips'
-require 'paynl/api/transaction/get_service'
-require 'paynl/api/transaction/start_transaction'
-require 'paynl/api/transaction/info'
-require 'paynl/api/transaction/refund'
-require 'paynl/api/api'
-require 'paynl/config'
-require 'paynl/transaction'
-require 'paynl/paymentmethods'
-require 'paynl'
+require_relative 'paynl/api/api'
+require_relative 'paynl/error/required/serviceiderror'
+require_relative 'paynl/error/required/apitokenerror'
+require_relative 'paynl/error/requirederror'
+require_relative 'paynl/helper'
+require_relative 'paynl/version'
+require_relative 'paynl/api/validate/is_pay_server_ip'
+require_relative 'paynl/api/validate/get_pay_server_ips'
+require_relative 'paynl/api/transaction/get_service'
+require_relative 'paynl/api/transaction/start_transaction'
+require_relative 'paynl/api/transaction/info'
+require_relative 'paynl/api/transaction/refund'
+require_relative 'paynl/api/api'
+require_relative 'paynl/config'
+require_relative 'paynl/transaction'
+require_relative 'paynl/paymentmethods'
+require_relative 'paynl'
 

data/lib/paynl/api/api.rb

@@ -44,14 +44,25 @@ module Paynl
 
         data = getData
         uri = Paynl::Config::getApiUrl(endpoint, version)
-        # puts uri
-        # puts data
-        # Code to actually do the CURL request
-        response = Typhoeus::Request.post(
-            uri,
-            params: data,
-            :headers => { 'User-Agent' => 'Ruby SDK ' + VERSION }
-        )
+        #puts uri
+        #puts data
+
+        if isServiceIdRequired
+          # Code to actually do the CURL request
+          response = Typhoeus::Request.post(
+              uri,
+              params: data,
+              userpwd: Paynl::Config::getTokenCode + ':' + Paynl::Config::getApiToken,
+              :headers => { 'User-Agent' => 'Ruby SDK ' + VERSION }
+          )          
+        else
+          # Code to actually do the CURL request
+          response = Typhoeus::Request.post(
+              uri,
+              params: data,
+              :headers => { 'User-Agent' => 'Ruby SDK ' + VERSION }
+          )
+        end
 
         # if response.code != 200
         #   raise 'API error'

data/lib/paynl/api/transaction/get_service.rb

@@ -14,7 +14,7 @@ module Paynl
 
       def doRequest
         # TODO: add caching to this
-        return super('transaction/getService', nil)
+        return super('transaction/getService', 16)
       end
     end
   end

data/lib/paynl/config.rb

@@ -1,10 +1,21 @@
 module Paynl
   class Config
     @@apiToken=''
+    @@tokenCode=''
     @@serviceId=''
     @@apiBase='https://rest-api.pay.nl'
     @@apiVersion=5
 
+    # getTokenCode - Retrieves Pay.nl tokencode
+    def self.getTokenCode
+      return @@tokenCode
+    end
+
+    # setTokenCode - Sets Pay.nl tokencode
+    def self.setTokenCode(tokenCode)
+      @@tokenCode = tokenCode
+    end
+
     # getApiToken - Retrieves Pay.nl api token
     def self.getApiToken
       return @@apiToken

data/lib/paynl/helper.rb

@@ -2,11 +2,17 @@ module Paynl
   class Helper
     def self.requireApiToken
       apiToken = Paynl::Config::getApiToken
+      tokenCode = Paynl::Config::getTokenCode
 
       # Hmm, porting PHP to Ruby is crap if you want to keep the structure
       if apiToken == nil? or apiToken == ''
         raise Paynl::Error::Required::ApiTokenError, 'Api token is required'
       end
+
+      if tokenCode == nil? or tokenCode == ''
+        raise Paynl::Error::Required::ApiTokenError, 'Api token code (AT-code) is required'
+      end
+      
     end
 
     def self.requireServiceId

data/lib/paynl/version.rb

@@ -1,3 +1,3 @@
 module Paynl
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paynl
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Sebastian Berm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
 - ".travis.yml"
 - Gemfile