@@ -79,16 +79,15 @@ class Blackbook::Importer::Hotmail < Blackbook::Importer::PageScraper
rows = page.search("//div[@class='ContactsPrintPane cPrintContact BorderTop']")
rows.collect do |row|
name = row.search("//div[@class='cDisplayName']").first.innerText.strip
- name = name[0,(name.size-3)] # char 142 is last char of clean text
-
+
vals = {}
- row.search("/table/tr").each do |pair|
+ row.search("//table/tr").each do |pair|
key = pair.search("/td[@class='TextAlignRight Label']").first.innerText.strip
val = pair.search("/td[@class='Value']").first.innerText.strip
vals[key.to_sym] = val
end
vals[:name] = name
- vals[:email] = (vals['Personal e-mail'.to_sym] || vals['Work e-mail'.to_sym]).split(' ').first rescue ''
+ vals[:email] = (vals['Personal e-mail:'.to_sym] || vals['Work e-mail:'.to_sym]).split(' ').first rescue ''
vals
end
end
lib/blackbook/importer/hotmail.rb
@@ -1,132 +1,191 @@
-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html dir="ltr">
<head>
<title>Windows Live Hotmail Print Contacts</title>
- <link rel="stylesheet" href="/mail/ThemeCommon_12.1.0069.1213.aspx?Theme=4&culture=en-US" type="text/css" id="ssThemeService"/>
- <link rel="stylesheet" href="http://gfx8.hotmail.com/mail/12.1.0069.1213/LayoutCommon.css" type="text/css"/>
- <link rel="stylesheet" href="/mail/LayoutCommon_12.1.0069.1213.aspx?Theme=4&culture=en-US" type="text/css"/>
- <link rel="stylesheet" href="http://gfx8.hotmail.com/mail/12.1.0069.1213/LayoutContactCommon.css" type="text/css"/>
- <link rel="stylesheet" href="/mail/LayoutContactCommon_12.1.0069.1213.aspx?Theme=4&culture=en-US" type="text/css"/>
+ <link rel="stylesheet" href="http://gfx8.hotmail.com/mail/13.2.0242.1113/styles/Base/hig.css" type="text/css"/>
+ <link rel="stylesheet" href="/mail/LayoutCommon_13.2.0242.1113.aspx?culture=en-US" type="text/css"/>
+ <link rel="stylesheet" href="http://gfx8.hotmail.com/mail/13.2.0242.1113/styles/Base/LayoutContactCommon.css" type="text/css"/>
<style type="text/css">
.FloatLeft, .HeaderLabel, .HeaderData {float:left;}
.FloatRight {float:right;}
.HeaderLabel {margin-right:0.45em;}
- .ContainerPadding {margin:0;padding:0.32em 0.64em 0.64em 0.64em;}
+ .ContainerPadding {padding:4px 4px 8px 4px;}
+ .PrintContent {padding:0px 12px;}
+ #PrintShellToolbar IMG {padding-right:4px;}
</style>
+
<script type="text/javascript">
function PrintDocument()
{
- document.getElementById("PrintShellToolbar").style.display = "none";
- window.setTimeout("window.print();",1)
- window.setTimeout("document.getElementById('PrintShellToolbar').style.display = 'block';",1)
+ var elem = document.getElementById("PrintShellToolbar");
+ if (elem)
+ {
+ elem.style.display = "none";
+ window.setTimeout("window.print();",1)
+ window.setTimeout("document.getElementById('PrintShellToolbar').style.display = 'block';",1)
+ }
}
</script>
</head>
<body onload="javascript:PrintDocument();">
- <div id="HeaderContainer">
- <table cellspacing="0" id="uxp_hdr"><tr><td class="uxp_hdrInner"><table class="uxp_hdrInnerTable" cellspacing="0"><tr><td><span id="uxp_hdr_jewelSpan"></span><a id="uxp_hdr_jewelLink" href="#"><img src="http://gfx1.hotmail.com/mail/uxp/w2/pr03/HIG/img/h/jewel_24_hover.png" alt="More services" title="" width="39" height="37" style="visibility:hidden"/><span class="uxp_hdr_windowsLiveText">Windows Live<span class="uxp_hdr_tm">™</span></span></a><br /></td></tr></table></td></tr></table>
- </div>
-
- <div class="cPrintDiv">
+ <div class="PrintContent">
<style type="text/css">
.ContactsPrintPane .ContactHeader {padding:0em 0em 1.33em .41em;padding-right:0em;padding-left:.41em;position:relative;}
.ContactHeader .cDisplayName {padding-top:.45em;}
-.ContactsPrintPane DIV.Label {width:12.91em;padding:.36em 1.64em .36em 0;padding-right:1.64em;padding-left:0;text-align:right;}
-.ContactsPrintPane DIV.Value {margin-left:13.91em;padding:.36em 0;}
+.ContactsPrintPane TD.Label {width:12.91em;padding:.36em 1.64em .36em 0;padding-right:1.64em;padding-left:0;text-align:right;}
+.ContactsPrintPane TD.Value {margin-left:13.91em;padding:.36em 0;}
.cPrintContact {padding:1em 0em 1em .41em;padding-right:0em;padding-left:.41em;}
-.cLinks {padding-left:.91em;)
+.cLinks {padding-left:.91em;}
+.ContactsPrintPane .cCol1 {float:none;padding:0px;}
</style>
<div id="PrintShellToolbar">
<div class="ContainerPadding">
<span class="FloatRight">
+
<a href="javascript:window.close();" >
- <img alt="" src="http://gfx1.hotmail.com/mail/w2/ltr/glyph_close_rest.gif" /> Close window
+ <img alt="" src="http://gfx1.hotmail.com/mail/w3/ltr/glyph_close_rest.gif" /> Close window
</a>
</span>
<span>
<a href="javascript:PrintDocument();" >
- <img alt="" src="http://gfx2.hotmail.com/mail/w2/ltr/i_print.gif" /> Print
+ <img alt="" src="http://gfx2.hotmail.com/mail/w3/ltr/i_print.gif" /><span class='VAlignTop'> Print</span>
</a>
</span>
+
</div>
</div>
<div class="ContactsPrintPane cPrintContact BorderTop">
-<div class="ContactHeader">
-
+
+<script type="text/javascript">
+ function ToggleDetails(hideId, showId)
+ {
+ var e = document.getElementById(hideId);
+ if (e)
+ {
+ e.style.display = "none";
+ e = document.getElementById(showId);
+ if (e)
+ e.style.display = "block";
+ }
+ }
+</script>
+<div class="ContactHeader ClearBoth">
<div class="cContactHeaderInfo">
+
<div class="cDisplayName" >
- Jane User
+ Jane User
</div>
-
+
</div>
+
</div>
-<table>
-
-<tr>
-<td class="TextAlignRight Label" >Personal e-mail</td>
-<td class="Value" >jane.user@example.com<span> (preferred e-mail address)</span></td>
-</tr>
-
-<tr>
-<td class="TextAlignRight Label" >Home phone</td>
-<td class="Value" >2068675309</td>
-</tr>
-
-<tr>
-<td class="TextAlignRight Label" >Mobile phone</td>
-<td class="Value" >2068675308</td>
-</tr>
-
-<tr>
-<td class="TextAlignRight Label" >Company</td>
-<td class="Value" >Example, Inc.</td>
-</tr>
-
-<tr>
-<td class="TextAlignRight Label" >Work e-mail</td>
-<td class="Value" >jane.work@example.com</td>
-</tr>
-
-<tr>
-<td class="TextAlignRight Label" >Work phone</td>
-<td class="Value" >2068675307</td>
-</tr>
-
-</table>
+
+ <div id="cFullView" class="ClearBoth">
+
+ <div class="cCol1">
+ <table>
+
+ <tr>
+ <td class="TextAlignRight Label" >Name:</td>
+ <td class="Value" >Jane User</td>
+
+ </tr>
+
+ </table>
+ </div>
+ <div class="cCol2">
+ <table>
+
+ </table>
+ </div>
+ <div class="cDetailsSeparator"> </div>
+
+ <div class="cCol1">
+
+ <table>
+
+ <tr>
+ <td class="TextAlignRight Label" >Personal e-mail:</td>
+ <td class="Value" >jane.user@example.com</td>
+ </tr>
+
+ </table>
+ </div>
+
+ <div class="cCol2">
+ <table>
+
+ </table>
+ </div>
+ <div class="cDetailsSeparator"> </div>
+
+</div>
+
</div>
<div class="ContactsPrintPane cPrintContact BorderTop">
-<div class="ContactHeader">
-
+
+<script type="text/javascript">
+ function ToggleDetails(hideId, showId)
+ {
+ var e = document.getElementById(hideId);
+ if (e)
+ {
+ e.style.display = "none";
+ e = document.getElementById(showId);
+ if (e)
+ e.style.display = "block";
+ }
+ }
+
+</script>
+<div class="ContactHeader ClearBoth">
<div class="cContactHeaderInfo">
+
<div class="cDisplayName" >
- Joe User
+ joe.user@example.com
</div>
-
+
</div>
</div>
-<table>
-<tr>
-<td class="TextAlignRight Label" >Personal e-mail</td>
-<td class="Value" >joe.user@example.com</td>
-</tr>
+ <div id="cFullView" class="ClearBoth">
+
+ <div class="cCol1">
+
+ <table>
+
+ <tr>
+ <td class="TextAlignRight Label" >Personal e-mail:</td>
+ <td class="Value" >joe.user@example.com</td>
+ </tr>
+
+ </table>
+ </div>
+
+ <div class="cCol2">
+ <table>
+
+ </table>
+ </div>
+ <div class="cDetailsSeparator"> </div>
+
+</div>
-</table>
</div>
- <img id="cleargif" alt="" src="http://h.live.com/c.gif?RF=&PI=44364&DI=5707&PS=93140" width="1" height="1" />
+ <img id="cleargif" alt="" src="http://h.msn.com/c.gif?RF=&PI=44364&DI=5707&PS=93140" width="1" height="1" />
</div>
</body>
+
</html>
test/fixtures/hotmail_contacts.html
@@ -77,8 +77,12 @@ class TestBlackbookImporterHotmail < Test::Unit::TestCase
assert_nothing_raised do
contacts = @importer.scrape_contacts
assert_equal 2, contacts.size
+
+ # Joe doesn't have a name, so we use his display name (which hotmail sets to his email)
assert contacts.detect{|c| c[:email] == 'joe.user@example.com'}
- assert contacts.detect{|c| c[:name] == 'Joe User'}
+ assert contacts.detect{|c| c[:name] == 'joe.user@example.com'}
+
+ # Jane has both a name and an email
assert contacts.detect{|c| c[:email] == 'jane.user@example.com'}
assert contacts.detect{|c| c[:name] == 'Jane User'}
end
test/test_blackbook_importer_hotmail.rb
837bc908894e8d679f7c6ac7b8c1901878de04da
Jeff Jolma
jeff@animoto.com
http://github.com/purzelrakete/blackbook/commit/506473b07a8c01975cc200b949ea0a316fa7bf93
506473b07a8c01975cc200b949ea0a316fa7bf93
2008-12-16T16:29:49-08:00
2008-12-10T08:04:39-08:00
fix hotmail import
One weird case is how to handle contacts that don't have names.
Hotmail gives them a "display name" with their email address. Should
we use that as the name or nil? This keeps it using this display
name, but I could be convinced otherwise.
Signed-off-by: Rany Keddo <rany@playtype.net>
1ce6a7479778090878cda41eb0d25f566f939471
Rany Keddo
rany@playtype.net