exacto_subscriber 0.1.2 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/exacto_subscriber.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exacto_subscriber}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Pickett"]
-  s.date = %q{2010-08-23}
+  s.date = %q{2010-08-31}
   s.description = %q{Manage Exact Target List subscribers: more coming}
   s.email = %q{dpickett@enlightsolutions.com}
   s.extra_rdoc_files = [
@@ -29,11 +29,20 @@ Gem::Specification.new do |s|
      "lib/exacto_subscriber.rb",
      "lib/exacto_subscriber/base.rb",
      "lib/exacto_subscriber/error.rb",
+     "lib/exacto_subscriber/ext/hacked_request.rb",
+     "lib/exacto_subscriber/list_unsubscription.rb",
+     "lib/exacto_subscriber/master_list_unsubscription.rb",
      "lib/exacto_subscriber/subscriber.rb",
+     "lib/exacto_subscriber/unsubscription.rb",
+     "spec/cassettes/list_unsubscriptions/find.yml",
+     "spec/cassettes/master_list_unsubscriptions/find_existing.yml",
+     "spec/cassettes/master_list_unsubscriptions/find_nonexistent.yml",
      "spec/cassettes/subscribers/find_by_email_and_list_id.yml",
      "spec/cassettes/subscribers/subscribe.yml",
      "spec/cassettes/subscribers/unsubscribe.yml",
      "spec/exact_target_credentials.example.yml",
+     "spec/exacto_subscriber/list_unsubscription_spec.rb",
+     "spec/exacto_subscriber/master_list_unsubscription_spec.rb",
      "spec/exacto_subscriber/subcriber_spec.rb",
      "spec/exacto_subscriber/unsubscription_spec.rb",
      "spec/exacto_subscriber_spec.rb",
@@ -46,7 +55,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Manage Exact Target List subscribers}
   s.test_files = [
-    "spec/exacto_subscriber/subcriber_spec.rb",
+    "spec/exacto_subscriber/list_unsubscription_spec.rb",
+     "spec/exacto_subscriber/master_list_unsubscription_spec.rb",
+     "spec/exacto_subscriber/subcriber_spec.rb",
      "spec/exacto_subscriber/unsubscription_spec.rb",
      "spec/exacto_subscriber_spec.rb",
      "spec/spec_helper.rb"

data/lib/exacto_subscriber/base.rb

@@ -9,7 +9,7 @@ module Exacto
       self.class.issue_request(&block)
     end
     
-    def self.issue_request(&block)
+    def self.issue_request(system_name = nil, &block)
       if block_given?
         builder = Nokogiri::XML::Builder.new do |xml|
           xml.exacttarget do
@@ -18,7 +18,7 @@ module Exacto
               xml.password Exacto.password
             end
             xml.system do
-              xml.system_name system_name
+              xml.system_name system_name || request_system_name
               yield(xml)
             end
           end
@@ -29,14 +29,54 @@ module Exacto
     end
     
     def self.parse_response(response)
-      trimmed_response = response["exacttarget"]["system"][self.system_name]
-      raise_errors_for(trimmed_response)
-      trimmed_response
+      raise_errors_for(response["exacttarget"]["system"][self.request_system_name])
+      trimmed_response = trim_response(response)
+
+      trimmed_response = trimmed_response[self.response_system_name] if trimmed_response
+      trimmed_response || {}
+    end
+    
+    def self.normalize(resulting_hash)
+      new_hash = {}
+      resulting_hash.each do |key, value|
+        if key =~ /subid/
+          new_hash[:subscriber_id] = value
+        elsif key =~ /Email\_\_Address/
+          new_hash[:email_address] = value
+        else
+          new_hash[key.gsub(/\_\_/, "_").gsub(/id/, "_id").downcase.to_sym] = value
+        end
+      end
+      
+      new_hash
+    end
+    
+    def self.format_date_for_request(date)
+      date.strftime("%m/%d/%Y").gsub(/^0/, "").gsub(/\/0/, "\/")
+    end
+    
+    def self.trim_response(response)
+      response["exacttarget"]["system"]
+    end
+    
+    def self.request_system_name
+      system_name
+    end
+    
+    def self.response_system_name
+      system_name
     end
     
     private
     def self.raise_errors_for(response)
       Error.from_response(response)
     end
+    
+    #we need to hack HTTParty to not encode params so inject a hacked request object in this method
+    def perform_request(http_method, path, options) #:nodoc:
+      options = default_options.dup.merge(options)
+      process_cookies(options)
+      HackedRequest.new(http_method, path, options).perform
+    end
   end
 end

data/lib/exacto_subscriber/error.rb

@@ -8,7 +8,7 @@ module Exacto
     end
     
     def self.from_response(response)
-      if code = response["error"]
+      if response && code = response["error"]
         raise new(code, response["error_description"])
       end
     end

data/lib/exacto_subscriber/ext/hacked_request.rb

@@ -0,0 +1,7 @@
+require "cgi"
+
+class HackedRequest < HTTParty::Request
+  def body
+    CGI.unescape(super)
+  end
+end

data/lib/exacto_subscriber/list_unsubscription.rb

@@ -0,0 +1,37 @@
+module Exacto
+  class ListUnsubscription < Unsubscription
+    def self.request_system_name
+      "tracking-channel"
+    end
+    
+    def self.find(list_id)
+      response = issue_request("list") do |xml|
+        xml.action "retrieve_sub"
+        xml.search_type "listid"
+        xml.search_value list_id
+        xml.search_status "Unsubscribed"
+      end
+      
+      response = [response] if response.is_a?(Hash) && !response.empty?
+      response.collect do |i|
+        new(normalize(i))
+      end
+    end
+    
+    def self.response_system_name
+      "subscriber"
+    end
+    
+    def self.trim_response(response)
+      super["list"]["subscribers"]
+    end
+    
+    def self.request_system_name
+      "tracking-channel"
+    end
+    
+    def self.response_system_name
+      "subscriber"
+    end
+  end
+end

data/lib/exacto_subscriber/master_list_unsubscription.rb

@@ -0,0 +1,33 @@
+module Exacto
+  class MasterListUnsubscription < Unsubscription
+    def self.find(start_date, end_date)
+      response = issue_request("tracking") do |xml|
+        xml.action "retrieve"
+        xml.sub_action "masterunsub"
+        xml.search_type ""
+        xml.search_value ""
+        xml.daterange do
+          xml.startdate format_date_for_request(start_date)
+          xml.enddate   format_date_for_request(end_date)
+        end
+      end
+
+      response = [response] if response.is_a?(Hash) && !response.empty?
+      response.collect do |i|
+        new(normalize(i))
+      end
+    end 
+    
+    def self.trim_response(response)
+      super(response)["tracking"]["masterunsub"]
+    end
+    
+    def self.request_system_name
+      "tracking"
+    end
+    
+    def self.response_system_name
+      "subscriber"
+    end
+  end
+end

data/lib/exacto_subscriber/subscriber.rb

@@ -1,6 +1,6 @@
 module Exacto
   class Subscriber < Exacto::Base 
-    attr_reader :email, :subscriber_id
+    attr_reader :email_address, :subscriber_id
     attr_accessor :list_id, :status, :attributes
         
     def initialize(options = {})
@@ -10,7 +10,7 @@ module Exacto
     def subscribe_to(list_id)
       @status = "active"
       @list_id = list_id
-      if item = self.class.find_by_email_and_list_id(email, list_id)
+      if item = self.class.find_by_email_and_list_id(email_address, list_id)
         item.list_id = list_id
         item.status = @status
         item.attributes = attributes
@@ -18,12 +18,14 @@ module Exacto
       else
         create
       end
+      
+      self
     end
     
     def unsubscribe_from(list_id)
       @list_id = list_id
       @status = "Unsubscribed"
-      if item = self.class.find_by_email_and_list_id(email, list_id)
+      if item = self.class.find_by_email_and_list_id(email_address, list_id)
         item.list_id = list_id
         item.status = status
         item.attributes = attributes
@@ -31,6 +33,8 @@ module Exacto
       else
         create
       end
+      
+      self
     end
     
     def create
@@ -49,7 +53,7 @@ module Exacto
         xml.action "edit"
         xml.search_type "listid"
         xml.search_value @list_id
-        xml.search_value2 email
+        xml.search_value2 email_address
         resource_xml(xml)
         xml.update true
       end
@@ -57,7 +61,7 @@ module Exacto
 
     def resource_xml(xml)
       xml.values do
-        xml.email__address @email
+        xml.email__address @email_address
         xml.status @status if @status
         (self.attributes || {}).each do |field, val|
           xml.send(field.to_s.gsub("_", "__"), val) 
@@ -74,20 +78,20 @@ module Exacto
     end
     
     def update_from_options(options)
-      @email  = options[:email]
+      @email_address  = options[:email_address]
       @status = options[:status]
       @subscriber_id = options[:subscriber_id]
       @list_id    = options[:list_id]
       @attributes = options[:attributes] || {}
     end
     
-    def self.find_by_email_and_list_id(email, list_id)
+    def self.find_by_email_and_list_id(email_address, list_id)
       begin
         result = issue_request do |xml|
           xml.action "retrieve"
           xml.search_type "listid"
           xml.search_value list_id
-          xml.search_value2 email
+          xml.search_value2 email_address
           xml.showChannelID nil
         end
       rescue Error => e
@@ -98,22 +102,7 @@ module Exacto
         end
       end
       
-      result.nil? ? nil : new(normalize(result))
-    end
-    
-    def self.normalize(resulting_hash)
-      new_hash = {}
-      resulting_hash.each do |key, value|
-        if key =~ /subid/
-          new_hash[:subscriber_id] = value
-        elsif key =~ /Email\_\_Address/
-          new_hash[:email] = value
-        else
-          new_hash[key.gsub(/\_\_/, "_").gsub(/id/, "_id").downcase.to_sym] = value
-        end
-      end
-      
-      new_hash
+      result.nil? || result.empty? ? nil : new(normalize(result))
     end
     
     def self.system_name

data/lib/exacto_subscriber/unsubscription.rb

@@ -0,0 +1,15 @@
+module Exacto
+  class Unsubscription < Base
+    attr_reader :email_address, :unsubscribed_at, :status
+    def initialize(options = {})
+      @email_address = options[:email_address]
+      if options[:unsubscribed_at]
+        @unsubscribed_at = DateTime.parse(options[:unsubscribed_at])
+      end
+    end
+    
+    def response_system_name
+      "subscriber"
+    end
+  end
+end

data/lib/exacto_subscriber.rb

@@ -21,7 +21,13 @@ module Exacto
   end
 end
 
+require "exacto_subscriber/ext/hacked_request"
+
 require "exacto_subscriber/error"
 require "exacto_subscriber/base"
 
 require "exacto_subscriber/subscriber"
+
+require "exacto_subscriber/unsubscription"
+require "exacto_subscriber/list_unsubscription"
+require "exacto_subscriber/master_list_unsubscription"

data/spec/cassettes/list_unsubscriptions/find.yml

@@ -0,0 +1,46 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://www.exacttarget.com:443/api/integrate.asp?qf=xml
+    body: xml=%3C%3Fxml%20version%3D%221.0%22%3F%3E%0A%3Cexacttarget%3E%0A%20%20%3Cauthorization%3E%0A%20%20%20%20%3Cusername%3E<%= CGI.escape username %>%3C%2Fusername%3E%0A%20%20%20%20%3Cpassword%3E<%= CGI.escape password %>%3C%2Fpassword%3E%0A%20%20%3C%2Fauthorization%3E%0A%20%20%3Csystem%3E%0A%20%20%20%20%3Csystem_name%3Elist%3C%2Fsystem_name%3E%0A%20%20%20%20%3Caction%3Eretrieve_sub%3C%2Faction%3E%0A%20%20%20%20%3Csearch_type%3Elistid%3C%2Fsearch_type%3E%0A%20%20%20%20%3Csearch_value%3E<%= CGI.escape list_id %>%3C%2Fsearch_value%3E%0A%20%20%20%20%3Csearch_status%3EUnsubscribed%3C%2Fsearch_status%3E%0A%20%20%3C%2Fsystem%3E%0A%3C%2Fexacttarget%3E%0A
+    headers: 
+      content-type: 
+      - application/x-www-form-urlencoded
+      connection: 
+      - close
+      content-length: 
+      - "612"
+      host: 
+      - www.exacttarget.com
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      x-powered-by: 
+      - ASP.NET
+      x-aspnet-version: 
+      - 2.0.50727
+      connection: 
+      - close
+      content-type: 
+      - text/xml; charset=utf-8
+      server: 
+      - Microsoft-IIS/6.0
+      date: 
+      - Tue, 31 Aug 2010 16:00:10 GMT
+      set-cookie: 
+      - ASP.NET_SessionId=yxuywfncnj3vjcq0vzq2ryzq; path=/; HttpOnly
+      cache-control: 
+      - private
+      transfer-encoding: 
+      - chunked
+    body: |
+      <?xml version='1.0'?>
+      <exacttarget>
+      <system>
+      <list><subscribers><subscriber><id>548693262</id><Email__Address>dpickett@secondrotation.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Daniel</First__Name><Last__Name>Pickett</Last__Name><Originating__Partner /><Packing__Slip__Count>0</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber><subscriber><id>550133036</id><Email__Address>james@secondrotation.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>James</First__Name><Last__Name>McElhiney</Last__Name><Originating__Partner /><Packing__Slip__Count>0</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber><subscriber><id>550133037</id><Email__Address>shari@secondrotation.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Shari</First__Name><Last__Name>Silvers</Last__Name><Originating__Partner /><Packing__Slip__Count>0</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber><subscriber><id>550133043</id><Email__Address>wai@secondrotation.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Wai</First__Name><Last__Name>Cheng</Last__Name><Originating__Partner /><Packing__Slip__Count>0</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber><subscriber><id>550133044</id><Email__Address>ex-rousseau@secondrotation.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Rousseau</First__Name><Last__Name>Aurelien</Last__Name><Originating__Partner /><Packing__Slip__Count>0</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber><subscriber><id>550133073</id><Email__Address>demo@secondrotation.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Demo</First__Name><Last__Name>Account</Last__Name><Originating__Partner /><Packing__Slip__Count>0</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber><subscriber><id>550133084</id><Email__Address>email-1076@example.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Anthony</First__Name><Last__Name>Lee</Last__Name><Originating__Partner>gazelle</Originating__Partner><Packing__Slip__Count>1</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber><subscriber><id>550133104</id><Email__Address>lilith@secondrotation.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Lilith</First__Name><Last__Name>Arthur</Last__Name><Originating__Partner>gazelle</Originating__Partner><Packing__Slip__Count>1</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber><subscriber><id>550133106</id><Email__Address>++donna@secondrotation.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Donna</First__Name><Last__Name>Le</Last__Name><Originating__Partner /><Packing__Slip__Count>0</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber><subscriber><id>550133120</id><Email__Address>email-2063@example.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Anna</First__Name><Last__Name>Butler</Last__Name><Originating__Partner>gazelle</Originating__Partner><Packing__Slip__Count>2</Packing__Slip__Count><Accepted__Transaction__Count>1</Accepted__Transaction__Count><Accepted__Transaction__Value>122.099998474121</Accepted__Transaction__Value></subscriber><subscriber><id>550133226</id><Email__Address>email-2630@example.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Jeffrey</First__Name><Last__Name>Cooper</Last__Name><Originating__Partner>gazelle</Originating__Partner><Packing__Slip__Count>1</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber><subscriber><id>550133271</id><Email__Address>thos@secondrotation.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Thos</First__Name><Last__Name>Niles</Last__Name><Originating__Partner>gazelle</Originating__Partner><Packing__Slip__Count>1</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber><subscriber><id>550133272</id><Email__Address>email-3521@example.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Raymond</First__Name><Last__Name>Sanders</Last__Name><Originating__Partner>gazelle</Originating__Partner><Packing__Slip__Count>1</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber><subscriber><id>550133289</id><Email__Address>email-3911@example.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Mary</First__Name><Last__Name>Baker</Last__Name><Originating__Partner>gazelle</Originating__Partner><Packing__Slip__Count>1</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber><subscriber><id>550133316</id><Email__Address>email-4639@example.com</Email__Address><EmailType>HTML</EmailType><Status>Unsubscribed</Status><First__Name>Timothy</First__Name><Last__Name>Evans</Last__Name><Originating__Partner>gazelle</Originating__Partner><Packing__Slip__Count>2</Packing__Slip__Count><Accepted__Transaction__Count>0</Accepted__Transaction__Count><Accepted__Transaction__Value>0</Accepted__Transaction__Value></subscriber></subscribers></list></system>
+      </exacttarget>
+
+    http_version: "1.1"

data/spec/cassettes/master_list_unsubscriptions/find_existing.yml

@@ -0,0 +1,54 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://www.exacttarget.com:443/api/integrate.asp?qf=xml
+    body: xml=%3C%3Fxml%20version%3D%221.0%22%3F%3E%0A%3Cexacttarget%3E%0A%20%20%3Cauthorization%3E%0A%20%20%20%20%3Cusername%3E<%= CGI.escape username %>%3C%2Fusername%3E%0A%20%20%20%20%3Cpassword%3E<%= CGI.escape password %>%3C%2Fpassword%3E%0A%20%20%3C%2Fauthorization%3E%0A%20%20%3Csystem%3E%0A%20%20%20%20%3Csystem_name%3Etracking%3C%2Fsystem_name%3E%0A%20%20%20%20%3Caction%3Eretrieve%3C%2Faction%3E%0A%20%20%20%20%3Csub_action%3Emasterunsub%3C%2Fsub_action%3E%0A%20%20%20%20%3Csearch_type%3E%3C%2Fsearch_type%3E%0A%20%20%20%20%3Csearch_value%3E%3C%2Fsearch_value%3E%0A%20%20%20%20%3Cdaterange%3E%0A%20%20%20%20%20%20%3Cstartdate%3E8%2F1%2F2010%3C%2Fstartdate%3E%0A%20%20%20%20%20%20%3Cenddate%3E9%2F1%2F2010%3C%2Fenddate%3E%0A%20%20%20%20%3C%2Fdaterange%3E%0A%20%20%3C%2Fsystem%3E%0A%3C%2Fexacttarget%3E%0A
+    headers: 
+      content-type: 
+      - application/x-www-form-urlencoded
+      connection: 
+      - close
+      content-length: 
+      - "782"
+      host: 
+      - www.exacttarget.com
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      x-powered-by: 
+      - ASP.NET
+      x-aspnet-version: 
+      - 2.0.50727
+      connection: 
+      - close
+      content-type: 
+      - text/xml; charset=utf-8
+      server: 
+      - Microsoft-IIS/6.0
+      date: 
+      - Tue, 31 Aug 2010 16:03:07 GMT
+      set-cookie: 
+      - ASP.NET_SessionId=f0jwbg55z5yeom55t0moaojx; path=/; HttpOnly
+      cache-control: 
+      - private
+      transfer-encoding: 
+      - chunked
+    body: |
+      <?xml version='1.0'?>
+      <exacttarget>
+      <system>
+      <tracking>
+      <masterunsub><subscriber>
+      <email_address>wai@secondrotation.com</email_address>
+      <name/>
+      <reason>Unsubscribed from list details on subscriber properties dialog.</reason>
+      <unsub_date_time>8/31/2010 8:50:00 AM</unsub_date_time>
+      </subscriber>
+      </masterunsub></tracking>
+      </system>
+      </exacttarget>
+
+    http_version: "1.1"

data/spec/cassettes/master_list_unsubscriptions/find_nonexistent.yml

@@ -0,0 +1,49 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://www.exacttarget.com:443/api/integrate.asp?qf=xml
+    body: xml=%3C%3Fxml%20version%3D%221.0%22%3F%3E%0A%3Cexacttarget%3E%0A%20%20%3Cauthorization%3E%0A%20%20%20%20%3Cusername%3E<%= CGI.escape username %>%3C%2Fusername%3E%0A%20%20%20%20%3Cpassword%3E<%= CGI.escape password %>%3C%2Fpassword%3E%0A%20%20%3C%2Fauthorization%3E%0A%20%20%3Csystem%3E%0A%20%20%20%20%3Csystem_name%3Etracking%3C%2Fsystem_name%3E%0A%20%20%20%20%3Caction%3Eretrieve%3C%2Faction%3E%0A%20%20%20%20%3Csub_action%3Emasterunsub%3C%2Fsub_action%3E%0A%20%20%20%20%3Csearch_type%3E%3C%2Fsearch_type%3E%0A%20%20%20%20%3Csearch_value%3E%3C%2Fsearch_value%3E%0A%20%20%20%20%3Cdaterange%3E%0A%20%20%20%20%20%20%3Cstartdate%3E8%2F1%2F2010%3C%2Fstartdate%3E%0A%20%20%20%20%20%20%3Cenddate%3E8%2F1%2F2010%3C%2Fenddate%3E%0A%20%20%20%20%3C%2Fdaterange%3E%0A%20%20%3C%2Fsystem%3E%0A%3C%2Fexacttarget%3E%0A
+    headers: 
+      content-type: 
+      - application/x-www-form-urlencoded
+      connection: 
+      - close
+      content-length: 
+      - "782"
+      host: 
+      - www.exacttarget.com
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      x-powered-by: 
+      - ASP.NET
+      x-aspnet-version: 
+      - 2.0.50727
+      connection: 
+      - close
+      content-type: 
+      - text/xml; charset=utf-8
+      server: 
+      - Microsoft-IIS/6.0
+      date: 
+      - Tue, 31 Aug 2010 16:03:08 GMT
+      set-cookie: 
+      - ASP.NET_SessionId=ucgyrv451ub3sw55feopvnqq; path=/; HttpOnly
+      cache-control: 
+      - private
+      transfer-encoding: 
+      - chunked
+    body: |
+      <?xml version='1.0'?>
+      <exacttarget>
+      <system>
+      <tracking>
+      <masterunsub><nosubs>No subscriber were found with the masterunsub status</nosubs>
+      </masterunsub></tracking>
+      </system>
+      </exacttarget>
+
+    http_version: "1.1"

data/spec/cassettes/subscribers/find_by_email_and_list_id.yml

@@ -29,9 +29,9 @@
       server: 
       - Microsoft-IIS/6.0
       date: 
-      - Fri, 20 Aug 2010 14:29:41 GMT
+      - Tue, 31 Aug 2010 16:00:23 GMT
       set-cookie: 
-      - ASP.NET_SessionId=oa3lbb22zyp5onrnbrbik5vc; path=/; HttpOnly
+      - ASP.NET_SessionId=vuvotub2esmgkwnejx42mdnt; path=/; HttpOnly
       cache-control: 
       - private
       transfer-encoding: 
@@ -40,7 +40,142 @@
       <?xml version='1.0'?>
       <exacttarget>
       <system>
-      <subscriber><subid>548749517</subid><listid><%= CGI.escape list_id %></listid><list_name>Development - master</list_name><Full__Name /><Email__Address>user3@example.com</Email__Address><User__Defined /><Email__Type>HTML</Email__Type><Status>Unsubscribed</Status><First__Name>John</First__Name><Last__Name>Smith</Last__Name><Packing__Slip__Count /><Originating__Partner /></subscriber></system>
+      <subscriber><subid>548749517</subid><listid><%= CGI.escape list_id %></listid><list_name>Development - master</list_name><Email__Address>user3@example.com</Email__Address><Email__Type>HTML</Email__Type><Status>Unsubscribed</Status><First__Name>John</First__Name><Last__Name>Smith</Last__Name><Originating__Partner /><Packing__Slip__Count>NaN</Packing__Slip__Count><Accepted__Transaction__Count>NaN</Accepted__Transaction__Count><Accepted__Transaction__Value>NaN</Accepted__Transaction__Value></subscriber></system>
+      </exacttarget>
+
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://www.exacttarget.com:443/api/integrate.asp?qf=xml
+    body: xml=%3C%3Fxml%20version%3D%221.0%22%3F%3E%0A%3Cexacttarget%3E%0A%20%20%3Cauthorization%3E%0A%20%20%20%20%3Cusername%3E<%= CGI.escape username %>%3C%2Fusername%3E%0A%20%20%20%20%3Cpassword%3E<%= CGI.escape password %>%3C%2Fpassword%3E%0A%20%20%3C%2Fauthorization%3E%0A%20%20%3Csystem%3E%0A%20%20%20%20%3Csystem_name%3Esubscriber%3C%2Fsystem_name%3E%0A%20%20%20%20%3Caction%3Eedit%3C%2Faction%3E%0A%20%20%20%20%3Csearch_type%3Elistid%3C%2Fsearch_type%3E%0A%20%20%20%20%3Csearch_value%3E<%= CGI.escape list_id %>%3C%2Fsearch_value%3E%0A%20%20%20%20%3Csearch_value2%3Euser3%40example.com%3C%2Fsearch_value2%3E%0A%20%20%20%20%3Cvalues%3E%0A%20%20%20%20%20%20%3Cemail__address%3Euser3%40example.com%3C%2Femail__address%3E%0A%20%20%20%20%20%20%3Cstatus%3Eactive%3C%2Fstatus%3E%0A%20%20%20%20%20%20%3CLast____Name%3ESmith%3C%2FLast____Name%3E%0A%20%20%20%20%20%20%3CFirst____Name%3EJohn%3C%2FFirst____Name%3E%0A%20%20%20%20%3C%2Fvalues%3E%0A%20%20%20%20%3Cupdate%3Etrue%3C%2Fupdate%3E%0A%20%20%3C%2Fsystem%3E%0A%3C%2Fexacttarget%3E%0A
+    headers: 
+      content-type: 
+      - application/x-www-form-urlencoded
+      connection: 
+      - close
+      content-length: 
+      - "988"
+      host: 
+      - www.exacttarget.com
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      x-powered-by: 
+      - ASP.NET
+      x-aspnet-version: 
+      - 2.0.50727
+      connection: 
+      - close
+      content-type: 
+      - text/xml; charset=utf-8
+      server: 
+      - Microsoft-IIS/6.0
+      date: 
+      - Tue, 31 Aug 2010 16:00:24 GMT
+      set-cookie: 
+      - ASP.NET_SessionId=rbry3y55m3wyamfe441wgw45; path=/; HttpOnly
+      cache-control: 
+      - private
+      transfer-encoding: 
+      - chunked
+    body: |
+      <?xml version='1.0'?>
+      <exacttarget>
+      <system>
+      <subscriber><subscriber_info>Subscriber was added/updated successfully</subscriber_info><subscriber_description>548749517</subscriber_description></subscriber></system>
+      </exacttarget>
+
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://www.exacttarget.com:443/api/integrate.asp?qf=xml
+    body: xml=%3C%3Fxml%20version%3D%221.0%22%3F%3E%0A%3Cexacttarget%3E%0A%20%20%3Cauthorization%3E%0A%20%20%20%20%3Cusername%3E<%= CGI.escape username %>%3C%2Fusername%3E%0A%20%20%20%20%3Cpassword%3E<%= CGI.escape password %>%3C%2Fpassword%3E%0A%20%20%3C%2Fauthorization%3E%0A%20%20%3Csystem%3E%0A%20%20%20%20%3Csystem_name%3Esubscriber%3C%2Fsystem_name%3E%0A%20%20%20%20%3Caction%3Eretrieve%3C%2Faction%3E%0A%20%20%20%20%3Csearch_type%3Elistid%3C%2Fsearch_type%3E%0A%20%20%20%20%3Csearch_value%3E<%= CGI.escape list_id %>%3C%2Fsearch_value%3E%0A%20%20%20%20%3Csearch_value2%3Euser3%40example.com%3C%2Fsearch_value2%3E%0A%20%20%20%20%3CshowChannelID%3E%3C%2FshowChannelID%3E%0A%20%20%3C%2Fsystem%3E%0A%3C%2Fexacttarget%3E%0A
+    headers: 
+      content-type: 
+      - application/x-www-form-urlencoded
+      connection: 
+      - close
+      content-length: 
+      - "677"
+      host: 
+      - www.exacttarget.com
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      x-powered-by: 
+      - ASP.NET
+      x-aspnet-version: 
+      - 2.0.50727
+      connection: 
+      - close
+      content-type: 
+      - text/xml; charset=utf-8
+      server: 
+      - Microsoft-IIS/6.0
+      date: 
+      - Tue, 31 Aug 2010 16:00:26 GMT
+      set-cookie: 
+      - ASP.NET_SessionId=gb41nx452pji1ejnl5cqof45; path=/; HttpOnly
+      cache-control: 
+      - private
+      transfer-encoding: 
+      - chunked
+    body: |
+      <?xml version='1.0'?>
+      <exacttarget>
+      <system>
+      <subscriber><subid>548749517</subid><listid><%= CGI.escape list_id %></listid><list_name>Development - master</list_name><Email__Address>user3@example.com</Email__Address><Email__Type>HTML</Email__Type><Status>Active</Status><First__Name>John</First__Name><Last__Name>Smith</Last__Name><Originating__Partner /><Packing__Slip__Count>NaN</Packing__Slip__Count><Accepted__Transaction__Count>NaN</Accepted__Transaction__Count><Accepted__Transaction__Value>NaN</Accepted__Transaction__Value></subscriber></system>
+      </exacttarget>
+
+    http_version: "1.1"
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :post
+    uri: https://www.exacttarget.com:443/api/integrate.asp?qf=xml
+    body: xml=%3C%3Fxml%20version%3D%221.0%22%3F%3E%0A%3Cexacttarget%3E%0A%20%20%3Cauthorization%3E%0A%20%20%20%20%3Cusername%3E<%= CGI.escape username %>%3C%2Fusername%3E%0A%20%20%20%20%3Cpassword%3E<%= CGI.escape password %>%3C%2Fpassword%3E%0A%20%20%3C%2Fauthorization%3E%0A%20%20%3Csystem%3E%0A%20%20%20%20%3Csystem_name%3Esubscriber%3C%2Fsystem_name%3E%0A%20%20%20%20%3Caction%3Edelete%3C%2Faction%3E%0A%20%20%20%20%3Csearch_type%3Esubid%3C%2Fsearch_type%3E%0A%20%20%20%20%3Csearch_value%3E548749517%3C%2Fsearch_value%3E%0A%20%20%3C%2Fsystem%3E%0A%3C%2Fexacttarget%3E%0A
+    headers: 
+      content-type: 
+      - application/x-www-form-urlencoded
+      connection: 
+      - close
+      content-length: 
+      - "544"
+      host: 
+      - www.exacttarget.com
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      x-powered-by: 
+      - ASP.NET
+      x-aspnet-version: 
+      - 2.0.50727
+      connection: 
+      - close
+      content-type: 
+      - text/xml; charset=utf-8
+      server: 
+      - Microsoft-IIS/6.0
+      date: 
+      - Tue, 31 Aug 2010 16:00:26 GMT
+      set-cookie: 
+      - ASP.NET_SessionId=1slfie552ajfzfbhec3dbf55; path=/; HttpOnly
+      cache-control: 
+      - private
+      transfer-encoding: 
+      - chunked
+    body: |
+      <?xml version='1.0'?>
+      <exacttarget>
+      <system>
+      <subscriber><subscriber_info>Subscriber Deleted Sucessfully!</subscriber_info></subscriber></system>
       </exacttarget>
 
     http_version: "1.1"

data/spec/cassettes/subscribers/subscribe.yml

@@ -29,9 +29,9 @@
       server: 
       - Microsoft-IIS/6.0
       date: 
-      - Fri, 20 Aug 2010 14:29:34 GMT
+      - Tue, 31 Aug 2010 16:00:14 GMT
       set-cookie: 
-      - ASP.NET_SessionId=eqze3nnlq5i4nmr5ljpm1f3y; path=/; HttpOnly
+      - ASP.NET_SessionId=q2bhxzzzuh1ihx45vulf1x55; path=/; HttpOnly
       cache-control: 
       - private
       transfer-encoding: 
@@ -40,52 +40,7 @@
       <?xml version='1.0'?>
       <exacttarget>
       <system>
-      <subscriber><subid>548749517</subid><listid><%= CGI.escape list_id %></listid><list_name>Development - master</list_name><Full__Name /><Email__Address>user3@example.com</Email__Address><User__Defined /><Email__Type>HTML</Email__Type><Status>Unsubscribed</Status><First__Name>John</First__Name><Last__Name>Smith</Last__Name><Packing__Slip__Count /><Originating__Partner /></subscriber></system>
-      </exacttarget>
-
-    http_version: "1.1"
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :post
-    uri: https://www.exacttarget.com:443/api/integrate.asp?qf=xml
-    body: xml=%3C%3Fxml%20version%3D%221.0%22%3F%3E%0A%3Cexacttarget%3E%0A%20%20%3Cauthorization%3E%0A%20%20%20%20%3Cusername%3E<%= CGI.escape username %>%3C%2Fusername%3E%0A%20%20%20%20%3Cpassword%3E<%= CGI.escape password %>%3C%2Fpassword%3E%0A%20%20%3C%2Fauthorization%3E%0A%20%20%3Csystem%3E%0A%20%20%20%20%3Csystem_name%3Esubscriber%3C%2Fsystem_name%3E%0A%20%20%20%20%3Caction%3Edelete%3C%2Faction%3E%0A%20%20%20%20%3Csearch_type%3Esubid%3C%2Fsearch_type%3E%0A%20%20%20%20%3Csearch_value%3E548749517%3C%2Fsearch_value%3E%0A%20%20%3C%2Fsystem%3E%0A%3C%2Fexacttarget%3E%0A
-    headers: 
-      content-type: 
-      - application/x-www-form-urlencoded
-      connection: 
-      - close
-      content-length: 
-      - "544"
-      host: 
-      - www.exacttarget.com
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
-      code: 200
-      message: OK
-    headers: 
-      x-powered-by: 
-      - ASP.NET
-      x-aspnet-version: 
-      - 2.0.50727
-      connection: 
-      - close
-      content-type: 
-      - text/xml; charset=utf-8
-      server: 
-      - Microsoft-IIS/6.0
-      date: 
-      - Fri, 20 Aug 2010 14:29:34 GMT
-      set-cookie: 
-      - ASP.NET_SessionId=boqm3d55gvcl4z45fwuacdq1; path=/; HttpOnly
-      cache-control: 
-      - private
-      transfer-encoding: 
-      - chunked
-    body: |
-      <?xml version='1.0'?>
-      <exacttarget>
-      <system>
-      <subscriber><subscriber_info>Subscriber Deleted Sucessfully!</subscriber_info></subscriber></system>
+      <subscriber><error>1</error><error_description>Subscriber not found with ListID = <%= CGI.escape list_id %> Email Address = user3@example.com</error_description></subscriber></system>
       </exacttarget>
 
     http_version: "1.1"
@@ -119,9 +74,9 @@
       server: 
       - Microsoft-IIS/6.0
       date: 
-      - Fri, 20 Aug 2010 14:29:35 GMT
+      - Tue, 31 Aug 2010 16:00:15 GMT
       set-cookie: 
-      - ASP.NET_SessionId=zl1tid55urbgqvzfizr2jn55; path=/; HttpOnly
+      - ASP.NET_SessionId=eaxyxx55ykdp3bmmvzu32gjd; path=/; HttpOnly
       cache-control: 
       - private
       transfer-encoding: 
@@ -138,14 +93,14 @@
   request: !ruby/struct:VCR::Request 
     method: :post
     uri: https://www.exacttarget.com:443/api/integrate.asp?qf=xml
-    body: xml=%3C%3Fxml%20version%3D%221.0%22%3F%3E%0A%3Cexacttarget%3E%0A%20%20%3Cauthorization%3E%0A%20%20%20%20%3Cusername%3E<%= CGI.escape username %>%3C%2Fusername%3E%0A%20%20%20%20%3Cpassword%3E<%= CGI.escape password %>%3C%2Fpassword%3E%0A%20%20%3C%2Fauthorization%3E%0A%20%20%3Csystem%3E%0A%20%20%20%20%3Csystem_name%3Esubscriber%3C%2Fsystem_name%3E%0A%20%20%20%20%3Caction%3Eadd%3C%2Faction%3E%0A%20%20%20%20%3Csearch_type%3Elistid%3C%2Fsearch_type%3E%0A%20%20%20%20%3Csearch_value%3E<%= CGI.escape list_id %>%3C%2Fsearch_value%3E%0A%20%20%20%20%3Csearch_value2%3E%3C%2Fsearch_value2%3E%0A%20%20%20%20%3Cvalues%3E%0A%20%20%20%20%20%20%3Cemail__address%3Euser3%40example.com%3C%2Femail__address%3E%0A%20%20%20%20%20%20%3Cstatus%3Eactive%3C%2Fstatus%3E%0A%20%20%20%20%20%20%3CLast__Name%3ESmith%3C%2FLast__Name%3E%0A%20%20%20%20%20%20%3CFirst__Name%3EJohn%3C%2FFirst__Name%3E%0A%20%20%20%20%3C%2Fvalues%3E%0A%20%20%3C%2Fsystem%3E%0A%3C%2Fexacttarget%3E%0A
+    body: xml=%3C%3Fxml%20version%3D%221.0%22%3F%3E%0A%3Cexacttarget%3E%0A%20%20%3Cauthorization%3E%0A%20%20%20%20%3Cusername%3E<%= CGI.escape username %>%3C%2Fusername%3E%0A%20%20%20%20%3Cpassword%3E<%= CGI.escape password %>%3C%2Fpassword%3E%0A%20%20%3C%2Fauthorization%3E%0A%20%20%3Csystem%3E%0A%20%20%20%20%3Csystem_name%3Esubscriber%3C%2Fsystem_name%3E%0A%20%20%20%20%3Caction%3Eadd%3C%2Faction%3E%0A%20%20%20%20%3Csearch_type%3Elistid%3C%2Fsearch_type%3E%0A%20%20%20%20%3Csearch_value%3E<%= CGI.escape list_id %>%3C%2Fsearch_value%3E%0A%20%20%20%20%3Csearch_value2%3E%3C%2Fsearch_value2%3E%0A%20%20%20%20%3Cvalues%3E%0A%20%20%20%20%20%20%3Cemail__address%3Euser3%40example.com%3C%2Femail__address%3E%0A%20%20%20%20%20%20%3Cstatus%3Eactive%3C%2Fstatus%3E%0A%20%20%20%20%20%20%3CLast____Name%3ESmith%3C%2FLast____Name%3E%0A%20%20%20%20%20%20%3CFirst____Name%3EJohn%3C%2FFirst____Name%3E%0A%20%20%20%20%3C%2Fvalues%3E%0A%20%20%3C%2Fsystem%3E%0A%3C%2Fexacttarget%3E%0A
     headers: 
       content-type: 
       - application/x-www-form-urlencoded
       connection: 
       - close
       content-length: 
-      - "914"
+      - "922"
       host: 
       - www.exacttarget.com
   response: !ruby/struct:VCR::Response 
@@ -164,9 +119,9 @@
       server: 
       - Microsoft-IIS/6.0
       date: 
-      - Fri, 20 Aug 2010 14:29:35 GMT
+      - Tue, 31 Aug 2010 16:00:17 GMT
       set-cookie: 
-      - ASP.NET_SessionId=2md1yivdzxvulsudaxk0xz55; path=/; HttpOnly
+      - ASP.NET_SessionId=ibxgga550dkk5tqqehyilc55; path=/; HttpOnly
       cache-control: 
       - private
       transfer-encoding: 

data/spec/cassettes/subscribers/unsubscribe.yml

@@ -29,9 +29,9 @@
       server: 
       - Microsoft-IIS/6.0
       date: 
-      - Fri, 20 Aug 2010 14:29:37 GMT
+      - Tue, 31 Aug 2010 16:00:17 GMT
       set-cookie: 
-      - ASP.NET_SessionId=dpxpqhbwps5xyounbg2llx45; path=/; HttpOnly
+      - ASP.NET_SessionId=xfbokdmxxjhjbmrnzh5jjq45; path=/; HttpOnly
       cache-control: 
       - private
       transfer-encoding: 
@@ -40,7 +40,7 @@
       <?xml version='1.0'?>
       <exacttarget>
       <system>
-      <subscriber><subid>548749517</subid><listid><%= CGI.escape list_id %></listid><list_name>Development - master</list_name><Full__Name /><Email__Address>user3@example.com</Email__Address><User__Defined /><Email__Type>HTML</Email__Type><Status>Active</Status><First__Name>John</First__Name><Last__Name>Smith</Last__Name><Packing__Slip__Count /><Originating__Partner /></subscriber></system>
+      <subscriber><subid>548749517</subid><listid><%= CGI.escape list_id %></listid><list_name>Development - master</list_name><Email__Address>user3@example.com</Email__Address><Email__Type>HTML</Email__Type><Status>Active</Status><First__Name>John</First__Name><Last__Name>Smith</Last__Name><Originating__Partner /><Packing__Slip__Count>NaN</Packing__Slip__Count><Accepted__Transaction__Count>NaN</Accepted__Transaction__Count><Accepted__Transaction__Value>NaN</Accepted__Transaction__Value></subscriber></system>
       </exacttarget>
 
     http_version: "1.1"
@@ -74,9 +74,9 @@
       server: 
       - Microsoft-IIS/6.0
       date: 
-      - Fri, 20 Aug 2010 14:29:37 GMT
+      - Tue, 31 Aug 2010 16:00:19 GMT
       set-cookie: 
-      - ASP.NET_SessionId=0h12lrmfqvvr3s55lyfy0kqc; path=/; HttpOnly
+      - ASP.NET_SessionId=k3ung0bkprsgif55kfslwa3m; path=/; HttpOnly
       cache-control: 
       - private
       transfer-encoding: 
@@ -119,9 +119,9 @@
       server: 
       - Microsoft-IIS/6.0
       date: 
-      - Fri, 20 Aug 2010 14:29:39 GMT
+      - Tue, 31 Aug 2010 16:00:20 GMT
       set-cookie: 
-      - ASP.NET_SessionId=dovlhm4534gpkqyxzk3veqm1; path=/; HttpOnly
+      - ASP.NET_SessionId=vigan255jwobvlyfsqwls055; path=/; HttpOnly
       cache-control: 
       - private
       transfer-encoding: 
@@ -138,14 +138,14 @@
   request: !ruby/struct:VCR::Request 
     method: :post
     uri: https://www.exacttarget.com:443/api/integrate.asp?qf=xml
-    body: xml=%3C%3Fxml%20version%3D%221.0%22%3F%3E%0A%3Cexacttarget%3E%0A%20%20%3Cauthorization%3E%0A%20%20%20%20%3Cusername%3E<%= CGI.escape username %>%3C%2Fusername%3E%0A%20%20%20%20%3Cpassword%3E<%= CGI.escape password %>%3C%2Fpassword%3E%0A%20%20%3C%2Fauthorization%3E%0A%20%20%3Csystem%3E%0A%20%20%20%20%3Csystem_name%3Esubscriber%3C%2Fsystem_name%3E%0A%20%20%20%20%3Caction%3Eadd%3C%2Faction%3E%0A%20%20%20%20%3Csearch_type%3Elistid%3C%2Fsearch_type%3E%0A%20%20%20%20%3Csearch_value%3E<%= CGI.escape list_id %>%3C%2Fsearch_value%3E%0A%20%20%20%20%3Csearch_value2%3E%3C%2Fsearch_value2%3E%0A%20%20%20%20%3Cvalues%3E%0A%20%20%20%20%20%20%3Cemail__address%3Euser3%40example.com%3C%2Femail__address%3E%0A%20%20%20%20%20%20%3Cstatus%3EUnsubscribed%3C%2Fstatus%3E%0A%20%20%20%20%20%20%3CLast__Name%3ESmith%3C%2FLast__Name%3E%0A%20%20%20%20%20%20%3CFirst__Name%3EJohn%3C%2FFirst__Name%3E%0A%20%20%20%20%3C%2Fvalues%3E%0A%20%20%3C%2Fsystem%3E%0A%3C%2Fexacttarget%3E%0A
+    body: xml=%3C%3Fxml%20version%3D%221.0%22%3F%3E%0A%3Cexacttarget%3E%0A%20%20%3Cauthorization%3E%0A%20%20%20%20%3Cusername%3E<%= CGI.escape username %>%3C%2Fusername%3E%0A%20%20%20%20%3Cpassword%3E<%= CGI.escape password %>%3C%2Fpassword%3E%0A%20%20%3C%2Fauthorization%3E%0A%20%20%3Csystem%3E%0A%20%20%20%20%3Csystem_name%3Esubscriber%3C%2Fsystem_name%3E%0A%20%20%20%20%3Caction%3Eadd%3C%2Faction%3E%0A%20%20%20%20%3Csearch_type%3Elistid%3C%2Fsearch_type%3E%0A%20%20%20%20%3Csearch_value%3E<%= CGI.escape list_id %>%3C%2Fsearch_value%3E%0A%20%20%20%20%3Csearch_value2%3E%3C%2Fsearch_value2%3E%0A%20%20%20%20%3Cvalues%3E%0A%20%20%20%20%20%20%3Cemail__address%3Euser3%40example.com%3C%2Femail__address%3E%0A%20%20%20%20%20%20%3Cstatus%3EUnsubscribed%3C%2Fstatus%3E%0A%20%20%20%20%20%20%3CLast____Name%3ESmith%3C%2FLast____Name%3E%0A%20%20%20%20%20%20%3CFirst____Name%3EJohn%3C%2FFirst____Name%3E%0A%20%20%20%20%3C%2Fvalues%3E%0A%20%20%3C%2Fsystem%3E%0A%3C%2Fexacttarget%3E%0A
     headers: 
       content-type: 
       - application/x-www-form-urlencoded
       connection: 
       - close
       content-length: 
-      - "920"
+      - "928"
       host: 
       - www.exacttarget.com
   response: !ruby/struct:VCR::Response 
@@ -164,9 +164,9 @@
       server: 
       - Microsoft-IIS/6.0
       date: 
-      - Fri, 20 Aug 2010 14:29:40 GMT
+      - Tue, 31 Aug 2010 16:00:21 GMT
       set-cookie: 
-      - ASP.NET_SessionId=jpwqno4542blwyqudden0w45; path=/; HttpOnly
+      - ASP.NET_SessionId=am5ia255rj3izmbmfpdeq345; path=/; HttpOnly
       cache-control: 
       - private
       transfer-encoding: 

data/spec/exacto_subscriber/list_unsubscription_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Exacto::ListUnsubscription do
+  let(:list_id) { configatron.exacto.test_list_id }
+  subject { Exacto::ListUnsubscription.find(list_id) }
+  
+  before(:each) do
+    VCR.insert_cassette('list_unsubscriptions/find')
+  end
+
+  after(:each) do
+    VCR.eject_cassette
+  end
+  
+  it { should_not be_empty }
+  
+  it 'should have an unsubscription with a valid email' do
+    subject.first.email_address.should_not be_nil
+  end
+end

data/spec/exacto_subscriber/master_list_unsubscription_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Exacto::MasterListUnsubscription do
+  describe "finding existing unsubscriptions" do
+    before(:each) do
+      VCR.insert_cassette('master_list_unsubscriptions/find_existing', :record => :all)
+    end
+
+    after(:each) do
+      VCR.eject_cassette
+    end
+
+    subject do
+      Exacto::MasterListUnsubscription.find(DateTime.parse("08/01/2010"), DateTime.parse("09/01/2010"))
+    end
+
+    it { should_not be_empty }
+    it 'should have a valid unsubscriber (someone with an email)' do
+      subject.first.email_address.should_not be_blank
+    end
+  end
+  
+  describe "finding an empty set of unsubscriptions" do
+    before(:each) do
+      VCR.insert_cassette('master_list_unsubscriptions/find_nonexistent', :record => :all)
+    end
+
+    after(:each) do
+      VCR.eject_cassette
+    end
+
+    subject do
+      Exacto::MasterListUnsubscription.find(DateTime.parse("08/01/2010"), DateTime.parse("08/01/2010"))
+    end
+
+    it { should be_empty }
+  end    
+end

data/spec/exacto_subscriber/subcriber_spec.rb

@@ -2,17 +2,18 @@ require 'spec_helper'
 
 describe Exacto::Subscriber do
   let(:list_id) { configatron.exacto.test_list_id }
-  let(:email) { "user3@example.com" }
+  let(:email_address) { "user3@example.com" }
+  
   subject do
     Exacto::Subscriber.new(
-      :email      => email, 
-      :attributes => {"First__Name" => "John", "Last__Name" => "Smith"})
+      :email_address => email_address, 
+      :attributes    => {"First__Name" => "John", "Last__Name" => "Smith"})
   end
   
   describe 'subscriptions' do
     before(:each) do
       VCR.insert_cassette('subscribers/subscribe')
-      result = subject.class.find_by_email_and_list_id(email, list_id)
+      result = subject.class.find_by_email_and_list_id(email_address, list_id)
       result.destroy if result
     end
 
@@ -35,7 +36,7 @@ describe Exacto::Subscriber do
   describe "unsubscribing" do
     before(:each) do
       VCR.insert_cassette('subscribers/unsubscribe')
-      result = subject.class.find_by_email_and_list_id(email, list_id)
+      result = subject.class.find_by_email_and_list_id(email_address, list_id)
       result.destroy if result
     end
 
@@ -58,17 +59,22 @@ describe Exacto::Subscriber do
   describe 'finding a subscriber by email and list id' do
     before(:each) do
       VCR.insert_cassette('subscribers/find_by_email_and_list_id')
+      Exacto::Subscriber.new(
+        :email_address => email_address, 
+        :attributes    => {"First__Name" => "John", "Last__Name" => "Smith"}).subscribe_to(list_id)
     end
 
     after(:each) do
+      subscriber.destroy
       VCR.eject_cassette
     end
 
-    subject { Exacto::Subscriber.find_by_email_and_list_id(email, list_id) }
+    let(:subscriber){ Exacto::Subscriber.find_by_email_and_list_id(email_address, list_id) }
+    subject { subscriber }
     
     it { should_not be_nil }
