contacts 1.2.3 → 1.2.4

data/Rakefile

@@ -43,13 +43,13 @@ spec = Gem::Specification.new do |s|
 
   #### Basic information.
 
-  s.name = 'adamhunter-contacts'
+  s.name = 'contacts'
   s.version = PKG_VERSION
   s.summary = <<-EOF
-   Ridiculously easy contact list information from various providers including Yahoo, Gmail, and Hotmail
+   A universal interface to grab contact list information from various providers including Yahoo, AOL, Gmail, Hotmail, and Plaxo.
   EOF
   s.description = <<-EOF
-   Ridiculously easy contact list information from various providers including Yahoo, Gmail, and Hotmail
+   A universal interface to grab contact list information from various providers including Yahoo, AOL, Gmail, Hotmail, and Plaxo.
   EOF
 
   #### Which files are to be included in this gem?  Everything!  (Except CVS directories.)

data/lib/contacts/aol.rb

@@ -13,7 +13,10 @@ class Contacts
     PROTOCOL_ERROR      = "AOL has changed its protocols, please upgrade this library first. If that does not work, dive into the code and submit a patch at http://github.com/cardmagic/contacts"
     
     def real_connect
-      
+      if login.strip =~ /^(.+)@aol\.com$/ # strip off the @aol.com for AOL logins
+        login = $1
+      end
+
       postdata = {
         "loginId" => login,
         "password" => password,
@@ -77,7 +80,7 @@ class Contacts
         data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
       end
       
-      if data.index("Invalid Screen Name or Password.")
+      if data.index("Invalid Username or Password. Please try again.")
         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"

data/lib/contacts/base.rb

@@ -9,7 +9,7 @@ require "erb"
 
 class Contacts
   TYPES = {}
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
   
   class Base
     def initialize(login, password, options={})

data/lib/contacts/hotmail.rb

@@ -78,9 +78,9 @@ class Contacts
           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|
+          raw_html = resp.body.split("
+").grep(/(?:e|dn)lk[0-9]+/)
+          raw_html.inject(-1) do |memo, row|
             c_info = row.match(/(e|dn)lk([0-9])+/)
             
             # Same contact, or different?
@@ -109,6 +109,7 @@ class Contacts
             @contacts << contact
           end
         end
+        
         return @contacts
       end
     end

data/lib/contacts/yahoo.rb

@@ -62,15 +62,11 @@ class Contacts
         raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
         end
         
-        parse data
-        
-        parse more_data
-        
         if more_data =~ /"TotalABContacts":(\d+)/
           total = $1.to_i
-          ((total / 50)).times do |i|
+          ((total / 50.0).ceil).times do |i|
             # now proceed with the new ".crumb" parameter to get the csv data
-            url = URI.parse(contact_list_url.sub("bucket=1","bucket=#{i+2}").sub("_crumb=crumb","_crumb=#{crumb}").sub("time", Time.now.to_f.to_s.sub(".","")[0...-2]))
+            url = URI.parse(contact_list_url.sub("bucket=1","bucket=#{i}").sub("_crumb=crumb","_crumb=#{crumb}").sub("time", Time.now.to_f.to_s.sub(".","")[0...-2]))
             http = open_http(url)
             resp, more_data = http.get("#{url.path}?#{url.query}",
               "Cookie" => @cookies,
@@ -81,7 +77,7 @@ class Contacts
             if resp.code_type != Net::HTTPOK
             raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
             end
-                        
+
             parse more_data
           end
         end
@@ -94,13 +90,11 @@ class Contacts
     
     def parse(data, options={})
       @contacts ||= []
-      if data =~ /var InitialContacts = (\[.*?\]);/
-        @contacts += Contacts.parse_json($1).select{|contact|!contact["email"].to_s.empty?}.map{|contact|[contact["contactName"], contact["email"]]}
-      elsif data =~ /^\{"response":/
-        @contacts +=  Contacts.parse_json(data)["response"]["ResultSet"]["Contacts"].to_a.select{|contact|!contact["email"].to_s.empty?}.map{|contact|[contact["contactName"], contact["email"]]}
-      else
-        @contacts
-      end
+      @contacts += Contacts.parse_json(data)["response"]["ResultSet"]["Contacts"].to_a.select{|contact|!contact["email"].to_s.empty?}.map do |contact|
+        name = contact["contactName"].split(",")
+        [[name.pop, name.join(",")].join(" ").strip, contact["email"]]
+      end if data =~ /^\{"response":/
+      @contacts
     end
     
   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,31 @@
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(dir + "/../lib/")
+require 'test/unit'
+require 'contacts'
+require 'yaml'
+
+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/aol_contact_importer_test.rb

@@ -0,0 +1,39 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/../test_helper"
+require 'contacts'
+
+class AolContactImporterTest < ContactImporterTestCase
+  def setup
+    super
+    @account = TestAccounts[:aol]
+  end
+
+  def test_successful_login
+    Contacts.new(:aol, @account.username, @account.password)
+  end
+
+  def test_importer_fails_with_invalid_password
+    assert_raise(Contacts::AuthenticationError) do
+      Contacts.new(:aol, @account.username, "wrong_password")
+    end
+  end
+
+  def test_importer_fails_with_blank_password
+    assert_raise(Contacts::AuthenticationError) do
+      Contacts.new(:aol, @account.username, "")
+    end
+  end
+
+  def test_importer_fails_with_blank_username
+    assert_raise(Contacts::AuthenticationError) do
+      Contacts.new(:aol, "", @account.password)
+    end
+  end
+
+  def test_fetch_contacts
+    contacts = Contacts.new(:aol, @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/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,41 @@
+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
+  
+  def test_importer_fails_with_invalid_msn_password
+    assert_raise(Contacts::AuthenticationError) do
+      Contacts.new(:hotmail, "test@msn.com","wrong_password")
+    end
+  end
+  
+  # Since the hotmail scraper doesn't read names, test email
+  def test_fetch_email
+    contacts = Contacts.new(:hotmail, @account.username, @account.password).contacts
+    @account.contacts.each do |contact|
+      assert contacts.any?{|book_contact| book_contact.last == contact.last }, "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,35 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/../test_helper"
+require 'contacts'
+
+class YahooContactImporterTest < ContactImporterTestCase
+  def setup
+    super
+    @account = TestAccounts[:yahoo]
+  end
+
+  def test_a_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
+    # yahoo needs some time to unset the failed login state, apparently... 
+    # ...1 sec and 5 secs still failed sporadically
+    sleep 10
+    assert_nothing_raised do
+      Contacts.new(:yahoo, @account.username, @account.password)
+    end
+  end
+
+  def test_a_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,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: contacts
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors: 
 - Lucas Carlson
-autorequire: 
+autorequire: contacts
 bindir: bin
 cert_chain: []
 
-date: 2010-01-20 00:00:00 -08:00
+date: 2010-07-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.1
+        version: 0.4.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: gdata
@@ -28,11 +28,11 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.1.1
     version: 
-description: A universal interface to grab contact list information from various providers including Yahoo, AOL, Gmail, Hotmail, and Plaxo.
+description: "   A universal interface to grab contact list information from various providers including Yahoo, AOL, Gmail, Hotmail, and Plaxo.\n"
 email: lucas@rufy.com
 executables: []
 
@@ -41,20 +41,28 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- LICENSE
-- Rakefile
-- README
-- examples/grab_contacts.rb
-- lib/contacts.rb
+- lib/contacts/aol.rb
 - lib/contacts/base.rb
-- lib/contacts/json_picker.rb
 - lib/contacts/gmail.rb
-- lib/contacts/aol.rb
 - lib/contacts/hotmail.rb
+- lib/contacts/json_picker.rb
 - 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/aol_contact_importer_test.rb
+- 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
+- examples/grab_contacts.rb
 has_rdoc: true
-homepage: http://github.com/cardmagic/contacts
+homepage: http://rubyforge.org/projects/contacts
 licenses: []
 
 post_install_message: 
@@ -74,8 +82,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: []
-
+requirements: 
+- A json parser, the gdata ruby gem
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: