Respect Faraday::Response::RaiseError::DEFAULT_OPTIONS when raising errors.

Author: dblock

.rubocop_todo.yml

@@ -1,17 +1,15 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-02-02 03:09:26 UTC using RuboCop version 1.68.0.
+# on 2025-10-16 14:00:36 UTC using RuboCop version 1.68.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Configuration parameters: AllowedPatterns.
-# AllowedPatterns: (?-mix:(exactly|at_least|at_most)\(\d+\)\.times)
-Lint/UnreachableLoop:
+RSpec/AnyInstance:
   Exclude:
-    - 'bin/strava-activities.rb'
+    - 'spec/strava/api/client_spec.rb'
 
 # Offense count: 13
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -23,11 +21,6 @@ RSpec/DescribedClass:
     - 'spec/strava/oauth/client_spec.rb'
     - 'spec/strava/webhooks/client_spec.rb'
 
-# Offense count: 1
-RSpec/MultipleDescribes:
-  Exclude:
-    - 'spec/strava/api/client/endpoints/activities/activity_spec.rb'
-
 # Offense count: 5
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:

Gemfile

@@ -5,6 +5,7 @@ source 'http://rubygems.org'
 gemspec
 
 group :development, :test do
+  gem 'csv'
   gem 'dotenv'
   gem 'faraday-retry'
   gem 'gpx'

lib/strava/errors/ratelimit_error.rb

@@ -3,29 +3,23 @@
 module Strava
   module Errors
     class RatelimitError < ::Faraday::ClientError
-      attr_reader :http_response, :ratelimit, :error_message
+      attr_reader :ratelimit
 
-      def initialize(http_response, error_message = nil)
-        @response = http_response.response
-        @ratelimit = Strava::Api::Ratelimit.new(@response)
-        @error_message = error_message || message
-        super({
-          status: http_response.status,
-          headers: http_response.response_headers,
-          body: http_response.body
-        })
+      def initialize(env, response)
+        @ratelimit = Strava::Api::Ratelimit.new(env.response)
+        super(response)
       end
 
       def message
-        response[:body]['message'] || super
+        response.body['message'] || super
       end
 
       def headers
-        response[:headers]
+        response.headers
       end
 
       def errors
-        response[:body]['errors']
+        response.body['errors']
       end
     end
   end

lib/strava/web/raise_response_error.rb

@@ -3,6 +3,7 @@
 module Strava
   module Web
     class RaiseResponseError < ::Faraday::Middleware
+      DEFAULT_OPTIONS = Faraday::Response::RaiseError::DEFAULT_OPTIONS
       CLIENT_ERROR_STATUSES = (400...600)
 
       def on_complete(env)
@@ -13,18 +14,38 @@ def on_complete(env)
           # mimic the behavior that we get with proxy requests with HTTPS
           raise Faraday::ConnectionFailed, %(407 "Proxy Authentication Required ")
         when 429
-          raise Strava::Errors::RatelimitError.new(env, 'Too Many Requests')
+          raise Strava::Errors::RatelimitError.new(env, response_values(env))
         when CLIENT_ERROR_STATUSES
           raise Strava::Errors::Fault, response_values(env)
         end
       end
 
       def response_values(env)
-        {
+        response = {
           status: env.status,
           headers: env.response_headers,
           body: env.body
         }
+
+        # Include the request data by default. If the middleware was explicitly
+        # configured to _not_ include request data, then omit it.
+        return response unless options[:include_request]
+
+        response.merge(
+          request: {
+            method: env.method,
+            url: env.url,
+            url_path: env.url.path,
+            params: query_params(env),
+            headers: env.request_headers,
+            body: env.request_body
+          }
+        )
+      end
+
+      def query_params(env)
+        env.request.params_encoder ||= Faraday::Utils.default_params_encoder
+        env.params_encoder.decode(env.url.query)
       end
     end
   end