From 773c7f19902e3e2c9dad3e65e713c24fe7dfc9ac Mon Sep 17 00:00:00 2001 From: Alan Fung-Schwarz Date: Thu, 30 Mar 2023 13:13:33 -0700 Subject: [PATCH 1/3] feat: Update bundler and oauth dependency [sc-660057] --- barkbox_client.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/barkbox_client.gemspec b/barkbox_client.gemspec index d6aec8f..aaf0e09 100644 --- a/barkbox_client.gemspec +++ b/barkbox_client.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |spec| spec.add_dependency "rails", ">= 4.2.5.2" spec.add_development_dependency "sqlite3" - spec.add_development_dependency "bundler", "~> 1.11" + spec.add_development_dependency "bundler", "~> 2.4.10" spec.add_development_dependency "rake", "~> 10.0" spec.add_development_dependency "rspec", "~> 3.5" spec.add_development_dependency "rspec-rails", "~> 3.5" @@ -36,5 +36,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "webmock" spec.add_runtime_dependency "multi_json" - spec.add_runtime_dependency "oauth2", "~> 1.4.0" + spec.add_runtime_dependency "oauth2", "~> 2.0" end From 47e11c797f4644204e0884b930b4ada68483e089 Mon Sep 17 00:00:00 2001 From: Alan Fung-Schwarz Date: Thu, 29 Jun 2023 10:21:04 -0700 Subject: [PATCH 2/3] Show the message of the error --- lib/barkbox_client/api_error.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/barkbox_client/api_error.rb b/lib/barkbox_client/api_error.rb index 3fe7fa4..4865bd4 100644 --- a/lib/barkbox_client/api_error.rb +++ b/lib/barkbox_client/api_error.rb @@ -7,12 +7,13 @@ def initialize(response) @errors = JSON.parse(response.body, symbolize_names: true)[:errors] @errors = {general: errors} if errors.is_a?(String) rescue => e - @errors = {general: 'Error'} + @errors = {general: e.message} end end def pretty_errors - return @errors if @errors.is_a?(String) + return @errors if @errors.nil? || @errors.is_a?(String) + @errors.map { |k, v| "#{k} #{v}" }.join(", ") end From 6ae696eef5e737ecd64aa6b2f0c36d7ff9ee3e85 Mon Sep 17 00:00:00 2001 From: Alan Fung-Schwarz Date: Tue, 26 Mar 2024 14:24:01 -0700 Subject: [PATCH 3/3] feat: Check class of errors --- lib/barkbox_client/api_error.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/barkbox_client/api_error.rb b/lib/barkbox_client/api_error.rb index 4865bd4..6224e9c 100644 --- a/lib/barkbox_client/api_error.rb +++ b/lib/barkbox_client/api_error.rb @@ -12,9 +12,16 @@ def initialize(response) end def pretty_errors - return @errors if @errors.nil? || @errors.is_a?(String) - - @errors.map { |k, v| "#{k} #{v}" }.join(", ") + case @errors + when String + @errors + when Hash + @errors.map { |k, v| "#{k} #{v}" }.join(", ") + when NilClass + "@errors was nil" + else + "Unknown error format: #{@errors}" + end end def message