contacts 1.0.13 → 1.0.15

data/Rakefile

@@ -10,7 +10,7 @@ PKG_VERSION = Contacts::VERSION
 
 PKG_FILES = FileList[
     "lib/**/*", "bin/*", "test/**/*", "[A-Z]*", "Rakefile", "doc/**/*", "examples/**/*"
-]
+] - ["test/accounts.yml"]
 
 desc "Default Task"
 task :default => [ :test ]

data/lib/contacts/base.rb

@@ -8,7 +8,7 @@ require "thread"
 
 class Contacts
   TYPES = {}
-  VERSION = "1.0.13"
+  VERSION = "1.0.15"
   
   class Base
     def initialize(login, password)

data/lib/contacts/gmail.rb

@@ -1,4 +1,14 @@
-require "json/add/rails"
+begin
+  # If the json gem is available, use it
+  require "json/add/rails"
+rescue MissingSourceFile
+  # Otherwise wrap the ActiveSupport JSON implementation for our simple use case
+  class JSON
+    def self.parse(i)
+      ActiveSupport::JSON.decode(i)
+    end
+  end
+end
 
 class Contacts
   class Gmail < Base
@@ -28,8 +38,10 @@ class Contacts
       data, resp, cookies, forward, old_url = post(LOGIN_URL, postdata, cookie, LOGIN_REFERER_URL) + [LOGIN_URL]
       
       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"
       elsif data.index("Required field must not be blank")
         raise AuthenticationError, "Login and password must not be blank"
@@ -79,4 +91,4 @@ class Contacts
   end
 
   TYPES[:gmail] = Gmail
-end
+end

data/lib/contacts/hotmail.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&amp;to=")
+          email_match_text_end = Regexp.escape("&amp;")
+          
+          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

data/lib/contacts/plaxo.rb

@@ -34,8 +34,8 @@ class Contacts
       elsif code == '200'
         @contacts = []
         doc.elements.each('//contact') do |cont|
-          name  = cont.elements['fullName'].text   #rescue nil
-          email = cont.elements['email1'].text #rescue nil
+          name  = cont.elements['fullName'].nil? ? cont.elements['displayName'].text : cont.elements['fullName'].text
+          email = cont.elements['email1'].text
           @contacts << [name, email]
         end.compact
         @contacts
@@ -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

data/test/example_accounts.yml

@@ -0,0 +1,40 @@
+gmail:
+  username: <changeme>
+  password: <changeme>
+  contacts: 
+    -
+      name: "FirstName1 LastName1"
+      email_address: "firstname1@example.com"
+    -
+      name: "FirstName2 LastName2"
+      email_address: "firstname2@example.com"
+yahoo:
+  username: <changeme>
+  password: <changeme>
+  contacts: 
+    -
+      name: "FirstName1 LastName1"
+      email_address: "firstname1@example.com"
+    -
+      name: "FirstName2 LastName2"
+      email_address: "firstname2@example.com"
+hotmail:
+  username: <changeme>
+  password: <changeme>
+  contacts: 
+    -
+      name: "FirstName1 LastName1"
+      email_address: "firstname1@example.com"
+    -
+      name: "FirstName2 LastName2"
+      email_address: "firstname2@example.com"
+aol:
+  username: <changeme>
+  password: <changeme>
+  contacts: 
+    -
+      name: "FirstName1 LastName1"
+      email_address: "firstname1@example.com"
+    -
+      name: "FirstName2 LastName2"
+      email_address: "firstname2@example.com"

data/test/test_helper.rb

@@ -0,0 +1,30 @@
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(dir + "/../lib/")
+require 'test/unit'
+require 'contacts'
+
+class ContactImporterTestCase < Test::Unit::TestCase
+  # Add more helper methods to be used by all tests here...
+  def default_test
+    assert true
+  end
+end
+
+class TestAccounts
+  def self.[](type)
+    load[type]
+  end
+  
+  def self.load(file = File.dirname(__FILE__) + "/accounts.yml")
+    raise "/test/accounts.yml file not found, please create, see /test/example_accounts.yml for information" unless File.exist?(file)
+    
+    accounts = {}
+    YAML::load(File.open(file)).each do |type, contents|
+      contacts = contents["contacts"].collect {|contact| [contact["name"], contact["email_address"]]}
+      accounts[type.to_sym] = Account.new(type.to_sym, contents["username"], contents["password"], contacts)
+    end
+    accounts
+  end
+
+  Account = Struct.new :type, :username, :password, :contacts
+end

data/test/test_suite.rb

@@ -0,0 +1,4 @@
+dir = File.dirname(__FILE__)
+Dir["#{dir}/**/*_test.rb"].each do |file|
+  require file
+end

data/test/unit/gmail_contact_importer_test.rb

@@ -0,0 +1,39 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/../test_helper"
+require 'contacts'
+
+class GmailContactImporterTest < ContactImporterTestCase
+  def setup
+    super
+    @account = TestAccounts[:gmail]
+  end
+
+  def test_successful_login
+    Contacts.new(:gmail, @account.username, @account.password)
+  end
+
+  def test_importer_fails_with_invalid_password
+    assert_raise(Contacts::AuthenticationError) do
+      Contacts.new(:gmail, @account.username, "wrong_password")
+    end
+  end
+
+  def test_importer_fails_with_blank_password
+    assert_raise(Contacts::AuthenticationError) do
+      Contacts.new(:gmail, @account.username, "")
+    end
+  end
+
+  def test_importer_fails_with_blank_username
+    assert_raise(Contacts::AuthenticationError) do
+      Contacts.new(:gmail, "", @account.password)
+    end
+  end
+
+  def test_fetch_contacts
+    contacts = Contacts.new(:gmail, @account.username, @account.password).contacts
+    @account.contacts.each do |contact|
+      assert contacts.include?(contact), "Could not find: #{contact.inspect} in #{contacts.inspect}"
+    end
+  end
+end

data/test/unit/hotmail_contact_importer_test.rb

@@ -0,0 +1,27 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/../test_helper"
+require 'contacts'
+
+class HotmailContactImporterTest < ContactImporterTestCase
+  def setup
+    super
+    @account = TestAccounts[:hotmail]
+  end
+
+  def test_successful_login
+    Contacts.new(:hotmail, @account.username, @account.password)
+  end
+
+  def test_importer_fails_with_invalid_password
+    assert_raise(Contacts::AuthenticationError) do
+      Contacts.new(:hotmail, @account.username,"wrong_password")
+    end
+  end
+
+  def test_fetch_contacts
+    contacts = Contacts.new(:hotmail, @account.username, @account.password).contacts
+    @account.contacts.each do |contact|
+      assert contacts.include?(contact), "Could not find: #{contact.inspect} in #{contacts.inspect}"
+    end
+  end
+end

data/test/unit/test_accounts_test.rb

@@ -0,0 +1,23 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/../test_helper"
+
+class TestAccountsTest < ContactImporterTestCase
+  def test_test_accounts_loads_data_from_example_accounts_file
+    account = TestAccounts.load(File.dirname(__FILE__) + "/../example_accounts.yml")[:gmail]
+    
+    assert_equal :gmail, account.type
+    assert_equal "<changeme>", account.username
+    assert_equal "<changeme>", account.password
+    assert_equal [["FirstName1 LastName1", "firstname1@example.com"], ["FirstName2 LastName2", "firstname2@example.com"]], account.contacts
+  end
+  
+  def test_test_accounts_blows_up_if_file_doesnt_exist
+    assert_raise(RuntimeError) do
+      TestAccounts.load("file_that_does_not_exist.yml")
+    end
+  end
+  
+  def test_we_can_load_from_account_file
+    assert_not_nil TestAccounts[:gmail].username
+  end
+end

data/test/unit/yahoo_csv_contact_importer_test.rb

@@ -0,0 +1,32 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/../test_helper"
+require 'contacts'
+
+class YahooContactImporterTest < ContactImporterTestCase
+  def setup
+    super
+    @account = TestAccounts[:yahoo]
+  end
+
+  def test_successful_login
+    Contacts.new(:yahoo, @account.username, @account.password)
+  end
+
+  def test_importer_fails_with_invalid_password
+    assert_raise(Contacts::AuthenticationError) do
+      Contacts.new(:yahoo, @account.username,"wrong_password")
+    end
+    # run the "successful" login test to ensure we reset yahoo's failed login lockout counter
+    # See http://www.pivotaltracker.com/story/show/138210
+    assert_nothing_raised do
+      Contacts.new(:yahoo, @account.username, @account.password)
+    end
+  end
+
+  def test_fetch_contacts
+    contacts = Contacts.new(:yahoo, @account.username, @account.password).contacts
+    @account.contacts.each do |contact|
+      assert contacts.include?(contact), "Could not find: #{contact.inspect} in #{contacts.inspect}"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: contacts
 version: !ruby/object:Gem::Version 
-  version: 1.0.13
+  version: 1.0.15
 platform: ruby
 authors: 
 - Lucas Carlson
@@ -9,7 +9,7 @@ autorequire: contacts
 bindir: bin
 cert_chain: []
 
-date: 2009-01-08 00:00:00 -08:00
+date: 2009-07-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,6 +38,14 @@ files:
 - lib/contacts/plaxo.rb
 - lib/contacts/yahoo.rb
 - lib/contacts.rb
+- test/example_accounts.yml
+- test/test_helper.rb
+- test/test_suite.rb
+- test/unit
+- test/unit/gmail_contact_importer_test.rb
+- test/unit/hotmail_contact_importer_test.rb
+- test/unit/test_accounts_test.rb
+- test/unit/yahoo_csv_contact_importer_test.rb
 - LICENSE
 - Rakefile
 - README