defra_ruby_govpay 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebc3e1002f53ab4c0e4a467375e730feac353cd05d9fb701e6a643a0b783645a
-  data.tar.gz: d6437d4b6f89f745737b903debb6b34819e17eba8ff7f59fbb641b45780e07b9
+  metadata.gz: 6040a654f7b5f443c957b0aae87e874d050986040c730544b2ea5edd0378a176
+  data.tar.gz: 97a4d9020a1390e37a4d20fd797f876f1fc73fd2991c1634b9f2332642da428b
 SHA512:
-  metadata.gz: ea2d5f0d93136560796f261b8ed2b7fb955196fa85708b40372ea61a3486cab12f4cf93de3463ea336ccf1ba3dfc672ffee00fa93f10a8305ce936ad2d1a74bd
-  data.tar.gz: 6badf44aaa4a8bc9bc0f0b6111f144d8b2fd8f455832be5c1489e2e3b523ea35d95863b939310dadcf68aa6fb7636cdf605d96423def9bb875adbd0117dc89ab
+  metadata.gz: f5a78da8b85f0d06bd92933428b676d3b1b3df7a260999ff0c717d1b577d89d5d4d1b3887e58120b21931574c0c17ae386fde16d6200645eccbc72e466e12200
+  data.tar.gz: f75230f02be4a3e347a78e1b7aaecdf7d06dea04c8d1f8164ed7d02332a4c32729e7b115206295b5ac03a2ed4082bd88c76b6ca20e1e9259ad2a5a5504739e2d

data/CHANGELOG.md

@@ -1,5 +1,55 @@
-## [Unreleased]
+# Changelog
 
-## [0.1.0] - 2023-09-06
+## [Unreleased](https://github.com/DEFRA/defra-ruby-govpay/tree/HEAD)
 
-- Initial release
+[Full Changelog](https://github.com/DEFRA/defra-ruby-govpay/compare/v0.2.3...HEAD)
+
+**Fixed bugs:**
+
+- fix DefraRubyGovpay config [\#9](https://github.com/DEFRA/defra-ruby-govpay/pull/9) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+
+**Merged pull requests:**
+
+- Bump rake from 13.0.6 to 13.1.0 [\#6](https://github.com/DEFRA/defra-ruby-govpay/pull/6) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v0.2.3](https://github.com/DEFRA/defra-ruby-govpay/tree/v0.2.3) (2023-11-07)
+
+[Full Changelog](https://github.com/DEFRA/defra-ruby-govpay/compare/v0.2.2...v0.2.3)
+
+**Implemented enhancements:**
+
+- Chore/ruby 2769 enhance govpay logging [\#8](https://github.com/DEFRA/defra-ruby-govpay/pull/8) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+
+## [v0.2.2](https://github.com/DEFRA/defra-ruby-govpay/tree/v0.2.2) (2023-11-06)
+
+[Full Changelog](https://github.com/DEFRA/defra-ruby-govpay/compare/v0.2.1...v0.2.2)
+
+**Implemented enhancements:**
+
+- gem version 0.2.2 [\#7](https://github.com/DEFRA/defra-ruby-govpay/pull/7) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+- Chore/ruby 2769 enhance govpay logging [\#5](https://github.com/DEFRA/defra-ruby-govpay/pull/5) ([PaulDoyle-DEFRA](https://github.com/PaulDoyle-DEFRA))
+
+## [v0.2.1](https://github.com/DEFRA/defra-ruby-govpay/tree/v0.2.1) (2023-10-03)
+
+[Full Changelog](https://github.com/DEFRA/defra-ruby-govpay/compare/v0.2.0...v0.2.1)
+
+## [v0.2.0](https://github.com/DEFRA/defra-ruby-govpay/tree/v0.2.0) (2023-09-26)
+
+[Full Changelog](https://github.com/DEFRA/defra-ruby-govpay/compare/v0.1.2...v0.2.0)
+
+## [v0.1.2](https://github.com/DEFRA/defra-ruby-govpay/tree/v0.1.2) (2023-09-18)
+
+[Full Changelog](https://github.com/DEFRA/defra-ruby-govpay/compare/v0.1.1...v0.1.2)
+
+**Merged pull requests:**
+
+- release/v0.1.2 [\#4](https://github.com/DEFRA/defra-ruby-govpay/pull/4) ([jjromeo](https://github.com/jjromeo))
+- gem version 0.1.0 [\#1](https://github.com/DEFRA/defra-ruby-govpay/pull/1) ([jjromeo](https://github.com/jjromeo))
+
+## [v0.1.1](https://github.com/DEFRA/defra-ruby-govpay/tree/v0.1.1) (2023-09-18)
+
+[Full Changelog](https://github.com/DEFRA/defra-ruby-govpay/compare/1bd9ccaffdb51137f980d553336b5dddf2f4901d...v0.1.1)
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    defra_ruby_govpay (0.2.2)
+    defra_ruby_govpay (0.2.4)
       rest-client (~> 2.1)
 
 GEM
@@ -111,7 +111,7 @@ GEM
     public_suffix (5.0.3)
     racc (1.7.2)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     regexp_parser (2.8.2)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
@@ -176,6 +176,7 @@ GEM
 PLATFORMS
   x86_64-darwin-21
   x86_64-darwin-22
+  x86_64-linux
 
 DEPENDENCIES
   byebug

data/lib/defra_ruby_govpay/api.rb

@@ -13,13 +13,8 @@ module DefraRubyGovpay
   # The API class is responsible for making requests to the Govpay API.
   # It handles the construction of request URLs, headers, and payload,
   # and also deals with any errors that occur during the API request.
+
   class API
-    def initialize(config = DefraRubyGovpay.configuration)
-      @config = config
-      @is_back_office = config.host_is_back_office
-      @front_office_token = config.govpay_front_office_api_token
-      @back_office_token = config.govpay_back_office_api_token
-    end
 
     def send_request(method:, path:, params: nil, is_moto: false)
       @is_moto = is_moto
@@ -55,21 +50,37 @@ module DefraRubyGovpay
 
     def handle_error(error, method, path, params)
       error_message = "Error sending request to govpay (#{method} #{path}, params: #{params}), " \
-                      "response body #{JSON.parse(error.response.body)}: #{error}"
+                      "response body: #{error.response&.body}: #{error}"
       DefraRubyGovpay.logger.error error_message
       raise GovpayApiError, error_message
     end
 
+    def govpay_url
+      @govpay_url ||= DefraRubyGovpay.configuration.govpay_url
+    end
+
     def url(path)
-      "#{@config.govpay_url}#{path}"
+      "#{govpay_url}#{path}"
+    end
+
+    def back_office_app
+      @back_office_app ||= DefraRubyGovpay.configuration.host_is_back_office
+    end
+
+    def front_office_token
+      @front_office_token ||= DefraRubyGovpay.configuration.govpay_front_office_api_token
+    end
+
+    def back_office_token
+      @back_office_token ||= DefraRubyGovpay.configuration.govpay_back_office_api_token
     end
 
     def bearer_token
-      @bearer_token ||= if @is_back_office
-                          @is_moto ? @back_office_token : @front_office_token
-                        else
-                          @front_office_token
-                        end
+      if back_office_app
+        @is_moto ? back_office_token : front_office_token
+      else
+        front_office_token
+      end
     end
 
     def payload(params)

data/lib/defra_ruby_govpay/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DefraRubyGovpay
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defra_ruby_govpay
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Jerome Pratt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-06 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client