billomat 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa8065de1ae3aa281d75f0021aec499e7ee218e3e768a54f2571011073f76d9d
-  data.tar.gz: 9a4a6f26d77652b6ac0e242cb84b24ab01f5089a9d1dae9b7317934b9aecb344
+  metadata.gz: 6ee6ebd2cbd53ca2dbd1dee24eae4635a8c59659eb9dd582a74ea653476fc92b
+  data.tar.gz: 63806bba355815bc2268fba35da890892aeafcbb1433495b277e720aeb3cf722
 SHA512:
-  metadata.gz: 1f7a148260094d9c89f828ae8adde9dcb7205fea54828aeb8e00b708aeed30238def5f9fc0661c6a205f1e959c1d29771738c57582e2bea2bbba5e67920a2921
-  data.tar.gz: 315670b263e80f5d665e50e1cc9aee5a3d4153977555093d0d2264b1c4a145cbeea81ac1bdb3f70195111e2904df6b9b3bfdaf82b6912b4ea51be9e77c04d7a2
+  metadata.gz: 0111304b1914f53af9e8a309e61d7bcff6e1f5df88610f9862d684fbf1ae2e41eb49cd39735b890d26aa36508f90d63a59ddf0f7ef883545142b30968b8a0472
+  data.tar.gz: 3eb8e02713788b62695c9fb2484c75e174b4b8ef3262fd726dff6f641d9d0417e587a7967fb237aa0ab7e18b6bed90745673f948fc72a65a42668afb5dc195ee

data/.rubocop.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-rspec
   - rubocop-rails
 
@@ -54,7 +54,7 @@ RSpec/NestedGroups:
   Max: 4
 
 # Disable regular Rails spec paths.
-RSpec/FilePath:
+Rails/FilePath:
   Enabled: false
 
 # Because we just implemented the ActiveRecord API.

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 * TODO: Replace this bullet point with an actual description of a change.
 
+### 1.5.1 (9 May 2025)
+
+* Corrected some RuboCop glitches ([#30](https://github.com/hausgold/billomat/pull/30))
+* Upgraded the rubocop dependencies ([#31](https://github.com/hausgold/billomat/pull/31))
+* Gracefully deal with non-JSON gateway error bodies ([#32](https://github.com/hausgold/billomat/pull/32))
+
 ### 1.5.0 (30 January 2025)
 
 * Added all versions up to Ruby 3.4 to the CI matrix ([#29](https://github.com/hausgold/billomat/pull/29))

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM hausgold/ruby:2.7
-MAINTAINER Hermann Mayer <hermann.mayer@hausgold.de>
+LABEL org.opencontainers.image.authors="containers@hausgold.de"
 
 # Update system gem
 RUN gem update --system '3.4.22'

data/Gemfile

@@ -13,9 +13,9 @@ gem 'guard-rspec', '~> 4.7'
 gem 'irb', '~> 1.2'
 gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.12'
-gem 'rubocop', '~> 1.28'
-gem 'rubocop-rails', '~> 2.14'
-gem 'rubocop-rspec', '~> 2.10'
+gem 'rubocop'
+gem 'rubocop-rails'
+gem 'rubocop-rspec'
 gem 'simplecov', '>= 0.22'
 gem 'yard', '>= 0.9.28'
 gem 'yard-activesupport-concern', '>= 0.0.1'

data/gemfiles/rails_6.1.gemfile

@@ -9,9 +9,9 @@ gem "guard-rspec", "~> 4.7"
 gem "irb", "~> 1.2"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.12"
-gem "rubocop", "~> 1.28"
-gem "rubocop-rails", "~> 2.14"
-gem "rubocop-rspec", "~> 2.10"
+gem "rubocop"
+gem "rubocop-rails"
+gem "rubocop-rspec"
 gem "simplecov", ">= 0.22"
 gem "yard", ">= 0.9.28"
 gem "yard-activesupport-concern", ">= 0.0.1"

data/gemfiles/rails_7.1.gemfile

@@ -9,9 +9,9 @@ gem "guard-rspec", "~> 4.7"
 gem "irb", "~> 1.2"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.12"
-gem "rubocop", "~> 1.28"
-gem "rubocop-rails", "~> 2.14"
-gem "rubocop-rspec", "~> 2.10"
+gem "rubocop"
+gem "rubocop-rails"
+gem "rubocop-rspec"
 gem "simplecov", ">= 0.22"
 gem "yard", ">= 0.9.28"
 gem "yard-activesupport-concern", ">= 0.0.1"

data/lib/billomat/gateway.rb

@@ -11,8 +11,7 @@ module Billomat
     def initialize(original_exception)
       # Extract the error from the response if it is present. If no error
       # could be extracted, use the whole body
-      body = original_exception.response&.body
-      response_error = JSON.parse(body).dig('errors', 'error') || body if body
+      response_error = unpack_error_message(original_exception)
 
       # Use the default message and append our detailed error
       message = original_exception.default_message
@@ -21,6 +20,21 @@ module Billomat
       super(message)
       @original_exception = original_exception
     end
+
+    private
+
+    # Extract an error message from the response. If json, parse and extract.
+    # Otherwise, extract the first 128 bytes from the body; it's probably
+    # generic error HTML generated by a LoadBalancer
+    #
+    # @param original_exception [RestClient::Exception] the original exception
+    # @return [String, nil] the extracted error message
+    def unpack_error_message(original_exception)
+      body = original_exception.response&.body
+      JSON.parse(body).dig('errors', 'error') || body if body
+    rescue JSON::ParserError
+      body[0, 127] # probably HTML, thus only take the first few bytes
+    end
   end
 
   # This class can be used by the gem to communicate with the API.

data/lib/billomat/models/base.rb

@@ -31,7 +31,7 @@ module Billomat
       # @param data [Hash] the attributes of the object
       # @return [Billomat::Models::Base] the record as an object
       #
-      # rubocop:disable Style/OpenStructUse because of the convenient
+      # rubocop:disable Style/OpenStructUse -- because of the convenient
       #   dynamic data access
       def initialize(data = {})
         @data = OpenStruct.new(data)
@@ -51,7 +51,7 @@ module Billomat
 
       # @return [TrueClass]
       #
-      # rubocop:disable Style/OpenStructUse because of the convenient
+      # rubocop:disable Style/OpenStructUse -- because of the convenient
       #   dynamic data access
       def create
         resp = Billomat::Gateway.new(

data/lib/billomat/version.rb

@@ -3,7 +3,7 @@
 # The gem version details.
 module Billomat
   # The version of the +billomat+ gem
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 
   class << self
     # Returns the version of gem as a string.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: billomat
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Hermann Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-01-30 00:00:00.000000000 Z
+date: 2025-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport