giannichiappetta-contacts 1.0.15 → 1.0.16

data/README

@@ -38,6 +38,10 @@ See the examples/ directory.
 
 * Britt Selvitelle from Twitter (mailto:anotherbritt@gmail.com) - http://twitter.com
 * Tony Targonski from GigPark (mailto:tony@gigpark.com) - http://gigpark.com
+* Waheed Barghouthi from Watwet (mailto:waheed.barghouthi@gmail.com) - http://watwet.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.12"
+  VERSION = "1.0.13"
   
   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,9 +38,11 @@ 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")
         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"
       elsif data.index("errormsg_0_logincaptcha")

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,41 @@ 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 = []
+        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)
+          
+          url_match_text_beginning = Regexp.escape("http://m.mail.live.com/?rru=compose&amp;to=")
+          url_match_text_end = Regexp.escape("&amp;")
+          @contacts = @contacts + resp.body.scan(/#{url_match_text_beginning}(.*)#{url_match_text_end}/)
+          
+          go = resp.body.include?("Next page")
+          index += 1
+        end
+        
+        @contacts.each do |contact|
+          contact = contact.to_a
+          contact[1] = CGI::unescape(contact[0])
+          contact[0] = nil
+        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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: giannichiappetta-contacts
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors: 
 - Lucas Carlson
@@ -9,17 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-05 00:00:00 -08:00
+date: 2009-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: 1.1.1
     version: 
 description: A universal interface to grab contact list information from various providers including Yahoo, Gmail, Hotmail, and Plaxo.
 email: lucas@rufy.com