contentful 2.2.1 → 2.2.2

data/doc/Contentful/SymbolCoercion.html

@@ -159,7 +159,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 25 11:55:57 2017 by
+  Generated on Wed Nov 15 11:06:21 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

data/doc/Contentful/Sync.html

@@ -643,7 +643,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 25 11:55:56 2017 by
+  Generated on Wed Nov 15 11:06:20 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

data/doc/Contentful/SyncPage.html

@@ -797,7 +797,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 25 11:55:57 2017 by
+  Generated on Wed Nov 15 11:06:21 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

data/doc/Contentful/TextCoercion.html

@@ -159,7 +159,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 25 11:55:57 2017 by
+  Generated on Wed Nov 15 11:06:21 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

data/doc/Contentful/Unauthorized.html

@@ -149,7 +149,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 25 11:55:56 2017 by
+  Generated on Wed Nov 15 11:06:21 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

data/doc/Contentful/UnparsableJson.html

@@ -149,7 +149,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 25 11:55:56 2017 by
+  Generated on Wed Nov 15 11:06:21 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

data/doc/Contentful/UnparsableResource.html

@@ -125,7 +125,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 25 11:55:56 2017 by
+  Generated on Wed Nov 15 11:06:21 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

data/doc/_index.html

@@ -532,7 +532,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 25 11:55:55 2017 by
+  Generated on Wed Nov 15 11:06:19 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

data/doc/file.CHANGELOG.html

@@ -62,6 +62,13 @@
 
 <h2 id="label-Unreleased">Unreleased</h2>
 
+<h2 id="label-2.2.1">2.2.1</h2>
+
+<h3 id="label-Fixed">Fixed</h3>
+<ul><li>
+<p>Fixed an edge case of 404 error having details as a string.</p>
+</li></ul>
+
 <h2 id="label-2.2.0">2.2.0</h2>
 
 <h3 id="label-Added">Added</h3>
@@ -534,7 +541,7 @@ based on ContentTypes</p>
 </div></div>
 
       <div id="footer">
-  Generated on Wed Oct 25 11:55:56 2017 by
+  Generated on Wed Nov 15 11:06:20 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

data/doc/file.LICENSE.html

@@ -60,7 +60,7 @@
       <div id="content"><div id='filecontents'>The MIT License (MIT)<br/><br/>Copyright (c) 2014 Contentful GmbH - Jan Lelis<br/>Copyright (c) 2016 Contentful GmbH - David Litvak<br/><br/>Permission is hereby granted, free of charge, to any person obtaining a copy<br/>of this software and associated documentation files (the &quot;Software&quot;), to deal<br/>in the Software without restriction, including without limitation the rights<br/>to use, copy, modify, merge, publish, distribute, sublicense, and/or sell<br/>copies of the Software, and to permit persons to whom the Software is<br/>furnished to do so, subject to the following conditions:<br/><br/>The above copyright notice and this permission notice shall be included in<br/>all copies or substantial portions of the Software.<br/><br/>THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR<br/>IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,<br/>FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE<br/>AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER<br/>LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,<br/>OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN<br/>THE SOFTWARE.</div></div>
 
       <div id="footer">
-  Generated on Wed Oct 25 11:55:56 2017 by
+  Generated on Wed Nov 15 11:06:20 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

data/doc/file.README.html

@@ -560,7 +560,7 @@ GmbH - David Litvak.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Wed Oct 25 11:55:56 2017 by
+  Generated on Wed Nov 15 11:06:20 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

data/doc/index.html

@@ -560,7 +560,7 @@ GmbH - David Litvak.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Wed Oct 25 11:55:55 2017 by
+  Generated on Wed Nov 15 11:06:19 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

data/doc/top-level-namespace.html

@@ -100,7 +100,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Oct 25 11:55:56 2017 by
+  Generated on Wed Nov 15 11:06:20 2017 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.4.1).
 </div>

data/lib/contentful/error.rb

@@ -122,7 +122,8 @@ module Contentful
     def handle_details(details)
       return details if details.is_a?(String)
 
-      message = "The requested #{details['type']} could not be found."
+      type = details['type'] || (details['sys'] || {})['type']
+      message = "The requested #{type} could not be found."
 
       resource_id = details.fetch('id', nil)
       message += " ID: #{resource_id}." if resource_id

data/lib/contentful/version.rb

@@ -1,5 +1,5 @@
 # Contentful Namespace
 module Contentful
   # Gem Version
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

data/spec/error_class_spec.rb

@@ -165,15 +165,28 @@ describe Contentful::Error do
             expect(error.message).to eq message
           end
 
-          it 'has a type' do
-            response = Contentful::Response.new raw_fixture('404_type', 404)
-            error = Contentful::Error[response.raw.status].new(response)
-
-            message = "HTTP status code: 404\n"\
-                      "Message: The requested resource or endpoint could not be found.\n"\
-                      "Details: The requested Asset could not be found.\n"\
-                      "Request ID: 85f-351076632"
-            expect(error.message).to eq message
+          describe 'has a type' do
+            it 'type is on the top level' do
+              response = Contentful::Response.new raw_fixture('404_type', 404)
+              error = Contentful::Error[response.raw.status].new(response)
+
+              message = "HTTP status code: 404\n"\
+                        "Message: The requested resource or endpoint could not be found.\n"\
+                        "Details: The requested Asset could not be found.\n"\
+                        "Request ID: 85f-351076632"
+              expect(error.message).to eq message
+            end
+
+            it 'type is not on the top level' do
+              response = Contentful::Response.new raw_fixture('404_sys_type', 404)
+              error = Contentful::Error[response.raw.status].new(response)
+
+              message = "HTTP status code: 404\n"\
+                        "Message: The requested resource or endpoint could not be found.\n"\
+                        "Details: The requested Space could not be found.\n"\
+                        "Request ID: 85f-351076632"
+              expect(error.message).to eq message
+            end
           end
 
           it 'can specify the resource id' do

data/spec/fixtures/json_responses/404_sys_type.json

@@ -0,0 +1,12 @@
+{
+  "sys": {
+    "type": "Error",
+    "id": "NotFound"
+  },
+  "details": {
+    "sys": {
+      "type": "Space"
+    }
+  },
+  "requestId": "85f-351076632"
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -410,6 +410,7 @@ files:
 - spec/fixtures/json_responses/403_reasons.json
 - spec/fixtures/json_responses/404_details_string.json
 - spec/fixtures/json_responses/404_id.json
+- spec/fixtures/json_responses/404_sys_type.json
 - spec/fixtures/json_responses/404_type.json
 - spec/fixtures/json_responses/content_type.json
 - spec/fixtures/json_responses/default_400.json
@@ -542,6 +543,7 @@ test_files:
 - spec/fixtures/json_responses/403_reasons.json
 - spec/fixtures/json_responses/404_details_string.json
 - spec/fixtures/json_responses/404_id.json
+- spec/fixtures/json_responses/404_sys_type.json
 - spec/fixtures/json_responses/404_type.json
 - spec/fixtures/json_responses/content_type.json
 - spec/fixtures/json_responses/default_400.json