drip-ruby 2.0.0 → 3.0.0

data/lib/drip/client/orders.rb

@@ -27,12 +27,12 @@ module Drip
       # Public: Create or update a refund.
       #
       # options      - Required. A Hash of refund properties
-      #                 amount	            - Required. The amount of the refund.
+      #                 amount              - Required. The amount of the refund.
       #                 provider            - Required. The provider for the Order being refunded.
       #                 order_upstream_id   - Required. The upstream_id for the Order being refunded.
-      #                 upstream_id	        - The unique id of refund in the order management system.
-      #                 note	              - A note about the refund.
-      #                 processed_at        - The String time at which the refund was processed in 
+      #                 upstream_id         - The unique id of refund in the order management system.
+      #                 note                - A note about the refund.
+      #                 processed_at        - The String time at which the refund was processed in
       #                                       ISO-8601 format.
       #
       # Returns a Drip::Response.

data/lib/drip/errors.rb

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

data/lib/drip/response.rb

@@ -51,10 +51,10 @@ module Drip
           if body.is_a?(Hash)
             body.each do |key, value|
               klass = if value.is_a?(Array)
-                Drip::Collections.find_class(key)
-              else
-                Drip::Resources.find_class(key)
-              end
+                        Drip::Collections.find_class(key)
+                      else
+                        Drip::Resources.find_class(key)
+                      end
 
               members[key] = klass.new(value)
             end
@@ -65,7 +65,7 @@ module Drip
 
     def member_map
       @member_map ||= {}.tap do |map|
-        members.each { |key, value| map[key.to_sym] = key }
+        members.each { |key, _value| map[key.to_sym] = key }
       end
     end
   end

data/lib/drip/version.rb

@@ -1,3 +1,3 @@
 module Drip
-  VERSION = "2.0.0".freeze
+  VERSION = "3.0.0".freeze
 end

data/test/drip/client/accounts_test.rb

@@ -2,24 +2,16 @@ require File.dirname(__FILE__) + '/../../test_helper.rb'
 
 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 @@ class Drip::Client::AccountsTest < Drip::TestCase
   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

data/test/drip/client/broadcasts_test.rb

@@ -2,24 +2,16 @@ require File.dirname(__FILE__) + '/../../test_helper.rb'
 
 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 @@ class Drip::Client::BroadcastsTest < Drip::TestCase
   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

data/test/drip/client/campaign_subscriptions_test.rb

@@ -2,25 +2,17 @@ require File.dirname(__FILE__) + '/../../test_helper.rb'
 
 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

data/test/drip/client/campaigns_test.rb

@@ -2,24 +2,16 @@ require File.dirname(__FILE__) + '/../../test_helper.rb'
 
 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 @@ class Drip::Client::CampaignsTest < Drip::TestCase
   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 @@ class Drip::Client::CampaignsTest < Drip::TestCase
   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 @@ class Drip::Client::CampaignsTest < Drip::TestCase
   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 @@ class Drip::Client::CampaignsTest < Drip::TestCase
   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

data/test/drip/client/conversions_test.rb

@@ -2,24 +2,16 @@ require File.dirname(__FILE__) + '/../../test_helper.rb'
 
 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 @@ class Drip::Client::ConversionsTest < Drip::TestCase
   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

data/test/drip/client/custom_fields_test.rb

@@ -2,24 +2,16 @@ require File.dirname(__FILE__) + '/../../test_helper.rb'
 
 class Drip::Client::CustomFieldsTest < 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 "#custom_fields" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
 
-      @stubs.get "12345/custom_field_identifiers" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/12345/custom_field_identifiers").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do

data/test/drip/client/events_test.rb

@@ -2,14 +2,7 @@ require File.dirname(__FILE__) + '/../../test_helper.rb'
 
 class Drip::Client::EventsTest < 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 "#track_event" do
@@ -30,11 +23,10 @@ class Drip::Client::EventsTest < Drip::TestCase
         }.to_json
 
         @response_status = 201
-        @response_body = stub
+        @response_body = "stub"
 
-        @stubs.post "12345/events", @payload do
-          [@response_status, {}, @response_body]
-        end
+        stub_request(:post, "https://api.getdrip.com/v2/12345/events").
+          to_return(status: @response_status, body: @response_body, headers: {})
       end
 
       should "send the right request" do
@@ -58,11 +50,10 @@ class Drip::Client::EventsTest < Drip::TestCase
         }.to_json
 
         @response_status = 201
-        @response_body = stub
+        @response_body = "stub"
 
-        @stubs.post "12345/events", @payload do
-          [@response_status, {}, @response_body]
-        end
+        stub_request(:post, "https://api.getdrip.com/v2/12345/events").
+          to_return(status: @response_status, body: @response_body, headers: {})
       end
 
       should "send the right request" do
@@ -87,11 +78,10 @@ class Drip::Client::EventsTest < Drip::TestCase
 
       @payload = { "batches" => [{ "events" => @events }] }.to_json
       @response_status = 201
-      @response_body = stub
+      @response_body = "stub"
 
-      @stubs.post "12345/events/batches", @payload do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:post, "https://api.getdrip.com/v2/12345/events/batches").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
@@ -103,11 +93,10 @@ class Drip::Client::EventsTest < Drip::TestCase
   context "#event_actions" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
 
-      @stubs.get "12345/event_actions" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/12345/event_actions").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do

data/test/drip/client/forms_test.rb

@@ -2,24 +2,16 @@ require File.dirname(__FILE__) + '/../../test_helper.rb'
 
 class Drip::Client::FormsTest < 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 "#forms" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
 
-      @stubs.get "12345/forms" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/12345/forms").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
@@ -31,12 +23,11 @@ class Drip::Client::FormsTest < Drip::TestCase
   context "#form" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
       @id = 9999999
 
-      @stubs.get "12345/forms/#{@id}" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/12345/forms/#{@id}").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do