Update faraday

.github/workflows/ci.yml

@@ -12,26 +12,22 @@ jobs:
     strategy:
       matrix:
         ruby:
+          - '3.2'
+          - '3.1'
           - '3.0'
-          - '2.7'
-          - '2.6'
-          - '2.5'
-    container:
-      image: ruby:${{ matrix.ruby }}
-      env:
-        BUNDLE_CLEAN: 'true'
-        BUNDLE_DEPLOYMENT: 'true'
-        BUNDLE_JOBS: 4
+
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
+      - uses: actions/checkout@v3
+
+      - uses: ruby/setup-ruby@v1
         with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-ruby${{ matrix.ruby }}-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: ${{ runner.os }}-ruby${{ matrix.ruby }}-
-      - name: Install gems
-        run: gem install bundler && bundle install
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: ruby -v
+
       - name: Rubocop
         run: bundle exec rubocop
+
       - name: RSpec
         run: bundle exec rake spec

.rubocop.yml

@@ -1,5 +1,9 @@
+require:
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
   NewCops: enable
 
 Style/Documentation:

Gemfile.lock

@@ -1,44 +1,40 @@
 PATH
   remote: .
   specs:
-    metabase (0.5.0)
-      faraday (>= 1.2.0)
-      faraday_middleware
+    metabase (0.6.0)
+      faraday (>= 2.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     amazing_print (1.2.2)
-    ast (2.4.1)
+    ast (2.4.2)
     bump (0.10.0)
     coderay (1.1.3)
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)
     docile (1.3.5)
-    faraday (1.3.0)
-      faraday-net_http (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    faraday-net_http (1.0.1)
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
     hashdiff (1.0.1)
+    json (2.6.3)
     method_source (1.0.0)
-    multipart-post (2.1.1)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
-    rainbow (3.0.0)
+    public_suffix (5.0.1)
+    rainbow (3.1.1)
     rake (13.0.3)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
+    regexp_parser (2.8.0)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -52,29 +48,35 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.1)
-    rubocop (1.8.1)
+    rubocop (1.50.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.1)
+      parser (>= 3.2.1.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.4.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.4.2)
     vcr (6.0.0)
-    webmock (3.11.1)
-      addressable (>= 2.3.6)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     yard (0.9.26)
@@ -83,18 +85,20 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  amazing_print
-  bump
-  bundler
+  amazing_print (>= 1.2.2)
+  bump (>= 0.10.0)
+  bundler (>= 2.4.13)
   metabase!
-  pry
-  rake
-  rspec
-  rubocop
-  simplecov
-  vcr
-  webmock
-  yard
+  pry (>= 0.14)
+  rake (>= 13.0.3)
+  rspec (>= 3.10.0)
+  rubocop (>= 1.19.0)
+  rubocop-rake (>= 0.4.0)
+  rubocop-rspec (>= 2.0.0)
+  simplecov (>= 0.21.2)
+  vcr (>= 6.0.0)
+  webmock (>= 3.12.2)
+  yard (>= 0.9.25)
 
 BUNDLED WITH
-   2.2.5
+   2.4.13

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   metabase:
-    image: metabase/metabase:v0.38.4
+    image: metabase/metabase:latest
     ports:
       - 3030:3000
     volumes:

lib/metabase/connection.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'faraday'
-require 'faraday_middleware'
 require 'metabase/error'
 
 module Metabase

lib/metabase/endpoint/card.rb

@@ -48,9 +48,9 @@ def query_card(card_id, format: :json, **params)
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#post-apicard
-      def new_card(**params)        
+      def new_card(**params)
         post('/api/card', **params)
-      end      
+      end
     end
   end
 end

lib/metabase/endpoint/collection.rb

@@ -24,7 +24,7 @@ def collection(collection_id, **params)
       # Fetch a collection's items.
       #
       # @param params [Hash] Query string
-      # @return [Array<Hash>] Parsed response JSON
+      # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#get-apicollectioniditems
       def collection_items(collection_id, **params)
         get("/api/collection/#{collection_id}/items", **params)
@@ -35,7 +35,7 @@ def collection_items(collection_id, **params)
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#post-apicollection
-      def new_collection(**params)        
+      def new_collection(**params)
         post('/api/collection', **params)
       end
     end

lib/metabase/endpoint/dashboard.rb

@@ -20,14 +20,14 @@ def dashboards(**params)
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#get-apidashboardid
       def dashboard(dashboard_id, **params)
         get("/api/dashboard/#{dashboard_id}", **params)
-      end      
+      end
 
       # Create a new dashboard.
       #
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#post-apidashboard
-      def new_dashboard(**params)        
+      def new_dashboard(**params)
         post('/api/dashboard', **params)
       end
 
@@ -37,7 +37,7 @@ def new_dashboard(**params)
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#post-apidashboardfrom-dashboard-idcopy
-      def copy_dashboard(from_dashboard_id, **params)        
+      def copy_dashboard(from_dashboard_id, **params)
         post("/api/dashboard/#{from_dashboard_id}/copy", **params)
       end
 
@@ -47,17 +47,17 @@ def copy_dashboard(from_dashboard_id, **params)
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#post-apidashboardidcards
-      def add_dashboard_card(dashboard_id, **params)        
+      def add_dashboard_card(dashboard_id, **params)
         post("/api/dashboard/#{dashboard_id}/cards", **params)
-      end      
+      end
 
       # Update Cards on a Dashboard.
       #
       # @param dashboard_id [Integer, String] Dashboard ID
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#put-apidashboardidcards
-      def update_dashboard_cards(dashboard_id, **params)        
+      def update_dashboard_cards(dashboard_id, **params)
         put("/api/dashboard/#{dashboard_id}/cards", **params)
       end
 
@@ -67,7 +67,7 @@ def update_dashboard_cards(dashboard_id, **params)
       # @param params [Hash] Query string
       # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#delete-apidashboardidcards
-      def delete_dashboard_card(dashboard_id, **params)        
+      def delete_dashboard_card(dashboard_id, **params)
         delete("/api/dashboard/#{dashboard_id}/cards", **params)
       end
     end

lib/metabase/endpoint/database.rb

@@ -6,7 +6,7 @@ module Database
       # Fetch all databases.
       #
       # @param params [Hash] Query string
-      # @return [Array<Hash>] Parsed response JSON
+      # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#get-apidatabase
       def databases(**params)
         get('/api/database', **params)

lib/metabase/endpoint/user.rb

@@ -6,7 +6,7 @@ module User
       # Fetch all users.
       #
       # @param params [Hash] Query string
-      # @return [Array<Hash>] Parsed response JSON
+      # @return [Hash] Parsed response JSON
       # @see https://github.com/metabase/metabase/blob/master/docs/api-documentation.md#get-apiuser
       def users(**params)
         get('/api/user', **params)

lib/metabase/error.rb

@@ -29,7 +29,7 @@ def build_error_message
       return nil if @response.nil?
 
       "#{@response.env.method.upcase} #{@response.env.url}: " \
-      "#{@response.status} - #{@response.body}"
+        "#{@response.status} - #{@response.body}"
     end
   end
 

metabase.gemspec

@@ -22,20 +22,22 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 3.0'
 
-  spec.add_runtime_dependency 'faraday', '>= 1.2.0'
-  spec.add_runtime_dependency 'faraday_middleware'
+  spec.add_runtime_dependency 'faraday', '>= 2.0.1'
 
-  spec.add_development_dependency 'amazing_print'
-  spec.add_development_dependency 'bump'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'vcr'
-  spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'yard'
+  spec.add_development_dependency 'amazing_print', '>= 1.2.2'
+  spec.add_development_dependency 'bump', '>= 0.10.0'
+  spec.add_development_dependency 'bundler', '>= 2.4.13'
+  spec.add_development_dependency 'pry', '>= 0.14'
+  spec.add_development_dependency 'rake', '>= 13.0.3'
+  spec.add_development_dependency 'rspec', '>= 3.10.0'
+  spec.add_development_dependency 'rubocop', '>= 1.19.0'
+  spec.add_development_dependency 'rubocop-rake', '>= 0.4.0'
+  spec.add_development_dependency 'rubocop-rspec', '>= 2.0.0'
+  spec.add_development_dependency 'simplecov', '>= 0.21.2'
+  spec.add_development_dependency 'vcr', '>= 6.0.0'
+  spec.add_development_dependency 'webmock', '>= 3.12.2'
+  spec.add_development_dependency 'yard', '>= 0.9.25'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

spec/metabase/connection_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Connection do
-  include_context 'client'
+  include_context 'with client'
 
   describe 'get' do
     include_examples 'response handling' do

spec/metabase/endpoint/activity_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Activity do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'activities', vcr: true do
-    context 'success' do
+    context 'when success' do
       it 'returns recent activities' do
         activities = client.activities
         expect(activities).to be_kind_of(Array)

spec/metabase/endpoint/alert_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 RSpec.describe Metabase::Endpoint::Alert do
-  include_context 'login'
+  include_context 'with login'
 
   describe 'alerts', vcr: true do
-    context 'success' do
+    context 'when success' do
       it 'returns all alerts' do
         alerts = client.alerts
         expect(alerts).to be_kind_of(Array)