contacts 1.0.6 → 1.0.7

data/README

@@ -30,8 +30,13 @@ Notice there are three ways to use this library so that you can limit the use as
 
 See the examples/ directory.
 
-== Authors    
+== Authors
+
 * Lucas Carlson from MOG (mailto:lucas@rufy.com) - http://mog.com
 
+== Contributors
+
+* Britt Selvitelle from Twitter (mailto:anotherbritt@gmail.com) - http://twitter.com
+
 This library is released under the terms of the BSD.
 

data/lib/contacts/base.rb

@@ -8,7 +8,7 @@ require "thread"
 
 class Contacts
   TYPES = {}
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
   
   class Base
     def initialize(login, password)
@@ -27,7 +27,7 @@ class Contacts
       @cookies && !@cookies.empty?
     end
 
-    def contacts
+    def contacts(options = {})
       return @contacts if @contacts
       if connected?
         url = URI.parse(contact_list_url)
@@ -40,7 +40,7 @@ class Contacts
           raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
         end
         
-        parse data
+        parse(data, options)
       end
     end
     

data/lib/contacts/gmail.rb

@@ -5,19 +5,19 @@ class Contacts
     URL                 = "https://mail.google.com/mail/"
     LOGIN_URL           = "https://www.google.com/accounts/ServiceLoginAuth"
     LOGIN_REFERER_URL   = "https://www.google.com/accounts/ServiceLogin?service=mail&passive=true&rm=false&continue=http%3A%2F%2Fmail.google.com%2Fmail%3Fui%3Dhtml%26zy%3Dl&ltmpl=yj_blanco&ltmplcache=2&hl=en"
-    CONTACT_LIST_URL    = "https://mail.google.com/mail/?view=cl&search=contacts&pnl=a"
+    CONTACT_LIST_URL    = "https://mail.google.com/mail/contacts/data/contacts?thumb=true&show=ALL&enums=true&psort=Name&max=10000&out=js&rf=&jsx=true"
     PROTOCOL_ERROR      = "Gmail has changed its protocols, please upgrade this library first. If that does not work, contact lucas@rufy.com with this error"
     
     def real_connect
       postdata =  "ltmpl=yj_blanco"
-      postdata += "&continue=#{CGI.escape(URL)}"
+      postdata += "&continue=%s" % CGI.escape(URL)
       postdata += "&ltmplcache=2"
       postdata += "&service=mail"
       postdata += "&rm=false"
       postdata += "&ltmpl=yj_blanco"
       postdata += "&hl=en"
-      postdata += "&Email=#{CGI.escape(login)}"
-      postdata += "&Passwd=#{CGI.escape(password)}"
+      postdata += "&Email=%s" % CGI.escape(login)
+      postdata += "&Passwd=%s" % CGI.escape(password)
       postdata += "&rmShown=1"
       postdata += "&null=Sign+in"
             
@@ -41,41 +41,34 @@ class Contacts
         raise ConnectionError, PROTOCOL_ERROR
       end
       
-      until forward.nil?
-        data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
-      end
       cookies = remove_cookie("LSID", cookies)
       cookies = remove_cookie("GV", cookies)
-            
-      if resp.code_type != Net::HTTPOK
-        raise ConnectionError, PROTOCOL_ERROR
-      end
-      
+
       @cookies = cookies
     end
     
   private
     
-    def parse(data)
-      data.gsub!("\n","")
-      data.gsub!("D([", "\nD([")
-      data.gsub!("]);", "]);\n")
-      data.gsub!("u003d", "=")
-      data.gsub!("u002f", "/")
+    def parse(data, options)
+      data.gsub!(/^while \(true\); &&&START&&&/, '')
+      data.gsub!(/ &&&END&&&$/, '')
+      @contacts = JSON.parse(data)['Body']['Contacts']
 
-      parsed_data = []
-      data.scan(%r{D\(\[(.*)\]\)}) do |match|
-        parsed_data << JSON.parse("[#{match[0]}]") rescue next
-      end
+      # Determine in which format to return the data.
       
-      @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[4] && !dr[4].empty? ? [[dr[3],dr[4]]] : [])
-        end)
+      # Return the full JSON Hash. 
+      return @contacts if(options[:details])
+
+      # Default format.
+      # ['Name', 'Email1', 'Email2', ...]
+      @contacts = @contacts.map do |c|
+        name, emails = c.values_at "Name", "Emails"
+        emails = emails.first.values
+        [name, emails].flatten
       end
     end
     
   end
 
   TYPES[:gmail] = Gmail
-end
+end

data/lib/contacts/hotmail.rb

@@ -9,8 +9,6 @@ class Contacts
     MAX_HTTP_THREADS    = 8
     
     def real_connect
-      @use_new_contact_url = false
-      
       data, resp, cookies, forward = get(URL)
       
       old_url = URL
@@ -18,10 +16,13 @@ class Contacts
         data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
       end
       