-    its(:email) { should_not be_nil }
-    its(:subscriber_id) {should_not be_nil}
+    its(:email_address) { should_not be_nil }
+    its(:subscriber_id) { should_not be_nil }
   end
   
 end

data/spec/exacto_subscriber/unsubscription_spec.rb

@@ -1,49 +1,14 @@
-# require 'spec_helper'
-# 
-# describe Exacto::Unsubscription do
-#   subject do
-#     Exacto::Unsubscription.new(
-#       :email => "user@example.com",
-#       :unsubscribed_at => Time.now.to_s
-#     )
-#   end
-# 
-#   its(:email) { should_not be_nil }
-#   its(:unsubscribed_at) { should_not be_nil }
-#   its(:unsubscribed_at) { should be_kind_of(DateTime) }
-# 
-#   describe "finding unsubscriptions" do
-#     before(:each) do
-#       VCR.insert_cassette('unsubscriptions/find')
-#     end
-# 
-#     after(:each) do
-#       VCR.eject_cassette
-#     end
-# 
-#     subject do
-#       Exacto::Unsubscription.find(
-#         :start_date => DateTime.parse("8/1/2010"), 
-#         :end_date   => DateTime.parse("8/20/2010"))
-#     end
-# 
-#     it { should_not be_empty }
-#   end
-# end
+require 'spec_helper'
 
