flexirest 1.8.9 → 1.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eeb42973b47925b75719642de9f2ad0ff58795453b0843ae2119ad32be87f89
-  data.tar.gz: fb6760cd9d4da6bbf4e3c653c7860790b3c259d7764f3ba4b2fc804461ff5d2b
+  metadata.gz: f402c30e90e85f106749a754d7783d2519da5b86cc0caf730799cac8a5f65c72
+  data.tar.gz: 29c6172196d8d09abbf37e2b40b0665d6b7d6498aa923b99c99e95683cf8c9c2
 SHA512:
-  metadata.gz: 4ab9bd72452449e4e46332f44b100a7bace5e06334eb408f215956590b07c398e24a9a89144f6f6d99ae392730f91232ba5482e0d3075d45d7851fc67a2334aa
-  data.tar.gz: af37f9b843b3bdf129078907468ac77f00019a9d499eecf8412a2c44d544b3792c5d0394449ae5a391f9e43dc6d107e707070772aea4f14fba4a6a3a05fde73c
+  metadata.gz: 502bdb7fb81e058703485d37c32f01f584ebdbc5a4d9eb37badf492847a9e9070f1705c06aee048397b61c16335b175b0447ccf8b6bf663080d83d84d6b64e8b
+  data.tar.gz: 4a2317aac7ea5adfafe440efb5401a6da26cb1a7a8f58d4d236a5978e8c239cd540d5a45a7c9bebc39d15065d07b75ab6410b3c42a53a8e5af986a984431afa4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.9.0
+
+Bugfix:
+
+- Correctly handle errors in JSONAPI calls (thanks to François Ferrandis for the PR).
+
 ## 1.8.9
 
 Feature:

data/lib/flexirest/json_api_proxy.rb

@@ -198,7 +198,7 @@ module Flexirest
 
         # Retrieve the resource(s) object or array from the data object
         records = body['data']
-        return records unless records.present?
+        return body['errors'] unless records.present?
 
         # Convert the resource object to an array,
         # because it is easier to work with an array than a single object

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.8.9"
+  VERSION = "1.9.10"
 end

data/spec/lib/json_api_spec.rb

@@ -239,6 +239,8 @@ module JsonAPIExample
       }
     }
 
+    get(:real_find, '/articles/:id')
+
     get(
       :find_lazy,
       '/articles/:id',
@@ -308,6 +310,27 @@ describe 'JSON API' do
     it 'should return a Flexirest::ResultIterator if the response contains more than one data instance' do
       expect(subject.find_all).to be_an_instance_of(Flexirest::ResultIterator)
     end
+
+    it 'should raise an error when response has "errors" key and no "data"' do
+      body = {
+        errors: [
+          {
+            title: "Record not found",
+            detail: "The record identified by 123456 could not be found",
+            code: "not_found",
+            status: "404",
+          }
+        ]
+      }
+      headers = { "Content-Type" => "application/vnd.api+json" }
+      expect_any_instance_of(Flexirest::Connection).
+        to receive(:get).with("/articles/123", an_instance_of(Hash)).
+        and_return(::FaradayResponseMock.new(OpenStruct.new(body: body.to_json, response_headers: headers, status: 404)))
+
+      expect(-> { JsonAPIExample::Article.real_find(123) }).to raise_error(Flexirest::HTTPNotFoundClientException) do |exception|
+        expect(exception.result.first.title).to eq("Record not found")
+      end
+    end
   end
 
   context 'attributes' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.8.9
+  version: 1.9.10
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler