blackbook 1.0.3 → 1.0.4

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.4 / 2008-02-27
+
+* 1 minor enhancement
+  * fix 1.0.3 dud with AOL issues - Thank you Howard Wong!
+
 == 1.0.3 / 2008-02-27
 
 * 1 minor enhancement

data/lib/blackbook.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 
 class Blackbook
   include ::Singleton
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
   
   class BlackbookError < ::StandardError; end
   class BadCredentialsError < BlackbookError; end

data/lib/blackbook/importer/aol.rb

@@ -55,17 +55,22 @@ class Blackbook::Importer::Aol < Blackbook::Importer::PageScraper
       raise( Blackbook::BadCredentialsError, "Must be authenticated to access contacts." )
     end
     
-    # Get user id from cookies
-    user_id = auth_cookie.value.scan(/&uid:([^&]+)&/).first.first
-    
-    # Get contacts print page
-    contacts_uri = agent.current_page.body.scan(/document.forms.searchForm.action = \"(.+)\";/)
-    raise( Blackbook::BadCredentialsError, "Must be authenticated to access contacts." ) unless contacts_uri
-    page = agent.get contacts_uri.first.first
+    # jump through the hoops of formulating a request to get printable contacts
+    uri = agent.current_page.uri.dup
+    inputs = agent.current_page.search("//input")
+    user = inputs.detect{|i| i['type'] == 'hidden' && i['name'] == 'user'}
+    utoken = user['value']
+
+    path = uri.path.split('/')
+    path.pop
+    path << 'addresslist-print.aspx'
+    uri.path = path.join('/')
+    uri.query = "command=all&sort=FirstLastNick&sortDir=Ascending&nameFormat=FirstLastNick&user=#{utoken}"
+    page = agent.get uri.to_s
 
     # Grab all the contacts
-    names = page.search("//a[@class='contactNameLabel']").map{|a| a.innerText}.flatten
-    emails = page.body.scan( /<span class="contactOtherEmailLabel">([^<]+)<\/span>/ ).flatten
+    names = page.body.scan( /<span class="fullName">([^<]+)<\/span>/ ).flatten
+    emails = page.body.scan( /<span>Email 1:<\/span> <span>([^<]+)<\/span>/ ).flatten
     (0...[names.size,emails.size].max).collect do |i|
       {
         :name => names[i],

data/test/fixtures/aol_new_contacts.html

@@ -302,7 +302,7 @@
 <div class="contactList">
 <form id="contactListForm" enctype="multipart/form-data" method="post" action="http://webmail.aol.com/34865/aim/en-us/Lite/ContactList.aspx" accept-charset="UTF-8">  
 	
-	<div class="toolbar"><div class="basicControls"><input type="submit" name="NewContact" value="New Contact" id="newContactBtn1" title="New Contact Button" tabindex="-1"/><input type="submit" name="NewList" value="New List" id="newListBtn1" title="New List Button" tabindex="-1"/><input type="submit" name="Import" value="Import" title="Import Button" tabindex="-1"/><input type="submit" name="DeleteContacts" value="Delete" id="deleteContactsBtn1" title="Delete Button" tabindex="-1" onclick="return deleteConfirmation('Are you sure you want to delete the selected contacts?');" disabled="disabled" /><input type="submit" name="SendEmail" id="sendEmailBtn1" title="Send Email Button" value="Email" tabindex="-1"/><input type="button" onclick="ProcessCommand('2','An error occurred while processing your command.','The selection is incorrect.','An unspecified error has occurred.','\n\nIf this problem continues, please see our technical support information at ','No contacts are selected. Please select one or more contacts before using this command.','','http://webmail.aol.com/34865/aim/en-us/Lite/','ULKLrUelQ2');" class="toolbarType" name="messageAction" value="Print" tabindex="-1"></div><div class="toolbarRight"><div style="display:inline;float:left; margin-top:3px;"><span class="showLabel">View:</span><select name ="categoryFilter" class="categoryFilterSelect" title="Category Filter Select" tabindex="-1"/><option value = "All">All</option><option value = "Auto-Added">Auto-Added</option><option value = "Co-Workers">Co-Workers</option><option value = "Family">Family</option><option value = "Friends">Friends</option><option value = "Uncategorized">Uncategorized</option></select><input type="submit" title="Filter Submit Button" tabindex="-1" name="filterSubmitButton" value="Go" onclick="categoryFilterSubmit();"/></div><div style="display:inline;float:right;"><select disabled="disabled" name="pageJumpTo" title="PageJumpTo Select" tabindex="-1"><option class="disabled">Page 1 of 1</option></select><input style="margin-right:5px;" type="submit" title="PageJumpTo Submit Button" tabindex="-1"name="pageJumpAction" value="Go" disabled="disabled"/><img class="prevButtonDisabled" src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" id="prevBtn1" title="Previous Button" tabindex="-1"/><img class="nextButtonDisabled" src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" id="nextBtn1" title="Next Button" tabindex="-1"/></div></div><div style="clear:both;"></div></div>
+	<div class="toolbar"><div class="basicControls"><input type="submit" name="NewContact" value="New Contact" id="newContactBtn1" title="New Contact Button" tabindex="-1"/><input type="submit" name="NewList" value="New List" id="newListBtn1" title="New List Button" tabindex="-1"/><input type="submit" name="Import" value="Import" title="Import Button" tabindex="-1"/><input type="submit" name="DeleteContacts" value="Delete" id="deleteContactsBtn1" title="Delete Button" tabindex="-1" onclick="return deleteConfirmation('Are you sure you want to delete the selected contacts?');" disabled="disabled" /><input type="submit" name="SendEmail" id="sendEmailBtn1" title="Send Email Button" value="Email" tabindex="-1"/><input type="button" onclick="ProcessCommand('4','An error occurred while processing your command.','The selection is incorrect.','An unspecified error has occurred.','\n\nIf this problem continues, please see our technical support information at ','No contacts are selected. Please select one or more contacts before using this command.','','http://webmail.aol.com/34865/aim/en-us/Lite/','ULKLrUelQ2');" class="toolbarType" name="messageAction" value="Print" tabindex="-1"></div><div class="toolbarRight"><div style="display:inline;float:left; margin-top:3px;"><span class="showLabel">View:</span><select name ="categoryFilter" class="categoryFilterSelect" title="Category Filter Select" tabindex="-1"/><option value = "All">All</option><option value = "Auto-Added">Auto-Added</option><option value = "Co-Workers">Co-Workers</option><option value = "Family">Family</option><option value = "Friends">Friends</option><option value = "Uncategorized">Uncategorized</option></select><input type="submit" title="Filter Submit Button" tabindex="-1" name="filterSubmitButton" value="Go" onclick="categoryFilterSubmit();"/></div><div style="display:inline;float:right;"><select disabled="disabled" name="pageJumpTo" title="PageJumpTo Select" tabindex="-1"><option class="disabled">Page 1 of 1</option></select><input style="margin-right:5px;" type="submit" title="PageJumpTo Submit Button" tabindex="-1"name="pageJumpAction" value="Go" disabled="disabled"/><img class="prevButtonDisabled" src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" id="prevBtn1" title="Previous Button" tabindex="-1"/><img class="nextButtonDisabled" src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" id="nextBtn1" title="Next Button" tabindex="-1"/></div></div><div style="clear:both;"></div></div>
 	
 	<h1 id=main class=SROnly><a name=main>Contacts</a></h1>
 	
@@ -311,20 +311,20 @@
 	<table width="100%" class="contactListTable" border="0" cellpadding="0" cellspacing="0">
 		<tr><th class="contactCheckCol"><input class="selectAllCB" type="checkbox" name="selectAllCB" onclick="aol.wsl.fContactsSelectAll();"/></th><th class="contactNameCol sortedColumn"><div class="contactNameHeader" onclick="sort('contactListForm','AB_SORT_ASCENDING','AB_SORT_BY_NAME');"><a href="#" class="contactNameHeaderLabel" onclick="sort('contactListForm','AB_SORT_ASCENDING','AB_SORT_BY_NAME');">Name</a></div><div class="sortAscending"></div></th><th class="contactEmailCol"><a href="#" class="contactEmailHeaderLabel" onclick="sort('contactListForm','AB_SORT_DESCENDING','AB_SORT_BY_EMAIL');">Email</a></th><th class="contactPhoneCol"><div class="headerLabel">Phone</div></th><th class="contactEditColSmall"><img src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" width="35" height="1"></th></tr>
 		
-<tr><td class="contactCheck"><input type="checkbox" name="mailto_select" onclick="aol.wsl.fContactsSelectCheckbox(this);" value="1" id="contact_1"/><label for="contact_1"><span class="SROnly">Joe User joe.user</span></label></td>
-<td class="contactName" id="1"><a href="#" id="1" onclick="detailClick('1');" class="contactNameLabel" title="Details-Contact:Joe User joe.user">Joe User</a></td>
-<td class="contactEmail" id="1"><a href="#" id="1" onclick="detailClick('1');" title="Details-Contact:Joe User joe.user"><span class="contactPrimaryEmailLabel">joe.user<span class="contactPrimaryEmailLabel">,</span><span class="contactOtherEmailLabel">joe.user@example.com</span></a></td><td NOWRAP class="contactPhone" id="1"><a href="#" id="1" onclick="detailClick('1');" title="Details-Contact:Joe User joe.user">(Mobile) 2063908743</a></td>
-<td class="contactEdit" id="1"><a href="#" title="Edit-Contact:Joe User joe.user" id="1" onclick="editClick('1');" class="contactEditLink">Edit</a></td></tr>
-<tr><td class="contactCheck"><input type="checkbox" name="mailto_select" onclick="aol.wsl.fContactsSelectCheckbox(this);" value="2" id="contact_2"/><label for="contact_2"><span class="SROnly">Jane User Jane User</span></label></td>
-<td class="contactName" id="2"><a href="#" id="2" onclick="detailClick('2');" class="contactNameLabel" title="Details-Contact:Jane User Jane User">Jane User</a></td>
-<td class="contactEmail" id="2"><a href="#" id="2" onclick="detailClick('2');" title="Details-Contact:Jane User Jane User"><span class="contactPrimaryEmailLabel">Jane User<span class="contactPrimaryEmailLabel">,</span><span class="contactOtherEmailLabel">jane.user@example.com</span></a></td><td NOWRAP class="contactPhone" id="2" onclick="detailClick('2');"></td>
-<td class="contactEdit" id="2"><a href="#" title="Edit-Contact:Jane User Jane User" id="2" onclick="editClick('2');" class="contactEditLink">Edit</a></td></tr>
+<tr><td class="contactCheck"><input type="checkbox" name="mailto_select" onclick="aol.wsl.fContactsSelectCheckbox(this);" value="3" id="contact_3"/><label for="contact_3"><span class="SROnly">Jane User jane.user</span></label></td>
+<td class="contactName" id="3"><a href="#" id="3" onclick="detailClick('3');" class="contactNameLabel" title="Details-Contact:Jane User jane.user">Jane User</a></td>
+<td class="contactEmail" id="3"><a href="#" id="3" onclick="detailClick('3');" title="Details-Contact:Jane User jane.user"><span class="contactPrimaryEmailLabel">jane.user<span class="contactPrimaryEmailLabel">,</span><span class="contactOtherEmailLabel">jane.user@example.com</span></a></td><td NOWRAP class="contactPhone" id="3" onclick="detailClick('3');"></td>
+<td class="contactEdit" id="3"><a href="#" title="Edit-Contact:Jane User jane.user" id="3" onclick="editClick('3');" class="contactEditLink">Edit</a></td></tr>
+<tr><td class="contactCheck"><input type="checkbox" name="mailto_select" onclick="aol.wsl.fContactsSelectCheckbox(this);" value="4" id="contact_4"/><label for="contact_4"><span class="SROnly">Joe User joe.user@example.com</span></label></td>
+<td class="contactName" id="4"><a href="#" id="4" onclick="detailClick('4');" class="contactNameLabel" title="Details-Contact:Joe User joe.user@example.com">Joe User</a></td>
+<td class="contactEmail" id="4"><a href="#" id="4" onclick="detailClick('4');" title="Details-Contact:Joe User joe.user@example.com"><span class="contactPrimaryEmailLabel">joe.user@example.com</span><span class="contactPrimaryEmailLabel">,</span><span class="contactOtherEmailLabel">joe.user@example2.com</span></a></td><td NOWRAP class="contactPhone" id="4" onclick="detailClick('4');"></td>
+<td class="contactEdit" id="4"><a href="#" title="Edit-Contact:Joe User joe.user@example.com" id="4" onclick="editClick('4');" class="contactEditLink">Edit</a></td></tr>
 
 	<tr><td><img alt="" src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" width="15" height="1" /></td><td><img alt="" src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" width="150" height="1" /></td><td><img alt="" src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" width="1" height="1" /></td><td><img alt="" src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" width="100" height="1" /></td><td><img alt="" src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" width="45" height="1"/>
 	
 	<!-- suppresses the padding of hidden form elements -->
 	<div style="display:none;">
-	<input type="hidden" name="folder" value="" />
+	<input type="hidden" name="folder" value="Inbox" />
 	<input type="hidden" id="searchCriteria" name="searchCriteria" value="" /> 
 	<input type="hidden" id="categoryFilterName" name="categoryFilterName" value="" /> 
 	<input type="hidden" id="pageView" name="pageView" value="normal" /> 
@@ -343,7 +343,7 @@
 	</td></tr>
 	</table>
 	
-	<div class="toolbarLower"><div class="basicControls"><input type="submit" name="NewContact" value="New Contact" id="newContactBtn" title="New Contact Button"/><input type="submit" name="NewList" value="New List" id="newListBtn" title="New List Button"/><input type="submit" name="Import" value="Import" title="Import Button"/><input type="submit" name="DeleteContacts" value="Delete" id="deleteContactsBtn" title="Delete Button" onclick="return deleteConfirmation('Are you sure you want to delete the selected contacts?');" disabled="disabled" /><input type="submit" name="SendEmail" id="sendEmailBtn" title="Send Email Button" value="Email"/><input type="button" onclick="ProcessCommand('2','An error occurred while processing your command.','The selection is incorrect.','An unspecified error has occurred.','\n\nIf this problem continues, please see our technical support information at ','No contacts are selected. Please select one or more contacts before using this command.','','http://webmail.aol.com/34865/aim/en-us/Lite/','ULKLrUelQ2');" class="toolbarType" name="messageAction" value="Print"></div><div class="toolbarRight"><div style="display:inline;float:left; margin-top:3px;"><span class="showLabel">View:</span><select name ="categoryFilter" class="categoryFilterSelect" title="Category Filter Select"/><option value = "All">All</option><option value = "Auto-Added">Auto-Added</option><option value = "Co-Workers">Co-Workers</option><option value = "Family">Family</option><option value = "Friends">Friends</option><option value = "Uncategorized">Uncategorized</option></select><input type="submit" title="Filter Submit Button" name="filterSubmitButton" value="Go" onclick="categoryFilterSubmit();"/></div><div style="display:inline;float:right;"><select disabled="disabled" name="pageJumpTo" title="PageJumpTo Select"><option class="disabled">Page 1 of 1</option></select><input style="margin-right:5px;" type="submit" title="PageJumpTo Submit Button"name="pageJumpAction" value="Go" disabled="disabled"/><img class="prevButtonDisabled" src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" id="prevBtn" title="Previous Button"/><img class="nextButtonDisabled" src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" id="nextBtn" title="Next Button"/></div></div><div style="clear:both;"></div></div>
+	<div class="toolbarLower"><div class="basicControls"><input type="submit" name="NewContact" value="New Contact" id="newContactBtn" title="New Contact Button"/><input type="submit" name="NewList" value="New List" id="newListBtn" title="New List Button"/><input type="submit" name="Import" value="Import" title="Import Button"/><input type="submit" name="DeleteContacts" value="Delete" id="deleteContactsBtn" title="Delete Button" onclick="return deleteConfirmation('Are you sure you want to delete the selected contacts?');" disabled="disabled" /><input type="submit" name="SendEmail" id="sendEmailBtn" title="Send Email Button" value="Email"/><input type="button" onclick="ProcessCommand('4','An error occurred while processing your command.','The selection is incorrect.','An unspecified error has occurred.','\n\nIf this problem continues, please see our technical support information at ','No contacts are selected. Please select one or more contacts before using this command.','','http://webmail.aol.com/34865/aim/en-us/Lite/','ULKLrUelQ2');" class="toolbarType" name="messageAction" value="Print"></div><div class="toolbarRight"><div style="display:inline;float:left; margin-top:3px;"><span class="showLabel">View:</span><select name ="categoryFilter" class="categoryFilterSelect" title="Category Filter Select"/><option value = "All">All</option><option value = "Auto-Added">Auto-Added</option><option value = "Co-Workers">Co-Workers</option><option value = "Family">Family</option><option value = "Friends">Friends</option><option value = "Uncategorized">Uncategorized</option></select><input type="submit" title="Filter Submit Button" name="filterSubmitButton" value="Go" onclick="categoryFilterSubmit();"/></div><div style="display:inline;float:right;"><select disabled="disabled" name="pageJumpTo" title="PageJumpTo Select"><option class="disabled">Page 1 of 1</option></select><input style="margin-right:5px;" type="submit" title="PageJumpTo Submit Button"name="pageJumpAction" value="Go" disabled="disabled"/><img class="prevButtonDisabled" src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" id="prevBtn" title="Previous Button"/><img class="nextButtonDisabled" src="http://o.aolcdn.com/cdn.webmail.aol.com/34865/aim/en-us/images/space.gif" id="nextBtn" title="Next Button"/></div></div><div style="clear:both;"></div></div>
 	
 	</form>	
 </div>
@@ -367,7 +367,7 @@
 	
 
 <div class="footer_container">
-	<table align="center"><tbody><tr width=100%><td><ul class="hatLinks links"><li><a href="http://webmail.aol.com/34865/aim/en-us/Lite/Today.aspx?AccessibilityRedirect=true" title="Click here for the accessible version">Accessible Version</a></li><li><a target="_blank" href="http://www.aol.com/aolnetwork/aolcom_terms.html">Terms of Service</a></li><li><a target="_blank" href="http://about.aol.com/aolnetwork/mem_commitments">Privacy Policy</a></li><li class=last><a target="_blank" href="http://www.aol.com/aolnetwork/trademarks.html">Trademarks</a></li></ul></td></tr></tbody></table>
+	<table align="center"><tbody><tr width=100%><td><ul class="hatLinks links"><li><a href="http://webmail.aol.com/34865/aim/en-us/Lite/Today.aspx?AccessibilityRedirect=true" title="Click here for the accessible version">Accessible Version</a></li><li><a href="http://webmail.aol.com/34865/aim/en-us/Suite.aspx?ac=f&amp;r=464" title="Switch to Standard Version">Standard Version</a></li><li><a target="_blank" href="http://www.aol.com/aolnetwork/aolcom_terms.html">Terms of Service</a></li><li><a target="_blank" href="http://about.aol.com/aolnetwork/mem_commitments">Privacy Policy</a></li><li class=last><a target="_blank" href="http://www.aol.com/aolnetwork/trademarks.html">Trademarks</a></li></ul></td></tr></tbody></table>
 	<div class="copyright">&copy; 2008 AOL LLC. All Rights Reserved</div>
 	<script>
 		 axs.l10n.keycap_summary = "This table describes the shortcut keys implemented on this page.";

data/test/test_blackbook_importer_aol.rb

@@ -89,13 +89,15 @@ class TestBlackbookImporterAol < Test::Unit::TestCase
 
     response = {'content-type' => 'text/html'}
     body = load_fixture('aol_application_page.html').join
-    page = WWW::Mechanize::Page.new(uri=nil, response, body, code=nil, mech=nil)
-    @importer.agent.expects(:current_page).once.returns(page)
+    uri = URI.parse('http://webmail.aol.com/34865/aim/en-us/Lite/Today.aspx')
+    page = WWW::Mechanize::Page.new(uri, response, body, code=nil, mech=nil)
+    @importer.agent.expects(:current_page).times(2).returns(page)
 
     response = {'content-type' => 'text/html'}
-    body = load_fixture('aol_new_contacts.html').join
+    body = load_fixture('aol_contacts.html').join
     page = WWW::Mechanize::Page.new(uri=nil, response, body, code=nil, mech=nil)
-    @importer.agent.expects(:get).with('http://webmail.aol.com/34865/aim/en-us/Lite/ContactList.aspx'
+    @importer.agent.expects(:get).with(
+      'http://webmail.aol.com/34865/aim/en-us/Lite/addresslist-print.aspx?command=all&sort=FirstLastNick&sortDir=Ascending&nameFormat=FirstLastNick&user=ULKLrUelQ2'
     ).once.returns(page)
 
     assert_nothing_raised do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blackbook
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Contentfree