feat: gracefully handle non json responses (#78)

drish · web-flow · commit 45c2b2828987 · 2024-11-05T19:01:24.000-03:00
diff --git a/lib/resend/request.rb b/lib/resend/request.rb
@@ -34,6 +34,9 @@ def perform
 
       options[:body] = @body.to_json unless @body.empty?
       resp = HTTParty.send(@verb.to_sym, "#{BASE_URL}#{@path}", options)
+
+      check_json!(resp)
+
       resp.transform_keys!(&:to_sym) unless resp.body.empty?
       handle_error!(resp) if resp[:statusCode] && (resp[:statusCode] != 200 || resp[:statusCode] != 201)
       resp
@@ -45,5 +48,17 @@ def handle_error!(resp)
       error = Resend::Error::ERRORS[code]
       raise(error.new(body, code)) if error
     end
+
+    private
+
+    def check_json!(resp)
+      if resp.body.is_a?(Hash)
+        JSON.parse(resp.body.to_json)
+      else
+        JSON.parse(resp.body)
+      end
+    rescue JSON::ParserError, TypeError
+      raise Resend::Error::InternalServerError.new("Resend API returned an unexpected response", nil)
+    end
   end
 end
diff --git a/spec/request_spec.rb b/spec/request_spec.rb
@@ -9,39 +9,58 @@
     Resend.api_key = "re_123"
   end
 
-  it "Resend::Error::InvalidRequestError 400" do
-    req = described_class.new
-    resp = {
-      :statusCode => 400,
-      :message => "400"
-    }
-    expect { req.handle_error!(resp) }.to raise_error(Resend::Error::InvalidRequestError, /400/)
-  end
+  context '#perform' do
+    context 'response is not json' do
+      before do
+        response = double(HTTParty::Response)
+        html = "<html>not json</html>"
+        allow(response).to receive(:body).and_return(html)
+        allow(HTTParty).to receive(:send).and_return(response)
+      end
 
-  it "Resend::Error::InvalidRequestError 422" do
-    req = described_class.new
-    resp = {
-      :statusCode => 422,
-      :message => "422"
-    }
-    expect { req.handle_error!(resp) }.to raise_error(Resend::Error::InvalidRequestError, /422/)
+      it 'should be rescuable' do
+        req = described_class.new
+        expect { req.perform }.to raise_error(Resend::Error::InternalServerError, /Resend API returned an unexpected response/)
+      end
+    end
   end
 
-  it "Resend::Error::RateLimitExceededError 429" do
-    req = described_class.new
-    resp = {
-      :statusCode => 429,
-      :message => "429"
-    }
-    expect { req.handle_error!(resp) }.to raise_error(Resend::Error::RateLimitExceededError, /429/)
-  end
+  context 'handle_error!' do
+
+    it "Resend::Error::InvalidRequestError 400" do
+      req = described_class.new
+      resp = {
+        :statusCode => 400,
+        :message => "400"
+      }
+      expect { req.handle_error!(resp) }.to raise_error(Resend::Error::InvalidRequestError, /400/)
+    end
+
+    it "Resend::Error::InvalidRequestError 422" do
+      req = described_class.new
+      resp = {
+        :statusCode => 422,
+        :message => "422"
+      }
+      expect { req.handle_error!(resp) }.to raise_error(Resend::Error::InvalidRequestError, /422/)
+    end
+
+    it "Resend::Error::RateLimitExceededError 429" do
+      req = described_class.new
+      resp = {
+        :statusCode => 429,
+        :message => "429"
+      }
+      expect { req.handle_error!(resp) }.to raise_error(Resend::Error::RateLimitExceededError, /429/)
+    end
 
-  it "Resend::Error::InternalServerError 500" do
-    req = described_class.new
-    resp = {
-      :statusCode => 500,
-      :message => "500"
-    }
-    expect { req.handle_error!(resp) }.to raise_error(Resend::Error::InternalServerError, /500/)
+    it "Resend::Error::InternalServerError 500" do
+      req = described_class.new
+      resp = {
+        :statusCode => 500,
+        :message => "500"
+      }
+      expect { req.handle_error!(resp) }.to raise_error(Resend::Error::InternalServerError, /500/)
+    end
   end
 end
