defra_ruby_govpay 0.2.8 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b1ac9bdd7fbc9c353f4f93f324ed988b2d17d3d744b4cc0c95e690b14cd343
-  data.tar.gz: 402ac1f3644735c4d69806e90c97959873377248b96602a3ff306ca83b3e83c2
+  metadata.gz: 1e5fd2d57466db964dd8229643792ecec297ce9b4d154d282e34c01ce6b5503a
+  data.tar.gz: d6eb1d75bc6e05124f23b30b6aabfb1b8d612ff1afba2e23b312e31b14269970
 SHA512:
-  metadata.gz: 64d5e81ca4208af458dfe56469f6d4f05845b8450c0bd11a0a89a7c73b4ac515d4184bec4c3cc08aa00e1a972d279631f430c90bc0f95d7314bccd90acb7fd45
-  data.tar.gz: 4531af74e4161427717899628554a3418bf83ffe331b6f8c625de018d76ab366899923c8af27d9316ff5874a8437efe56201832981d719f91a3c40a83f0f38d7
+  metadata.gz: b107a66a0d092c18f17ce65b5712fa6d48698f770d5fb606a7cefe5e66c3da09816378327781cc2ee69916d22ad2560f90b6477d52823c18a426ff10b7018e18
+  data.tar.gz: d1297c85b66ce8716440a339fb08cf4efb7b06e87bb1dfa9d646cc5de03e1b1354604ffdcb6af61e0d20ce79cf267d25ab6342236c609811ca411d77e4889aec

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [Unreleased](https://github.com/DEFRA/defra-ruby-govpay/tree/HEAD)
+
+[Full Changelog](https://github.com/DEFRA/defra-ruby-govpay/compare/v1.0.0...HEAD)
+
+**Fixed bugs:**
+
+- Fix/ruby 3682 webhook payment not found [\#36](https://github.com/DEFRA/defra-ruby-govpay/pull/36) ([PaulDoyle-EA](https://github.com/PaulDoyle-EA))
+
+## [v1.0.0](https://github.com/DEFRA/defra-ruby-govpay/tree/v1.0.0) (2025-04-30)
+
+[Full Changelog](https://github.com/DEFRA/defra-ruby-govpay/compare/v0.2.8...v1.0.0)
+
+**Merged pull requests:**
+
+- Version 1.0.0 - Major release for renamed webhook services [\#35](https://github.com/DEFRA/defra-ruby-govpay/pull/35) ([jjromeo](https://github.com/jjromeo))
+- \[RUBY-3757\] Refactor webhook handling services in Govpay gem [\#34](https://github.com/DEFRA/defra-ruby-govpay/pull/34) ([jjromeo](https://github.com/jjromeo))
+
 ## [v0.2.8](https://github.com/DEFRA/defra-ruby-govpay/tree/v0.2.8) (2025-04-29)
 
 [Full Changelog](https://github.com/DEFRA/defra-ruby-govpay/compare/v0.2.7...v0.2.8)
@@ -8,6 +25,10 @@
 
 - RUBY 3757 wcr tech move govpay webhook handling to the govpay gem [\#32](https://github.com/DEFRA/defra-ruby-govpay/pull/32) ([jjromeo](https://github.com/jjromeo))
 
+**Merged pull requests:**
+
+- Bump version to 0.2.8 and update changelog [\#33](https://github.com/DEFRA/defra-ruby-govpay/pull/33) ([jjromeo](https://github.com/jjromeo))
+
 ## [v0.2.7](https://github.com/DEFRA/defra-ruby-govpay/tree/v0.2.7) (2025-04-28)
 
 [Full Changelog](https://github.com/DEFRA/defra-ruby-govpay/compare/v0.2.6...v0.2.7)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    defra_ruby_govpay (0.2.8)
+    defra_ruby_govpay (1.0.1)
       rest-client (~> 2.1)
 
 GEM
@@ -17,9 +17,9 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
-    ast (2.4.2)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    ast (2.4.3)
     async (2.6.5)
       console (~> 1.10)
       fiber-annotation
@@ -41,21 +41,22 @@ GEM
     async-pool (0.4.0)
       async (>= 1.25)
     base64 (0.1.1)
-    bigdecimal (3.1.4)
+    bigdecimal (3.2.2)
     byebug (11.1.3)
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
     console (1.23.2)
       fiber-annotation
       fiber-local
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
     defra_ruby_style (0.4.0)
       rubocop (>= 1.0, < 2.0)
       rubocop-factory_bot
       rubocop-rake
       rubocop-rspec
-    diff-lcs (1.5.0)
+    diff-lcs (1.6.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     drb (2.1.1)
@@ -78,15 +79,16 @@ GEM
       octokit (~> 4.6)
       rainbow (>= 2.2.1)
       rake (>= 10.0)
-    hashdiff (1.0.1)
+    hashdiff (1.2.0)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     io-event (1.3.3)
-    json (2.6.3)
-    language_server-protocol (3.17.0.3)
+    json (2.13.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
     mime-types (3.5.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0808)
@@ -97,10 +99,11 @@ GEM
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
+    prism (1.4.0)
     protocol-hpack (1.4.2)
     protocol-http (0.25.0)
     protocol-http1 (0.16.0)
@@ -108,53 +111,52 @@ GEM
     protocol-http2 (0.15.1)
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.18)
-    public_suffix (5.0.3)
-    racc (1.7.2)
+    public_suffix (6.0.2)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.1.0)
-    regexp_parser (2.8.2)
+    regexp_parser (2.11.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rexml (3.4.1)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.57.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.4)
+    rubocop (1.79.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.25.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     sawyer (0.9.2)
@@ -167,8 +169,10 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (2.5.0)
-    webmock (3.19.1)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/README.md

@@ -88,11 +88,11 @@ The webhook services extract and return data from the webhook payload:
 
 ```ruby
 # For payment webhooks
-result = DefraRubyGovpay::GovpayWebhookPaymentService.run(webhook_body)
+result = DefraRubyGovpay::WebhookPaymentService.run(webhook_body)
 # => { id: "hu20sqlact5260q2nanm0q8u93", status: "success" }
 
 # For refund webhooks
-result = DefraRubyGovpay::GovpayWebhookRefundService.run(webhook_body)
+result = DefraRubyGovpay::WebhookRefundService.run(webhook_body)
 # => { id: "789", payment_id: "original-payment-123", status: "success" }
 ```
 
@@ -123,8 +123,8 @@ The gem can handle both payment and refund webhooks:
 
 The appropriate service class will be used based on the webhook type:
 
-- `GovpayWebhookPaymentService` for payment webhooks
-- `GovpayWebhookRefundService` for refund webhooks
+- `WebhookPaymentService` for payment webhooks
+- `WebhookRefundService` for refund webhooks
 
 ## Testing
 

data/lib/defra_ruby_govpay/object.rb

@@ -7,7 +7,7 @@ module DefraRubyGovpay
   # and gives us openstruct objects for easier reading/consuming
   class Object < OpenStruct
     def initialize(attributes)
-      super to_ostruct(attributes)
+      super(to_ostruct(attributes))
     end
 
     def to_ostruct(obj)

data/lib/defra_ruby_govpay/services/{govpay_webhook_base_service.rb → webhook_base_service.rb}

@@ -3,8 +3,8 @@
 require "active_support/core_ext/object/blank"
 
 module DefraRubyGovpay
-  class GovpayWebhookBaseService
-    class InvalidGovpayStatusTransition < StandardError; end
+  class WebhookBaseService
+    class InvalidStatusTransition < StandardError; end
 
     attr_accessor :webhook_body, :previous_status
 
@@ -31,7 +31,7 @@ module DefraRubyGovpay
       else
         DefraRubyGovpay.logger.warn(
           "Status \"#{@previous_status}\" unchanged in #{payment_or_refund_str} webhook update " \
-          "#{log_webhook_context}"
+          "#{log_webhook_context} "
         )
       end
 
@@ -44,9 +44,9 @@ module DefraRubyGovpay
     def validate_status_transition
       return if self.class::VALID_STATUS_TRANSITIONS[previous_status]&.include?(webhook_payment_or_refund_status)
 
-      raise InvalidGovpayStatusTransition, "Invalid #{payment_or_refund_str} status transition " \
-                                           "from #{previous_status} to #{webhook_payment_or_refund_status}" \
-                                           "#{log_webhook_context}"
+      raise InvalidStatusTransition, "Invalid #{payment_or_refund_str} status transition " \
+                                     "from #{previous_status} to #{webhook_payment_or_refund_status}" \
+                                     "#{log_webhook_context}"
     end
 
     def extract_data_from_webhook

data/lib/defra_ruby_govpay/services/{govpay_webhook_body_validator_service.rb → webhook_body_validator_service.rb}

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module DefraRubyGovpay
-  class GovpayWebhookBodyValidatorService
+  class WebhookBodyValidatorService
     class ValidationFailure < StandardError; end
 
     def self.run(body:, signature:)
       raise ValidationFailure, "Missing expected signature" if signature.blank?
 
-      body_signatures = GovpayWebhookSignatureService.run(body:)
+      body_signatures = WebhookSignatureService.run(body:)
       return true if body_signatures[:front_office] == signature || body_signatures[:back_office] == signature
 
       raise ValidationFailure, "digest/signature header mismatch"

data/lib/defra_ruby_govpay/services/{govpay_webhook_payment_service.rb → webhook_payment_service.rb}

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 module DefraRubyGovpay
-  class GovpayWebhookPaymentService < GovpayWebhookBaseService
+  class WebhookPaymentService < WebhookBaseService
 
     VALID_STATUS_TRANSITIONS = {
-      "created" => %w[started submitted success failed cancelled error],
-      "started" => %w[submitted success failed cancelled error],
-      "submitted" => %w[success failed cancelled error],
+      "created" => %w[started submitted success failed cancelled expired error],
+      "started" => %w[submitted success failed cancelled expired error],
+      "submitted" => %w[success failed cancelled expired error],
       "success" => %w[],
       "failed" => %w[],
       "cancelled" => %w[],

data/lib/defra_ruby_govpay/services/{govpay_webhook_refund_service.rb → webhook_refund_service.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DefraRubyGovpay
-  class GovpayWebhookRefundService < GovpayWebhookBaseService
+  class WebhookRefundService < WebhookBaseService
 
     VALID_STATUS_TRANSITIONS = {
       "submitted" => %w[success],

data/lib/defra_ruby_govpay/services/{govpay_webhook_sanitizer_service.rb → webhook_sanitizer_service.rb}

@@ -3,7 +3,7 @@
 require "active_support/core_ext/object/deep_dup"
 
 module DefraRubyGovpay
-  class GovpayWebhookSanitizerService
+  class WebhookSanitizerService
     def self.call(webhook_body)
       new.call(webhook_body)
     end

data/lib/defra_ruby_govpay/services/{govpay_webhook_signature_service.rb → webhook_signature_service.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DefraRubyGovpay
-  class GovpayWebhookSignatureService
+  class WebhookSignatureService
     class DigestFailure < StandardError; end
 
     def self.run(body:)
@@ -11,7 +11,7 @@ module DefraRubyGovpay
     def run(body:)
       generate_signatures(body.to_s)
     rescue StandardError => e
-      DefraRubyGovpay.logger.error "Govpay payment webhook signature generation failed: #{e}"
+      DefraRubyGovpay.logger.error "Payment webhook signature generation failed: #{e}"
       raise DigestFailure, e
     end
 

data/lib/defra_ruby_govpay/version.rb

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

data/lib/defra_ruby_govpay.rb

@@ -9,12 +9,12 @@ require_relative "defra_ruby_govpay/payment"
 require_relative "defra_ruby_govpay/refund"
 require_relative "defra_ruby_govpay/error"
 require_relative "defra_ruby_govpay/api"
-require_relative "defra_ruby_govpay/services/govpay_webhook_base_service"
-require_relative "defra_ruby_govpay/services/govpay_webhook_payment_service"
-require_relative "defra_ruby_govpay/services/govpay_webhook_refund_service"
-require_relative "defra_ruby_govpay/services/govpay_webhook_sanitizer_service"
-require_relative "defra_ruby_govpay/services/govpay_webhook_signature_service"
-require_relative "defra_ruby_govpay/services/govpay_webhook_body_validator_service"
+require_relative "defra_ruby_govpay/services/webhook_base_service"
+require_relative "defra_ruby_govpay/services/webhook_payment_service"
+require_relative "defra_ruby_govpay/services/webhook_refund_service"
+require_relative "defra_ruby_govpay/services/webhook_sanitizer_service"
+require_relative "defra_ruby_govpay/services/webhook_signature_service"
+require_relative "defra_ruby_govpay/services/webhook_body_validator_service"
 
 # The DefraRubyGovpay module facilitates integration with Govpay services.
 # It provides a convenient and configurable way to interact with Govpay APIs in Defra's ruby applications.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defra_ruby_govpay
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 1.0.1
 platform: ruby
 authors:
 - Jerome Pratt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2025-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -53,12 +53,12 @@ files:
 - lib/defra_ruby_govpay/object.rb
 - lib/defra_ruby_govpay/payment.rb
 - lib/defra_ruby_govpay/refund.rb
-- lib/defra_ruby_govpay/services/govpay_webhook_base_service.rb
-- lib/defra_ruby_govpay/services/govpay_webhook_body_validator_service.rb
-- lib/defra_ruby_govpay/services/govpay_webhook_payment_service.rb
-- lib/defra_ruby_govpay/services/govpay_webhook_refund_service.rb
-- lib/defra_ruby_govpay/services/govpay_webhook_sanitizer_service.rb
-- lib/defra_ruby_govpay/services/govpay_webhook_signature_service.rb
+- lib/defra_ruby_govpay/services/webhook_base_service.rb
+- lib/defra_ruby_govpay/services/webhook_body_validator_service.rb
+- lib/defra_ruby_govpay/services/webhook_payment_service.rb
+- lib/defra_ruby_govpay/services/webhook_refund_service.rb
+- lib/defra_ruby_govpay/services/webhook_sanitizer_service.rb
+- lib/defra_ruby_govpay/services/webhook_signature_service.rb
 - lib/defra_ruby_govpay/version.rb
 - sig/defra_ruby_govpay.rbs
 homepage: https://github.com/DEFRA/defra-ruby-govpay