-      postdata =  "PPSX=#{CGI.escape(data.split("><").grep(/PPSX/).first[/=\S+$/][2..-3])}&"
-      postdata += "PwdPad=#{PWDPAD[0...(PWDPAD.length-@password.length)]}&"
-      postdata += "login=#{CGI.escape(login)}&passwd=#{CGI.escape(password)}&LoginOptions=2&"
-      postdata += "PPFT=#{CGI.escape(data.split("><").grep(/PPFT/).first[/=\S+$/][2..-3])}"
+      postdata =  "PPSX=%s&PwdPad=%s&login=%s&passwd=%s&LoginOptions=2&PPFT=%s" % [
+        CGI.escape(data.split("><").grep(/PPSX/).first[/=\S+$/][2..-3]),
+        PWDPAD[0...(PWDPAD.length-@password.length)],
+        CGI.escape(login),
+        CGI.escape(password),
+        CGI.escape(data.split("><").grep(/PPFT/).first[/=\S+$/][2..-3])
+      ]
       
       form_url = data.split("><").grep(/form/).first.split[5][8..-2]
       data, resp, cookies, forward = post(form_url, postdata, cookies)
@@ -38,27 +39,31 @@ class Contacts
       until forward.nil?
         data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
       end
-      
-      if resp.code_type != Net::HTTPOK
-        raise ConnectionError, PROTOCOL_ERROR
-      end
 
-      forward = "http://www.hotmail.msn.com/cgi-bin/sbox"
+=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
       
-      if resp.code_type != Net::HTTPOK
-        raise ConnectionError, PROTOCOL_ERROR
-      elsif old_url.include?('login.live.com')
-        data, resp, cookies, forward, old_url = get("http://mail.live.com/mail", cookies)
-        data, resp, cookies, forward, old_url = get(forward, cookies)
-        old_url = forward
-        @use_new_contact_url = true
-      end
+      data, resp, cookies, forward, old_url = get("http://mail.live.com/mail", cookies)
+      data, resp, cookies, forward, old_url = get(forward, cookies)
       
-      @domain = URI.parse(old_url).host
+      @domain = URI.parse(forward).host
       @cookies = cookies
     rescue AuthenticationError => m
       if @attempt == 1
@@ -71,7 +76,7 @@ class Contacts
   private
     
     def contact_list_url
-      (@use_new_contact_url ? NEW_CONTACT_LIST_URL : OLD_CONTACT_LIST_URL) % @domain
+      NEW_CONTACT_LIST_URL % @domain
     end
     
     def follow_email(data, id, contacts_slot)
@@ -93,48 +98,12 @@ class Contacts
       @contacts[contacts_slot][1] = e[1] if e[1].match(/@/)
     end
 
-    def parse(data)
-      if @use_new_contact_url
-        data = CSV.parse(data)
-        col_names = data.shift
-        @contacts = data.map do |person|
-          [[person[1], person[2], person[3]].delete_if{|i|i.nil?}.join(" "), person[46]] unless person[46].nil?
-        end.compact      
-      else
-        chunks = data.split('id="hotmail"')
-        prev = chunks.delete_at(0)
-      
-        queue = Queue.new
-        threads = []
-        @contacts = []
-        chunks.each do |chunk|
-          name = chunk.split('return false;">')[1].split('</a>')[0] rescue nil
-          email = chunk.split('return false;">')[2].split('</a>')[0] rescue nil
-          unless email && email != "more"
-            prev = chunk
-            next
-          end
-          next_slot = @contacts.size
-          @contacts[next_slot] = [name, email]
-          if email.match(/\.\.\.$/)
-            if m = prev.match(/\s+id="([A-Za-z0-9\-]+)"/)
-              queue.push([m[1], next_slot])
-              if threads.size < MAX_HTTP_THREADS
-                threads.push(Thread.new {
-                    while x = queue.pop
-                      follow_email(data, *x)
-                    end
-                })
-              end
-            end
-          end
-          prev = chunk
-        end
-      
-        threads.each { queue.push(nil) }
-        threads.each { |t| t.join }
-        @contacts
-      end
+    def parse(data, options={})
+      data = CSV.parse(data)
+      col_names = data.shift
+      @contacts = data.map do |person|
+        [[person[1], person[2], person[3]].delete_if{|i|i.nil?}.join(" "), person[46]] unless person[46].nil?
+      end.compact      
     end
     
   end

data/lib/contacts/yahoo.rb

@@ -68,7 +68,7 @@ class Contacts
 
   private
     
-    def parse(data)
+    def parse(data, options={})
       data = CSV.parse(data)
       col_names = data.shift
       @contacts = data.map do |person|

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: contacts
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
-date: 2007-10-29 00:00:00 -07:00
+  version: 1.0.7
+date: 2007-11-20 00:00:00 -08:00
 summary: Ridiculously easy contact list information from various providers including Yahoo, Gmail, and Hotmail
 require_paths: 
 - lib