quickpay-ruby-client 1.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0db8d46e31a28416b4e0b7ade182b396ee10be52
-  data.tar.gz: 9c4fd8fef2c3a3b64730ae8f62be8d9a00f71822
+SHA256:
+  metadata.gz: 47a7b8b3bec59cf6276448d2e8eb29149288518b12d0df8e377fc10783bb6090
+  data.tar.gz: d80a3b9b3deda68bea662dd67a5937ea724a7aa58d44ec7fde61c74c588b9e43
 SHA512:
-  metadata.gz: c2690337637c7f098400ce849070d70fd6dbddc18fd55d49b3a8d20ef3902009a56eb7954c5364193e5ec3430b6867a6d32eba992dd8218521fe5d635b5dc560
-  data.tar.gz: f35af9f1e711344682fedb0540f7f58093c051dde49cef89fb6ed8786dcb8922558ee2c775e7c41406bdc051dafe84130f6c449fca29f9803c5f897fe41a59e4
+  metadata.gz: cadad5ea2172320dd9133e6e8534d08cc1475d1b3d8d66839686eebaeba74000e0b162f8332b118cc21794299970a3c938b199f85ceff6a5b44c37405164ffaa
+  data.tar.gz: c46b7f639b9f9359c53206a02583c5c593535601541cd8a75861666b943db5a629edfb7df58d6b25615450758b8ffa461bcb668a002b7022e511f7f2acd85ede

data/.gitignore

@@ -1,9 +1,4 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
+.bundle/
+coverage/
+pkg/
+Gemfile.lock

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 rvm:
-  - 2.1.2
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
 cache: bundler
-script: bundle exec rspec --format documentation --color
+before_script: wget -O ~/.rubocop.yml https://quickpay.github.io/development/.rubocop.yml
+script: bundle exec rake
 notifications:
   slack:
     secure: SixeTgiVsOaeWyKwICxLJ0GLN/C9j6qW1ZdaEytIDuZaBAn9oArrRGkJiehFdlzcPUHwzMWC0vl9GQzyBhZ7dbq+B53QY1mH9LTb9A53Y2d1OO1kBjJAkC5Yprvpjm52+x889Dwlz0bfLETvLsC2ej0NZDvSSLKFjpZZIZMOWkg=

data/CHANGELOG.md

@@ -1,23 +1,86 @@
 # Changelog
 
+## 3.0.0
 
-## Unreleased
+### Breaking changes
 
