Create Result directly from the xml and add #succeeded? & #failed? he…

…lpers

lib/campaign_monitor.rb

@@ -168,12 +168,11 @@ def lists(client_id)
   #  @cm = CampaignMonitor.new()
   #  result = @cm.add_subscriber(12345, "ralph.wiggum@simpsons.net", "Ralph Wiggum")
   #
-  #  if result.code == 0
+  #  if result.succeeded?
   #    puts "Subscriber Added to List"
   #  end
   def add_subscriber(list_id, email, name)
-    response = Subscriber_Add("ListID" => list_id, "Email" => email, "Name" => name)
-    Result.new(response["Message"], response["Code"].to_i)
+    Result.new(Subscriber_Add("ListID" => list_id, "Email" => email, "Name" => name))
   end
 
   # Encapsulates

lib/campaign_monitor/list.rb

@@ -16,24 +16,22 @@ def initialize(id=nil, name=nil)
     #  @list = new List(12345)
     #  result = @list.add_subscriber("ralph.wiggum@simpsons.net")
     #
-    #  if result.code == 0
+    #  if result.succeeded?
     #    puts "Added Subscriber"
     #  end
     def add_subscriber(email, name = nil)
-      response = @cm_client.Subscriber_Add("ListID" => @id, "Email" => email, "Name" => name)
-      Result.new(response["Message"], response["Code"].to_i)
+      Result.new(@cm_client.Subscriber_Add("ListID" => @id, "Email" => email, "Name" => name))
     end
 
     # Example
     #  @list = new List(12345)
     #  result = @list.remove_subscriber("ralph.wiggum@simpsons.net")
     #
-    #  if result.code == 0
+    #  if result.succeeded?
     #    puts "Deleted Subscriber"
     #  end
     def remove_subscriber(email)
-      response = @cm_client.Subscriber_Unsubscribe("ListID" => @id, "Email" => email)
-      Result.new(response["Message"], response["Code"].to_i)
+      Result.new(@cm_client.Subscriber_Unsubscribe("ListID" => @id, "Email" => email))
     end
 
     # Example

lib/campaign_monitor/result.rb

@@ -3,9 +3,17 @@ class CampaignMonitor
   class Result
     attr_reader :message, :code
 
-    def initialize(message, code)
-      @message = message
-      @code = code
+    def initialize(response)
+      @message = response["Message"]
+      @code = response["Code"].to_i
+    end
+
+    def succeeded?
+      code == 0
+    end
+
+    def failed?
+      !succeeded?
     end
   end
 end

lib/campaign_monitor/subscriber.rb

@@ -14,24 +14,21 @@ def initialize(email_address, name=nil, date=nil)
     #  @subscriber = Subscriber.new("ralph.wiggum@simpsons.net")
     #  @subscriber.add(12345)
     def add(list_id)
-      response = @cm_client.Subscriber_Add("ListID" => list_id, "Email" => @email_address, "Name" => @name)
-      Result.new(response["Message"], response["Code"].to_i)
+      Result.new(@cm_client.Subscriber_Add("ListID" => list_id, "Email" => @email_address, "Name" => @name))
     end
 
     # Example
     #  @subscriber = Subscriber.new("ralph.wiggum@simpsons.net")
     #  @subscriber.add_and_resubscribe(12345)
     def add_and_resubscribe(list_id)
-      response = @cm_client.Subscriber_AddAndResubscribe("ListID" => list_id, "Email" => @email_address, "Name" => @name)
-      Result.new(response["Message"], response["Code"].to_i)
+      Result.new(@cm_client.Subscriber_AddAndResubscribe("ListID" => list_id, "Email" => @email_address, "Name" => @name))
     end
 
     # Example
     #  @subscriber = Subscriber.new("ralph.wiggum@simpsons.net")
     #  @subscriber.unsubscribe(12345)
     def unsubscribe(list_id)
-      response = @cm_client.Subscriber_Unsubscribe("ListID" => list_id, "Email" => @email_address)
-      Result.new(response["Message"], response["Code"].to_i)
+      Result.new(@cm_client.Subscriber_Unsubscribe("ListID" => list_id, "Email" => @email_address))
     end
   end
 end