Remove Faraday

drip-ruby.gemspec

@@ -25,7 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "shoulda-context", "~> 1.0"
   spec.add_development_dependency "mocha", "~> 1.1"
   spec.add_development_dependency "minitest", "~> 5.0"
-
-  spec.add_runtime_dependency "faraday", "~> 0.13"
-  spec.add_runtime_dependency "faraday_middleware", "~> 0.12"
+  spec.add_development_dependency "webmock", "~> 3.4"
 end

lib/drip/client.rb

@@ -1,3 +1,4 @@
+require "drip/errors"
 require "drip/response"
 require "drip/client/accounts"
 require "drip/client/broadcasts"
@@ -14,8 +15,8 @@
 require "drip/client/webhooks"
 require "drip/client/workflows"
 require "drip/client/workflow_triggers"
-require "faraday"
-require "faraday_middleware"
+require "net/http"
+require "uri"
 require "json"
 
 module Drip
@@ -36,6 +37,8 @@ class Client
     include Workflows
     include WorkflowTriggers
 
+    REDIRECT_LIMIT = 10
+
     attr_accessor :access_token, :api_key, :account_id, :url_prefix
 
     def initialize(options = {})
@@ -55,56 +58,65 @@ def content_type
     end
 
     def get(url, options = {})
-      make_request(:get, url, options)
+      make_request(Net::HTTP::Get, make_uri(url), options)
     end
 
     def post(url, options = {})
-      make_request(:post, url, options)
+      make_request(Net::HTTP::Post, make_uri(url), options)
     end
 
     def put(url, options = {})
-      make_request(:put, url, options)
+      make_request(Net::HTTP::Put, make_uri(url), options)
     end
 
     def delete(url, options = {})
-      make_request(:delete, url, options)
+      make_request(Net::HTTP::Delete, make_uri(url), options)
     end
 
-    def make_request(verb, url, options)
+  private
+
+    def make_uri(path)
+      URI(url_prefix) + URI(path)
+    end
+
+    def make_request(verb_klass, uri, options, step = 0)
+      raise TooManyRedirectsError, 'too many HTTP redirects' if step >= REDIRECT_LIMIT
+
       build_response do
-        connection.send(verb) do |req|
-          req.url url
+        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
+          if verb_klass.is_a? Net::HTTP::Get
+            uri.query = URI.encode_www_form(options)
+          end
+
+          request = verb_klass.new uri
+
+          unless verb_klass.is_a? Net::HTTP::Get
+            request.body = options.to_json
+          end
 
-          if verb == :get
-            req.params = options
+          request['User-Agent'] = "Drip Ruby v#{Drip::VERSION}"
+          request['Content-Type'] = content_type
+          request['Accept'] = "*/*"
+
+          if access_token
+            request['Authorization'] = "Bearer #{access_token}"
           else
-            req.body = options.to_json
+            request.basic_auth api_key, ""
+          end
+
+          response = http.request request
+          if response.is_a?(Net::HTTPRedirection)
+            return make_request(verb_klass, URI(response["Location"]), options, step + 1)
+          else
+            response
           end
         end
       end
     end
 
     def build_response(&block)
       response = yield
-      Drip::Response.new(response.status, response.body)
-    end
-
-    def connection
-      @connection ||= Faraday.new do |f|
-        f.url_prefix = url_prefix
-        f.headers['User-Agent'] = "Drip Ruby v#{Drip::VERSION}"
-        f.headers['Content-Type'] = content_type
-        f.headers['Accept'] = "*/*"
-
-        if access_token
-          f.headers['Authorization'] = "Bearer #{access_token}"
-        else
-          f.basic_auth api_key, ""
-        end
-
-        f.response :json, content_type: /\bjson$/
-        f.adapter :net_http
-      end
+      Drip::Response.new(response.code.to_i, response.body)
     end
   end
 end

lib/drip/errors.rb

@@ -0,0 +1,3 @@
+module Drip
+  class TooManyRedirectsError < StandardError; end
+end

test/drip/client/accounts_test.rb

@@ -2,24 +2,16 @@
 
 class Drip::Client::AccountsTest < Drip::TestCase
   def setup
-    @stubs = Faraday::Adapter::Test::Stubs.new
-
-    @connection = Faraday.new do |builder|
-      builder.adapter :test, @stubs
-    end
-
     @client = Drip::Client.new
-    @client.expects(:connection).at_least_once.returns(@connection)
   end
 
   context "#accounts" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
 
