Update to work with multiple Campaign Monitor accounts (API keys)

lib/campaign_monitor.rb

@@ -125,7 +125,7 @@ def method_missing(method_id, params = {})
   #  end
   def clients
     handle_response(User_GetClients()) do |response|
-      response["Client"].collect{|c| Client.new(c["ClientID"], c["Name"])}
+      response["Client"].collect{|c| Client.new(c["ClientID"], c["Name"], self)}
     end
   end
 
@@ -148,7 +148,7 @@ def parsed_system_date
   #  end
   def campaigns(client_id)
     handle_response(Client_GetCampaigns("ClientID" => client_id)) do |response|
-      response["Campaign"].collect{|c| Campaign.new(c["CampaignID"], c["Subject"], c["SentDate"], c["TotalRecipients"].to_i)}
+      response["Campaign"].collect{|c| Campaign.new(c["CampaignID"], c["Subject"], c["SentDate"], c["TotalRecipients"].to_i, self)}
     end
   end
 
@@ -163,7 +163,7 @@ def campaigns(client_id)
   #  end
   def lists(client_id)
     handle_response(Client_GetLists("ClientID" => client_id)) do |response|
-      response["List"].collect{|l| List.new(l["ListID"], l["Name"])}
+      response["List"].collect{|l| List.new(l["ListID"], l["Name"], self)}
     end
   end
 

lib/campaign_monitor/campaign.rb

@@ -5,12 +5,12 @@ class Campaign
 
     attr_reader :id, :subject, :sent_date, :total_recipients, :cm_client
 
-    def initialize(id=nil, subject=nil, sent_date=nil, total_recipients=nil)
+    def initialize(id=nil, subject=nil, sent_date=nil, total_recipients=nil, client=nil)
       @id = id
       @subject = subject
       @sent_date = sent_date
       @total_recipients = total_recipients
-      @cm_client = CampaignMonitor.new
+      @cm_client = client || CampaignMonitor.new
     end
 
     # Example

lib/campaign_monitor/client.rb

@@ -7,10 +7,10 @@ class Client
 
     # Example
     #  @client = new Client(12345)
-    def initialize(id, name=nil)
+    def initialize(id, name=nil, client=nil)
       @id = id
       @name = name
-      @cm_client = CampaignMonitor.new
+      @cm_client = client || CampaignMonitor.new
     end
 
     # Example

lib/campaign_monitor/list.rb

@@ -10,10 +10,10 @@ class List
 
     # Example
     #  @list = new List(12345)
-    def initialize(id=nil, name=nil)
+    def initialize(id=nil, name=nil, client=nil)
       @id = id
       @name = name
-      @cm_client = CampaignMonitor.new
+      @cm_client = client || CampaignMonitor.new
     end
 
     # Example

lib/campaign_monitor/subscriber.rb

@@ -6,11 +6,11 @@ class Subscriber
     attr_accessor :email_address, :name, :date_subscribed
     attr_reader :cm_client
 
-    def initialize(email_address, name=nil, date=nil)
+    def initialize(email_address, name=nil, date=nil, client=nil)
       @email_address = email_address
       @name = name
       @date_subscribed = date_subscribed
-      @cm_client = CampaignMonitor.new
+      @cm_client = client || CampaignMonitor.new
     end
 
     # Example