Merge pull request #404 from stokarenko/expose-not-found-json-errors

Expose NotFound json errors

Author: gaorlov

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## Unreleased
+- [#404](https://github.com/JsonApiClient/json_api_client/pull/404) - Expose NotFound json errors
 - [378](https://github.com/JsonApiClient/json_api_client/pull/378) - Add the ability to create a subclass of JsonApiClient::Resource to have a modified id method
 
 ## 1.21.0

lib/json_api_client/errors.rb

@@ -46,11 +46,18 @@ class NotAuthorized < ClientError
 
     class NotFound < ClientError
       attr_reader :uri
-      def initialize(uri)
-        @uri = uri
+      def initialize(env_or_uri, msg = nil)
+        env = nil
+
+        if env_or_uri.kind_of?(Faraday::Env)
+          env = env_or_uri
+          @uri = env[:url]
+        else
+          @uri = env_or_uri
+        end
 
-        msg = "Resource not found: #{uri.to_s}"
-        super nil, msg
+        msg ||= "Resource not found: #{uri.to_s}"
+        super env, msg
       end
     end
 

lib/json_api_client/middleware/status.rb

@@ -37,7 +37,7 @@ def handle_status(code, env)
         when 403
           raise Errors::AccessDenied, env
         when 404
-          raise Errors::NotFound, env[:url]
+          raise Errors::NotFound, env
         when 408
           raise Errors::RequestTimeout, env
         when 409

lib/json_api_client/query/builder.rb

@@ -92,7 +92,7 @@ def to_a
 
       def find(args = {})
         if klass.raise_on_blank_find_param && args.blank?
-          raise Errors::NotFound, 'blank .find param'
+          raise Errors::NotFound, nil, 'blank .find param'
         end
 
         case args

test/unit/errors_test.rb

@@ -60,13 +60,34 @@ def test_500_errors_with_with_json_api_response
     assert_equal '503 Service Unavailable (Timeout error)', exception.message
   end
 
-  def test_not_found
+  def test_not_found_with_json_api_response
     stub_request(:get, "http://example.com/users")
-      .to_return(status: 404, body: "something irrelevant")
+      .to_return(
+        headers: {content_type: "application/vnd.api+json"},
+        status: 404,
+        body: {errors: [{title: "Not found"}]}.to_json
+      )
+
+    exception = assert_raises(JsonApiClient::Errors::NotFound) { User.all }
+    assert_equal(
+      "Resource not found: http://example.com/users (Not found)",
+      exception.message
+    )
+  end
 
-    assert_raises JsonApiClient::Errors::NotFound do
-      User.all
-    end
+  def test_not_found_errors_with_plain_text_response
+    stub_request(:get, "http://example.com/users")
+      .to_return(
+        headers: {content_type: "text/plain"},
+        status: 404,
+        body: "resource not found"
+      )
+
+    exception = assert_raises(JsonApiClient::Errors::NotFound) { User.all }
+    assert_equal(
+      "Resource not found: http://example.com/users",
+      exception.message
+    )
   end
 
   def test_conflict