createsend 4.1.1 → 5.1.1

data/test/fixtures/journey_clicks.json

@@ -0,0 +1,35 @@
+{
+  "Results": [
+    {
+      "EmailAddress": "example+1@example.com",
+      "Date": "2019-07-29 10:33:00",
+      "URL": "http://test.com",
+      "IPAddress": "192.168.0.3",
+      "Latitude": -33.8683,
+      "Longitude": 151.2086,
+      "City": "Sydney",
+      "Region": "New South Wales",
+      "CountryCode": "AU",
+      "CountryName": "Australia"
+    },
+    {
+      "EmailAddress": "example+2@example.com",
+      "Date": "2019-07-29 10:35:00",
+      "URL": "http://test.com",
+      "IPAddress": "192.168.0.3",
+      "Latitude": -33.8683,
+      "Longitude": 151.2086,
+      "City": "Sydney",
+      "Region": "New South Wales",
+      "CountryCode": "AU",
+      "CountryName": "Australia"
+    }
+  ],
+  "ResultsOrderedBy": "Date",
+  "OrderDirection": "ASC",
+  "PageNumber": 1,
+  "PageSize": 2,
+  "RecordsOnThisPage": 2,
+  "TotalNumberOfRecords": 5,
+  "NumberOfPages": 3
+}

data/test/fixtures/journey_opens.json

@@ -0,0 +1,55 @@
+{
+  "Results": [
+    {
+      "EmailAddress": "example+1@example.com",
+      "Date": "2019-07-29 10:33:00",
+      "IPAddress": "192.168.0.3",
+      "Latitude": -33.8683,
+      "Longitude": 151.2086,
+      "City": "Sydney",
+      "Region": "New South Wales",
+      "CountryCode": "AU",
+      "CountryName": "Australia"
+    },
+    {
+      "EmailAddress": "example+2@example.com",
+      "Date": "2019-07-29 10:35:00",
+      "IPAddress": "192.168.0.3",
+      "Latitude": -33.8683,
+      "Longitude": 151.2086,
+      "City": "Sydney",
+      "Region": "New South Wales",
+      "CountryCode": "AU",
+      "CountryName": "Australia"
+    },
+    {
+      "EmailAddress": "example+3@example.com",
+      "Date": "2019-07-29 10:35:00",
+      "IPAddress": "192.168.0.3",
+      "Latitude": -33.8683,
+      "Longitude": 151.2086,
+      "City": "Sydney",
+      "Region": "New South Wales",
+      "CountryCode": "AU",
+      "CountryName": "Australia"
+    },
+    {
+      "EmailAddress": "example+4@example.com",
+      "Date": "2019-07-29 10:35:00",
+      "IPAddress": "192.168.0.3",
+      "Latitude": -33.8683,
+      "Longitude": 151.2086,
+      "City": "Sydney",
+      "Region": "New South Wales",
+      "CountryCode": "AU",
+      "CountryName": "Australia"
+    }
+  ],
+  "ResultsOrderedBy": "Date",
+  "OrderDirection": "ASC",
+  "PageNumber": 1,
+  "PageSize": 1000,
+  "RecordsOnThisPage": 4,
+  "TotalNumberOfRecords": 4,
+  "NumberOfPages": 1
+}

data/test/fixtures/journey_recipients.json

@@ -0,0 +1,27 @@
+{
+  "Results": [
+    {
+      "EmailAddress": "example+1@example.com",
+      "SentDate": "2019-07-12 09:45:00"
+    },
+    {
+      "EmailAddress": "example+2@example.com",
+      "SentDate": "2019-07-12 10:45:00"
+    },
+    {
+      "EmailAddress": "example+3@example.com",
+      "SentDate": "2019-07-13 09:00:00"
+    },
+    {
+      "EmailAddress": "example+4@example.com",
+      "SentDate": "2019-07-16 11:45:00"
+    }
+  ],
+  "ResultsOrderedBy": "SentDate",
+  "OrderDirection": "ASC",
+  "PageNumber": 2,
+  "PageSize": 10,
+  "RecordsOnThisPage": 4,
+  "TotalNumberOfRecords": 14,
+  "NumberOfPages": 2
+}

data/test/fixtures/journey_summary.json

@@ -0,0 +1,18 @@
+{
+  "JourneyID": "a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1",
+  "Name": "New journey",
+  "TriggerType": "On Subscription",
+  "Status": "Active",
+  "Emails": [
+    {
+      "EmailID": "b1b1b1b1b1b1b1b1b1b1",
+      "Name": "New Email",
+      "Bounced": 0,
+      "Clicked": 0,
+      "Opened": 3,
+      "Sent": 1,
+      "UniqueOpened": 1,
+      "Unsubscribed": 0
+    }
+  ]
+}

data/test/fixtures/journey_unsubscribes.json

@@ -0,0 +1,26 @@
+{
+  "Results": [
+    {
+      "EmailAddress": "example+1@example.com",
+      "Date": "2019-07-29 10:33:00",
+      "IPAddress": "192.168.0.3"
+    },
+    {
+      "EmailAddress": "example+2@example.com",
+      "Date": "2019-07-29 10:35:00",
+      "IPAddress": "192.168.0.3"
+    },
+    {
+      "EmailAddress": "example+3@example.com",
+      "Date": "2019-07-29 10:35:00",
+      "IPAddress": "192.168.0.3"
+    }
+  ],
+  "ResultsOrderedBy": "Date",
+  "OrderDirection": "ASC",
+  "PageNumber": 1,
+  "PageSize": 1000,
+  "RecordsOnThisPage": 4,
+  "TotalNumberOfRecords": 4,
+  "NumberOfPages": 1
+}

data/test/fixtures/journeys.json

@@ -0,0 +1,20 @@
+[
+  {
+    "ListID": "a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a",
+    "JourneyID": "b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b",
+    "Name": "Journey One",
+    "Status": "Not started"
+  },
+  {
+    "ListID": "c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c",
+    "JourneyID": "d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d",
+    "Name": "Journey Two",
+    "Status": "Active"
+  },
+  {
+    "ListID": "c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c1c",
+    "JourneyID": "e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e2e",
+    "Name": "Journey Three",
+    "Status": "Paused"
+  }
+]

data/test/fixtures/subscriber_details_with_track_pref.json

@@ -0,0 +1,22 @@
+{
+  "EmailAddress": "subscriber@example.com",
+  "Name": "Subscriber One",
+  "Date": "2010-10-25 10:28:00",
+  "State": "Active",
+  "CustomFields": [
+    {
+      "Key": "website",
+      "Value": "http://example.com"
+    },
+    {
+      "Key": "age",
+      "Value": "24"
+    },
+    {
+      "Key": "subscription date",
+      "Value": "2010-03-09"
+    }
+  ],
+  "ReadsEmailWith": "Gmail",
+  "ConsentToTrack": "Yes"
+}

data/test/fixtures/unconfirmed_subscribers.json

@@ -11,7 +11,8 @@
                     "Value": "http://example.com"
                 }
             ],
-            "ReadsEmailWith": ""
+            "ReadsEmailWith": "",
+            "ConsentToTrack": "Yes"
         },
         {
             "EmailAddress": "subs+7878787y8ggg@example.com",
@@ -24,7 +25,8 @@
                     "Value": "http://subdomain.example.com"
                 }
             ],
-            "ReadsEmailWith": ""
+            "ReadsEmailWith": "",
+            "ConsentToTrack": "No"
         }
     ],
     "ResultsOrderedBy": "email",

data/test/helper.rb

@@ -30,7 +30,7 @@ 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.1/#{url}"
+    result = "https://#{auth_section}api.createsend.com/api/v3.2/#{url}"
   else
     result = url
   end
@@ -42,7 +42,8 @@ def stub_request(method, auth, url, filename, status=nil)
   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(auth, url), options)
+  createsend_url = createsend_url(auth, url)
+  FakeWeb.register_uri(method, createsend_url, options)
 end
 
 def stub_get(*args); stub_request(:get, *args) end

data/test/journey_test.rb

@@ -0,0 +1,156 @@
+require File.dirname(__FILE__) + '/helper'
+
+class JourneyTest < Test::Unit::TestCase
+  multiple_contexts "authenticated_using_oauth_context", "authenticated_using_api_key_context" do
+    setup do
+      @journey = CreateSend::Journey.new @auth, 'a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1'
+    end
+
+    should "get the summary for a journey" do
+      stub_get(@auth, "journeys/#{@journey.journey_id}.json", "journey_summary.json")
+
+      summary = @journey.summary
+      summary.Name.should == 'New journey'
+      summary.TriggerType.should == 'On Subscription'
+      summary.Status.should == 'Active'
+
+      summary.Emails.size.should == 1
+      summary.Emails.first.EmailID.should == 'b1b1b1b1b1b1b1b1b1b1'
+      summary.Emails.first.Name.should == 'New Email'
+      summary.Emails.first.Bounced.should == 0
+      summary.Emails.first.Clicked.should == 0
+      summary.Emails.first.Opened.should == 3
+      summary.Emails.first.Sent.should == 1
+      summary.Emails.first.UniqueOpened.should == 1
+      summary.Emails.first.Unsubscribed.should == 0
+    end
+
+    should "return a paged list of recipients of a particular email" do
+      journey_date = "2019-07-12 09:22"
+      stub_get(@auth, "journeys/email/b1b1b1b1b1b1b1b1b1b1/recipients.json" \
+        "?date=#{ERB::Util.url_encode(journey_date)}" \
+        "&page=2" \
+        "&pagesize=5" \
+        "&orderdirection=asc", "journey_recipients.json")
+
+      recipients = @journey.email_recipients email_id = 'b1b1b1b1b1b1b1b1b1b1', date = journey_date, page = 2, page_size = 5, order_direction = 'asc'
+      recipients.Results.size.should == 4
+      recipients.Results.first.EmailAddress.should == 'example+1@example.com'
+      recipients.Results.first.SentDate.should == '2019-07-12 09:45:00'
+
+      recipients.ResultsOrderedBy.should == 'SentDate'
+      recipients.OrderDirection.should == 'ASC'
+      recipients.PageNumber.should == 2
+      recipients.PageSize.should == 10
+      recipients.RecordsOnThisPage.should == 4
+      recipients.TotalNumberOfRecords.should == 14
+      recipients.NumberOfPages.should == 2
+    end
+
+    should "return a paged list of subscribers who opened given journey email" do
+      journey_date = "2019-02-08 09:22"
+      stub_get(@auth, "journeys/email/b1b1b1b1b1b1b1b1b1b1/opens.json" \
+        "?date=#{ERB::Util.url_encode(journey_date)}" \
+        "&page=2" \
+        "&pagesize=5" \
+        "&orderdirection=asc", "journey_opens.json")
+
+      opens = @journey.email_opens email = 'b1b1b1b1b1b1b1b1b1b1', date = journey_date, page = 2, page_size = 5, order_direction = 'asc'
+      opens.Results.size.should == 4
+      opens.Results.last.EmailAddress.should == "example+4@example.com"
+      opens.Results.last.Date.should == "2019-07-29 10:35:00"
+      opens.Results.last.IPAddress.should == "192.168.0.3"
+      opens.Results.last.Latitude.should == -33.8683
+      opens.Results.last.Longitude.should == 151.2086
+      opens.Results.last.City.should == "Sydney"
+      opens.Results.last.Region.should == "New South Wales"
+      opens.Results.last.CountryCode.should == "AU"
+      opens.Results.last.CountryName.should == "Australia"
+
+      opens.ResultsOrderedBy.should == "Date"
+      opens.OrderDirection.should == "ASC"
+      opens.PageNumber.should == 1
+      opens.PageSize.should == 1000
+      opens.RecordsOnThisPage.should == 4
+      opens.TotalNumberOfRecords.should == 4
+      opens.NumberOfPages.should == 1
+    end
+
+    should "return a paged list of subscribers who clicked on a journey email" do
+      journey_date = "2019-07-29 10:30"
+      stub_get(@auth, "journeys/email/b1b1b1b1b1b1b1b1b1b1/clicks.json" \
+        "?date=#{ERB::Util.url_encode(journey_date)}" \
+        "&page=1" \
+        "&pagesize=2" \
+        "&orderdirection=asc", "journey_clicks.json")
+
+      clicks = @journey.email_clicks email = 'b1b1b1b1b1b1b1b1b1b1', date = journey_date, page = 1, page_size = 2, order_direction = 'asc'
+      clicks.Results.size.should == 2
+      clicks.Results.first.EmailAddress.should == "example+1@example.com"
+      clicks.Results.first.Date.should == "2019-07-29 10:33:00"
+      clicks.Results.first.URL.should == "http://test.com"
+      clicks.Results.first.IPAddress.should == "192.168.0.3"
+      clicks.Results.first.Latitude.should == -33.8683
+      clicks.Results.first.Longitude.should == 151.2086
+      clicks.Results.first.City.should == "Sydney"
+      clicks.Results.first.Region.should == "New South Wales"
+      clicks.Results.first.CountryCode.should == "AU"
+      clicks.Results.first.CountryName.should == "Australia"
+
+      clicks.ResultsOrderedBy.should == "Date"
+      clicks.OrderDirection.should == "ASC"
+      clicks.PageNumber.should == 1
+      clicks.PageSize.should == 2
+      clicks.RecordsOnThisPage.should == 2
+      clicks.TotalNumberOfRecords.should == 5
+      clicks.NumberOfPages.should == 3
+    end
+
+    should "return a paged list of subscribers who unsubscribed from a journey email" do
+      journey_date = "2019-07-29 10:22"
+      stub_get(@auth, "journeys/email/b1b1b1b1b1b1b1b1b1b1/unsubscribes.json" \
+        "?date=#{ERB::Util.url_encode(journey_date)}" \
+        "&page=1" \
+        "&pagesize=10" \
+        "&orderdirection=desc", "journey_unsubscribes.json")
+
+      unsubscribes = @journey.email_unsubscribes email = 'b1b1b1b1b1b1b1b1b1b1', date = journey_date, page = 1, page_size = 10, order_direction = 'desc'
+      unsubscribes.Results.size.should == 3
+      unsubscribes.Results.first.EmailAddress.should == "example+1@example.com"
+      unsubscribes.Results.first.Date.should == "2019-07-29 10:33:00"
+      unsubscribes.Results.first.IPAddress.should == "192.168.0.3"
+
+      unsubscribes.ResultsOrderedBy.should == "Date"
+      unsubscribes.OrderDirection.should == "ASC"
+      unsubscribes.PageNumber.should == 1
+      unsubscribes.PageSize.should == 1000
+      unsubscribes.RecordsOnThisPage.should == 4
+      unsubscribes.TotalNumberOfRecords.should == 4
+      unsubscribes.NumberOfPages.should == 1
+    end
+
+    should "return a paged list of emails that bounced for a journey email" do
+      journey_date = "2019-07-29 10:31"
+      stub_get(@auth, "journeys/email/b1b1b1b1b1b1b1b1b1b1/bounces.json" \
+        "?date=#{ERB::Util.url_encode(journey_date)}" \
+        "&page=20" \
+        "&pagesize=5" \
+        "&orderdirection=desc", "journey_bounces.json")
+
+      bounces = @journey.email_bounces email = 'b1b1b1b1b1b1b1b1b1b1', date = journey_date, page = 20, page_size = 5, order_direction = 'desc'
+      bounces.Results.size.should == 4
+      bounces.Results.first.EmailAddress.should == "example+1@example.com"
+      bounces.Results.first.BounceType.should == "4"
+      bounces.Results.first.Date.should == "2019-07-29 10:33:00"
+      bounces.Results.first.Reason.should == "Soft Bounce - Mailbox Full"
+
+      bounces.ResultsOrderedBy.should == "Date"
+      bounces.OrderDirection.should == "ASC"
+      bounces.PageNumber.should == 1
+      bounces.PageSize.should == 1000
+      bounces.RecordsOnThisPage.should == 4
+      bounces.TotalNumberOfRecords.should == 4
+      bounces.NumberOfPages.should == 1
+    end
+  end
+end

data/test/list_test.rb

@@ -66,7 +66,7 @@ class ListTest < Test::Unit::TestCase
 
     should "update a custom field" do
       key = "[mycustomfield]"
-      stub_put(@auth, "lists/#{@list.list_id}/customfields/#{CGI.escape(key)}.json", "update_custom_field.json")
+      stub_put(@auth, "lists/#{@list.list_id}/customfields/#{ERB::Util.url_encode(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
@@ -76,14 +76,14 @@ class ListTest < Test::Unit::TestCase
 
     should "delete a custom field" do
       custom_field_key = "[newdatefield]"
-      stub_delete(@auth, "lists/#{@list.list_id}/customfields/#{CGI.escape(custom_field_key)}.json", nil)
+      stub_delete(@auth, "lists/#{@list.list_id}/customfields/#{ERB::Util.url_encode(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(@auth, "lists/#{@list.list_id}/customfields/#{CGI.escape(custom_field_key)}/options.json", nil)
+      stub_put(@auth, "lists/#{@list.list_id}/customfields/#{ERB::Util.url_encode(custom_field_key)}/options.json", nil)
       @list.update_custom_field_options custom_field_key, new_options, true
     end
 
@@ -129,7 +129,7 @@ class ListTest < Test::Unit::TestCase
     
     should "get the active subscribers for a list" do
       min_date = "2010-01-01"
-      stub_get(@auth, "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=#{ERB::Util.url_encode(min_date)}&includetrackingpreference=false",
         "active_subscribers.json")
       res = @list.active min_date
       res.ResultsOrderedBy.should == "email"
@@ -156,9 +156,9 @@ class ListTest < Test::Unit::TestCase
 
     should "get the unconfirmed subscribers for a list" do
       min_date = "2010-01-01"
-      stub_get(@auth, "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=#{ERB::Util.url_encode(min_date)}&includetrackingpreference=true",
         "unconfirmed_subscribers.json")
-      res = @list.unconfirmed min_date
+      res = @list.unconfirmed(min_date, 1, 1000, "email", "asc", true)
       res.ResultsOrderedBy.should == "email"
       res.OrderDirection.should == "asc"
       res.PageNumber.should == 1
@@ -170,11 +170,12 @@ class ListTest < Test::Unit::TestCase
       res.Results.first.EmailAddress.should == "subs+7t8787Y@example.com"
       res.Results.first.Name.should =="Unconfirmed One"
       res.Results.first.State.should == "Unconfirmed"
+      res.Results.first.ConsentToTrack.should == "Yes"
     end
 
     should "get the unsubscribed subscribers for a list" do
       min_date = "2010-01-01"
-      stub_get(@auth, "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=#{ERB::Util.url_encode(min_date)}&includetrackingpreference=false",
         "unsubscribed_subscribers.json")
       res = @list.unsubscribed min_date
       res.ResultsOrderedBy.should == "email"
@@ -195,7 +196,7 @@ class ListTest < Test::Unit::TestCase
 
     should "get the deleted subscribers for a list" do
       min_date = "2010-01-01"
-      stub_get(@auth, "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=#{ERB::Util.url_encode(min_date)}&includetrackingpreference=false",
         "deleted_subscribers.json")
       res = @list.deleted min_date
       res.ResultsOrderedBy.should == "email"
@@ -216,7 +217,7 @@ class ListTest < Test::Unit::TestCase
 
     should "get the bounced subscribers for a list" do
       min_date = "2010-01-01"
-      stub_get(@auth, "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=#{ERB::Util.url_encode(min_date)}&includetrackingpreference=false",
         "bounced_subscribers.json")
       res = @list.bounced min_date
       res.ResultsOrderedBy.should == "email"

data/test/person_test.rb

@@ -9,7 +9,7 @@ class PersonTest < Test::Unit::TestCase
 
     should "get a person by client id and email address" do
       email = "person@example.com"
-      stub_get(@auth, "clients/#{@client_id}/people.json?email=#{CGI.escape(email)}", "person_details.json")
+      stub_get(@auth, "clients/#{@client_id}/people.json?email=#{ERB::Util.url_encode(email)}", "person_details.json")
       person = CreateSend::Person.get @auth, @client_id, email
       person.EmailAddress.should == email
       person.Name.should == "Person One"
@@ -26,13 +26,13 @@ class PersonTest < Test::Unit::TestCase
     should "update a person" do
       email = "person@example.com"
       new_email = "new_email_address@example.com"
-      stub_put(@auth, "clients/#{@client_id}/people.json?email=#{CGI.escape(email)}", nil)
+      stub_put(@auth, "clients/#{@client_id}/people.json?email=#{ERB::Util.url_encode(email)}", nil)
       @person.update new_email, "Person", 1023, "NewPassword"
       @person.email_address.should == new_email
     end
       
     should "delete a person" do
-      stub_delete(@auth, "clients/#{@person.client_id}/people.json?email=#{CGI.escape(@person.email_address)}", nil)
+      stub_delete(@auth, "clients/#{@person.client_id}/people.json?email=#{ERB::Util.url_encode(@person.email_address)}", nil)
       @person.delete
     end
   end

data/test/segment_test.rb

@@ -28,7 +28,7 @@ class SegmentTest < Test::Unit::TestCase
 
     should "get the active subscribers for a particular segment in the list" do
       min_date = "2010-01-01"
-      stub_get(@auth, "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=#{ERB::Util.url_encode(min_date)}&includetrackingpreference=false",
         "segment_subscribers.json")
       res = @segment.subscribers min_date
       res.ResultsOrderedBy.should == "email"

data/test/subscriber_test.rb

@@ -9,7 +9,7 @@ class SubscriberTest < Test::Unit::TestCase
     
     should "get a subscriber by list id and email address" do
       email = "subscriber@example.com"
-      stub_get(@auth, "subscribers/#{@list_id}.json?email=#{CGI.escape(email)}", "subscriber_details.json")
+      stub_get(@auth, "subscribers/#{@list_id}.json?email=#{ERB::Util.url_encode(email)}&includetrackingpreference=false", "subscriber_details.json")
       subscriber = CreateSend::Subscriber.get @auth, @list_id, email
       subscriber.EmailAddress.should == email
       subscriber.Name.should == "Subscriber One"
@@ -21,16 +21,25 @@ class SubscriberTest < Test::Unit::TestCase
       subscriber.ReadsEmailWith.should == "Gmail"
     end
 
+    should "get a subscriber with track preference information" do
+      email = "subscriber@example.com"
+      stub_get(@auth, "subscribers/#{@list_id}.json?email=#{ERB::Util.url_encode(email)}&includetrackingpreference=true", "subscriber_details_with_track_pref.json")
+      subscriber = CreateSend::Subscriber.get @auth, @list_id, email, true
+      subscriber.EmailAddress.should == email
+      subscriber.Name.should == "Subscriber One"
+      subscriber.ConsentToTrack == "Yes"
+    end
+
     should "add a subscriber without custom fields" do
       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 = CreateSend::Subscriber.add @auth, @list_id, "subscriber@example.com", "Subscriber", [], true, "Yes"
       email_address.should == "subscriber@example.com"
     end
 
     should "add a subscriber with custom fields" do
       stub_post(@auth, "subscribers/#{@list_id}.json", "add_subscriber.json")
       custom_fields = [ { :Key => 'website', :Value => 'http://example.com/' } ]
-      email_address = CreateSend::Subscriber.add @auth, @list_id, "subscriber@example.com", "Subscriber", custom_fields, true
+      email_address = CreateSend::Subscriber.add @auth, @list_id, "subscriber@example.com", "Subscriber", custom_fields, true, "Yes"
       email_address.should == "subscriber@example.com"
     end
 
@@ -39,25 +48,25 @@ class SubscriberTest < Test::Unit::TestCase
       custom_fields = [ { :Key => 'multioptionselectone', :Value => 'myoption' }, 
         { :Key => 'multioptionselectmany', :Value => 'firstoption' },
         { :Key => 'multioptionselectmany', :Value => 'secondoption' } ]
-      email_address = CreateSend::Subscriber.add @auth, @list_id, "subscriber@example.com", "Subscriber", custom_fields, true
+      email_address = CreateSend::Subscriber.add @auth, @list_id, "subscriber@example.com", "Subscriber", custom_fields, true, "Yes"
       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(@auth, "subscribers/#{@list_id}.json?email=#{CGI.escape(email)}", nil)
+      stub_put(@auth, "subscribers/#{@list_id}.json?email=#{ERB::Util.url_encode(email)}", nil)
       custom_fields = [ { :Key => 'website', :Value => 'http://example.com/' } ]
-      @subscriber.update new_email, "Subscriber", custom_fields, true
+      @subscriber.update new_email, "Subscriber", custom_fields, true, "Yes"
       @subscriber.email_address.should == new_email
     end
 
     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(@auth, "subscribers/#{@list_id}.json?email=#{CGI.escape(email)}", nil)
+      stub_put(@auth, "subscribers/#{@list_id}.json?email=#{ERB::Util.url_encode(email)}", nil)
       custom_fields = [ { :Key => 'website', :Value => '', :Clear => true } ]
-      @subscriber.update new_email, "Subscriber", custom_fields, true
+      @subscriber.update new_email, "Subscriber", custom_fields, true, "No"
       @subscriber.email_address.should == new_email
     end
     
@@ -133,8 +142,8 @@ class SubscriberTest < Test::Unit::TestCase
         { :EmailAddress => "example+2@example.com", :Name => "Example Two" },
         { :EmailAddress => "example+3@example.com", :Name => "Example Three" },
       ]
-      lambda { import_result = CreateSend::Subscriber.import @auth, @list_id, subscribers, true
-        }.should raise_error(CreateSend::BadRequest)
+      lambda { import_result = CreateSend::Subscriber.import @auth, @list_id, subscribers, 
+        true }.should raise_error(CreateSend::BadRequest)
     end
 
     should "unsubscribe a subscriber" do
@@ -143,7 +152,7 @@ class SubscriberTest < Test::Unit::TestCase
     end
 
     should "get a subscriber's history" do
-      stub_get(@auth, "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=#{ERB::Util.url_encode(@subscriber.email_address)}", "subscriber_history.json")
       history = @subscriber.history
       history.size.should == 1
       history.first.Name.should == "Campaign One"
@@ -157,7 +166,7 @@ class SubscriberTest < Test::Unit::TestCase
     end
 
     should "delete a subscriber" do
-      stub_delete(@auth, "subscribers/#{@subscriber.list_id}.json?email=#{CGI.escape(@subscriber.email_address)}", nil)
+      stub_delete(@auth, "subscribers/#{@subscriber.list_id}.json?email=#{ERB::Util.url_encode(@subscriber.email_address)}", nil)
       @subscriber.delete
     end
   end