+describe Exacto::Unsubscription do
+  subject do
+    Exacto::Unsubscription.new(
+      :email_address => "user@example.com",
+      :unsubscribed_at => Time.now.to_s
+    )
+  end
 
-# <?xml version="1.0"?>
-# <exacttarget>
-#   <authorization>
-#     <username>gazelle_engineering</username>
-#     <password>gazelle@55</password>
-#   </authorization>
-#   <system>
-#     <system_name>tracking-channel</system_name>
-#     <action>retrieve</action>
-#     <sub_action>unsubscribe</sub_action>
-#     <search_type>daterange</search_type>
-#     <search_value>8/1/2010</search_value>
-#     <search_value2>8/20/2010</search_value2>
-#   </system>
-# </exacttarget>
+  its(:email_address) { should_not be_nil }
+  its(:unsubscribed_at) { should_not be_nil }
+  its(:unsubscribed_at) { should be_kind_of(DateTime) }
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exacto_subscriber
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dan Pickett
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -04:00
+date: 2010-08-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -136,11 +136,20 @@ files:
 - lib/exacto_subscriber.rb
 - lib/exacto_subscriber/base.rb
 - lib/exacto_subscriber/error.rb
+- lib/exacto_subscriber/ext/hacked_request.rb
+- lib/exacto_subscriber/list_unsubscription.rb
+- lib/exacto_subscriber/master_list_unsubscription.rb
 - lib/exacto_subscriber/subscriber.rb
