contacts 1.0.12 → 1.0.13

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)
@@ -136,6 +136,9 @@ class Contacts
       cookies = parse_cookies(resp.response['set-cookie'], cookies)
       forward = resp.response['Location']
       forward ||= (data =~ /<meta.*?url='([^']+)'/ ? CGI.unescapeHTML($1) : nil)
+	if (not forward.nil?) && URI.parse(forward).host.nil?
+		forward = url.scheme.to_s + "://" + url.host.to_s + forward
+	end
       return data, resp, cookies, forward
     end
     
@@ -151,6 +154,9 @@ class Contacts
       data = uncompress(resp, data)
       cookies = parse_cookies(resp.response['set-cookie'], cookies)
       forward = resp.response['Location']
+	  if (not forward.nil?) && URI.parse(forward).host.nil?
+		forward = url.scheme.to_s + "://" + url.host.to_s + forward
+	  end
       return data, resp, cookies, forward
     end
     

data/lib/contacts/gmail.rb

@@ -67,7 +67,9 @@ class Contacts
       if @contacts != nil
         @contacts = @contacts.delete_if {|c| c["Emails"].nil?}.map do |c|
           name, emails = c.values_at "Name", "Emails"
-          emails = emails.first.values
+          # emails are returned in a form of
+          # [{"Address"=>"home.email@gmail.com"}, {"Type"=>{"Id"=>"WORK"}, "Address"=>"work.email@gmail.com"}]
+          emails = emails.collect{|a| a.values_at("Address")}
           [name, emails].flatten
         end
       else

data/lib/contacts/hotmail.rb

@@ -3,6 +3,7 @@ class Contacts
     URL                 = "http://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"
     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"
@@ -60,10 +61,32 @@ class Contacts
       end
 =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(forward).host
+      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
       if @attempt == 1
@@ -73,10 +96,51 @@ class Contacts
       end
     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 )
+        
+        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)
+      end
+    end
+
+
   private
     
     def contact_list_url
-      NEW_CONTACT_LIST_URL % @domain
+      NEWEST_CONTACT_LIST_URL % @domain
     end
     
     def follow_email(data, id, contacts_slot)
@@ -100,7 +164,7 @@ class Contacts
 
     def parse(data, options={})
       data = data.split("\r\n")
-      data = CSV.parse(data.join("\r\n").gsub('"', ''), ';')
+      data = CSV.parse(data.join("\r\n").gsub('"', '').gsub(';', ','), ';')
       col_names = data.shift
 
       @contacts = data.delete_if{|person|person[0].nil?}.map do |person|
@@ -109,7 +173,6 @@ class Contacts
         [[person[1], person[2], person[3]].delete_if{|i|i.empty?}.join(" "), person[idx - 1]] unless person[idx - 1].nil?
       end.compact 
     end
-    
   end
 
   TYPES[:hotmail] = Hotmail

data/lib/contacts/yahoo.rb

@@ -16,7 +16,7 @@ class Contacts
       
       data, resp, cookies, forward = post(LOGIN_URL, postdata)
       
-      if data.index("Invalid ID or password")
+      if data.index("Invalid ID or password") || data.index("This ID is not yet taken")
         raise AuthenticationError, "Username and password do not match"
       elsif data.index("Sign in") && data.index("to Yahoo!")
         raise AuthenticationError, "Required field must not be blank"

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: contacts
 version: !ruby/object:Gem::Version 
-  version: 1.0.12
-platform: ""
+  version: 1.0.13
+platform: ruby
 authors: 
 - Lucas Carlson
 autorequire: contacts
 bindir: bin
 cert_chain: []
 
-date: 2008-07-11 00:00:00 -07:00
+date: 2009-01-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -63,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - A json parser
 rubyforge_project: 
-rubygems_version: 0.9.5
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Ridiculously easy contact list information from various providers including Yahoo, Gmail, and Hotmail