contacts 1.2.0 → 1.2.1

data/README

@@ -1,6 +1,6 @@
 == Welcome to Contacts
 
-Contacts is a universal interface to grab contact list information from various providers including Hotmail, AOL, Gmail and Yahoo.
+Contacts is a universal interface to grab contact list information from various providers including Hotmail, AOL, Gmail, Plaxo and Yahoo.
 
 == Download
 
@@ -41,6 +41,7 @@ See the examples/ directory.
 * Waheed Barghouthi from Watwet (mailto:waheed.barghouthi@gmail.com) - http://watwet.com
 * Glenn Sidney from Glenn Fu (mailto:glenn@glennfu.com) - http://glennfu.com
 * Brian McQuay from Onomojo (mailto:brian@onomojo.com) - http://onomojo.com
+* Adam Hunter (mailto:adamhunter@me.com) - http://adamhunter.me/
 
 This library is released under the terms of the BSD.
 

data/lib/contacts/aol.rb

@@ -9,6 +9,7 @@ end
 
 class Contacts
   require 'hpricot'
+  require 'csv'
   class Aol < Base
     URL                 = "http://www.aol.com/"
     LOGIN_URL           = "https://my.screenname.aol.com/_cqr/login/login.psp"
@@ -125,21 +126,25 @@ class Contacts
         end
         
         data, resp, cookies, forward, old_url = get(CONTACT_LIST_CSV_URL, @cookies, CONTACT_LIST_URL) + [CONTACT_LIST_URL]
+
+        until forward.nil?
+          data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
+        end
         
-        if forward.nil?
-          parse data
-        else
-          raise AuthenticationError, "Account cancelled"
+        if data.include?("error.gif")
+          raise AuthenticationError, "Account invalid"
         end
+        
+        parse data
       end
     end
   private
     
     def parse(data, options={})
-      data = CSV.parse(data)
+      data = CSV::Reader.parse(data)
       col_names = data.shift
       @contacts = data.map do |person|
-        ["#{person[0]} #{person[1]}", person[4]] unless person[4].empty?
+        ["#{person[0]} #{person[1]}", person[4]] if person[4] && !person[4].empty?
       end.compact
     end    
   end

data/lib/contacts/base.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: contacts
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Lucas Carlson