contacts 1.0.0 → 1.0.1

data/lib/contacts/base.rb

@@ -5,7 +5,7 @@ require "uri"
 
 class Contacts
   TYPES = {}
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
   
   class Base
     def initialize(login, password)

data/lib/contacts/gmail.rb

@@ -70,7 +70,7 @@ class Contacts
       
       @contacts = parsed_data.select{|d| d[0] == "cl"}.inject([]) do |a,d|
         a.concat(d.inject([]) do |ar,dr|
-          ar.concat(dr.is_a?(Array) ? [[dr[3],dr[4]]] : [])
+          ar.concat(dr.is_a?(Array) && dr[4] && !dr[4].empty? ? [[dr[3],dr[4]]] : [])
         end)
       end
     end

data/lib/contacts/hotmail.rb

@@ -67,7 +67,7 @@ class Contacts
       @contacts = chunks.map do |chunk|
         name = chunk.split('return false;">')[1].split('</a>')[0] rescue nil
         email = chunk.split('return false;">')[2].split('</a>')[0] rescue nil
-        [name, email] if email
+        [name, email] if email && email != "more"
       end.compact
     end
     

data/lib/contacts/yahoo.rb

@@ -1,8 +1,10 @@
+require 'csv'
+
 class Contacts
   class Yahoo < Base
     URL                 = "http://mail.yahoo.com/"
     LOGIN_URL           = "https://login.yahoo.com/config/login"
-    CONTACT_LIST_URL    = "http://address.yahoo.com/"
+    CONTACT_LIST_URL    = "http://address.yahoo.com/index.php?VPC=import_export&A=B&submit[action_export_yahoo]=Export%20Now"
     PROTOCOL_ERROR      = "Yahoo has changed its protocols, please upgrade this library first. If that does not work, contact lucas@rufy.com with this error"
     
     def real_connect
@@ -35,20 +37,11 @@ class Contacts
   private
     
     def parse(data)
-      chunks = data.split("c_row")
-      chunks.delete_at(0)
-      
-      processed_data = {}
-      chunks.each_with_index do |chunk, i|
-        processed_data[i/2] ||= []
-        if i%2 == 0 # then it is a name
-          processed_data[i/2] << chunk.split(/[^,]\n/).grep(/contactname/).first.gsub(/(<|^).*?(>|$)/,'').strip
-        else # it is an email
-          processed_data[i/2] << chunk.split.grep(/compose.mail.yahoo.com/).first.gsub(/(<|^).*?(>|$)/,'').strip rescue next
-        end
-      end
-      
-      @contacts = processed_data.values.delete_if{|data|data[1].nil?}
+      data = CSV.parse(data)
+      col_names = data.shift
+      @contacts = data.map do |person|
+        [[person[0], person[1], person[2]].delete_if{|i|i.empty?}.join(" "), person[4]] unless person[4].empty?
+      end.compact
     end
     
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: contacts
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2006-12-04 00:00:00 -08:00
+  version: 1.0.1
+date: 2006-12-07 00:00:00 -08:00
 summary: Ridiculously easy contact list information from various providers including Yahoo, Gmail, and Hotmail
 require_paths: 
 - lib
@@ -37,6 +37,48 @@ files:
 - LICENSE
 - Rakefile
 - README
+- doc/classes
+- doc/created.rid
+- doc/files
+- doc/fr_class_index.html
+- doc/fr_file_index.html
+- doc/fr_method_index.html
+- doc/index.html
+- doc/rdoc-style.css
+- doc/classes/Contacts
+- doc/classes/Contacts.html
+- doc/classes/Contacts.src
+- doc/classes/Contacts/AuthenticationError.html
+- doc/classes/Contacts/Base.html
+- doc/classes/Contacts/Base.src
+- doc/classes/Contacts/ConnectionError.html
+- doc/classes/Contacts/ContactsError.html
+- doc/classes/Contacts/Gmail.html
+- doc/classes/Contacts/Gmail.src
+- doc/classes/Contacts/Hotmail.html
+- doc/classes/Contacts/Hotmail.src
+- doc/classes/Contacts/TypeNotFound.html
+- doc/classes/Contacts/Yahoo.html
+- doc/classes/Contacts/Yahoo.src
+- doc/classes/Contacts/Base.src/M000005.html
+- doc/classes/Contacts/Base.src/M000006.html
+- doc/classes/Contacts/Base.src/M000007.html
+- doc/classes/Contacts/Base.src/M000008.html
+- doc/classes/Contacts/Base.src/M000009.html
+- doc/classes/Contacts/Base.src/M000010.html
+- doc/classes/Contacts/Gmail.src/M000004.html
+- doc/classes/Contacts/Hotmail.src/M000011.html
+- doc/classes/Contacts/Yahoo.src/M000003.html
+- doc/classes/Contacts.src/M000001.html
+- doc/classes/Contacts.src/M000002.html
+- doc/files/lib
+- doc/files/README.html
+- doc/files/lib/contacts
+- doc/files/lib/contacts_rb.html
+- doc/files/lib/contacts/base_rb.html
+- doc/files/lib/contacts/gmail_rb.html
+- doc/files/lib/contacts/hotmail_rb.html
+- doc/files/lib/contacts/yahoo_rb.html
 - examples/grab_contacts.rb
 test_files: []