-### Features:
+The interface has been changed to (https://github.com/QuickPay/quickpay-ruby-client/pull/36):
 
-(your contribution here)
+- always return an array for all request types (incl. when adding the `raw: true` option)
+- order the array as `[body, status, headers]` (was `[status, body, headers]`
+- always parse JSON body unless the `raw: true` option is set
 
-### Bugfixes
+The reasoning is that we almost always want the `body`, but in some case we want `status`and/or `headers` as well. Before we had to set the `raw: true` option, but then a JSON body would not be parsed.
 
-(your contribution here)
+```ruby
+body, = client.get("/ping")
+body, status, = client.get("/ping")
+body, status, headers = client.get("/ping")
+body, status, headers = client.get("/ping", raw: true)
+```
+
+### New features
+
+#### Blocks
+
+You can now pass a block to a request (https://github.com/QuickPay/quickpay-ruby-client/pull/32):
+
+```ruby
+msg = client.get("/ping") do |body, status, headers, error|
+  case error
+  when nil
+    body["msg"]
+  when QuickPay::API::NotFound
+    nil
+  else
+    raise error
+  end
+end
+```
+
+#### Verbose errors
+
+The `QuickPay::API::Error` now includes the request that yielded the error - for example:
+
+```
+#<QuickPay::API::Error::NotFound:
+  status=404,
+  body="404 Not Found",
+  headers={"Server"=>"nginx", "Date"=>"Sun, 21 Mar 2021 09:10:12 GMT", "Connection"=>"keep-alive", "X-Cascade"=>"pass", "Vary"=>"Origin"}
+  request=#<struct QuickPay::API::Client::Request
+    method=:post,
+    path="/payments",
+    body="{\"currency\":\"DKK\",\"order_id\":\"1212\"}",
+    headers={"User-Agent"=>"quickpay-ruby-client, v2.0.3", "Accept-Version"=>"v10", "Content-Type"=>"application/json"},
+    query=nil>>
+```
+
+## v2.0.3
+
+* Add the possibility of settins options for JSON parser
+
+## v2.0.2
+
+* Update excon dependency for CVE-2019-16779 (prognostikos)
+
+## v2.0.1
+
+* More verbose `#to_s`/`#inspect` on errors
+
+## v2.0.0
+
+* This is a total rewrite and while the code is cleaner, simpler and faster, it does present some **breaking changes compared to v1.X.X**:
+    * The client now accepts arguements `username` instead of `password` and `api_key` has been removed. To authenticate with an API key, simply set `password: <key>` and omit username.
+    * The request methods now accepts request body as an named option (`client.post(<endpoint>, body: { amount: 100 })`) rather than a hash of body params (`client.post(<endpoint>, amount: 100)`).
+* Replace the following dependencies - which reduces the total number of dependencies to 5 (was 27):
+    * HTTParty => Excon (https://github.com/excon/excon) - which luckily means no more partying hard.
+    * Rspec => Minitest
 
 ## v1.2.0 (2016-10-25)
 
- - Can now HEAD (https://github.com/QuickPay/quickpay-ruby-client/pull/21)
+* Can now HEAD (https://github.com/QuickPay/quickpay-ruby-client/pull/21)
 
 ## v1.1.0 (2016-01-11)
 
-### Features:
-
- - Send options to the underlaying HTTParty (https://github.com/QuickPay/quickpay-ruby-client/pull/16)
- - Be able to upload files (https://github.com/QuickPay/quickpay-ruby-client/pull/17<Paste>)
+* Send options to the underlaying HTTParty (https://github.com/QuickPay/quickpay-ruby-client/pull/16)
+* Be able to upload files (https://github.com/QuickPay/quickpay-ruby-client/pull/17<Paste>)

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in quickpay-ruby-client.gemspec
 gemspec

data/README.md

@@ -1,20 +1,26 @@
-quickpay-ruby-client
-======================
+# QuickPay::API::Client
+
 [![Build Status](https://travis-ci.org/QuickPay/quickpay-ruby-client.svg)](https://travis-ci.org/QuickPay/quickpay-ruby-client)
 
-`quickpay-ruby-client` is a official client for [QuickPay API](http://tech.quickpay.net/api). The Quickpay API enables you to accept payments in a secure and reliable manner. This gem currently support QuickPay `v10` api.
+The `quickpay-ruby-client` gem is a official client for [QuickPay API](https://learn.quickpay.net/tech-talk/api). The Quickpay API enables you to accept payments in a secure and reliable manner.
+
+This gem currently support QuickPay `v10` api.
 
 ## Installation
 
 Add to your Gemfile
-  
-    $ gem 'quickpay-ruby-client'
+
+```ruby
+gem "quickpay-ruby-client"
+```
 
 or install from Rubygems:
-  
-    $ gem install quickpay-ruby-client
-  
-It is currently tested with Ruby ( >= 2.1.x)
+
+```
+$ gem install quickpay-ruby-client
+```
+
+It is currently tested with Ruby ( >= 2.5.x)
 
 * MRI
 * Rubinius (2.0)
@@ -25,63 +31,122 @@ Before doing anything you should register yourself with QuickPay and get access
 
 ### Create a new API client
 
-First you should create a client instance that is anonymous or authorized with `api_key` or login credentials provided by QuickPay. 
+First you should create a client instance that is anonymous or authorized with your API key or login credentials provided by QuickPay.
 
 To initialise an anonymous client:
 
-```
-require 'quickpay/api/client'
+```ruby
+require "quickpay/api/client"
 client = QuickPay::API::Client.new
 ```
 
-To initialise a client with QuickPay Api Key:
+To initialise a client with QuickPay API Key:
 
-```
-require 'quickpay/api/client'
-client = QuickPay::API::Client.new(api_key: ENV['QUICKPAY_API_KEY'])
+```ruby
+require "quickpay/api/client"
+client = QuickPay::API::Client.new(password: ENV["QUICKPAY_API_KEY"])
 ```
 
 Or you can provide login credentials like:
 
-```
-require 'quickpay/api/client'
-client = QuickPay::API::Client.new(email: ENV['QUICKPAY_LOGIN'], password: ENV['QUICKPAY_PASSWORD'])
+```ruby
+require "quickpay/api/client"
+client = QuickPay::API::Client.new(username: ENV["QUICKPAY_LOGIN"], password: ENV["QUICKPAY_PASSWORD"])
 ```
 
-To pass request specific headers:
+You can also set some connection specific options (default values shown):
 
+```ruby
+client = QuickPay::API::Client.new(
+  options: {
+    read_timeout: 60,
+    write_timeout: 60,
+    connect_timeout: 60,
+    json_opts: { symbolize_names: false }
+  }
+)
 ```
-client = Quickpay::API::Client.new({ email: ENV['QUICKPAY_LOGIN'], password: ENV['QUICKPAY_PASSWORD'] }, 
-                                   :headers => { 'QuickPay-Callback-URL' => 'https://webshop.com' }) 
-```
 
+### Sending request
+
+You can afterwards call any method described in QuickPay API with corresponding http method and endpoint. These methods are supported currently: `get`, `post`, `put`, `patch`, `delete` and `head`.
+
+Any request will return an array in the form `[body, status, headers]`:
 
-### API Calls
+```ruby
+# Shortest form when interested in the response body only
+body, = client.get("/ping")
+puts body.inspect
 
-You can afterwards call any method described in QuickPay api with corresponding http method and endpoint. These methods are supported currently: `get`, `post`, `put`, `patch` and `delete`.
+# Get all response information
+body, status, headers = client.get("/ping")
+puts body.inspect, status.inspect, headers.inspect
 
 ```
-client.get("/activity").each do |activity|
-  puts activity["id"]
-end
 
+You can also do requests in block form:
+
+```ruby
+client.get("/ping") do |body, status, headers|
+  puts body.inspect
+end
 ```
 
-If you want raw http response, headers Please add `:raw => true` parameter:
+It is even possible to pass the `QuickPay::API::Error` to the block as the 4th parameter to be able to handle the errors that _would_ have otherwise been raised. This parameter is nil when the response is a success.
 
+```ruby
+# the error is not raised but passed to the block as the fourth parameter
+client.get("/ping") do |body, status, headers, error|
+  case error
+  when nil
+    body[:id]
+  when QuickPay::API::NotFound
+    nil
+  else
+    raise error
+  end
+end
+
+# will raise `QuickPay::API::Error::NotFound` since the fourth block param is not defined
+client.get("/non-existing-path") do |body, status, headers| do
+end
 ```
-status, body, headers = client.get("/activity", :raw => true)
+
+If you want raw http response body, you can add `:raw => true` parameter:
+
+```ruby
+body, status, headers = client.get("/ping", raw: true)
 
 if status == 200
-  JSON.parse(body).each do |activity|
-    puts activity["id"]
-  end
+  puts JSON.parse(body).inspect
 else
-  puts "Error: #{body}"
+  # do something else
 end
 
 ```
 
+Beyond the endpoint, the client accepts the following options (default values shown):
+
+  * `body: ""`
+  * `headers: {}`
+  * `query: {}`
+  * `raw: false`
+  * `json_opts: nil`
+
+Full example:
+
+```ruby
+response, = client.post(
+  "/payments/1/capture",
+  body: { amount: 100 }.to_json,
+  headers: { "Content-Type" => "application/json" },
+  query: { "synchronized" => "" },
+  raw: false,
+  json_opts: { symbolize_names: true }
+)
+
+```
+
 ### Handling API exceptions
 
 By default `(get|post|patch|put|delete)` will return JSON parsed body on success (i.e. `2xx` response code) otherwise it will raise appropriate error. Your code should handle the errors appropriately. Following error codes are supported currently:
@@ -90,7 +155,7 @@ By default `(get|post|patch|put|delete)` will return JSON parsed body on success
 Response status |  Error    |
 ----------------| ----------|
 `400` | `QuickPay::API::BadRequest`
-`401` | `QuickPay::API::Unauthorized` 
+`401` | `QuickPay::API::Unauthorized`
 `402` | `QuickPay::API::PaymentRequired`
 `403` | `QuickPay::API::Forbidden`
 `404` | `QuickPay::API::NotFound`
@@ -98,26 +163,43 @@ Response status |  Error    |
 `406` | `QuickPay::API::NotAcceptable`
 `409` | `QuickPay::API::Conflict`
 `500` | `QuickPay::API::ServerError`
+`502` | `QuickPay::API::BadGateway`
+`503` | `QuickPay::API::ServiceUnavailable`
+`504` | `QuickPay::API::GatewayTimeout`
 
 All exceptions inherits `QuickPay::API::Error`, so you can listen for any api error like:
 
-```
+```ruby
 begin
-  client.post("/payments", :currency => :DKK, :order_id => '1212')
-  ... 
+  client.post("/payments", body: { currency: "DKK", order_id: "1212" }, headers: { "Content-Type" => "application/json" })
 rescue QuickPay::API::Error => e
-  puts e.body
+  puts e.inspect
 end
 ```
 
-You can read more about api responses at [http://tech.quickpay.net/api/](http://tech.quickpay.net/api).
+Example error object:
+
+```
+#<QuickPay::API::Error::NotFound:
+  status=404,
+  body="404 Not Found",
+  headers={"Server"=>"nginx", "Date"=>"Sun, 21 Mar 2021 09:10:12 GMT", "Connection"=>"keep-alive", "X-Cascade"=>"pass", "Vary"=>"Origin"}
+  request=#<struct QuickPay::API::Client::Request
+    method=:post,
+    path="/payments",
+    body="{\"currency\":\"DKK\",\"order_id\":\"1212\"}",
+    headers={"User-Agent"=>"quickpay-ruby-client, v2.0.3", "Accept-Version"=>"v10", "Content-Type"=>"application/json"},
+    query=nil>>
+```
+
+You can read more about QuickPay API responses at [https://learn.quickpay.net/tech-talk/api](https://learn.quickpay.net/tech-talk/api).
 
 ## Contributions
 
 To contribute:
 
-1. Write a spec that fails
-2. Fix spec by adding/changing code
+1. Write a test that fails
+2. Fix test by adding/changing code
 3. Add feature or bugfix to changelog in the "Unreleased" section
 4. Submit a pull request
 5. World is now a better place! :)
@@ -125,5 +207,5 @@ To contribute:
 ### Running the specs
 
 ```
-bundle exec rspec
+$ bundle exec rake test
 ```

data/Rakefile

@@ -1 +1,33 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+require "rubocop/rake_task"
+
+task default: :test
+
+desc "Open an irb/pry session"
+task :console do
+  exec "bin/console"
+end
+
+namespace :test do
+  RuboCop::RakeTask.new
+
+  task :opts do
+    ENV["TESTOPTS"] = "--verbose"
+  end
+
+  desc "Run tests"
+  task :specs do |t|
+    Rake::TestTask.new(t.name) do |tt|
+      tt.libs << "."
+      tt.test_files = Dir.glob("test/*.rb")
+      tt.warning = false
+    end
+  end
+
+  desc "Run tests with verbose output"
+  task verbose: %i[opts test]
+end
+
+desc "Run test suite"
+task test: ["test:specs", "test:rubocop"]

data/bin/console

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+ENV["APP_KIND"] = "console"
+APP_ROOT = File.realdirpath(File.expand_path("..", __dir__))
+$LOAD_PATH.unshift(APP_ROOT)
+
+require "irb"
+require "lib/quickpay/api/client"
+
+CLIENT = QuickPay::API::Client.new
+
+ARGV.clear
+IRB.start

data/lib/quickpay/api/client.rb

@@ -1,34 +1,81 @@
-require 'quickpay'
-require 'quickpay/api/request'
-require 'quickpay/api/errors'
+require "excon"
+require "json"
+require "quickpay/api/error"
+require "quickpay/api/version"
 
 module QuickPay
-  class << self
-    attr_accessor :base_uri
-  end
-
   module API
     class Client
-      attr_accessor :options
-      
-      def initialize(auth_params = {}, opts = {})
-        opts[:secret]   ||= extract_auth(auth_params)
-        opts[:base_uri] ||= (QuickPay.base_uri || QuickPay::BASE_URI)
+      DEFAULT_HEADERS = {
+        "User-Agent" => "quickpay-ruby-client, v#{QuickPay::API::VERSION}",
+        "Accept-Version" => "v10"
+      }.freeze
+
+      Request = Struct.new(:method, :path, :body, :headers, :query) # rubocop:disable Lint/StructNewOverride
+
+      def initialize(username: nil, password: nil, base_uri: "https://api.quickpay.net", options: {})
+        opts = {
+          read_timeout: options.fetch(:read_timeout, 60),
+          write_timeout: options.fetch(:write_timeout, 60),
+          connect_timeout: options.fetch(:connect_timeout, 60),
+          json_opts: options.fetch(:json_opts, nil)
+        }
 
-        @options = opts.dup
+        opts[:username] = Excon::Utils.escape_uri(username) if username
+        opts[:password] = Excon::Utils.escape_uri(password) if password
+
+        @connection = Excon.new(base_uri, opts)
       end
-      
-      def extract_auth params
-        if params[:email] and params[:password]  
-          "#{params[:email]}:#{params[:password]}"
-        elsif params[:api_key]
-          ":#{params[:api_key]}"
+
+      %i[get post patch put delete head].each do |method|
+        define_method(method) do |path, **options, &block|
+          headers = DEFAULT_HEADERS.merge(options.fetch(:headers, {}))
+          body    = begin
+            data = options.fetch(:body, "")
+            if headers["Content-Type"] == "application/json" && data.instance_of?(Hash)
+              data.to_json
+            else
+              data
+            end
+          end
+
+          req = Request.new(
+            method,
+            path,
+            scrub_body(body.dup, headers["Content-Type"]),
+            headers,
+            options.fetch(:query, {})
+          ).freeze
+
+          res = @connection.request(**req.to_h)
+          error = QuickPay::API::Error.by_status_code(res.status, res.body, res.headers, req)
+
+          if !options.fetch(:raw, false) && res.headers["Content-Type"] =~ %r{application/json}
+            res.body = JSON.parse(res.body, options[:json_opts] || @connection.data[:json_opts])
+          end
+
+          if block
+            # Raise error if not specified as fourth block parameter
+            raise error if error && block.parameters.size < 4
+
+            block.call(res.body, res.status, res.headers, error)
+          else
+            raise error if error
+
+            [res.body, res.status, res.headers]
+          end
         end
       end
 
-      [:get, :post, :patch, :put, :delete, :head].each do |method|
-        define_method(method) do |*args|
-          Request.new(options).request(method, *args)
+      private
+
+      def scrub_body(body, content_type)
+        return "" if body.to_s.empty?
+
+        if ["application/json", "application/x-www-form-urlencoded"].include?(content_type)
+          body
+        else
+          "<scrubbed for Content-Type #{content_type}>"
         end
       end
     end

data/lib/quickpay/api/error.rb

@@ -0,0 +1,68 @@
+module QuickPay
+  module API
+    class Error < StandardError
+      class BadRequest < Error; end
+
+      class Unauthorized < Error; end
+
+      class PaymentRequired < Error; end
+
+      class Forbidden < Error; end
+
+      class NotFound < Error; end
+
+      class MethodNotAllowed < Error; end
+
+      class NotAcceptable < Error; end
+
+      class Conflict < Error; end
+
+      class TooManyRequest < Error; end
+
+      class InternalServerError < Error; end
+
+      class BadGateway < Error; end
+
+      class ServiceUnavailable < Error; end
+
+      class GatewayTimeout < Error; end
+
+      CLASS_MAP = {
+        400 => BadRequest,
+        401 => Unauthorized,
+        402 => PaymentRequired,
+        403 => Forbidden,
+        404 => NotFound,
+        405 => MethodNotAllowed,
+        406 => NotAcceptable,
+        409 => Conflict,
+        429 => TooManyRequest,
+        500 => InternalServerError,
+        502 => BadGateway,
+        503 => ServiceUnavailable,
+        504 => GatewayTimeout
+      }.freeze
+
+      attr_reader :status, :body, :headers, :request
+
+      def initialize(status, body, headers, request)
+        @status  = status
+        @body    = body
+        @headers = headers
+        @request = request
+      end
+
+      def to_s
+        "#<#{self.class}: status=#{status}, body=#{body.inspect}, " \
+        "headers=#{headers.inspect} request=#{request.inspect}>"
+      end
+      alias_method :inspect, :to_s
+
+      def self.by_status_code(status, body, headers, request)
+        return if (200..399).cover? status
+
+        CLASS_MAP.fetch(status, QuickPay::API::Error).new(status, body, headers, request)
+      end
+    end
+  end
+end

data/lib/quickpay/api/{errors/conflict.rb → version.rb}

@@ -1,7 +1,5 @@
-
 module QuickPay
   module API
-    class Conflict < Error
-    end
+    VERSION = "3.0.0".freeze
   end
 end

data/quickpay-ruby-client.gemspec

@@ -1,16 +1,17 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'quickpay/version'
+require "quickpay/api/version"
 
 Gem::Specification.new do |spec|
+  spec.required_ruby_version = ">= 2.5.0" # rubocop:disable Gemspec/RequiredRubyVersion
+
   spec.name          = "quickpay-ruby-client"
-  spec.version       = QuickPay::VERSION
+  spec.version       = QuickPay::API::VERSION
   spec.authors       = ["QuickPay Developers"]
   spec.email         = ["support@quickpay.net"]
 
   spec.summary       = "Ruby client for QuickPay API"
-  spec.description   = "Embed QuickPay's secure payments directly into your Ruby applications. more at https://tech.quickpay.net"
+  spec.description   = "Embed QuickPay's secure payments directly into your Ruby applications. Learn more at https://tech.quickpay.net"
   spec.homepage      = "https://github.com/QuickPay/quickpay-ruby-client"
   spec.license       = "MIT"
 
@@ -19,11 +20,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.2"
-  spec.add_development_dependency "rspec-mocks"
-  spec.add_development_dependency "webmock", "~> 1.24"
-  spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov-console"
 
-  spec.add_dependency "httmultiparty", "~> 0.3.16"
+  spec.add_dependency "excon", "~> 0.79.0"
+  spec.add_dependency "json", "~> 2.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickpay-ruby-client
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - QuickPay Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,35 +25,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-mocks
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,21 +95,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httmultiparty
+  name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.79.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.16
+        version: 0.79.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.16
+        version: 2.5.0
 description: Embed QuickPay's secure payments directly into your Ruby applications.
-  more at https://tech.quickpay.net
+  Learn more at https://tech.quickpay.net
 email:
 - support@quickpay.net
 executables: []
@@ -117,30 +145,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/quickpay.rb
+- bin/console
 - lib/quickpay/api/client.rb
-- lib/quickpay/api/errors.rb
-- lib/quickpay/api/errors/bad_request.rb
-- lib/quickpay/api/errors/conflict.rb
-- lib/quickpay/api/errors/forbidden.rb
-- lib/quickpay/api/errors/method_not_allowed.rb
-- lib/quickpay/api/errors/not_acceptable.rb
-- lib/quickpay/api/errors/not_found.rb
-- lib/quickpay/api/errors/payment_required.rb
-- lib/quickpay/api/errors/quickpay_error.rb
-- lib/quickpay/api/errors/server_error.rb
-- lib/quickpay/api/errors/unauthorized.rb
-- lib/quickpay/api/request.rb
-- lib/quickpay/constants.rb
-- lib/quickpay/logger.rb
-- lib/quickpay/version.rb
+- lib/quickpay/api/error.rb
+- lib/quickpay/api/version.rb
 - quickpay-ruby-client.gemspec
 homepage: https://github.com/QuickPay/quickpay-ruby-client
 licenses:
@@ -154,15 +168,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby client for QuickPay API

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/lib/quickpay.rb

@@ -1,4 +0,0 @@
-require 'json'
-require 'quickpay/version'
-require 'quickpay/logger'
-require 'quickpay/constants'

data/lib/quickpay/api/errors.rb

@@ -1,10 +0,0 @@
-
-[:quickpay_error, :bad_request, :unauthorized, :payment_required, 
- :forbidden, :not_found, :method_not_allowed, :not_acceptable, 
- :conflict, :server_error].each do |err_code|   
-    require "quickpay/api/errors/#{err_code}"
-end
-
-
-
-

data/lib/quickpay/api/errors/bad_request.rb

@@ -1,7 +0,0 @@
-
-module QuickPay
-  module API
-    class BadRequest < Error
-    end
-  end
-end

data/lib/quickpay/api/errors/forbidden.rb

@@ -1,7 +0,0 @@
-
-module QuickPay
-  module API
-    class Forbidden < Error
-    end
-  end
-end

data/lib/quickpay/api/errors/method_not_allowed.rb

@@ -1,7 +0,0 @@
-
-module QuickPay
-  module API
-    class MethodNotAllowed < Error
-    end
-  end
-end

data/lib/quickpay/api/errors/not_acceptable.rb

@@ -1,7 +0,0 @@
-
-module QuickPay
-  module API
-    class NotAcceptable < Error
-    end
-  end
-end

data/lib/quickpay/api/errors/not_found.rb

@@ -1,7 +0,0 @@
-
-module QuickPay
-  module API
-    class NotFound < Error
-    end
-  end
-end

data/lib/quickpay/api/errors/payment_required.rb

@@ -1,7 +0,0 @@
-
-module QuickPay
-  module API
-    class PaymentRequired < Error
-    end
-  end
-end

data/lib/quickpay/api/errors/quickpay_error.rb

@@ -1,13 +0,0 @@
-module QuickPay
-  module API
-    class Error < StandardError
-      attr_reader :code, :status, :body
-
-      def initialize(code, status, body)
-        @code   = code
-        @status = status
-        @body   = body
-      end
-    end
-  end  
-end

data/lib/quickpay/api/errors/server_error.rb

@@ -1,7 +0,0 @@
-
-module QuickPay
-  module API
-    class ServerError < Error
-    end
-  end
-end

data/lib/quickpay/api/errors/unauthorized.rb

@@ -1,7 +0,0 @@
-
-module QuickPay
-  module API
-    class Unauthorized < Error
-    end
-  end
-end

data/lib/quickpay/api/request.rb

@@ -1,98 +0,0 @@
-require 'httmultiparty'
-
-module QuickPay
-  module API
-    class Request
-      include HTTMultiParty
-
-      attr_reader :options, :secret
-
-      def initialize (options = {})
-        @options = options.dup
-        @secret  = @options.delete(:secret)
-        self.class.base_uri(options[:base_uri] || BASE_URI)
-      end
-
-      def request method, path, data = {}
-        raw = data.delete(:raw)
-        req_headers = headers.merge(data.delete(:headers) || {})
-
-        http_options = options.dup
-        if data.any? { |_key, value| value.is_a?(File) }
-          http_options[:body] = data
-          http_options[:detect_mime_type] = true
-        else
-          case method
-          when :get, :delete, :head
-            http_options[:query] = data
-          when :post, :patch, :put
-            http_options[:body] = data.to_json
-            req_headers["Content-Type"] = "application/json"
-          end
-        end
-
-        http_options[:headers] = headers.merge(req_headers)
-        QuickPay.logger.debug { "#{method.to_s.upcase} #{base_uri}#{path} #{http_options}" }
-        create_response(raw, self.class.send(method, path, http_options))
-      end
-
-      def create_response raw, res
-        if raw
-          [res.code, res.body, res.headers]
-        else
-          response = res.parsed_response
-          raise_error(response, res.code) if res.code >= 400
-          response
-        end
-      end
-
-      def raise_error body, status
-        code = API_STATUS_CODES[status].to_s
-        args = [code, status, body]
-
-        klass =
-          begin
-            require "quickpay/api/errors/#{code}"
-            class_name = code.split('_').map(&:capitalize).join('')
-            QuickPay::API.const_get(class_name)
-          rescue LoadError, NameError
-            QuickPay::API::Error
-          end
-
-        fail klass.new(*args), error_description(body)
-      end
-
-      private
-
-      def base_uri
-        self.class.default_options[:base_uri]
-      end
-
-      def error_description msg
-        msg
-      end
-
-      def headers
-        heads = {
-          'User-Agent'     => user_agent,
-          'Accept-Version' => "v#{QuickPay::API_VERSION}"
-        }
-        heads['Authorization'] = "Basic #{authorization}" if secret != nil
-        heads
-      end
-
-      def user_agent
-        user_agent = "quickpay-ruby-client, v#{QuickPay::VERSION}"
-        user_agent += ", #{RUBY_VERSION}, #{RUBY_PLATFORM}, #{RUBY_PATCHLEVEL}"
-        if defined?(RUBY_ENGINE)
-          user_agent += ", #{RUBY_ENGINE}"
-        end
-        user_agent
-      end
-
-      def authorization
-        Base64.strict_encode64(secret)
-      end
-    end
-  end
-end

data/lib/quickpay/constants.rb

@@ -1,21 +0,0 @@
-
-module QuickPay
-  BASE_URI    = 'https://api.quickpay.net'
-  API_VERSION = 10
-  
-  API_STATUS_CODES = {
-    200 => :ok,
-    201 => :created,
-    202 => :accepted,
-    400 => :bad_request,
-    401 => :unauthorized,
-    402 => :payment_required,
-    403 => :forbidden,
-    404 => :not_found,
-    405 => :method_not_allowed,
-    406 => :not_acceptable,
-    409 => :conflict,
-    500 => :server_error
-  }  
-end
-

data/lib/quickpay/logger.rb

@@ -1,16 +0,0 @@
-require 'logger'
-
-module QuickPay
-  class << self
-    attr_writer :logger
-    
-    def logger
-      @logger ||= lambda {
-        logger = Logger.new($stdout)
-        logger.level = Logger::INFO
-        logger  
-      }.call 
-    end
-    
-  end
-end

data/lib/quickpay/version.rb

@@ -1,3 +0,0 @@
-module QuickPay
-  VERSION = "1.2.0"
-end