+- lib/exacto_subscriber/unsubscription.rb
+- spec/cassettes/list_unsubscriptions/find.yml
+- spec/cassettes/master_list_unsubscriptions/find_existing.yml
+- spec/cassettes/master_list_unsubscriptions/find_nonexistent.yml
 - spec/cassettes/subscribers/find_by_email_and_list_id.yml
 - spec/cassettes/subscribers/subscribe.yml
 - spec/cassettes/subscribers/unsubscribe.yml
 - spec/exact_target_credentials.example.yml
+- spec/exacto_subscriber/list_unsubscription_spec.rb
+- spec/exacto_subscriber/master_list_unsubscription_spec.rb
 - spec/exacto_subscriber/subcriber_spec.rb
 - spec/exacto_subscriber/unsubscription_spec.rb
 - spec/exacto_subscriber_spec.rb
@@ -181,6 +190,8 @@ signing_key:
 specification_version: 3
 summary: Manage Exact Target List subscribers
 test_files: 
+- spec/exacto_subscriber/list_unsubscription_spec.rb
+- spec/exacto_subscriber/master_list_unsubscription_spec.rb
 - spec/exacto_subscriber/subcriber_spec.rb
 - spec/exacto_subscriber/unsubscription_spec.rb
 - spec/exacto_subscriber_spec.rb