contentful 2.18.0 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c528da80cb5f6311e4777fb2e4df10669e4b68040999a897e56a6aa3175d93f
-  data.tar.gz: fbdceb0c8f8529e5c2447835a1769e5e6f630dcd96b5b7262884e3213275782c
+  metadata.gz: a5b438ba31c476508694b1c294d2881789d186aa3177a35be94d17e8921a9014
+  data.tar.gz: 993a24776cff08778e8b6b473933bdf234f31f6ccdd5742c907d05a4d4f05a10
 SHA512:
-  metadata.gz: e754c6ff56a14421791b440a4003d128e69550b8c40d4913d86af91ac63070047ddc0ebdf99d5a1fd72a6605f950b3f030c0edf50c8ffa976fffe7934461ab61
-  data.tar.gz: 7289773832ac258c0994d6e38dca5491d9c6954d788b3bb3fc904e24c0697a9789dd27a38957d893fbbc163dddfa9bb62c6a32b3f0b7b07a9be1e456c41f5ed4
+  metadata.gz: 83c52658865579070c024434d1bc6ad1ca115e00c8f60f32d8354cf7b5bf71a08092ba640ab109f98d0a84b3853347741628cc9a1202a5f893fe45c98d22058b
+  data.tar.gz: 547b64d7a90788e3dfae97a03b17356b5dd0f9cd6a00fdb72d4b98d742c8597b907127b2670acb1691002f1198d2afd0edc81831df924056761157e661f59edb

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## 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`
+
 ## 2.18.0
 * Added support for Taxonomy endpoints
 

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>
 
@@ -369,6 +369,15 @@ client = Contentful::Client.new(
         the original log_level on the logger, for example when using Rails.logger.
       </td>
     </tr>
+    <tr>
+      <td><code>http_instrumenter</code></td>
+      <td><code>nil</code></td>
+      <td>
+        An HTTP instrumenter object that implements the <code>HTTP::Features::Instrumentation::Instrumenter</code> interface.
+        When provided, it will be used to instrument all HTTP requests made by the client.
+        This is useful for monitoring, logging, or tracking HTTP requests.
+      </td>
+    </tr>
   </tbody>
 </table>
 
@@ -749,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/client.rb

@@ -44,16 +44,18 @@ module Contentful
       application_name: nil,
       application_version: nil,
       integration_name: nil,
-      integration_version: nil
+      integration_version: nil,
+      http_instrumenter: nil
     }
 
     attr_reader :configuration, :logger, :proxy
 
     # Wraps the actual HTTP request via proxy
     # @private
-    def self.get_http(url, query, headers = {}, proxy = {}, timeout = {})
+    def self.get_http(url, query, headers = {}, proxy = {}, timeout = {}, instrumenter)
       http = HTTP[headers]
       http = http.timeout(timeout) if timeout.any?
+      http = http.use(instrumentation: { instrumenter: instrumenter }) if instrumenter
       if proxy[:host]
         http.via(proxy[:host], proxy[:port], proxy[:username], proxy[:password]).get(url, params: query)
       else
@@ -92,6 +94,10 @@ module Contentful
     # @option given_configuration [String] :application_version
     # @option given_configuration [String] :integration_name
     # @option given_configuration [String] :integration_version
+    # @option given_configuration [HTTP::Features::Instrumentation::Instrumenter, nil] :http_instrumenter
+    #   An HTTP instrumenter object that implements the instrumentation interface.
+    #   When provided, it will be used to instrument all HTTP requests made by the client.
+    #   This is useful for monitoring, logging, or tracking HTTP requests.
     def initialize(given_configuration = {})
       @configuration = default_configuration.merge(given_configuration)
       normalize_configuration!
@@ -410,7 +416,8 @@ module Contentful
           request_query(request.query),
           request_headers,
           proxy_params,
-          timeout_params
+          timeout_params,
+          configuration[:http_instrumenter]
         ), request
       )
     end

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.18.0'
+  VERSION = '2.20.0'
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: contentful
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.20.0
 platform: ruby
 authors:
 - Contentful GmbH (Jan Lelis)
 - Contentful GmbH (Andreas Tiefenthaler)
 - Contentful GmbH (David Litvak Bruno)
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -21,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
@@ -31,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
@@ -286,7 +285,6 @@ homepage: https://github.com/contentful/contentful.rb
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -301,8 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: contentful
 test_files: []