simpal 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59c15a2190f2e39b690e62e5810b67d3349ae9d16951454094a3b514b0b272ab
-  data.tar.gz: 0e8d968edd55bfe5e511dcdde9265788f8b066dc7d233f2d56c0826e1329adea
+  metadata.gz: ff9bd39a1b3bf614656ba4aa4db6bda6de2ce675e2d429d705f00737e02fa324
+  data.tar.gz: 3d3b24a4727dc9321d37ffb10cc502a7141e759453cf42c6c5ee13728b308994
 SHA512:
-  metadata.gz: d1cc200b083f7915c3fb9632dc9fdf76d40e2451e4219be0c2f84d57e217ef92c777dbe2fe584159931bdf85a3b058bc6b0d670efa423549ab814eef393b3553
-  data.tar.gz: 0da21ae496a886e3cda38cb3619e9bbbfadb0cfeac11e00c804dc29ff611c315b91670bf0690281ceb0771ef5b1f987f012b1e77fcf6615a492b4f6fc3fd770b
+  metadata.gz: 6af06ce6dbfb1b8a6151894089b00642e0f8b221edf1f04e1b8d63b041226794ffcf04cc807d5980a4cd1f605c248cde3bc7e240a5c64340541ef744ee97e9f9
+  data.tar.gz: fd272791debd28b4896bdb8fd1391dbdbcf8f9adc43322b9c9db81bf8675d055e53bde820b1725e3808ca75bfc639b5e24b813baa16952ca342d9629e1dfa37a

data/.rubocop.yml

@@ -11,8 +11,18 @@ Layout/LineLength:
 
 Metrics/BlockLength:
   Exclude:
+    - '**/*.gemspec'
     - 'spec/**/*'
 
+Metrics/ClassLength:
+  Exclude:
+    - 'spec/support/fake_*.rb'
+
+Metrics/MethodLength:
+  Max: 40
+  Exclude:
+    - 'spec/support/fake_*.rb'
+
 Metrics/AbcSize:
   Max: 40
 
@@ -22,8 +32,5 @@ Metrics/CyclomaticComplexity:
 Metrics/PerceivedComplexity:
   Max: 20
 
-Metrics/MethodLength:
-  Max: 40
-
 Naming/VariableNumber:
   EnforcedStyle: snake_case

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-## [Unreleased]
+# Changelog
+
+## [0.1.1] - 2021-05-27
+
+- Fixed a bug when used in a test suite that doesn't include a Date header in the response.
 
 ## [0.1.0] - 2021-05-21
 

data/Guardfile

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+guard :rspec, cmd: 'bundle exec rspec' do
+  require 'guard/rspec/dsl'
+
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_files)
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+
+  # Ruby library files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+end

data/lib/simpal/api/payments/authorizations.rb

@@ -54,12 +54,12 @@ module Simpal
         # @param  id      [String]         The ID of an authorized payment.
         # @param  headers [Hash]           The custom headers to add to the request.
         # @param  client  [Simpal::Client] The API client to make the request with.
-        # @return         [Hash]           An empty hash.
+        # @return         [Boolean]        `true` when the authorization has been voided, `false` otherwise.
         #
         def self.void(id, headers: {}, client: nil)
           client = Simpal.client_for(client)
           response = client.connection.post("/v2/payments/authorizations/#{id}/void", nil, headers)
-          response.body
+          response.success?
         end
       end
     end

data/lib/simpal/client.rb

@@ -51,12 +51,15 @@ module Simpal
     #
     def connection
       @connection ||= Faraday.new(service_url, headers: headers) do |connection|
-        connection.use Faraday::Response::RaiseError
+        connection.request :json
+
+        connection.response :raise_error
+        connection.response :json
+
         connection.use Simpal::Middleware::Headers
-        connection.use FaradayMiddleware::EncodeJson
-        connection.use FaradayMiddleware::ParseJson
         connection.use Simpal::Middleware::Authorization, self
-        connection.adapter Faraday.default_adapter
+
+        connection.adapter :net_http
       end
     end
   end

data/lib/simpal/constants.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Simpal
-  VERSION = '0.1.0'
+  VERSION = '1.0.0'
 end

data/lib/simpal/middleware/authorization.rb

@@ -42,17 +42,25 @@ module Simpal
 
       def connection
         @connection ||= Faraday.new(client.service_url, headers: client.headers) do |connection|
-          connection.use Faraday::Request::UrlEncoded
-          connection.use Faraday::Response::RaiseError
-          connection.use FaradayMiddleware::ParseJson
-          connection.basic_auth(client.client_id, client.client_secret)
+          connection.request :url_encoded
+
+          connection.response :raise_error
+          connection.response :json
+
+          connection.request :authorization, :basic, client.client_id, client.client_secret
         end
       end
 
+      def expiry_base_date_for(response)
+        Time.httpdate(response.headers['date'])
+      rescue StandardError
+        Time.now
+      end
+
       def refresh_access_token!
         response = connection.post('/v1/oauth2/token', grant_type: :client_credentials)
         @access_token = response.body['access_token']
-        @access_token_expires_at = Time.httpdate(response.headers['date']) + response.body['expires_in']
+        @access_token_expires_at = expiry_base_date_for(response) + response.body['expires_in'].to_i
       end
 
       def refresh_access_token

data/lib/simpal/payment/authorization.rb

@@ -50,11 +50,10 @@ module Simpal
       # @param  id      [String]         The ID of an authorized payment.
       # @param  headers [Hash]           The custom headers to add to the request.
       # @param  client  [Simpal::Client] The API client to make the request with.
-      # @return         [Boolean]        `true` if the authorization was voided, else an exception is raised.
+      # @return         [Boolean]        `true` when the authorization has been voided, `false` otherwise.
       #
       def self.void(id, headers: {}, client: nil)
         API::Payments::Authorizations.void(id, headers: headers, client: client)
-        true
       end
     end
   end

data/lib/simpal.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'faraday'
-require 'faraday_middleware'
 require 'json'
 require 'singleton'
 require 'time'

data/simpal.gemspec

@@ -27,13 +27,16 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday', '~> 1.4'
-  spec.add_dependency 'faraday_middleware', '~> 1.0'
+  spec.add_dependency 'faraday', '~> 2.0'
 
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'guard', '~> 2.18'
+  spec.add_development_dependency 'guard-rspec', '~> 4.7'
+  spec.add_development_dependency 'pry', '~> 0.14.1'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 1.7'
   spec.add_development_dependency 'rubocop-rake', '~> 0.5.1'
   spec.add_development_dependency 'rubocop-rspec', '~> 2.3'
+  spec.add_development_dependency 'sinatra', '~> 2.1'
+  spec.add_development_dependency 'webmock', '~> 3.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simpal
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Nialto Services
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2022-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,42 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '2.18'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.18'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.14'
 description:
 email:
 - support@nialtoservices.co.uk
@@ -136,6 +178,7 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -179,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A simple, lightweight wrapper around PayPal's REST API.