@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "contacts"
- s.version = "1.0.14"
+ s.version = "1.0.15"
s.date = "2009-05-06"
s.summary = "A universal interface to grab contact list information from various providers including Yahoo, Gmail, Hotmail, and Plaxo."
s.email = "lucas@rufy.com"
contacts.gemspec
@@ -8,7 +8,7 @@ require "thread"
class Contacts
TYPES = {}
- VERSION = "1.0.13"
+ VERSION = "1.0.15"
class Base
def initialize(login, password)
lib/contacts/base.rb
@@ -39,7 +39,7 @@ class Contacts
cookies = remove_cookie("GMAIL_LOGIN", cookies)
- if data.index("Username and password do not match")
+ if data.index("Username and password do not match") || data.index("New to Gmail? It's free and easy")
raise AuthenticationError, "Username and password do not match"
elsif data.index("The username or password you entered is incorrect")
raise AuthenticationError, "Username and password do not match"
@@ -91,4 +91,4 @@ class Contacts
end
TYPES[:gmail] = Gmail
-end
+end
\ No newline at end of file
lib/contacts/gmail.rb
@@ -1,9 +1,9 @@
class Contacts
class Hotmail < Base
- URL = "http://login.live.com/login.srf?id=2"
+ URL = "https://login.live.com/login.srf?id=2"
OLD_CONTACT_LIST_URL = "http://%s/cgi-bin/addresses"
NEW_CONTACT_LIST_URL = "http://%s/mail/GetContacts.aspx"
- NEWEST_CONTACT_LIST_URL = "http://%s/mail/options.aspx?subsection=26"
+ CONTACT_LIST_URL = "http://mpeople.live.com/default.aspx?pg=0"
COMPOSE_URL = "http://%s/cgi-bin/compose?"
PROTOCOL_ERROR = "Hotmail has changed its protocols, please upgrade this library first. If that does not work, report this error at http://rubyforge.org/forum/?group_id=2693"
PWDPAD = "IfYouAreReadingThisYouHaveTooMuchFreeTime"
@@ -11,7 +11,6 @@ class Contacts
def real_connect
data, resp, cookies, forward = get(URL)
-
old_url = URL
until forward.nil?
data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
@@ -37,55 +36,16 @@ class Contacts
end
old_url = form_url
+
until forward.nil?
data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
end
-
-=begin
- if data =~ %r{action="(.*?)"}
- forward = $1
- puts forward
- napexp = CGI.escape(data.to_s[/id="NAPExp" value="(.*?)"/][19...-1])
- nap = CGI.escape(data.to_s[/id="NAP" value="(.*?)"/][16...-1])
- anon = CGI.escape(data.to_s[/id="ANON" value="(.*?)"/][17...-1])
- anonexp = CGI.escape(data.to_s[/id="ANONExp" value="(.*?)"/][20...-1])
- t = CGI.escape(data.to_s[/id="t" value="(.*?)"/][14...-1])
-
- postdata = "NAPExp=%s&NAP=%s&ANON=%s&ANONExp=%s&t=%s" % [ napexp, nap, anon, anonexp, t ]
- puts postdata
- data, resp, cookies, forward, old_url = post(forward, postdata, cookies, old_url) + [forward]
- end
-
- until forward.nil?
- data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
- end
-=end
data, resp, cookies, forward = get("http://mail.live.com/mail", cookies)
until forward.nil?
data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
end
-
- # click on 'Contiune' if presented with the Hotmail Listened page
- # look for the Submit button with a "TakeMeToInbox" name (this should work for other languages)
- if (not old_url.grep(/MessageAtLogin.aspx/).first.nil?)
-
- viewState = data.split(/>\s*?</).grep(/__VIEWSTATE/).first[/value=\".+?\"/][7..-2]
- eventValidation = data.split(/>\s*?</).grep(/__EVENTVALIDATION/).first[/value=\".+?\"/][7..-2]
- continueValue = data.split(/>\s*?</).grep(/TakeMeToInbox/).first[/value=\".+?\"/][7..-2]
-
- # post back to the same url
- postdata = "%s=%s&%s=%s&%s=%s" % [
- "__VIEWSTATE", CGI.escape(viewState),
- "__EVENTVALIDATION", CGI.escape(eventValidation),
- CGI.escape("TakeMeToInbox"), CGI.escape(continueValue)
- ]
- data, resp, cookies, forward = post( old_url, postdata, cookies, old_url )
- until forward.nil?
- data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
- end
- end
-
+
@domain = URI.parse(old_url).host
@cookies = cookies
rescue AuthenticationError => m
@@ -97,7 +57,6 @@ class Contacts
end
def contacts(options = {})
- return @contacts if @contacts
if connected?
url = URI.parse(contact_list_url)
data, resp, cookies, forward = get( contact_list_url, @cookies )
@@ -105,75 +64,62 @@ class Contacts
if resp.code_type != Net::HTTPOK
raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
end
-
- # we have to click on the Export Contacts button to get the csv:
- # Search the content for __VIEWSTATE or __EVENTVALIDATION
- viewState = data.split(/>\s*?</).grep(/__VIEWSTATE/).first[/value=\".+?\"/][7..-2]
- eventValidation = data.split(/>\s*?</).grep(/__EVENTVALIDATION/).first[/value=\".+?\"/][7..-2]
- exportValue = data.split(/>\s*?</).grep(/ctl02\$ExportButton/).first[/value=\".+?\"/][7..-2]
- mt = cookies.split("; ").grep(/mt=/).first[3..-1]
- # post back to the same url
- postdata = "%s=%s&%s=%s&%s=%s&%s=%s" % [
- "__VIEWSTATE", CGI.escape(viewState),
- "__EVENTVALIDATION", CGI.escape(eventValidation),
- CGI.escape("ctl02$ExportButton"), CGI.escape(exportValue),
- "mt", CGI.escape( mt )
- ]
-
- url = URI.parse(contact_list_url)
- http = open_http(url)
- resp, data = http.post("#{url.path}?#{url.query}", postdata,
- "User-Agent" => "Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0",
- "Accept-Encoding" => "gzip",
- "Cookie" => cookies,
- "Referer" => contact_list_url,
- "Content-Type" => 'application/x-www-form-urlencoded'
- )
-
- data = uncompress(resp, data)
- parse(data, options)
+ @contacts = []
+ build_contacts = []
+ go = true
+ index = 0
+
+ while(go) do
+ go = false
+ url = URI.parse(get_contact_list_url(index))
+ http = open_http(url)
+ resp, data = http.get(get_contact_list_url(index), "Cookie" => @cookies)
+
+ email_match_text_beginning = Regexp.escape("http://m.mail.live.com/?rru=compose&to=")
+ email_match_text_end = Regexp.escape("&")
+
+ raw_html = resp.body.grep(/(?:e|dn)lk[0-9]+/)
+ raw_html.delete_at 0
+ raw_html.inject do |memo, row|
+ c_info = row.match(/(e|dn)lk([0-9])+/)
+
+ # Same contact, or different?
+ build_contacts << [] if memo != c_info[2]
+
+ # Grab info
+ case c_info[1]
+ when "e" # Email
+ build_contacts.last[1] = row.match(/#{email_match_text_beginning}(.*)#{email_match_text_end}/)[1]
+ when "dn" # Name
+ build_contacts.last[0] = row.match(/<a[^>]*>(.+)<\/a>/)[1]
+ end
+
+ # Set memo to contact id
+ c_info[2]
+ end
+
+ go = resp.body.include?("Next page")
+ index += 1
+ end
+
+ build_contacts.each do |contact|
+ unless contact[1].nil?
+ # Only return contacts with email addresses
+ contact[1] = CGI::unescape(contact[1])
+ @contacts << contact
+ end
+ end
+ return @contacts
end
end
-
-
- private
- def contact_list_url
- NEWEST_CONTACT_LIST_URL % @domain
+ def get_contact_list_url(index)
+ "http://mpeople.live.com/default.aspx?pg=#{index}"
end
- def follow_email(data, id, contacts_slot)
- compose_url = COMPOSE_URL % @domain
- postdata = "HrsTest=&to=#{id}&mailto=1&ref=addresses"
- postdata += "&curmbox=00000000-0000-0000-0000-000000000001"
-
- a = data.split(/>\s*<input\s+/i).grep(/\s+name="a"/i)
- return nil if a.empty?
-
- a = a[0].match(/\s+value="([a-f0-9]+)"/i) or return nil
- postdata += "&a=#{a[1]}"
-
- data, resp, @cookies, forward = post(compose_url, postdata, @cookies)
- e = data.split(/>\s*<input\s+/i).grep(/\s+name="to"/i)
- return nil if e.empty?
-
- e = e[0].match(/\s+value="([^"]+)"/i) or return nil
- @contacts[contacts_slot][1] = e[1] if e[1].match(/@/)
- end
-
- def parse(data, options={})
- data = data.split("\r\n")
- data = CSV.parse(data.join("\r\n").gsub('"', '').gsub(';', ','), ';')
- col_names = data.shift
-
- @contacts = data.delete_if{|person|person[0].nil?}.map do |person|
- person = person[0].split(",")
- next unless (idx = person.index('SMTP'))
- [[person[1], person[2], person[3]].delete_if{|i|i.empty?}.join(" "), person[idx - 1]] unless person[idx - 1].nil?
- end.compact
- end
+ private
+
+ TYPES[:hotmail] = Hotmail
end
-
- TYPES[:hotmail] = Hotmail
end
\ No newline at end of file
lib/contacts/hotmail.rb
@@ -53,7 +53,7 @@ end # Contacts
# sample contacts responses
-'
+=begin
Bad email
=========
<?xml version="1.0" encoding="utf-8" ?>
@@ -119,5 +119,4 @@ Success
<editCounter>3</editCounter>
</ns1:GetContactsResponse>
-
-'
+=end
\ No newline at end of file
lib/contacts/plaxo.rb
@@ -32,6 +32,8 @@ class GmailContactImporterTest < ContactImporterTestCase
def test_fetch_contacts
contacts = Contacts.new(:gmail, @account.username, @account.password).contacts
- assert_equal @account.contacts, contacts
+ @account.contacts.each do |contact|
+ assert contacts.include?(contact), "Could not find: #{contact.inspect} in #{contacts.inspect}"
+ end
end
end
\ No newline at end of file
test/unit/gmail_contact_importer_test.rb
@@ -20,6 +20,8 @@ class HotmailContactImporterTest < ContactImporterTestCase
def test_fetch_contacts
contacts = Contacts.new(:hotmail, @account.username, @account.password).contacts
- assert_equal @account.contacts, contacts
+ @account.contacts.each do |contact|
+ assert contacts.include?(contact), "Could not find: #{contact.inspect} in #{contacts.inspect}"
+ end
end
end
test/unit/hotmail_contact_importer_test.rb
@@ -25,6 +25,8 @@ class YahooContactImporterTest < ContactImporterTestCase
def test_fetch_contacts
contacts = Contacts.new(:yahoo, @account.username, @account.password).contacts
- assert_equal @account.contacts, contacts
+ @account.contacts.each do |contact|
+ assert contacts.include?(contact), "Could not find: #{contact.inspect} in #{contacts.inspect}"
+ end
end
end
\ No newline at end of file
test/unit/yahoo_csv_contact_importer_test.rb
cedf6f38c8fee32e119bae4005799ef073015b8d
Lucas Carlson
lucas@rufy.com
http://github.com/cardmagic/contacts/commit/727fe48335b64f89576096af779b02cb5ecf2e61
727fe48335b64f89576096af779b02cb5ecf2e61
2009-07-11T01:30:22-07:00
2009-07-11T01:30:22-07:00
Various fixes from giannichiappetta as well as cleaning up the unit tests and fixing a gmail authentication check
77878b77bc585038c1db1f4597fd2cbc2a34b72a
Lucas Carlson
lucas@rufy.com