-      @stubs.get "accounts" do
-        [@response_status, {}, @response_body]
-      end
+    stub_request(:get, "https://api.getdrip.com/v2/accounts").
+      to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
@@ -31,12 +23,11 @@ def setup
   context "#account" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
       @id = 9999999
 
-      @stubs.get "accounts/#{@id}" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/accounts/#{@id}").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do

test/drip/client/broadcasts_test.rb

@@ -2,24 +2,16 @@
 
 class Drip::Client::BroadcastsTest < Drip::TestCase
   def setup
-    @stubs = Faraday::Adapter::Test::Stubs.new
-
-    @connection = Faraday.new do |builder|
-      builder.adapter :test, @stubs
-    end
-
     @client = Drip::Client.new { |c| c.account_id = "12345" }
-    @client.expects(:connection).at_least_once.returns(@connection)
   end
 
   context "#broadcasts" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
 
-      @stubs.get "12345/broadcasts" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/12345/broadcasts").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the correct request" do
@@ -31,12 +23,11 @@ def setup
   context "#broadcast" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
       @id = 99999
 
-      @stubs.get "12345/broadcasts/#{@id}" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/12345/broadcasts/#{@id}").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the correct request" do

test/drip/client/campaign_subscriptions_test.rb

@@ -2,25 +2,17 @@
 
 class Drip::Client::CampaignSubscriptionsTest < Drip::TestCase
   def setup
-    @stubs = Faraday::Adapter::Test::Stubs.new
-
-    @connection = Faraday.new do |builder|
-      builder.adapter :test, @stubs
-    end
-
     @client = Drip::Client.new { |c| c.account_id = "12345" }
-    @client.expects(:connection).at_least_once.returns(@connection)
   end
 
   context "#campaign_subscriptions" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
       @subscriber_id = "abc123"
 
-      @stubs.get "12345/subscribers/#{@subscriber_id}/campaign_subscriptions" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/12345/subscribers/#{@subscriber_id}/campaign_subscriptions").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do

test/drip/client/campaigns_test.rb

@@ -2,24 +2,16 @@
 
 class Drip::Client::CampaignsTest < Drip::TestCase
   def setup
-    @stubs = Faraday::Adapter::Test::Stubs.new
-
-    @connection = Faraday.new do |builder|
-      builder.adapter :test, @stubs
-    end
-
     @client = Drip::Client.new { |c| c.account_id = "12345" }
-    @client.expects(:connection).at_least_once.returns(@connection)
   end
 
   context "#campaigns" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
 
-      @stubs.get "12345/campaigns" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/12345/campaigns").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
@@ -31,12 +23,11 @@ def setup
   context "#campaign" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
       @id = 9999999
 
-      @stubs.get "12345/campaigns/#{@id}" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/12345/campaigns/#{@id}").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
@@ -48,12 +39,11 @@ def setup
   context "#activate_campaign" do
     setup do
       @response_status = 204
-      @response_body = stub
+      @response_body = nil
       @id = 9999999
 
-      @stubs.post "12345/campaigns/#{@id}/activate" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:post, "https://api.getdrip.com/v2/12345/campaigns/#{@id}/activate").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
@@ -65,12 +55,11 @@ def setup
   context "#pause_campaign" do
     setup do
       @response_status = 204
-      @response_body = stub
+      @response_body = nil
       @id = 9999999
 
-      @stubs.post "12345/campaigns/#{@id}/pause" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:post, "https://api.getdrip.com/v2/12345/campaigns/#{@id}/pause").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
@@ -82,12 +71,11 @@ def setup
   context "#campaign_subscribers" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
       @id = 9999999
 
-      @stubs.get "12345/campaigns/#{@id}/subscribers" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/12345/campaigns/#{@id}/subscribers").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do

test/drip/client/conversions_test.rb

@@ -2,24 +2,16 @@
 
 class Drip::Client::ConversionsTest < Drip::TestCase
   def setup
-    @stubs = Faraday::Adapter::Test::Stubs.new
-
-    @connection = Faraday.new do |builder|
-      builder.adapter :test, @stubs
-    end
-
     @client = Drip::Client.new { |c| c.account_id = "12345" }
-    @client.expects(:connection).at_least_once.returns(@connection)
   end
 
   context "#conversions" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
 
-      @stubs.get "12345/goals" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/12345/goals").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
@@ -31,12 +23,11 @@ def setup
   context "#conversion" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
       @id = 9999999
 
-      @stubs.get "12345/goals/#{@id}" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/12345/goals/#{@id}").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do