contacts 1.0.16 → 1.0.17

data/README

@@ -39,6 +39,7 @@ 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
+* Glenn Sidney from Glenn Fu (mailto:glenn@glennfu.com) - http://glennfu.com
 
 This library is released under the terms of the BSD.
 

data/lib/contacts/base.rb

@@ -5,10 +5,11 @@ require "uri"
 require "zlib"
 require "stringio"
 require "thread"
+require "erb"
 
 class Contacts
   TYPES = {}
-  VERSION = "1.0.16"
+  VERSION = "1.0.17"
   
   class Base
     def initialize(login, password)
@@ -19,7 +20,7 @@ class Contacts
     end
     
     def connect
-      raise AuthenticationError, "Login and password must not be nil, login: #{@login.inspect}, password: #{@password.inspect}" if @login.nil? || @password.nil?
+      raise AuthenticationError, "Login and password must not be nil, login: #{@login.inspect}, password: #{@password.inspect}" if @login.nil? || @login.empty? || @password.nil? || @password.empty?
       real_connect
     end
     
@@ -92,10 +93,14 @@ class Contacts
       http
     end
     
+    def cookie_hash_from_string(cookie_string)
+      cookie_string.split(";").map{|i|i.split("=", 2).map{|j|j.strip}}.inject({}){|h,i|h[i[0]]=i[1];h}
+    end
+    
     def parse_cookies(data, existing="")
       return existing if data.nil?
 
-      cookies = existing.split(";").map{|i|i.split("=", 2).map{|j|j.strip}}.inject({}){|h,i|h[i[0]]=i[1];h}
+      cookies = cookie_hash_from_string(existing)
       
       data.gsub!(/ ?[\w]+=EXPIRED;/,'')
       data.gsub!(/ ?expires=(.*?, .*?)[;,$]/i, ';')

data/lib/contacts/gmail.rb

@@ -9,36 +9,40 @@ else
   require 'json/add/rails'
 end
 
+class Hash
+  def to_query_string
+    u = ERB::Util.method(:u)
+    map { |k, v|
+      u.call(k) + "=" + u.call(v)
+    }.join("&")
+  end
+end
+
 class Contacts
   class Gmail < Base
     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"
+    LOGIN_REFERER_URL   = "https://www.google.com/accounts/ServiceLogin?service=mail&passive=true&rm=false&continue=http%3A%2F%2Fmail.google.com%2Fmail%2F%3Fui%3Dhtml%26zy%3Dl&bsv=zpwhtygjntrz&scc=1&ltmpl=default&ltmplcache=2"
     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, dive into the code and submit a patch at http://github.com/cardmagic/contacts"
     
     def real_connect
-      postdata =  "ltmpl=yj_blanco"
-      postdata += "&continue=%s" % CGI.escape(URL)
-      postdata += "&ltmplcache=2"
-      postdata += "&service=mail"
-      postdata += "&rm=false"
-      postdata += "&ltmpl=yj_blanco"
-      postdata += "&hl=en"
-      postdata += "&Email=%s" % CGI.escape(login)
-      postdata += "&Passwd=%s" % CGI.escape(password)
-      postdata += "&rmShown=1"
-      postdata += "&null=Sign+in"
+      postdata = {
+        "Email" => login,
+        "Passwd" => password,
+        "PersistentCookie" => "yes",
+        "asts" => "",
+        "rmShown" => "1",
+        "signIn" => CGI.escape("Sign in")
+      }
             
-      time =      Time.now.to_i
-      time_past = Time.now.to_i - 8 - rand(12)
-      cookie =    "GMAIL_LOGIN=T#{time_past}/#{time_past}/#{time}"
-      
-      data, resp, cookies, forward, old_url = post(LOGIN_URL, postdata, cookie, LOGIN_REFERER_URL) + [LOGIN_URL]
-      
-      cookies = remove_cookie("GMAIL_LOGIN", cookies)
+      # Get this cookie and stick it in the form to confirm to Google that your cookies work
+      data, resp, cookies, forward = get(LOGIN_REFERER_URL)
+      postdata["GALX"] = cookie_hash_from_string(cookies)["GALX"]
 
-      if data.index("Username and password do not match") || data.index("New to Gmail? It's free and easy")
+      data, resp, cookies, forward, old_url = post(LOGIN_URL, postdata.to_query_string, cookies, LOGIN_REFERER_URL) + [LOGIN_REFERER_URL]
+      
+      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"
@@ -65,7 +69,7 @@ class Contacts
       data.gsub!(/ &&&END&&&$/, '')
       data.gsub!(/\t/, ' ') # tabs in the note field cause errors with JSON.parse
       data.gsub!(/[\t\x00-\x1F]/, " ") # strip control characters
-
+      
       @contacts = JSON.parse(data)['Body']['Contacts'] || {}
 
       # Determine in which format to return the data.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: contacts
 version: !ruby/object:Gem::Version 
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors: 
 - Lucas Carlson
@@ -9,7 +9,7 @@ autorequire: contacts
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 -07:00
+date: 2009-10-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency