createsend 2.5.1 → 3.0.0

data/test/fixtures/expired_oauth_token_api_error.json

@@ -0,0 +1,4 @@
+{
+  "Code": 121,
+  "Message": "Expired OAuth Token"
+}

data/test/fixtures/oauth_exchange_token.json

@@ -0,0 +1,5 @@
+{
+    "access_token": "SlAV32hkKG",
+    "expires_in": 1209600,
+    "refresh_token": "tGzv3JOkF0XG5Qx2TlKWIA"
+}

data/test/fixtures/oauth_exchange_token_error.json

@@ -0,0 +1,4 @@
+{
+    "error": "invalid_grant",
+    "error_description": "Specified code was invalid or expired"
+}

data/test/fixtures/refresh_oauth_token.json

@@ -0,0 +1,5 @@
+{
+    "access_token": "SlAV32hkKG2e12e",
+    "expires_in": 1209600,
+    "refresh_token": "tGzv3JOkF0XG5Qx2TlKWIA"
+}

data/test/helper.rb

@@ -3,7 +3,6 @@ require 'pathname'
 
 require 'shoulda'
 require 'matchy'
-require 'mocha/setup'
 require 'fakeweb'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -18,19 +17,53 @@ def fixture_file(filename)
   File.read(file_path)
 end
 
-def createsend_url(api_key, url)
-  api_key.nil? ? url : url =~ /^http/ ? url : "https://#{api_key}:x@api.createsend.com/api/v3/#{url}"
+def createsend_url(auth, url)
+  if not url =~ /^http/
+    auth_section = ''
+    auth_section = "#{auth[:api_key]}:x@" if auth and auth.has_key? :api_key
+    result = "https://#{auth_section}api.createsend.com/api/v3/#{url}"
+  else
+    result = url
+  end
+  result
 end
 
-def stub_request(method, api_key, url, filename, status=nil)
+def stub_request(method, auth, url, filename, status=nil)
   options = {:body => ""}
   options.merge!({:body => fixture_file(filename)}) if filename
   options.merge!({:status => status}) if status
   options.merge!(:content_type => "application/json; charset=utf-8")
-  FakeWeb.register_uri(method, createsend_url(api_key, url), options)
+  FakeWeb.register_uri(method, createsend_url(auth, url), options)
 end
 
 def stub_get(*args); stub_request(:get, *args) end
 def stub_post(*args); stub_request(:post, *args) end
 def stub_put(*args); stub_request(:put, *args) end
 def stub_delete(*args); stub_request(:delete, *args) end
+
+def multiple_contexts(*contexts, &blk)
+  contexts.each do |context|
+    send(context, &blk)
+  end
+end
+
+def authenticated_using_oauth_context(&blk)
+  context "when an api caller is authenticated using oauth" do
+    setup do
+      @access_token = 'joidjo2i3joi3je'
+      @refresh_token = 'j89u98eu9e8ufe'
+      @auth = {:access_token => @access_token, :refresh_token => @refresh_token}
+    end
+    merge_block(&blk)
+  end
+end
+
+def authenticated_using_api_key_context(&blk)
+  context "when an api caller is authenticated using an api key" do
+    setup do
+      @api_key = '123123123123123123123'
+      @auth = {:api_key => @api_key}
+    end
+    merge_block(&blk)
+  end
+end

data/test/list_test.rb

@@ -1,49 +1,47 @@
 require File.dirname(__FILE__) + '/helper'
 
 class ListTest < Test::Unit::TestCase
-  context "when an api caller is authenticated" do
+  multiple_contexts "authenticated_using_oauth_context", "authenticated_using_api_key_context" do
     setup do
-      @api_key = '123123123123123123123'
-      CreateSend.api_key @api_key
       @client_id = "87y8d7qyw8d7yq8w7ydwqwd"
       @list_id = "e3c5f034d68744f7881fdccf13c2daee"
-      @list = CreateSend::List.new @list_id
+      @list = CreateSend::List.new @auth, @list_id
     end
 
     should "create a list without passing in unsubscribe setting" do
-      stub_post(@api_key, "lists/#{@client_id}.json", "create_list.json")
-      list_id = CreateSend::List.create @client_id, "List One", "", false, ""
+      stub_post(@auth, "lists/#{@client_id}.json", "create_list.json")
+      list_id = CreateSend::List.create @auth, @client_id, "List One", "", false, ""
       list_id.should == "e3c5f034d68744f7881fdccf13c2daee"
     end
 
     should "create a list passing in unsubscribe setting" do
-      stub_post(@api_key, "lists/#{@client_id}.json", "create_list.json")
-      list_id = CreateSend::List.create @client_id, "List One", "", false, "", "OnlyThisList"
+      stub_post(@auth, "lists/#{@client_id}.json", "create_list.json")
+      list_id = CreateSend::List.create @auth, @client_id, "List One", "", false, "", "OnlyThisList"
       list_id.should == "e3c5f034d68744f7881fdccf13c2daee"
     end
 
     should "update a list without passing in unsubscribe setting" do
-      stub_put(@api_key, "lists/#{@list.list_id}.json", nil)
+      stub_put(@auth, "lists/#{@list.list_id}.json", nil)
       @list.update "List One Renamed", "", false, ""
     end
 
     should "update a list passing in unsubscribe setting" do
-      stub_put(@api_key, "lists/#{@list.list_id}.json", nil)
+      stub_put(@auth, "lists/#{@list.list_id}.json", nil)
       @list.update "List One Renamed", "", false, "", "OnlyThisList"
     end
 
     should "update a list passing in unsubscribe setting and suppression list options" do
-      stub_put(@api_key, "lists/#{@list.list_id}.json", nil)
+      stub_put(@auth, "lists/#{@list.list_id}.json", nil)
       @list.update "List One Renamed", "", false, "", "OnlyThisList", true, true
     end
 
     should "delete a list" do
-      stub_delete(@api_key, "lists/#{@list.list_id}.json", nil)
+      stub_delete(@auth, "lists/#{@list.list_id}.json", nil)
       @list.delete
     end
 
     should "create a custom field" do
-      stub_post(@api_key, "lists/#{@list.list_id}/customfields.json", "create_custom_field.json")
+      stub_post(@auth, "lists/#{@list.list_id}/customfields.json", "create_custom_field.json")
       personalisation_tag = @list.create_custom_field "new date field", "Date"
       request = FakeWeb.last_request.body
       request.include?("\"FieldName\":\"new date field\"").should == true
@@ -54,7 +52,7 @@ class ListTest < Test::Unit::TestCase
     end
 
     should "create a custom field with options and visible_in_preference_center" do
-      stub_post(@api_key, "lists/#{@list.list_id}/customfields.json", "create_custom_field.json")
+      stub_post(@auth, "lists/#{@list.list_id}/customfields.json", "create_custom_field.json")
       options = ["one", "two"]
       personalisation_tag = @list.create_custom_field("newsletter format",
         "MultiSelectOne", options, false)
@@ -68,7 +66,7 @@ class ListTest < Test::Unit::TestCase
 
     should "update a custom field" do
       key = "[mycustomfield]"
-      stub_put(@api_key, "lists/#{@list.list_id}/customfields/#{CGI.escape(key)}.json", "update_custom_field.json")
+      stub_put(@auth, "lists/#{@list.list_id}/customfields/#{CGI.escape(key)}.json", "update_custom_field.json")
       personalisation_tag = @list.update_custom_field key, "my renamed custom field", true
       request = FakeWeb.last_request.body
       request.include?("\"FieldName\":\"my renamed custom field\"").should == true
@@ -78,19 +76,19 @@ class ListTest < Test::Unit::TestCase
 
     should "delete a custom field" do
       custom_field_key = "[newdatefield]"
-      stub_delete(@api_key, "lists/#{@list.list_id}/customfields/#{CGI.escape(custom_field_key)}.json", nil)
+      stub_delete(@auth, "lists/#{@list.list_id}/customfields/#{CGI.escape(custom_field_key)}.json", nil)
       @list.delete_custom_field custom_field_key
     end
     
     should "update the options of a multi-optioned custom field" do
       custom_field_key = "[newdatefield]"
       new_options = [ "one", "two", "three" ]
-      stub_put(@api_key, "lists/#{@list.list_id}/customfields/#{CGI.escape(custom_field_key)}/options.json", nil)
+      stub_put(@auth, "lists/#{@list.list_id}/customfields/#{CGI.escape(custom_field_key)}/options.json", nil)
       @list.update_custom_field_options custom_field_key, new_options, true
     end
 
     should "get the details of a list" do
-      stub_get(@api_key, "lists/#{@list.list_id}.json", "list_details.json")
+      stub_get(@auth, "lists/#{@list.list_id}.json", "list_details.json")
       details = @list.details
       details.ConfirmedOptIn.should == false
       details.Title.should == "a non-basic list :)"
@@ -101,7 +99,7 @@ class ListTest < Test::Unit::TestCase
     end
 
     should "get the custom fields for a list" do
-      stub_get(@api_key, "lists/#{@list.list_id}/customfields.json", "custom_fields.json")
+      stub_get(@auth, "lists/#{@list.list_id}/customfields.json", "custom_fields.json")
       cfs = @list.custom_fields
       cfs.size.should == 3
       cfs.first.FieldName.should == "website"
@@ -112,7 +110,7 @@ class ListTest < Test::Unit::TestCase
     end
 
     should "get the segments for a list" do
-      stub_get(@api_key, "lists/#{@list.list_id}/segments.json", "segments.json")
+      stub_get(@auth, "lists/#{@list.list_id}/segments.json", "segments.json")
       segments = @list.segments
       segments.size.should == 2
       segments.first.ListID.should == 'a58ee1d3039b8bec838e6d1482a8a965'
@@ -121,7 +119,7 @@ class ListTest < Test::Unit::TestCase
     end
     
     should "get the stats for a list" do
-      stub_get(@api_key, "lists/#{@list.list_id}/stats.json", "list_stats.json")
+      stub_get(@auth, "lists/#{@list.list_id}/stats.json", "list_stats.json")
       stats = @list.stats
       stats.TotalActiveSubscribers.should == 6
       stats.TotalUnsubscribes.should == 2
@@ -131,7 +129,7 @@ class ListTest < Test::Unit::TestCase
     
     should "get the active subscribers for a list" do
       min_date = "2010-01-01"
-      stub_get(@api_key, "lists/#{@list.list_id}/active.json?pagesize=1000&orderfield=email&page=1&orderdirection=asc&date=#{CGI.escape(min_date)}",
+      stub_get(@auth, "lists/#{@list.list_id}/active.json?pagesize=1000&orderfield=email&page=1&orderdirection=asc&date=#{CGI.escape(min_date)}",
         "active_subscribers.json")
       res = @list.active min_date
       res.ResultsOrderedBy.should == "email"
@@ -158,7 +156,7 @@ class ListTest < Test::Unit::TestCase
 
     should "get the unconfirmed subscribers for a list" do
       min_date = "2010-01-01"
-      stub_get(@api_key, "lists/#{@list.list_id}/unconfirmed.json?pagesize=1000&orderfield=email&page=1&orderdirection=asc&date=#{CGI.escape(min_date)}",
+      stub_get(@auth, "lists/#{@list.list_id}/unconfirmed.json?pagesize=1000&orderfield=email&page=1&orderdirection=asc&date=#{CGI.escape(min_date)}",
         "unconfirmed_subscribers.json")
       res = @list.unconfirmed min_date
       res.ResultsOrderedBy.should == "email"
@@ -176,7 +174,7 @@ class ListTest < Test::Unit::TestCase
 
     should "get the unsubscribed subscribers for a list" do
       min_date = "2010-01-01"
-      stub_get(@api_key, "lists/#{@list.list_id}/unsubscribed.json?pagesize=1000&orderfield=email&page=1&orderdirection=asc&date=#{CGI.escape(min_date)}", 
+      stub_get(@auth, "lists/#{@list.list_id}/unsubscribed.json?pagesize=1000&orderfield=email&page=1&orderdirection=asc&date=#{CGI.escape(min_date)}", 
         "unsubscribed_subscribers.json")
       res = @list.unsubscribed min_date
       res.ResultsOrderedBy.should == "email"
@@ -197,7 +195,7 @@ class ListTest < Test::Unit::TestCase
 
     should "get the deleted subscribers for a list" do
       min_date = "2010-01-01"
-      stub_get(@api_key, "lists/#{@list.list_id}/deleted.json?pagesize=1000&orderfield=email&page=1&orderdirection=asc&date=#{CGI.escape(min_date)}", 
+      stub_get(@auth, "lists/#{@list.list_id}/deleted.json?pagesize=1000&orderfield=email&page=1&orderdirection=asc&date=#{CGI.escape(min_date)}", 
         "deleted_subscribers.json")
       res = @list.deleted min_date
       res.ResultsOrderedBy.should == "email"
@@ -218,7 +216,7 @@ class ListTest < Test::Unit::TestCase
 
     should "get the bounced subscribers for a list" do
       min_date = "2010-01-01"
-      stub_get(@api_key, "lists/#{@list.list_id}/bounced.json?pagesize=1000&orderfield=email&page=1&orderdirection=asc&date=#{CGI.escape(min_date)}",
+      stub_get(@auth, "lists/#{@list.list_id}/bounced.json?pagesize=1000&orderfield=email&page=1&orderdirection=asc&date=#{CGI.escape(min_date)}",
         "bounced_subscribers.json")
       res = @list.bounced min_date
       res.ResultsOrderedBy.should == "email"
@@ -238,7 +236,7 @@ class ListTest < Test::Unit::TestCase
     end
 
     should "get the webhooks for a list" do
-      stub_get(@api_key, "lists/#{@list.list_id}/webhooks.json", "list_webhooks.json")
+      stub_get(@auth, "lists/#{@list.list_id}/webhooks.json", "list_webhooks.json")
       hooks = @list.webhooks
       hooks.size.should == 2
       hooks.first.WebhookID.should == "943678317049bc13"
@@ -250,32 +248,32 @@ class ListTest < Test::Unit::TestCase
     end
 
     should "create a webhook for a list" do
-      stub_post(@api_key, "lists/#{@list.list_id}/webhooks.json", "create_list_webhook.json")
+      stub_post(@auth, "lists/#{@list.list_id}/webhooks.json", "create_list_webhook.json")
       webhook_id = @list.create_webhook ["Unsubscribe", "Spam"], "http://example.com/unsub", "json"
       webhook_id.should == "6a783d359bd44ef62c6ca0d3eda4412a"
     end
     
     should "test a webhook for a list" do
       webhook_id = "jiuweoiwueoiwueowiueo"
-      stub_get(@api_key, "lists/#{@list.list_id}/webhooks/#{webhook_id}/test.json", nil)
+      stub_get(@auth, "lists/#{@list.list_id}/webhooks/#{webhook_id}/test.json", nil)
       @list.test_webhook webhook_id
     end
 
     should "delete a webhook for a list" do
       webhook_id = "jiuweoiwueoiwueowiueo"
-      stub_delete(@api_key, "lists/#{@list.list_id}/webhooks/#{webhook_id}.json", nil)
+      stub_delete(@auth, "lists/#{@list.list_id}/webhooks/#{webhook_id}.json", nil)
       @list.delete_webhook webhook_id
     end
     
     should "activate a webhook for a list" do
       webhook_id = "jiuweoiwueoiwueowiueo"
-      stub_put(@api_key, "lists/#{@list.list_id}/webhooks/#{webhook_id}/activate.json", nil)
+      stub_put(@auth, "lists/#{@list.list_id}/webhooks/#{webhook_id}/activate.json", nil)
       @list.activate_webhook webhook_id
     end
 
     should "de-activate a webhook for a list" do
       webhook_id = "jiuweoiwueoiwueowiueo"
-      stub_put(@api_key, "lists/#{@list.list_id}/webhooks/#{webhook_id}/deactivate.json", nil)
+      stub_put(@auth, "lists/#{@list.list_id}/webhooks/#{webhook_id}/deactivate.json", nil)
       @list.deactivate_webhook webhook_id
     end
   end

data/test/person_test.rb

@@ -1,18 +1,16 @@
 require File.dirname(__FILE__) + '/helper'
 
 class PersonTest < Test::Unit::TestCase
-  context "when an api caller is authenticated" do
+  multiple_contexts "authenticated_using_oauth_context", "authenticated_using_api_key_context" do
     setup do
-      @api_key = '123123123123123123123'
-      CreateSend.api_key @api_key
       @client_id = "d98h2938d9283d982u3d98u88"
-      @person = CreateSend::Person.new @client_id, "person@example.com"
+      @person = CreateSend::Person.new @auth, @client_id, "person@example.com"
     end
-    
+
     should "get a person by client id and email address" do
       email = "person@example.com"
-      stub_get(@api_key, "clients/#{@client_id}/people.json?email=#{CGI.escape(email)}", "person_details.json")      
-      person = CreateSend::Person.get @client_id, email
+      stub_get(@auth, "clients/#{@client_id}/people.json?email=#{CGI.escape(email)}", "person_details.json")
+      person = CreateSend::Person.get @auth, @client_id, email
       person.EmailAddress.should == email
       person.Name.should == "Person One"
       person.AccessLevel.should == 1023
@@ -20,21 +18,21 @@ class PersonTest < Test::Unit::TestCase
     end
 
     should "add a person" do
-      stub_post(@api_key, "clients/#{@client_id}/people.json", "add_person.json")
-      result = CreateSend::Person.add @client_id, "person@example.com", "Person", 0, "Password"
+      stub_post(@auth, "clients/#{@client_id}/people.json", "add_person.json")
+      result = CreateSend::Person.add @auth, @client_id, "person@example.com", "Person", 0, "Password"
       result.EmailAddress.should == "person@example.com"
     end
 
     should "update a person" do
       email = "person@example.com"
       new_email = "new_email_address@example.com"
-      stub_put(@api_key, "clients/#{@client_id}/people.json?email=#{CGI.escape(email)}", nil)
+      stub_put(@auth, "clients/#{@client_id}/people.json?email=#{CGI.escape(email)}", nil)
       @person.update new_email, "Person", 1023, "NewPassword"
       @person.email_address.should == new_email
     end
       
     should "delete a person" do
-      stub_delete(@api_key, "clients/#{@person.client_id}/people.json?email=#{CGI.escape(@person.email_address)}", nil)
+      stub_delete(@auth, "clients/#{@person.client_id}/people.json?email=#{CGI.escape(@person.email_address)}", nil)
       @person.delete
     end
   end

data/test/segment_test.rb

@@ -1,36 +1,34 @@
 require File.dirname(__FILE__) + '/helper'
 
 class SegmentTest < Test::Unit::TestCase
-  context "when an api caller is authenticated" do
+  multiple_contexts "authenticated_using_oauth_context", "authenticated_using_api_key_context" do
     setup do
-      @api_key = '123123123123123123123'
-      CreateSend.api_key @api_key
-      @segment = CreateSend::Segment.new('98y2e98y289dh89h938389')
+      @segment = CreateSend::Segment.new @auth, '98y2e98y289dh89h938389'
     end
 
     should "create a new segment" do
       list_id = "2983492834987394879837498"
       rules = [ { :Subject => "EmailAddress", :Clauses => [ "CONTAINS example.com" ] } ]
-      stub_post(@api_key, "segments/#{list_id}.json", "create_segment.json")
-      res = CreateSend::Segment.create list_id, "new segment title", rules
+      stub_post(@auth, "segments/#{list_id}.json", "create_segment.json")
+      res = CreateSend::Segment.create @auth, list_id, "new segment title", rules
       res.should == "0246c2aea610a3545d9780bf6ab89006"
     end
 
     should "update a segment" do
       rules = [ { :Subject => "Name", :Clauses => [ "EQUALS subscriber" ] } ]
-      stub_put(@api_key, "segments/#{@segment.segment_id}.json", nil)
+      stub_put(@auth, "segments/#{@segment.segment_id}.json", nil)
       @segment.update "new title for segment", rules
     end
-    
+
     should "add a rule to a segment" do
       clauses = [ "CONTAINS example.com" ]
-      stub_post(@api_key, "segments/#{@segment.segment_id}/rules.json", nil)
+      stub_post(@auth, "segments/#{@segment.segment_id}/rules.json", nil)
       @segment.add_rule "EmailAddress", clauses
     end
 
     should "get the active subscribers for a particular segment in the list" do
       min_date = "2010-01-01"
-      stub_get(@api_key, "segments/#{@segment.segment_id}/active.json?pagesize=1000&orderfield=email&page=1&orderdirection=asc&date=#{CGI.escape(min_date)}",
+      stub_get(@auth, "segments/#{@segment.segment_id}/active.json?pagesize=1000&orderfield=email&page=1&orderdirection=asc&date=#{CGI.escape(min_date)}",
         "segment_subscribers.json")
       res = @segment.subscribers min_date
       res.ResultsOrderedBy.should == "email"
@@ -47,14 +45,14 @@ class SegmentTest < Test::Unit::TestCase
       res.Results.first.State.should == "Active"
       res.Results.first.CustomFields.should == []
     end
-    
+
     should "delete a segment" do
-      stub_delete(@api_key, "segments/#{@segment.segment_id}.json", nil)
+      stub_delete(@auth, "segments/#{@segment.segment_id}.json", nil)
       @segment.delete
     end
 
     should "get the details of a segment" do
-      stub_get(@api_key, "segments/#{@segment.segment_id}.json", "segment_details.json")
+      stub_get(@auth, "segments/#{@segment.segment_id}.json", "segment_details.json")
       res = @segment.details
       res.ActiveSubscribers.should == 0
       res.Rules.size.should == 2
@@ -67,7 +65,7 @@ class SegmentTest < Test::Unit::TestCase
     end
 
     should "clear a segment's rules" do
-      stub_delete(@api_key, "segments/#{@segment.segment_id}/rules.json", nil)
+      stub_delete(@auth, "segments/#{@segment.segment_id}/rules.json", nil)
       @segment.clear_rules
     end
 

data/test/subscriber_test.rb

@@ -1,18 +1,16 @@
 require File.dirname(__FILE__) + '/helper'
 
 class SubscriberTest < Test::Unit::TestCase
-  context "when an api caller is authenticated" do
+  multiple_contexts "authenticated_using_oauth_context", "authenticated_using_api_key_context" do
     setup do
-      @api_key = '123123123123123123123'
-      CreateSend.api_key @api_key
       @list_id = "d98h2938d9283d982u3d98u88"
-      @subscriber = CreateSend::Subscriber.new @list_id, "subscriber@example.com"
+      @subscriber = CreateSend::Subscriber.new @auth, @list_id, "subscriber@example.com"
     end
     
     should "get a subscriber by list id and email address" do
       email = "subscriber@example.com"
-      stub_get(@api_key, "subscribers/#{@list_id}.json?email=#{CGI.escape(email)}", "subscriber_details.json")
-      subscriber = CreateSend::Subscriber.get @list_id, email
+      stub_get(@auth, "subscribers/#{@list_id}.json?email=#{CGI.escape(email)}", "subscriber_details.json")
+      subscriber = CreateSend::Subscriber.get @auth, @list_id, email
       subscriber.EmailAddress.should == email
       subscriber.Name.should == "Subscriber One"
       subscriber.Date.should == "2010-10-25 10:28:00"
@@ -24,31 +22,31 @@ class SubscriberTest < Test::Unit::TestCase
     end
 
     should "add a subscriber without custom fields" do
-      stub_post(@api_key, "subscribers/#{@list_id}.json", "add_subscriber.json")
-      email_address = CreateSend::Subscriber.add @list_id, "subscriber@example.com", "Subscriber", [], true
+      stub_post(@auth, "subscribers/#{@list_id}.json", "add_subscriber.json")
+      email_address = CreateSend::Subscriber.add @auth, @list_id, "subscriber@example.com", "Subscriber", [], true
       email_address.should == "subscriber@example.com"
     end
 
     should "add a subscriber with custom fields" do
-      stub_post(@api_key, "subscribers/#{@list_id}.json", "add_subscriber.json")
+      stub_post(@auth, "subscribers/#{@list_id}.json", "add_subscriber.json")
       custom_fields = [ { :Key => 'website', :Value => 'http://example.com/' } ]
-      email_address = CreateSend::Subscriber.add @list_id, "subscriber@example.com", "Subscriber", custom_fields, true
+      email_address = CreateSend::Subscriber.add @auth, @list_id, "subscriber@example.com", "Subscriber", custom_fields, true
       email_address.should == "subscriber@example.com"
     end
 
     should "add a subscriber with custom fields including multi-option fields" do
-      stub_post(@api_key, "subscribers/#{@list_id}.json", "add_subscriber.json")
+      stub_post(@auth, "subscribers/#{@list_id}.json", "add_subscriber.json")
       custom_fields = [ { :Key => 'multioptionselectone', :Value => 'myoption' }, 
         { :Key => 'multioptionselectmany', :Value => 'firstoption' },
         { :Key => 'multioptionselectmany', :Value => 'secondoption' } ]
-      email_address = CreateSend::Subscriber.add @list_id, "subscriber@example.com", "Subscriber", custom_fields, true
+      email_address = CreateSend::Subscriber.add @auth, @list_id, "subscriber@example.com", "Subscriber", custom_fields, true
       email_address.should == "subscriber@example.com"
     end
 
     should "update a subscriber with custom fields" do
       email = "subscriber@example.com"
       new_email = "new_email_address@example.com"
-      stub_put(@api_key, "subscribers/#{@list_id}.json?email=#{CGI.escape(email)}", nil)
+      stub_put(@auth, "subscribers/#{@list_id}.json?email=#{CGI.escape(email)}", nil)
       custom_fields = [ { :Key => 'website', :Value => 'http://example.com/' } ]
       @subscriber.update new_email, "Subscriber", custom_fields, true
       @subscriber.email_address.should == new_email
@@ -57,20 +55,20 @@ class SubscriberTest < Test::Unit::TestCase
     should "update a subscriber with custom fields including the clear option" do
       email = "subscriber@example.com"
       new_email = "new_email_address@example.com"
-      stub_put(@api_key, "subscribers/#{@list_id}.json?email=#{CGI.escape(email)}", nil)
+      stub_put(@auth, "subscribers/#{@list_id}.json?email=#{CGI.escape(email)}", nil)
       custom_fields = [ { :Key => 'website', :Value => '', :Clear => true } ]
       @subscriber.update new_email, "Subscriber", custom_fields, true
       @subscriber.email_address.should == new_email
     end
     
     should "import many subscribers at once" do
-      stub_post(@api_key, "subscribers/#{@list_id}/import.json", "import_subscribers.json")
+      stub_post(@auth, "subscribers/#{@list_id}/import.json", "import_subscribers.json")
       subscribers = [
         { :EmailAddress => "example+1@example.com", :Name => "Example One" },
         { :EmailAddress => "example+2@example.com", :Name => "Example Two" },
         { :EmailAddress => "example+3@example.com", :Name => "Example Three" },
       ]
-      import_result = CreateSend::Subscriber.import @list_id, subscribers, true
+      import_result = CreateSend::Subscriber.import @auth, @list_id, subscribers, true
       import_result.FailureDetails.size.should == 0
       import_result.TotalUniqueEmailsSubmitted.should == 3
       import_result.TotalExistingSubscribers.should == 0
@@ -79,13 +77,13 @@ class SubscriberTest < Test::Unit::TestCase
     end
 
     should "import many subscribers at once, and start subscription-based autoresponders" do
-      stub_post(@api_key, "subscribers/#{@list_id}/import.json", "import_subscribers.json")
+      stub_post(@auth, "subscribers/#{@list_id}/import.json", "import_subscribers.json")
       subscribers = [
         { :EmailAddress => "example+1@example.com", :Name => "Example One" },
         { :EmailAddress => "example+2@example.com", :Name => "Example Two" },
         { :EmailAddress => "example+3@example.com", :Name => "Example Three" },
       ]
-      import_result = CreateSend::Subscriber.import @list_id, subscribers, true, true
+      import_result = CreateSend::Subscriber.import @auth, @list_id, subscribers, true, true
       import_result.FailureDetails.size.should == 0
       import_result.TotalUniqueEmailsSubmitted.should == 3
       import_result.TotalExistingSubscribers.should == 0
@@ -94,13 +92,13 @@ class SubscriberTest < Test::Unit::TestCase
     end
 
     should "import many subscribers at once with custom fields, including the clear option" do
-      stub_post(@api_key, "subscribers/#{@list_id}/import.json", "import_subscribers.json")
+      stub_post(@auth, "subscribers/#{@list_id}/import.json", "import_subscribers.json")
       subscribers = [
         { :EmailAddress => "example+1@example.com", :Name => "Example One", :CustomFields => [ { :Key => 'website', :Value => '', :Clear => true } ] },
         { :EmailAddress => "example+2@example.com", :Name => "Example Two", :CustomFields => [ { :Key => 'website', :Value => '', :Clear => false } ]  },
         { :EmailAddress => "example+3@example.com", :Name => "Example Three", :CustomFields => [ { :Key => 'website', :Value => '', :Clear => false } ]  },
       ]
-      import_result = CreateSend::Subscriber.import @list_id, subscribers, true
+      import_result = CreateSend::Subscriber.import @auth, @list_id, subscribers, true
       import_result.FailureDetails.size.should == 0
       import_result.TotalUniqueEmailsSubmitted.should == 3
       import_result.TotalExistingSubscribers.should == 0
@@ -110,13 +108,13 @@ class SubscriberTest < Test::Unit::TestCase
 
     should "import many subscribers at once with partial success" do
       # Stub request with 400 Bad Request as the expected response status
-      stub_post(@api_key, "subscribers/#{@list_id}/import.json", "import_subscribers_partial_success.json", 400)
+      stub_post(@auth, "subscribers/#{@list_id}/import.json", "import_subscribers_partial_success.json", 400)
       subscribers = [
         { :EmailAddress => "example+1@example", :Name => "Example One" },
         { :EmailAddress => "example+2@example.com", :Name => "Example Two" },
         { :EmailAddress => "example+3@example.com", :Name => "Example Three" },
       ]
-      import_result = CreateSend::Subscriber.import @list_id, subscribers, true
+      import_result = CreateSend::Subscriber.import @auth, @list_id, subscribers, true
       import_result.FailureDetails.size.should == 1
       import_result.FailureDetails.first.EmailAddress.should == "example+1@example"
       import_result.FailureDetails.first.Code.should == 1
@@ -128,12 +126,12 @@ class SubscriberTest < Test::Unit::TestCase
     end
 
     should "unsubscribe a subscriber" do
-      stub_post(@api_key, "subscribers/#{@subscriber.list_id}/unsubscribe.json", nil)
+      stub_post(@auth, "subscribers/#{@subscriber.list_id}/unsubscribe.json", nil)
       @subscriber.unsubscribe
     end
-    
+
     should "get a subscriber's history" do
-      stub_get(@api_key, "subscribers/#{@subscriber.list_id}/history.json?email=#{CGI.escape(@subscriber.email_address)}", "subscriber_history.json")
+      stub_get(@auth, "subscribers/#{@subscriber.list_id}/history.json?email=#{CGI.escape(@subscriber.email_address)}", "subscriber_history.json")
       history = @subscriber.history
       history.size.should == 1
       history.first.Name.should == "Campaign One"
@@ -147,7 +145,7 @@ class SubscriberTest < Test::Unit::TestCase
     end
 
     should "delete a subscriber" do
-      stub_delete(@api_key, "subscribers/#{@subscriber.list_id}.json?email=#{CGI.escape(@subscriber.email_address)}", nil)
+      stub_delete(@auth, "subscribers/#{@subscriber.list_id}.json?email=#{CGI.escape(@subscriber.email_address)}", nil)
       @subscriber.delete
     end
   end