Update to work with new Vertebrae and Faraday v2 middleware.

.ruby-version

@@ -1 +1 @@
-3.1.2
+3.2.2

action_network_rest.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_runtime_dependency 'vertebrae', '~> 0.6.0'
+  spec.add_runtime_dependency 'vertebrae', '>= 1.0.0'
 
   spec.add_development_dependency 'bundler', '~> 2.1'
-  spec.add_development_dependency 'byebug', '~> 11.1'
+  spec.add_development_dependency 'debug'
   spec.add_development_dependency 'dotenv', '~> 2.7'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

lib/action_network_rest/api.rb

@@ -3,17 +3,15 @@
 module ActionNetworkRest
   class API < Vertebrae::API
     def setup
-      connection.stack do |builder|
-        builder.use Faraday::Request::Multipart
-        builder.use Faraday::Request::UrlEncoded
+      connection.faraday_connection = Faraday.new(connection.configuration.faraday_options) do |f|
+        f.request :multipart
+        f.request :url_encoded
 
-        builder.use Faraday::Response::Logger if ENV['DEBUG']
+        f.response :mashify
+        f.response :json
 
-        builder.use FaradayMiddleware::Mashify
-        builder.use FaradayMiddleware::ParseJson
-
-        builder.use ActionNetworkRest::Response::RaiseError
-        builder.adapter connection.configuration.adapter
+        f.response :actionnetwork_raise_error
+        f.adapter connection.configuration.adapter
       end
     end
   end

lib/action_network_rest/base.rb

@@ -28,7 +28,7 @@ def all
         wait = min_wait * (1.5**tries)
         new_time = Time.now.to_r
         if (timestamp + min_wait - new_time).positive?
-          sleep(wait) # Wait if calling again could excede the rate limit
+          sleep(wait) # Wait if calling again could exceed the rate limit
           tries += 1
           next # check again
         end
@@ -46,7 +46,7 @@ def all
           end
 
           sleep(wait)
-          tries += 1 # Exponential back off if got Too Many Requests error reponse
+          tries += 1 # Exponential back off if got Too Many Requests error response
           next
         end
         timestamp = Time.now.to_r

lib/action_network_rest/response/raise_error.rb

@@ -2,7 +2,7 @@
 
 module ActionNetworkRest
   module Response
-    class RaiseError < Faraday::Response::Middleware
+    class RaiseError < Faraday::Middleware
       # rubocop:disable Style/GuardClause
       def on_complete(response)
         status_code = response[:status].to_i
@@ -44,3 +44,5 @@ class TooManyRequests < StandardError; end
     class UsedAllRequestTries < StandardError; end
   end
 end
+
+Faraday::Response.register_middleware actionnetwork_raise_error: -> { ActionNetworkRest::Response::RaiseError }

lib/action_network_rest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionNetworkRest
-  VERSION = '0.11.0'
+  VERSION = '1.0.0'
 end

spec/advocacy_campaigns_spec.rb

@@ -141,7 +141,7 @@
 
     before :each do
       stub_actionnetwork_request("/advocacy_campaigns/#{advocacy_campaign_id}", method: :get)
-        .to_return(status: status, body: response_body)
+        .to_return(status: status, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should retrieve advocacy_campaign data' do
@@ -399,7 +399,7 @@
     context 'requesting first page' do
       before :each do
         stub_actionnetwork_request('/advocacy_campaigns/?page=1', method: :get)
-          .to_return(status: 200, body: response_body)
+          .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
       end
 
       it 'should retrieve first page when callig with argument' do
@@ -420,7 +420,7 @@
     context 'requesting page 3 advocacy_campaigns' do
       before :each do
         stub_actionnetwork_request('/advocacy_campaigns/?page=3', method: :get)
-          .to_return(status: 200, body: response_body)
+          .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
       end
 
       it 'should retreive the advocacy_campaigns data from page 3' do
@@ -570,7 +570,7 @@
     end
     let!(:post_stub) do
       stub_actionnetwork_request('/advocacy_campaigns/', method: :post, body: request_body)
-        .to_return(status: 200, body: response_body)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should POST advocacy_campaign data' do
@@ -724,7 +724,7 @@
       stub_actionnetwork_request("/advocacy_campaigns/#{advocacy_campaign_id}",
                                  method: :put,
                                  body: advocacy_campaign_data)
-        .to_return(status: 200, body: response_body)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should PUT advocacy_campaign data' do

spec/attendances_spec.rb

@@ -32,7 +32,7 @@
 
     let!(:post_stub) do
       stub_actionnetwork_request("/events/#{event_id}/attendances/", method: :post, body: request_body)
-        .to_return(status: 200, body: response_body)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should POST signature data' do
@@ -62,7 +62,7 @@
       let!(:post_stub) do
         stub_actionnetwork_request("/event_campaigns/#{event_campaign_id}/events/#{event_id}/attendances/",
                                    method: :post, body: request_body)
-          .to_return(status: 200, body: response_body)
+          .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
       end
 
       it 'should POST signature data to the prefixed path' do

spec/campaigns_spec.rb

@@ -59,7 +59,7 @@
 
     before :each do
       stub_actionnetwork_request("/campaigns/#{campaign_id}", method: :get)
-        .to_return(status: status, body: response_body)
+        .to_return(status: status, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should retrieve campaign data' do
@@ -176,7 +176,7 @@
     context 'requesting first page' do
       before :each do
         stub_actionnetwork_request('/campaigns/?page=1', method: :get)
-          .to_return(status: 200, body: response_body)
+          .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
       end
 
       it 'should retrieve first page when callig with argument' do
@@ -197,7 +197,7 @@
     context 'requesting page 3 campaigns' do
       before :each do
         stub_actionnetwork_request('/campaigns/?page=3', method: :get)
-          .to_return(status: 200, body: response_body)
+          .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
       end
 
       it 'should retreive the campaigns data from page 3' do

spec/entry_point_spec.rb

@@ -11,7 +11,8 @@
     let(:response_body) { { some: 'data' }.to_json }
 
     before :each do
-      stub_actionnetwork_request('/', method: :get).to_return(status: 200, body: response_body)
+      stub_actionnetwork_request('/', method: :get)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should return the response' do
@@ -21,7 +22,8 @@
 
   describe '#authenticated_successfully?' do
     before :each do
-      stub_actionnetwork_request('/', method: :get).to_return(status: 200, body: response_body)
+      stub_actionnetwork_request('/', method: :get)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
     end
 
     context 'response includes tags' do

spec/event_campaigns_spec.rb

@@ -11,7 +11,8 @@
     let(:response_body) { { some: 'data' }.to_json }
 
     before :each do
-      stub_actionnetwork_request('/event_campaigns/123', method: :get).to_return(status: 200, body: response_body)
+      stub_actionnetwork_request('/event_campaigns/123', method: :get)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should return the response' do
@@ -23,7 +24,8 @@
     let(:response_body) { fixture('event_campaigns/list.json') }
 
     it 'should return the response' do
-      stub_actionnetwork_request('/event_campaigns/?page=1', method: :get).to_return(status: 200, body: response_body)
+      stub_actionnetwork_request('/event_campaigns/?page=1', method: :get)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
 
       expect(subject.event_campaigns.list.length).to eq(2)
       expect(subject.event_campaigns.list.first)
@@ -32,8 +34,8 @@
     end
 
     it 'should paginate' do
-      stub_request = stub_actionnetwork_request('/event_campaigns/?page=2', method: :get).to_return(status: 200,
-                                                                                                    body: response_body)
+      stub_request = stub_actionnetwork_request('/event_campaigns/?page=2', method: :get)
+                     .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
       subject.event_campaigns.list(page: 2)
       expect(stub_request).to have_been_requested
     end
@@ -57,7 +59,7 @@
     end
     let!(:put_stub) do
       stub_actionnetwork_request("/event_campaigns/#{campaign_id}", method: :put, body: campaign_data)
-        .to_return(status: 200, body: response_body)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should PUT event campaign data' do

spec/events_spec.rb

@@ -11,7 +11,8 @@
     let(:response_body) { { some: 'data' }.to_json }
 
     before :each do
-      stub_actionnetwork_request('/events/123', method: :get).to_return(status: 200, body: response_body)
+      stub_actionnetwork_request('/events/123', method: :get)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should return the response' do
@@ -23,24 +24,25 @@
     let(:response_body) { fixture('events/list.json') }
 
     it 'should return the response' do
-      stub_actionnetwork_request('/events/?page=1', method: :get).to_return(status: 200, body: response_body)
+      stub_actionnetwork_request('/events/?page=1', method: :get)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
 
       expect(subject.events.list.length).to eq(2)
       expect(subject.events.list.first).to include({ 'action_network_id' => '8a625981-67a4-4457-8b55-2e30b267b2c2' })
     end
 
     it 'should support event_campaign listing' do
-      stub_request = stub_actionnetwork_request('/event_campaigns/foo/events/?page=1',
-                                                method: :get).to_return(status: 200, body: response_body)
+      stub_request = stub_actionnetwork_request('/event_campaigns/foo/events/?page=1', method: :get)
+                     .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
 
       subject.event_campaigns('foo').events.list
 
       expect(stub_request).to have_been_requested
     end
 
     it 'should paginate' do
-      stub_request = stub_actionnetwork_request('/events/?page=2', method: :get).to_return(status: 200,
-                                                                                           body: response_body)
+      stub_request = stub_actionnetwork_request('/events/?page=2', method: :get)
+                     .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
       subject.events.list(page: 2)
       expect(stub_request).to have_been_requested
     end
@@ -64,7 +66,7 @@
     end
     let!(:post_stub) do
       stub_actionnetwork_request('/events/', method: :post, body: request_body)
-        .to_return(status: 200, body: response_body)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should POST event data' do
@@ -169,7 +171,7 @@
     end
     let!(:put_stub) do
       stub_actionnetwork_request("/events/#{event_id}", method: :put, body: event_data)
-        .to_return(status: 200, body: response_body)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should PUT event data' do

spec/forms_spec.rb

@@ -140,7 +140,7 @@
 
     before :each do
       stub_actionnetwork_request("/forms/#{form_id}", method: :get)
-        .to_return(status: status, body: response_body)
+        .to_return(status: status, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should retrieve form data' do
@@ -396,7 +396,7 @@
     context 'requesting first page' do
       before :each do
         stub_actionnetwork_request('/forms/?page=1', method: :get)
-          .to_return(status: 200, body: response_body)
+          .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
       end
 
       it 'should retrieve first page when calling without page as argument' do
@@ -417,7 +417,7 @@
     context 'requesting page 3 forms' do
       before :each do
         stub_actionnetwork_request('/forms/?page=3', method: :get)
-          .to_return(status: 200, body: response_body)
+          .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
       end
 
       it 'should retreive the forms data from page 3' do
@@ -563,7 +563,7 @@
     end
     let!(:post_stub) do
       stub_actionnetwork_request('/forms/', method: :post, body: request_body)
-        .to_return(status: 200, body: response_body)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should POST form data' do
@@ -711,7 +711,7 @@
     end
     let!(:put_stub) do
       stub_actionnetwork_request("/forms/#{form_id}", method: :put, body: form_data)
-        .to_return(status: 200, body: response_body)
+        .to_return(status: 200, body: response_body, headers: { content_type: 'application/json' })
     end
 
     it 'should PUT form data' do