contentful 2.19.0 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f73573b5e007f3d6ef23b5d347f1d524a0c88e7e1ad90f044a20290b71eb1df
-  data.tar.gz: d9ba166255a82387acbea7127f665c4aedd5181b36f5dab67a6ddc6286d87876
+  metadata.gz: a5b438ba31c476508694b1c294d2881789d186aa3177a35be94d17e8921a9014
+  data.tar.gz: 993a24776cff08778e8b6b473933bdf234f31f6ccdd5742c907d05a4d4f05a10
 SHA512:
-  metadata.gz: '0693f89bec3ad2bc4324b523fc6086260c26f0f48e20614df3005c8ae39d733915193ce7fe8f7698fe90c383610af030a8e18becd5ea4d8ae9dbb5dc0e6553d9'
-  data.tar.gz: aef73a49aad4da0757a2a2f8e013a46137e5bb6ebed392de2a3c916093b3a4ef96deabca8e33c1360c6eff9dd4b1edce58be4b18309cdd95934ba6ae0d5d28f2
+  metadata.gz: 83c52658865579070c024434d1bc6ad1ca115e00c8f60f32d8354cf7b5bf71a08092ba640ab109f98d0a84b3853347741628cc9a1202a5f893fe45c98d22058b
+  data.tar.gz: 547b64d7a90788e3dfae97a03b17356b5dd0f9cd6a00fdb72d4b98d742c8597b907127b2670acb1691002f1198d2afd0edc81831df924056761157e661f59edb

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 2.20.0
+* Allow `http` gem `6.x` by widening the dependency constraint to `'> 0.8', '< 7.0'`. Resolves [#278](https://github.com/contentful/contentful.rb/issues/278).
+* Adapted error response handling for `http` 6.x: status codes are now coerced to integers for class lookup (`HTTP::Response::Status` no longer inherits from `Delegator`), and the rate-limit reset header is read via `raw.headers[...]` (the `[]` delegator on `HTTP::Response` was removed).
+
 ## 2.19.0
 * Added `http_instrumenter` configuration option to allow instrumenting HTTP requests. [#266](https://github.com/contentful/contentful.rb/pull/266)
 * Updated `http` gem version to `> 4`

data/README.md

@@ -21,8 +21,8 @@
     <img src="https://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT License" />
   </a>
   &nbsp;
-  <a href="https://app.circleci.com/pipelines/github/contentful/contentful.rb?branch=master">
-    <img src="https://circleci.com/gh/contentful/contentful.rb/tree/master.svg?style=svg" alt="CircleCI">
+  <a href="https://github.com/contentful/contentful.rb/actions/workflows/ci.yml">
+    <img src="https://github.com/contentful/contentful.rb/actions/workflows/ci.yml/badge.svg" alt="CI">
   </a>
 </p>
 
@@ -758,6 +758,14 @@ For more information on the internal changes present in the 2.x release, please
 
 We appreciate any help on our repositories. For more details about how to contribute see our [CONTRIBUTING.md](CONTRIBUTING.md) document.
 
+For a reproducible local setup, open this repository in its included dev container. The container installs the project dependencies automatically when it is created.
+
+After the container is ready, run:
+
+```bash
+bundle exec rake rspec_rubocop
+```
+
 ## License
 
 This repository is published under the [MIT](LICENSE.txt) license.

data/lib/contentful/error.rb

@@ -149,7 +149,7 @@ module Contentful
 
     # Time until next available request, in seconds.
     def reset_time
-      @reset_time ||= @response.raw[RATE_LIMIT_RESET_HEADER_KEY]
+      @reset_time ||= @response.raw.headers[RATE_LIMIT_RESET_HEADER_KEY]
     end
 
     protected

data/lib/contentful/response.rb

@@ -58,31 +58,35 @@ module Contentful
       parse_http_error
     end
 
+    def status_code
+      raw.status.to_i
+    end
+
     def valid_http_response?
-      [200, 201].include?(raw.status)
+      [200, 201].include?(status_code)
     end
 
     def service_unavailable_response?
-      @raw.status == 503
+      status_code == 503
     end
 
     def service_unavailable_error
       @status = :error
       @error_message = '503 - Service Unavailable'
-      @object = Error[@raw.status].new(self)
+      @object = Error[status_code].new(self)
     end
 
     def parse_http_error
       @status = :error
-      @object = Error[raw.status].new(self)
+      @object = Error[status_code].new(self)
     end
 
     def invalid_response?
-      [400, 404].include?(raw.status)
+      [400, 404].include?(status_code)
     end
 
     def no_content_response?
-      raw.to_s == '' && raw.status == 204
+      raw.to_s == '' && status_code == 204
     end
 
     def parse_json!

data/lib/contentful/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 2.19.0
+  version: 2.20.0
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
@@ -20,7 +20,7 @@ dependencies:
         version: '0.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '0.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement