hyperclient 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f55cb82362d8eca25347e15c91387bbf2957f1f1241af27fccff1086b412d1b
-  data.tar.gz: f31325a293b0aec888b94910b8c3dc28d2f30a6666fe59063b4112251f46e7c4
+  metadata.gz: '02694a72cb9a16a0faac55b463c859a470bce22f7976b0b77c19da138cceded8'
+  data.tar.gz: d96697a7e493f29b2a3207850b961664cfa18e0195b526abb16c9c108b2e2bc3
 SHA512:
-  metadata.gz: e9b17e112614d3c600497c6c7cfd56268195427da789629d006742ff96e70d2b6972ba16fbfa075ab62613eeace923d8fdb4f231b9d86a04f82b75fa5d4a4826
-  data.tar.gz: 8a8861e266967702c86d5762ec5b786687298c37e797a5c324583c9d3c9d2fe4dc83cf8841c912db3d14a0bf731d1dbee0c1c85b3d43961589c5741b43b3f128
+  metadata.gz: 45bb98cc9a22fd721c71f32a4e7b2634610279fe66a8466d6f2339efb994853896ed33867baa3e460cd805055b2b2611108d703f7c7788b952ef3693393140fd
+  data.tar.gz: c3c47fee4c97362f31c40a8923eec8c7573be28e215a43bdaac89c44e573cd93cec57291932718dd1bd136689c9f46f1ceff2ace244d613d76871cf9e7529df6

data/.github/dependabot.yml

@@ -0,0 +1,18 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+    timezone: Europe/Madrid
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: rubocop
+    versions:
+    - 1.10.0
+    - 1.11.0
+    - 1.12.0
+    - 1.12.1
+    - 1.9.0
+    - 1.9.1

data/.github/workflows/coverage.yml

@@ -0,0 +1,24 @@
+---
+name: coverage
+on: [push, pull_request]
+
+env:
+  COVERAGE: 1
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install Ruby (2.7)
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+        bundler-cache: true
+    - name: Build and test with RSpec
+      run: |
+        bundle exec rake test
+    - name: Coveralls
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/danger.yml

@@ -0,0 +1,22 @@
+---
+name: danger
+on:
+  pull_request:
+    types: [opened, reopened, edited, synchronize]
+jobs:
+  danger:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+        bundler-cache: true
+    - name: Run Danger
+      run: |
+        # the personal token is public, this is ok, base64 encode to avoid tripping Github
+        TOKEN=$(echo -n Z2hwX0xNQ3VmanBFeTBvYkZVTWh6NVNqVFFBOEUxU25abzBqRUVuaAo= | base64 --decode)
+        DANGER_GITHUB_API_TOKEN=$TOKEN bundle exec danger --verbose

data/.github/workflows/lint.yml

@@ -0,0 +1,16 @@
+name: lint
+on: [push, pull_request]
+jobs:
+  rubocop:
+    name: RuboCop
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.7'
+          bundler-cache: true
+      - run: bundle exec rubocop
+

data/.github/workflows/test.yml

@@ -0,0 +1,23 @@
+---
+name: test
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        entry:
+          - { ruby: '3.2' }
+          - { ruby: '2.7' }
+          - { ruby: 'ruby-head', allowed-failure: true }
+          - { ruby: 'jruby-head', allowed-failure: true }
+    name: test (${{ matrix.entry.ruby }})
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.entry.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake test spinach
+        continue-on-error: ${{ matrix.entry.allowed-failure || false }}

data/.rubocop.yml

@@ -1,6 +1,11 @@
 inherit_from: .rubocop_todo.yml
 
+require:
+  - rubocop-rake
+  - rubocop-minitest
+
 AllCops:
+  NewCops: enable
   TargetRubyVersion: 2.3
 
 Metrics:

data/.rubocop_todo.yml

@@ -1,21 +1,52 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-12-03 14:08:14 -0500 using RuboCop version 0.81.0.
+# on 2024-02-01 15:28:54 UTC using RuboCop version 1.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
+# Offense count: 1
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'hyperclient.gemspec'
+
+# Offense count: 1
+# Configuration parameters: AllowComments, AllowEmptyLambdas.
+Lint/EmptyBlock:
+  Exclude:
+    - 'test/hyperclient/entry_point_test.rb'
+
+# Offense count: 4
+Lint/MissingSuper:
+  Exclude:
+    - 'lib/hyperclient/attributes.rb'
+    - 'lib/hyperclient/entry_point.rb'
+    - 'lib/hyperclient/link_collection.rb'
+    - 'lib/hyperclient/resource_collection.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal?
+Lint/RedundantSafeNavigation:
+  Exclude:
+    - 'lib/hyperclient/link.rb'
+
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
     - 'features/steps/api_navigation.rb'
     - 'features/steps/default_config.rb'
+    - 'features/support/env.rb'
 
-# Offense count: 4
+# Offense count: 5
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -23,30 +54,5 @@ Style/Documentation:
     - 'features/steps/api_navigation.rb'
     - 'features/steps/default_config.rb'
     - 'features/support/api.rb'
+    - 'features/support/env.rb'
     - 'features/support/fixtures.rb'
-
-# Offense count: 2
-Style/DoubleNegation:
-  Exclude:
-    - 'lib/hyperclient/curie.rb'
-    - 'lib/hyperclient/link.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/hyperclient/link_collection.rb'
-    - 'lib/hyperclient/resource.rb'
-    - 'lib/hyperclient/resource_collection.rb'
-
-# Offense count: 1
-Style/MethodMissingSuper:
-  Exclude:
-    - 'lib/hyperclient/collection.rb'
-
-# Offense count: 101
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 147

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Changelog
 
+### 2.0.0 (2024/02/01)
+
+* [#268](https://github.com/codegram/hyperclient/pull/268): Replace Travis-CI with GHA - [@dblock](https://github.com/dblock).
+* [#269](https://github.com/codegram/hyperclient/pull/269): Re-add code coverage - [@dblock](https://github.com/dblock).
+* [#270](https://github.com/codegram/hyperclient/pull/270): Upgrade Rubocop to 1.45 - [@dblock](https://github.com/dblock).
+* [#271](https://github.com/codegram/hyperclient/pull/271): Test against Ruby 3.2 - [@dblock](https://github.com/dblock).
+* [#285](https://github.com/codegram/hyperclient/pull/285): Support Faraday 2.x - [@dblock](https://github.com/dblock).
+
 ### 1.0.1 (2021/01/02)
 
 * [#193](https://github.com/codegram/hyperclient/pull/193): Auto-paginate collections - [@dblock](https://github.com/dblock).

data/CONTRIBUTING.md

@@ -106,7 +106,7 @@ git push origin my-feature-branch -f
 
 #### Check on Your Pull Request
 
-Go back to your pull request after a few minutes and see whether it passed muster with Travis-CI. Everything should look green, otherwise fix issues and amend your commit as described above.
+Go back to your pull request after a few minutes and see whether it passed muster with CI. Everything should look green, otherwise fix issues and amend your commit as described above.
 
 #### Be Patient
 

data/Gemfile

@@ -1,10 +1,5 @@
-# NOTE: this is temporary until Bundler 2.0 changes how github: references work.
-git_source(:github) { |repo| "https://github.com/#{repo['/'] ? repo : "#{repo}/#{repo}"}.git" }
-
 source 'https://rubygems.org'
 
-gem 'faraday', ENV['FARADAY_VERSION'] if ENV.key?('FARADAY_VERSION')
-
 gemspec
 
 group :development do
@@ -18,8 +13,11 @@ end
 
 group :development, :test do
   gem 'rake'
-  gem 'rubocop', '0.81.0', require: false
+  gem 'rubocop', '~> 1.48.0', require: false
+  gem 'rubocop-minitest', require: false
+  gem 'rubocop-rake', require: false
   gem 'simplecov', require: false
+  gem 'simplecov-lcov', require: false
 end
 
 group :test do

data/README.md

@@ -1,7 +1,7 @@
 # Hyperclient
 
 [![Gem Version](http://img.shields.io/gem/v/hyperclient.svg)](http://badge.fury.io/rb/hyperclient)
-[![Build Status](http://img.shields.io/travis/codegram/hyperclient.svg)](https://travis-ci.org/codegram/hyperclient)
+[![Build Status](https://github.com/codegram/hyperclient/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/codegram/hyperclient/actions/workflows/test.yml)
 [![Code Climate](https://codeclimate.com/github/codegram/hyperclient.svg)](https://codeclimate.com/github/codegram/hyperclient)
 [![Coverage Status](https://img.shields.io/coveralls/codegram/hyperclient.svg)](https://coveralls.io/r/codegram/hyperclient?branch=master)
 
@@ -25,7 +25,7 @@ Hyperclient is a Hypermedia API client written in Ruby. It fully supports [JSON
 
 # Usage
 
-The examples in this README use the [Splines Demo API](https://github.com/ruby-grape/grape-with-roar) running [here](https://grape-with-roar.herokuapp.com/api). If you're upgrading from a previous version, please make sure to read [UPGRADING](UPGRADING.md).
+The examples in this README use the [Splines Demo API](https://github.com/ruby-grape/grape-with-roar) running [here](https://grape-with-roar.herokuapp.com/api). Use version 1.x with Faraday 1.x, and version 2.x with Faraday 2.x. If you're upgrading from a previous version, please make sure to read [UPGRADING](UPGRADING.md).
 
 ## API Client
 
@@ -50,7 +50,7 @@ Hyperclient constructs a connection using typical [Faraday](http://github.com/lo
 ```ruby
 api = Hyperclient.new('https://grape-with-roar.herokuapp.com/api') do |client|
   client.connection do |conn|
-    conn.use Faraday::Request::OAuth
+    conn.use Faraday::Request::Instrumentation
   end
 end
 ```
@@ -60,7 +60,7 @@ You can pass options to the Faraday connection block in the `connection` block:
 ```ruby
 api = Hyperclient.new('https://grape-with-roar.herokuapp.com/api') do |client|
   client.connection(ssl: { verify: false }) do |conn|
-    conn.use Faraday::Request::OAuth
+    conn.use Faraday::Request::Instrumentation
   end
 end
 ```

data/RELEASING.md

@@ -12,7 +12,7 @@ bundle install
 rake
 ```
 
-Check that the last build succeeded in [Travis CI](https://travis-ci.org/codegram/hyperclient) for all supported platforms.
+Check that the last build succeeded in CI for all supported platforms.
 
 Increment the version, modify [lib/hyperclient/version.rb](lib/hyperclient/version.rb).
 

data/Rakefile

@@ -6,14 +6,6 @@ Bundler.setup :default, :test, :development
 
 Bundler::GemHelper.install_tasks
 
-if ENV['COVERAGE']
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter '/test/'
-    add_filter '/features/'
-  end
-end
-
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|

data/features/steps/api_navigation.rb

@@ -43,13 +43,13 @@ class Spinach::Features::ApiNavigation < Spinach::FeatureSteps
   end
 
   step 'I should be able to access it\'s title and body' do
-    @post._attributes.title.wont_equal nil
-    @post._attributes.body.wont_equal nil
+    assert_kind_of String, @post._attributes.title
+    assert_kind_of String, @post._attributes.body
   end
 
   step 'I should also be able to access it\'s embedded comments' do
     comment = @post._embedded.comments.first
-    comment._attributes.title.wont_equal nil
+    assert_kind_of String, comment._attributes.title
   end
 
   step 'I should be able to navigate to next page' do

data/features/steps/default_config.rb

@@ -25,7 +25,7 @@ class Spinach::Features::DefaultConfig < Spinach::FeatureSteps
   end
 
   step 'it should have been parsed as JSON' do
-    @posts._attributes.total_posts.to_i.must_equal 4
-    @posts._attributes['total_posts'].to_i.must_equal 4
+    assert_equal 4, @posts._attributes.total_posts.to_i
+    assert_equal 4, @posts._attributes['total_posts'].to_i
   end
 end

data/features/support/api.rb

@@ -7,17 +7,28 @@ module API
   before do
     WebMock::Config.instance.query_values_notation = :flat_array
 
-    stub_request(:any, /api.example.org*/).to_return(body: root_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org').to_return(body: root_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/authors').to_return(body: authors_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/posts').to_return(body: posts_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/posts?page=2').to_return(body: posts_page2_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/posts?page=3').to_return(body: posts_page3_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/posts/1').to_return(body: post1_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/posts/2').to_return(body: post2_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/posts/3').to_return(body: post3_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/page2').to_return(body: page2_response, headers: { 'Content-Type' => 'application/hal+json' })
-    stub_request(:get, 'api.example.org/page3').to_return(body: page3_response, headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:any, /api.example.org*/).to_return(body: root_response,
+                                                     headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org').to_return(body: root_response,
+                                                    headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/authors').to_return(body: authors_response,
+                                                            headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts').to_return(body: posts_response,
+                                                          headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts?page=2').to_return(body: posts_page2_response,
+                                                                 headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts?page=3').to_return(body: posts_page3_response,
+                                                                 headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts/1').to_return(body: post1_response,
+                                                            headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts/2').to_return(body: post2_response,
+                                                            headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/posts/3').to_return(body: post3_response,
+                                                            headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/page2').to_return(body: page2_response,
+                                                          headers: { 'Content-Type' => 'application/hal+json' })
+    stub_request(:get, 'api.example.org/page3').to_return(body: page3_response,
+                                                          headers: { 'Content-Type' => 'application/hal+json' })
   end
 
   def api

data/features/support/env.rb

@@ -1,4 +1,17 @@
-require 'minitest/spec'
+require 'minitest'
 require 'webmock'
 WebMock.enable!
 require 'hyperclient'
+
+Minitest::Spec.new nil if defined?(Minitest::Spec)
+Spinach.config[:failure_exceptions] << Minitest::Assertion
+
+class Spinach::FeatureSteps
+  include Minitest::Assertions
+  attr_accessor :assertions
+
+  def initialize(*args)
+    super(*args)
+    self.assertions = 0
+  end
+end

data/hyperclient.gemspec

@@ -8,13 +8,13 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/codegram/hyperclient/'
   gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = 'hyperclient'
   gem.require_paths = ['lib']
   gem.version       = Hyperclient::VERSION
 
   gem.add_dependency 'addressable'
-  gem.add_dependency 'faraday', '>= 0.9.0'
-  gem.add_dependency 'faraday_hal_middleware'
-  gem.add_dependency 'faraday_middleware'
+  gem.add_dependency 'faraday', '>= 2'
+  gem.add_dependency 'faraday-follow_redirects'
+  gem.add_dependency 'faraday_hal_middleware', '>= 0.2'
+  gem.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/hyperclient/entry_point.rb

@@ -1,4 +1,4 @@
-require 'faraday_middleware'
+require 'faraday/follow_redirects'
 require 'faraday_hal_middleware'
 
 module Hyperclient
@@ -20,7 +20,7 @@ module Hyperclient
   #
   #  client = Hyperclient::EntryPoint.new('http://my.api.org') do |entry_point|
   #    entry_point.connection do |conn|
-  #      conn.use Faraday::Request::OAuth
+  #      conn.use Faraday::Request::Instrumentation
   #    end
   #    entry_point.headers['Access-Token'] = 'token'
   #  end
@@ -138,7 +138,7 @@ module Hyperclient
     def default_faraday_block
       lambda do |connection, &block|
         connection.use Faraday::Response::RaiseError
-        connection.use FaradayMiddleware::FollowRedirects
+        connection.use Faraday::FollowRedirects::Middleware
         connection.request :hal_json
         connection.response :hal_json, content_type: /\bjson$/
 

data/lib/hyperclient/resource.rb

@@ -111,9 +111,7 @@ module Hyperclient
       elsif !Array.method_defined?(method)
         %i[_attributes _embedded _links].each do |target|
           target = send(target)
-          if target.respond_to?(method.to_s)
-            return target.send(method, *args, &block)
-          end
+          return target.send(method, *args, &block) if target.respond_to?(method.to_s)
         end
         super
       end

data/lib/hyperclient/resource_collection.rb

@@ -23,9 +23,7 @@ module Hyperclient
     private
 
     def build_resource(representation)
-      if representation.is_a?(Array)
-        return representation.map(&method(:build_resource))
-      end
+      return representation.map(&method(:build_resource)) if representation.is_a?(Array)
 
       Resource.new(representation, @entry_point)
     end

data/lib/hyperclient/version.rb

@@ -1,3 +1,3 @@
 module Hyperclient
-  VERSION = '1.0.1'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/test/hyperclient/entry_point_test.rb

@@ -26,18 +26,18 @@ module Hyperclient
 
         it 'can insert additional middleware after a connection has been constructed' do
           _(entry_point.connection).must_be_kind_of Faraday::Connection
-          entry_point.connection.use :instrumentation
+          entry_point.connection.use Faraday::Request::Instrumentation
           handlers = entry_point.connection.builder.handlers
-          _(handlers).must_include FaradayMiddleware::Instrumentation
+          _(handlers).must_include Faraday::Request::Instrumentation
         end
 
         it 'creates a Faraday connection with the default block' do
           handlers = entry_point.connection.builder.handlers
 
           _(handlers).must_include Faraday::Response::RaiseError
-          _(handlers).must_include FaradayMiddleware::FollowRedirects
-          _(handlers).must_include FaradayMiddleware::EncodeHalJson
-          _(handlers).must_include FaradayMiddleware::ParseHalJson
+          _(handlers).must_include Faraday::FollowRedirects::Middleware
+          _(handlers).must_include Faraday::HalJson::Request
+          _(handlers).must_include Faraday::HalJson::Response
 
           _(entry_point.connection.options.params_encoder).must_equal Faraday::FlatParamsEncoder
         end
@@ -137,9 +137,9 @@ module Hyperclient
         it 'creates a Faraday connection with the default block' do
           handlers = entry_point.connection.builder.handlers
           _(handlers).wont_include Faraday::Response::RaiseError
-          _(handlers).wont_include FaradayMiddleware::FollowRedirects
-          _(handlers).must_include FaradayMiddleware::EncodeJson
-          _(handlers).must_include FaradayMiddleware::ParseJson
+          _(handlers).wont_include Faraday::FollowRedirects
+          _(handlers).must_include Faraday::Request::Json
+          _(handlers).must_include Faraday::Response::Json
         end
       end
     end
@@ -148,7 +148,7 @@ module Hyperclient
       let(:entry_point) do
         EntryPoint.new 'http://my.api.org' do |entry_point|
           entry_point.connection do |conn|
-            conn.use Faraday::Request::OAuth
+            conn.use Faraday::Request::Instrumentation
           end
           entry_point.headers['Access-Token'] = 'token'
         end
@@ -168,11 +168,11 @@ module Hyperclient
         it 'creates a Faraday connection with the default block plus any additional handlers' do
           handlers = entry_point.connection.builder.handlers
 
-          _(handlers).must_include Faraday::Request::OAuth
+          _(handlers).must_include Faraday::Request::Instrumentation
           _(handlers).must_include Faraday::Response::RaiseError
-          _(handlers).must_include FaradayMiddleware::FollowRedirects
-          _(handlers).must_include FaradayMiddleware::EncodeHalJson
-          _(handlers).must_include FaradayMiddleware::ParseHalJson
+          _(handlers).must_include Faraday::FollowRedirects::Middleware
+          _(handlers).must_include Faraday::HalJson::Request
+          _(handlers).must_include Faraday::HalJson::Response
 
           _(entry_point.connection.options.params_encoder).must_equal Faraday::FlatParamsEncoder
         end

data/test/hyperclient/resource_test.rb

@@ -60,7 +60,8 @@ module Hyperclient
 
     describe '_links' do
       it '_expand' do
-        resource = Resource.new({ '_links' => { 'orders' => { 'href' => '/orders/{id}', 'templated' => true } } }, entry_point)
+        resource = Resource.new({ '_links' => { 'orders' => { 'href' => '/orders/{id}', 'templated' => true } } },
+                                entry_point)
         _(resource._links.orders._expand(id: 1)._url).must_equal '/orders/1'
         _(resource.orders._expand(id: 1)._url).must_equal '/orders/1'
         _(resource.orders(id: 1)._url).must_equal '/orders/1'

data/test/hyperclient_test.rb

@@ -13,7 +13,7 @@ describe Hyperclient do
       let(:client) do
         Hyperclient.new('http://api.example.org') do |client|
           client.connection(default: true) do |conn|
-            conn.use Faraday::Request::OAuth
+            conn.use Faraday::Request::Instrumentation
           end
           client.headers['Access-Token'] = 'token'
         end
@@ -31,11 +31,11 @@ describe Hyperclient do
 
       it 'creates a Faraday connection with the default block plus any additional handlers' do
         handlers = client.connection.builder.handlers
-        _(handlers).must_include Faraday::Request::OAuth
+        _(handlers).must_include Faraday::Request::Instrumentation
         _(handlers).must_include Faraday::Response::RaiseError
-        _(handlers).must_include FaradayMiddleware::FollowRedirects
-        _(handlers).must_include FaradayMiddleware::EncodeHalJson
-        _(handlers).must_include FaradayMiddleware::ParseHalJson
+        _(handlers).must_include Faraday::FollowRedirects::Middleware
+        _(handlers).must_include Faraday::HalJson::Request
+        _(handlers).must_include Faraday::HalJson::Response
       end
     end
   end

data/test/test_helper.rb

@@ -1,11 +1,30 @@
 $LOAD_PATH << 'lib'
 
+if ENV['COVERAGE']
+  require 'simplecov'
+  require 'simplecov-lcov'
+  SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
+  SimpleCov::Formatter::LcovFormatter.config do |c|
+    c.report_with_single_file = true
+    c.lcov_file_name = 'lcov.info'
+    c.single_report_path = 'coverage/lcov.info'
+  end
+  SimpleCov.start do
+    add_filter '/test/'
+    add_filter '/features/'
+  end
+end
+
 require 'minitest/autorun'
 require 'minitest/pride'
+require 'minitest/unit'
 require 'mocha/minitest'
 require 'json'
 
-MiniTest::Test.class_eval do
+require 'faraday'
+require 'faraday/request/instrumentation'
+
+MiniTest::Assertions.class_eval do
   def stub_request(conn, adapter_class = Faraday::Adapter::Test, &stubs_block)
     adapter_handler = conn.builder.handlers.find { |h| h.klass < Faraday::Adapter }
     if adapter_handler

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperclient
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Oriol Gual
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-02 00:00:00.000000000 Z
+date: 2024-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -30,16 +30,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: faraday_hal_middleware
+  name: faraday-follow_redirects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday_hal_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 description: Hyperclient is a Ruby Hypermedia API client.
 email:
 - oriol.gual@gmail.com
@@ -73,10 +73,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
+- ".github/dependabot.yml"
+- ".github/workflows/coverage.yml"
+- ".github/workflows/danger.yml"
+- ".github/workflows/lint.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -122,7 +127,8 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/codegram/hyperclient/
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -138,28 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: ''
-test_files:
-- features/api_navigation.feature
-- features/default_config.feature
-- features/steps/api_navigation.rb
-- features/steps/default_config.rb
-- features/support/api.rb
-- features/support/env.rb
-- features/support/fixtures.rb
-- test/fixtures/collection.json
-- test/fixtures/element.json
-- test/fixtures/root.json
-- test/hyperclient/attributes_test.rb
-- test/hyperclient/collection_test.rb
-- test/hyperclient/curie_test.rb
-- test/hyperclient/entry_point_test.rb
-- test/hyperclient/link_collection_test.rb
-- test/hyperclient/link_test.rb
-- test/hyperclient/resource_collection_test.rb
-- test/hyperclient/resource_test.rb
-- test/hyperclient_test.rb
-- test/test_helper.rb
+test_files: []

data/.travis.yml

@@ -1,24 +0,0 @@
-language: ruby
-
-sudo: false
-
-matrix:
-  include:
-    - rvm: 2.6.6
-      env: FARADAY_VERSION=0.9.0
-    - rvm: 2.6.6
-      env: FARADAY_VERSION=0.17.0
-    - rvm: 2.6.6
-      env: FARADAY_VERSION="~> 1.0"
-    - rvm: 2.6.6
-      script:
-        - bundle exec danger
-    - rvm: 2.3.8
-    - rvm: jruby-9.2.7.0
-    - rvm: jruby-head
-    - rvm: ruby-head
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-
-bundler_args: --without development