contacts_cn 1.2.6 → 1.2.7

data/lib/contacts/aol.rb

@@ -7,11 +7,11 @@ class Contacts
     LOGIN_REFERER_URL   = "http://webmail.aol.com/"
     LOGIN_REFERER_PATH = "sitedomain=sns.webmail.aol.com&lang=en&locale=us&authLev=0&uitype=mini&loginId=&redirType=js&xchk=false"
     AOL_NUM = "29970-343" # this seems to change each time they change the protocol
-    
+
     CONTACT_LIST_URL    = "http://webmail.aol.com/#{AOL_NUM}/aim-2/en-us/Lite/ContactList.aspx?folder=Inbox&showUserFolders=False"
     CONTACT_LIST_CSV_URL = "http://webmail.aol.com/#{AOL_NUM}/aim-2/en-us/Lite/ABExport.aspx?command=all"
     PROTOCOL_ERROR      = "AOL 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
       if login.strip =~ /^(.+)@aol\.com$/ # strip off the @aol.com for AOL logins
         login = $1
@@ -47,39 +47,39 @@ class Contacts
         "redirType" => "",
         "xchk" => "false"
       }
- 
+
       # Get this cookie and stick it in the form to confirm to Aol that your cookies work
       data, resp, cookies, forward = get(URL)
       postdata["stips"] = cookie_hash_from_string(cookies)["stips"]
       postdata["tst"] = cookie_hash_from_string(cookies)["tst"]
- 
+
       data, resp, cookies, forward, old_url = get(LOGIN_REFERER_URL, cookies) + [URL]
       until forward.nil?
         data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
       end
-      
+
       data, resp, cookies, forward, old_url = get("#{LOGIN_URL}?#{LOGIN_REFERER_PATH}", cookies) + [LOGIN_REFERER_URL]
       until forward.nil?
         data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
       end
- 
+
       doc = Hpricot(data)
       (doc/:input).each do |input|
         postdata["usrd"] = input.attributes["value"] if input.attributes["name"] == "usrd"
       end
       # parse data for <input name="usrd" value="2726212" type="hidden"> and add it to the postdata
- 
+
       postdata["SNS_SC"] = cookie_hash_from_string(cookies)["SNS_SC"]
       postdata["SNS_LDC"] = cookie_hash_from_string(cookies)["SNS_LDC"]
       postdata["LTState"] = cookie_hash_from_string(cookies)["LTState"]
       # raise data.inspect
-      
+
       data, resp, cookies, forward, old_url = post(LOGIN_URL, h_to_query_string(postdata), cookies, LOGIN_REFERER_URL) + [LOGIN_REFERER_URL]
-      
+
       until forward.nil?
         data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
       end
-      
+
       if data.index("Invalid Username or Password. Please try again.")
         raise AuthenticationError, "Username and password do not match"
       elsif data.index("Required field must not be blank")
@@ -91,57 +91,57 @@ class Contacts
       elsif cookies == ""
         raise ConnectionError, PROTOCOL_ERROR
       end
- 
+
       @cookies = cookies
     end
- 
+
     def contacts
       postdata = {
         "file" => 'contacts',
         "fileType" => 'csv'
       }
- 
+
       return @contacts if @contacts
       if connected?
         data, resp, cookies, forward, old_url = get(CONTACT_LIST_URL, @cookies, CONTACT_LIST_URL) + [CONTACT_LIST_URL]
- 
+
         until forward.nil?
           data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
         end
-        
+
         if resp.code_type != Net::HTTPOK
           raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
         end
- 
+
         # parse data and grab <input name="user" value="8QzMPIAKs2" type="hidden">
         doc = Hpricot(data)
         (doc/:input).each do |input|
           postdata["user"] = input.attributes["value"] if input.attributes["name"] == "user"
         end
-        
+
         data, resp, cookies, forward, old_url = get(CONTACT_LIST_CSV_URL, @cookies, CONTACT_LIST_URL) + [CONTACT_LIST_URL]
- 
+
         until forward.nil?
           data, resp, cookies, forward, old_url = get(forward, cookies, old_url) + [forward]
         end
-        
+
         if data.include?("error.gif")
           raise AuthenticationError, "Account invalid"
         end
-        
+
         parse data
       end
     end
-  private
-    
+    private
+
     def parse(data, options={})
       data = CSV::Reader.parse(data)
       col_names = data.shift
       @contacts = data.map do |person|
         ["#{person[0]} #{person[1]}", person[4]] if person[4] && !person[4].empty?
       end.compact
-    end    
- 
+    end
+
     def h_to_query_string(hash)
       u = ERB::Util.method(:u)
       hash.map { |k, v|
@@ -149,6 +149,6 @@ class Contacts
       }.join("&")
     end
   end
- 
+
   TYPES[:aol] = Aol
-end
+end

data/lib/contacts/base.rb

@@ -9,7 +9,7 @@ require "erb"
 
 class Contacts
   TYPES = {}
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 
   class Base
     def initialize(login, password, options={})
@@ -36,7 +36,7 @@ class Contacts
         url = URI.parse(contact_list_url)
         http = open_http(url)
         resp, data = http.get("#{url.path}?#{url.query}",
-          "Cookie" => @cookies
+        "Cookie" => @cookies
         )
 
         if resp.code_type != Net::HTTPOK
@@ -74,7 +74,7 @@ class Contacts
       @password
     end
 
-  private
+    private
 
     def domain
       @d ||= self.class.const_get(:DOMAIN) rescue nil
@@ -142,19 +142,19 @@ class Contacts
       url = URI.parse(url)
       http = open_http(url)
       resp, data = http.post(url.path, 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" => referer,
-        "Content-Type" => 'application/x-www-form-urlencoded'
+      "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" => referer,
+      "Content-Type" => 'application/x-www-form-urlencoded'
       )
       data = uncompress(resp, data)
       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
+      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
 
@@ -162,17 +162,17 @@ class Contacts
       url = URI.parse(url)
       http = open_http(url)
       resp, data = http.get("#{url.path}?#{url.query}",
-        "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" => referer
+      "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" => referer
       )
       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
+      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
 
@@ -183,8 +183,8 @@ class Contacts
         data = gz.read
         gz.close
         resp.response['content-encoding'] = nil
-      # FIXME: Not sure what Hotmail was feeding me with their 'deflate',
-      #        but the headers definitely were not right
+        # FIXME: Not sure what Hotmail was feeding me with their 'deflate',
+        #        but the headers definitely were not right
       when 'deflate'
         data = Zlib::Inflate.inflate(data)
         resp.response['content-encoding'] = nil

data/lib/contacts/gmail.rb

@@ -2,20 +2,20 @@ require 'gdata'
 
 class Contacts
   class Gmail < Base
-    
+
     CONTACTS_SCOPE = 'http://www.google.com/m8/feeds/'
     CONTACTS_FEED = CONTACTS_SCOPE + 'contacts/default/full/?max-results=1000'
-    
+
     def contacts
       return @contacts if @contacts
     end
-    
+
     def real_connect
       @client = GData::Client::Contacts.new
       @client.clientlogin(@login, @password, @captcha_token, @captcha_response)
-      
+
       feed = @client.get(CONTACTS_FEED).to_xml
-      
+
       @contacts = feed.elements.to_a('entry').collect do |entry|
         title, email = entry.elements['title'].text, nil
         entry.elements.each('gd:email') do |e|
@@ -27,9 +27,9 @@ class Contacts
     rescue GData::Client::AuthorizationError => e
       raise AuthenticationError, "Username or password are incorrect"
     end
-    
+
     private
-    
+
     TYPES[:gmail] = Gmail
   end
-end
+end

data/lib/contacts/hotmail.rb

@@ -79,7 +79,7 @@ class Contacts
           email_match_text_end = Regexp.escape("&")
 
           raw_html = resp.body.split("
-").grep(/(?:e|dn)lk[0-9]+/)
+          ").grep(/(?:e|dn)lk[0-9]+/)
           raw_html.inject(-1) do |memo, row|
             c_info = row.match(/(e|dn)lk([0-9])+/)
 
@@ -88,10 +88,10 @@ class Contacts
 
             # Grab info
             case c_info[1]
-              when "e" # Email
-                build_contacts.last[1] = row.match(/#{email_match_text_beginning}(.*)#{email_match_text_end}/)[1]
-              when "dn" # Name
-                build_contacts.last[0] = row.match(/<a[^>]*>(.+)<\/a>/)[1]
+            when "e" # Email
+              build_contacts.last[1] = row.match(/#{email_match_text_beginning}(.*)#{email_match_text_end}/)[1]
+            when "dn" # Name
+              build_contacts.last[0] = row.match(/<a[^>]*>(.+)<\/a>/)[1]
             end
 
             # Set memo to contact id

data/lib/contacts/json_picker.rb

@@ -5,7 +5,7 @@ end
 class Contacts
   def self.parse_json( string )
     if Object.const_defined?('ActiveSupport') and
-       ActiveSupport.const_defined?('JSON')
+      ActiveSupport.const_defined?('JSON')
       ActiveSupport::JSON.decode( string )
     elsif Object.const_defined?('JSON')
       JSON.parse( string )

data/lib/contacts/net_ease.rb

@@ -1,116 +1,116 @@
 class Contacts
   class NetEase < Base
-  	URL = "http://www.163.com"
+    URL = "http://www.163.com"
     LOGIN_URL = "https://reg.163.com/logins.jsp"
     LoginData = {
-    	:url2 => {
-    		:wy163 => 'http://mail.163.com/errorpage/err_163.htm',
-		  	:wy126 => 'http://mail.126.com/errorpage/err_126.htm',
-				:yeah => 'http://mail.yeah.net/errorpage/err_yeah.htm'
-    	},
-    	:url => {
-    		:wy163 => 'http://entry.mail.163.com/coremail/fcg/ntesdoor2?lightweight=1&verifycookie=1&language=-1&style=-1&username=%s',
-    		:wy126 => 'http://entry.mail.126.com/cgi/ntesdoor?hid=10010102&lightweight=1&verifycookie=1&language=0&style=-1&username=%s',
-    		:yeah => 'http://entry.mail.yeah.net/cgi/ntesdoor?lightweight=1&verifycookie=1&style=-1&username=%s'
-    	},
-    	:product => {
-    		:wy163 => 'mail163',
-    		:wy126 => 'mail126',
-    		:yeah => 'mailyeah'
-    	}
+      :url2 => {
+        :wy163 => 'http://mail.163.com/errorpage/err_163.htm',
+        :wy126 => 'http://mail.126.com/errorpage/err_126.htm',
+        :yeah => 'http://mail.yeah.net/errorpage/err_yeah.htm'
+      },
+      :url => {
+        :wy163 => 'http://entry.mail.163.com/coremail/fcg/ntesdoor2?lightweight=1&verifycookie=1&language=-1&style=-1&username=%s',
+        :wy126 => 'http://entry.mail.126.com/cgi/ntesdoor?hid=10010102&lightweight=1&verifycookie=1&language=0&style=-1&username=%s',
+        :yeah => 'http://entry.mail.yeah.net/cgi/ntesdoor?lightweight=1&verifycookie=1&style=-1&username=%s'
+      },
+      :product => {
+        :wy163 => 'mail163',
+        :wy126 => 'mail126',
+        :yeah => 'mailyeah'
+      }
     }
     ENTER_MAIL_URL = {
-    	:wy163 => "http://entry.mail.163.com/coremail/fcg/ntesdoor2?lightweight=1&verifycookie=1&language=-1&style=-1&username=%s",
-    	:wy126 => "http://entry.mail.126.com/cgi/ntesdoor?hid=10010102&lightweight=1&verifycookie=1&language=0&style=-1&username=%s",
-    	:yeah => "http://entry.mail.yeah.net/cgi/ntesdoor?lightweight=1&verifycookie=1&style=-1&username=%s"
+      :wy163 => "http://entry.mail.163.com/coremail/fcg/ntesdoor2?lightweight=1&verifycookie=1&language=-1&style=-1&username=%s",
+      :wy126 => "http://entry.mail.126.com/cgi/ntesdoor?hid=10010102&lightweight=1&verifycookie=1&language=0&style=-1&username=%s",
+      :yeah => "http://entry.mail.yeah.net/cgi/ntesdoor?lightweight=1&verifycookie=1&style=-1&username=%s"
     }
 
-		CONTACT_LIST_URL = "%ss?sid=%s&func=global:sequential"
-		PROTOCOL_ERROR = "netease has changed its protocols, please upgrade this library first. you can also contact kamechb@gmail.com"
+    CONTACT_LIST_URL = "%ss?sid=%s&func=global:sequential"
+    PROTOCOL_ERROR = "netease has changed its protocols, please upgrade this library first. you can also contact kamechb@gmail.com"
 
     def initialize(login, password, options={})
-			@mail_type = get_mail_type(login)
-			super(login,password,options)
+      @mail_type = get_mail_type(login)
+      super(login,password,options)
     end
 
     def real_connect
-			login_for_cookies
-			enter_mail_server
+      login_for_cookies
+      enter_mail_server
     end
 
     def contacts
-    	return @contacts if @contacts
+      return @contacts if @contacts
       if connected?
-				url = URI.parse(CONTACT_LIST_URL % [@mail_server,@sid])
-				http = open_http(url)
-				postdata = '<?xml version="1.0"?><object><array name="items"><object><string name="func">pab:searchContacts</string><object name="var"><array name="order"><object><string name="field">FN</string><boolean name="ignoreCase">true</boolean></object></array></object></object><object><string name="func">user:getSignatures</string></object><object><string name="func">pab:getAllGroups</string></object></array></object>'
-				set_header = {"Cookie" => @cookies,'Accept' => 'text/javascript','Content-Type' => 'application/xml; charset=UTF-8'}
-				resp, data = http.post("#{url.path}?#{url.query}",postdata,set_header)
-				if resp.code_type != Net::HTTPOK
+        url = URI.parse(CONTACT_LIST_URL % [@mail_server,@sid])
+        http = open_http(url)
+        postdata = '<?xml version="1.0"?><object><array name="items"><object><string name="func">pab:searchContacts</string><object name="var"><array name="order"><object><string name="field">FN</string><boolean name="ignoreCase">true</boolean></object></array></object></object><object><string name="func">user:getSignatures</string></object><object><string name="func">pab:getAllGroups</string></object></array></object>'
+        set_header = {"Cookie" => @cookies,'Accept' => 'text/javascript','Content-Type' => 'application/xml; charset=UTF-8'}
+        resp, data = http.post("#{url.path}?#{url.query}",postdata,set_header)
+        if resp.code_type != Net::HTTPOK
           raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
         end
-				parse(data)
+        parse(data)
       end
     end
 
     private
 
     def get_mail_type(username)
-    	if username.include?("@126.com")
-    		:wy126
-    	elsif username.include?("@163.com")
-    		:wy163
-    	elsif username.include?("@yeah.net")
-    		:yeah
-    	else
-    		raise MailServerError, "there are only three mail servers that 126.com, 163.com and yeah.net. please add domain after username"
-    	end
+      if username.include?("@126.com")
+        :wy126
+      elsif username.include?("@163.com")
+        :wy163
+      elsif username.include?("@yeah.net")
+        :yeah
+      else
+        raise MailServerError, "there are only three mail servers that 126.com, 163.com and yeah.net. please add domain after username"
+      end
     end
 
     def parse(data)
-    	json_data = Contacts.parse_json(data)
-    	json_data['var'][0]['var'].map{|contactor|
-    		[contactor['FN'],contactor['EMAIL;PREF']]
-    	}
+      json_data = Contacts.parse_json(data)
+      json_data['var'][0]['var'].map{|contactor|
+        [contactor['FN'],contactor['EMAIL;PREF']]
+      }
     end
 
     def login_for_cookies
-    	data = {
-	      :type => '1',
-				:url => LoginData[:url][@mail_type],
-				:username => @login,
-				:password => @password,
-				:selType => '-1',
-				:remUser => '1',
-				:secure => 'on',
-				:verifycookie => '1',
-				:style => '-1',
-				:product => LoginData[:product][@mail_type],
-				:savelogin => '',
-				:url2 => LoginData[:url2][@mail_type]
+      data = {
+        :type => '1',
+        :url => LoginData[:url][@mail_type],
+        :username => @login,
+        :password => @password,
+        :selType => '-1',
+        :remUser => '1',
+        :secure => 'on',
+        :verifycookie => '1',
+        :style => '-1',
+        :product => LoginData[:product][@mail_type],
+        :savelogin => '',
+        :url2 => LoginData[:url2][@mail_type]
       }
       postdata = data.to_query_string
       #login and get cookie
       data, resp, cookies, forward = post(LOGIN_URL,postdata)
       @cookies = cookies
       if data.index(LoginData[:url2][@mail_type])
-      	raise AuthenticationError, "Username or password error"
+        raise AuthenticationError, "Username or password error"
       end
     end
 
     def enter_mail_server
-			#get mail server and sid
-			enter_mail_url = ENTER_MAIL_URL[@mail_type] % @login
-			data, resp, cookies, forward = get(enter_mail_url,@cookies)
-			location = resp['Location']
-			data_reg = /<a.*?(http.*?)main.jsp\?sid=(.*?)\">/
-			location_reg = /(http.*?)main.jsp\?sid=(.*)/
-			unless data.match(data_reg) || location.match(location_reg)
-				raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
-			end
-			@cookies = cookies
-			@mail_server = $1
-			@sid = $2
+      #get mail server and sid
+      enter_mail_url = ENTER_MAIL_URL[@mail_type] % @login
+      data, resp, cookies, forward = get(enter_mail_url,@cookies)
+      location = resp['Location']
+      data_reg = /<a.*?(http.*?)main.jsp\?sid=(.*?)\">/
+      location_reg = /(http.*?)main.jsp\?sid=(.*)/
+      unless data.match(data_reg) || location.match(location_reg)
+        raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
+      end
+      @cookies = cookies
+      @mail_server = $1
+      @sid = $2
     end
     TYPES[:net_ease] = NetEase
   end

data/lib/contacts/plaxo.rb

@@ -7,28 +7,28 @@ class Contacts
     ADDRESS_BOOK_URL    = "http://www.plaxo.com/po3/?module=ab&operation=viewFull&mode=normal"
     CONTACT_LIST_URL    = "http://www.plaxo.com/axis/soap/contact?_action=getContacts&_format=xml"
     PROTOCOL_ERROR      = "Plaxo 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
-      
+
     end # real_connect
-    
+
     def contacts
       getdata = "&authInfo.authByEmail.email=%s" % CGI.escape(login)
       getdata += "&authInfo.authByEmail.password=%s" % CGI.escape(password)
       data, resp, cookies, forward = get(CONTACT_LIST_URL + getdata)
-      
+
       if resp.code_type != Net::HTTPOK
         raise ConnectionError, PROTOCOL_ERROR
       end
-      
+
       parse data
     end # contacts
-    
-  private
+
+    private
     def parse(data, options={})
       doc = REXML::Document.new(data)
       code = doc.elements['//response/code'].text
-      
+
       if code == '401'
         raise AuthenticationError, "Username and password do not match"
       elsif code == '200'
@@ -50,13 +50,13 @@ class Contacts
       else
         raise ConnectionError, PROTOCOL_ERROR
       end
-      
+
     end # parse
 
   end # Plaxo
-  
+
   TYPES[:plaxo] = Plaxo
-  
+
 end # Contacts
 
 
@@ -96,7 +96,7 @@ Success
     <message>OK</message>
     <userId>77311236242</userId>
   </response>
-  
+
   <contacts>
 
     <contact>
@@ -109,7 +109,7 @@ Success
       <email1>joeblow1@mailinator.com</email1>
       <folderId>5291351</folderId>
     </contact>
-    
+
     <contact>
       <itemId>61313159</itemId>
       <displayName>Joe Blow2</displayName>
@@ -120,11 +120,11 @@ Success
       <email1>joeblow2@mailinator.com</email1>
       <folderId>5291351</folderId>
     </contact>
-    
+
   </contacts>
-  
+
   <totalCount>2</totalCount>
   <editCounter>3</editCounter>
-  
+
 </ns1:GetContactsResponse>
-=end
+=end

data/lib/contacts/sina.rb

@@ -1,35 +1,35 @@
 class Contacts
   class Sina < Base
-  	URL = "http://mail.sina.com.cn"
+    URL = "http://mail.sina.com.cn"
     LOGIN_URL = {
-    	:sina_cn => "https://mail.sina.com.cn/cgi-bin/cnlogin.php",
-    	:sina_com => "https://mail.sina.com.cn/cgi-bin/login.php"
+      :sina_cn => "https://mail.sina.com.cn/cgi-bin/cnlogin.php",
+      :sina_com => "https://mail.sina.com.cn/cgi-bin/login.php"
     }
-		LOGIN_COOKIE = {
-			:sina_cn => "sina_cn_mail_id=nonobo_t; sina_cn_mail_recid=true",
-			:sina_com => "sina_free_mail_id=fangs2; sina_free_mail_recid=true; sina_free_mail_ltype=uid; sina_vip_mail_recid=false"
-		}
-		DOMAIN = {
-			:sina_cn => 'sina.cn',
-			:sina_com => 'sina.com'
-		}
-		PROTOCOL_ERROR = "sina has changed its protocols, please upgrade this library first. you can also contact kamechb@gmail.com"
+    LOGIN_COOKIE = {
+      :sina_cn => "sina_cn_mail_id=nonobo_t; sina_cn_mail_recid=true",
+      :sina_com => "sina_free_mail_id=fangs2; sina_free_mail_recid=true; sina_free_mail_ltype=uid; sina_vip_mail_recid=false"
+    }
+    DOMAIN = {
+      :sina_cn => 'sina.cn',
+      :sina_com => 'sina.com'
+    }
+    PROTOCOL_ERROR = "sina has changed its protocols, please upgrade this library first. you can also contact kamechb@gmail.com"
 
     def initialize(login, password, options={})
-			@mail_type = get_mail_type(login)
-			super(login,password,options)
+      @mail_type = get_mail_type(login)
+      super(login,password,options)
     end
 
     def real_connect
-			login_for_cookies
-			redirect_for_location
+      login_for_cookies
+      redirect_for_location
     end
 
     def contacts
-			return @contacts if @contacts
+      return @contacts if @contacts
       if connected?
-      	data, resp, cookies, forward = get(@mail_url,@cookies)
-      	if resp.code_type != Net::HTTPOK
+        data, resp, cookies, forward = get(@mail_url,@cookies)
+        if resp.code_type != Net::HTTPOK
           raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
         end
         parse(data)
@@ -39,50 +39,51 @@ class Contacts
     private
 
     def get_mail_type(username)
-    	if username.include?("@sina.com")
-    		:sina_com
-    	elsif username.include?("@sina.cn")
-    		:sina_cn
-    	else
-    		raise MailServerError, "there are only two mail servers that sina.com and sina.cn. please add domain after username"
-    	end
+      if username.include?("@sina.com")
+        :sina_com
+      elsif username.include?("@sina.cn")
+        :sina_cn
+      else
+        raise MailServerError, "there are only two mail servers that sina.com and sina.cn. please add domain after username"
+      end
     end
 
     def parse(data)
-			data =~ /conf.*?contacts:.*?(\{.*?\}),\s*groups:/m
-			contacts = $1.gsub("&quot;",'')
-			contacts = ActiveSupport::JSON.decode(contacts)
-			contacts['contact'].map{|contactor|
-				[contactor['name'],contactor['email']]
-			}
+      #data =~ /conf.*?contacts:.*?(\{.*?\}),\s*groups:/m
+      data =~ /conf.*?contacts.*?(\{.*\}).*?groups/m
+      contacts = $1.gsub("&quot;",'')
+      contacts = ActiveSupport::JSON.decode(contacts)
+      contacts['contact'].map{|contactor|
+        [contactor['name'],contactor['email']]
+      }
     end
 
     def login_for_cookies
-    	data = {
-    		:domain => DOMAIN[@mail_type],
-				:logintype => 'uid',
-				:u => @login,
-				:psw => @password,
-				:savelogin => 'on',
-				:sshchk => 'on',
-				:ssl => 'on'
-    	}
-    	data, resp, cookies, forward = post(LOGIN_URL[@mail_type],data.to_query_string,LOGIN_COOKIE[@mail_type])
-    	login_faile_flag = %r{form.*?action.*?http.*?mail.sina.com.cn/cgi-bin/.*?login.php}m
-    	if data.match(login_faile_flag)
-    		raise AuthenticationError, "Username or password error"
-    	end
-    	data.match(/URL=(http:\/\/.*?)'>/)
-			@redirect_url = $1
-			@mail_server = @redirect_url.match(/(http:\/\/.*\..*?)\//)
-			@cookies = cookies
+      data = {
+        :domain => DOMAIN[@mail_type],
+        :logintype => 'uid',
+        :u => @login,
+        :psw => @password,
+        :savelogin => 'on',
+        :sshchk => 'on',
+        :ssl => 'on'
+      }
+      data, resp, cookies, forward = post(LOGIN_URL[@mail_type],data.to_query_string,LOGIN_COOKIE[@mail_type])
+      login_faile_flag = %r{form.*?action.*?http.*?mail.sina.com.cn/cgi-bin/.*?login.php}m
+      if data.match(login_faile_flag)
+        raise AuthenticationError, "Username or password error"
+      end
+      data.match(/URL=(http:\/\/.*?)'>/)
+      @redirect_url = $1
+      @mail_server = @redirect_url.match(/(http:\/\/.*\..*?)\//)
+      @cookies = cookies
     end
 
     def redirect_for_location
-    	data, resp, cookies, forward = get(@redirect_url,@cookies)
-    	location = resp['Location']
-    	@mail_url = location.index("http://") ? location : "#{@mail_server}#{location}"
-    	@cookies = cookies
+      data, resp, cookies, forward = get(@redirect_url,@cookies)
+      location = resp['Location']
+      @mail_url = location.index("http://") ? location : "#{@mail_server}#{location}"
+      @cookies = cookies
     end
 
     TYPES[:sina] = Sina

data/lib/contacts/sohu.rb

@@ -1,21 +1,21 @@
 class Contacts
   class Sohu < Base
-  	URL = "http://mail.sohu.com"
-  	DOMAIN = "sohu.com"
+    URL = "http://mail.sohu.com"
+    DOMAIN = "sohu.com"
     LOGIN_URL = "https://passport.sohu.com/sso/login.jsp"
     LOGIN_COOKIE = "IPLOC=CN3301; SUV=1008301317090277"
-		MAIL_URL = "http://mail.sohu.com/bapp/81/main"
-		PROTOCOL_ERROR = "sohu has changed its protocols, please upgrade this library first. you can also contact kamechb@gmail.com"
+    MAIL_URL = "http://mail.sohu.com/bapp/81/main"
+    PROTOCOL_ERROR = "sohu has changed its protocols, please upgrade this library first. you can also contact kamechb@gmail.com"
 
     def real_connect
-    	login_for_cookies
+      login_for_cookies
     end
 
     def contacts
-			return @contacts if @contacts
+      return @contacts if @contacts
       if connected?
-      	data, resp, cookies, forward = get(MAIL_URL,@cookies)
-      	if resp.code_type != Net::HTTPOK
+        data, resp, cookies, forward = get(MAIL_URL,@cookies)
+        if resp.code_type != Net::HTTPOK
           raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
         end
         parse(data)
@@ -26,32 +26,32 @@ class Contacts
 
 
     def parse(data)
-			data.match(/ADDRESSES.*?'(\{.*?\})';/m)
-			contacts = ActiveSupport::JSON.decode($1)
-			contacts['contact'].map{|contactor|
-				[contactor['nickname'],contactor['email']]
-			}
+      data.match(/ADDRESSES.*?'(\{.*?\})';/m)
+      contacts = ActiveSupport::JSON.decode($1)
+      contacts['contact'].map{|contactor|
+        [contactor['nickname'],contactor['email']]
+      }
     end
 
-		def login_for_cookies
-			data = {
-				:userid => @login,
-				:password => @password,
-				:appid => '1000',
-				:persistentcookie => '0',
-				:s => '1283173792650',
-				:b => '2',
-				:w => '1280',
-				:pwdtype => '0',
-				:v => '26'
-			}
-			data, resp, cookies, forward = get("#{LOGIN_URL}?#{data.to_query_string}",LOGIN_COOKIE)
-			login_faile_flag = %r{login_status.*?error}
-			if data.match(login_faile_flag)
-				raise AuthenticationError, "Username or password error"
-			end
-			@cookies = cookies
-		end
+    def login_for_cookies
+      data = {
+        :userid => @login,
+        :password => @password,
+        :appid => '1000',
+        :persistentcookie => '0',
+        :s => '1283173792650',
+        :b => '2',
+        :w => '1280',
+        :pwdtype => '0',
+        :v => '26'
+      }
+      data, resp, cookies, forward = get("#{LOGIN_URL}?#{data.to_query_string}",LOGIN_COOKIE)
+      login_faile_flag = %r{login_status.*?error}
+      if data.match(login_faile_flag)
+        raise AuthenticationError, "Username or password error"
+      end
+      @cookies = cookies
+    end
 
     TYPES[:sohu] = Sohu
   end

data/lib/contacts/yahoo.rb

@@ -5,15 +5,15 @@ class Contacts
     ADDRESS_BOOK_URL    = "http://address.mail.yahoo.com/?.rand=430244936"
     CONTACT_LIST_URL    = "http://address.mail.yahoo.com/?_src=&_crumb=crumb&sortfield=3&bucket=1&scroll=1&VPC=social_list&.r=time"
     PROTOCOL_ERROR      = "Yahoo 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      
+
+    def real_connect
       postdata =  ".tries=2&.src=ym&.md5=&.hash=&.js=&.last=&promo=&.intl=us&.bypass="
       postdata += "&.partner=&.u=4eo6isd23l8r3&.v=0&.challenge=gsMsEcoZP7km3N3NeI4mX"
       postdata += "kGB7zMV&.yplus=&.emailCode=&pkg=&stepid=&.ev=&hasMsgr=1&.chkP=Y&."
       postdata += "done=#{CGI.escape(URL)}&login=#{CGI.escape(login)}&passwd=#{CGI.escape(password)}"
-      
+
       data, resp, cookies, forward = post(LOGIN_URL, postdata)
-      
+
       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!")
@@ -23,24 +23,24 @@ class Contacts
       elsif cookies == ""
         raise ConnectionError, PROTOCOL_ERROR
       end
-      
+
       data, resp, cookies, forward = get(forward, cookies, LOGIN_URL)
-      
+
       if resp.code_type != Net::HTTPOK
         raise ConnectionError, PROTOCOL_ERROR
       end
-      
+
       @cookies = cookies
     end
-    
-    def contacts       
+
+    def contacts
       return @contacts if @contacts
       if connected?
         # first, get the addressbook site with the new crumb parameter
         url = URI.parse(address_book_url)
         http = open_http(url)
         resp, data = http.get("#{url.path}?#{url.query}",
-          "Cookie" => @cookies
+        "Cookie" => @cookies
         )
 
         if resp.code_type != Net::HTTPOK
@@ -53,15 +53,15 @@ class Contacts
         url = URI.parse(contact_list_url.sub("_crumb=crumb","_crumb=#{crumb}").sub("time", Time.now.to_f.to_s.sub(".","")[0...-2]))
         http = open_http(url)
         resp, more_data = http.get("#{url.path}?#{url.query}",
-          "Cookie" => @cookies,
-          "X-Requested-With" => "XMLHttpRequest",
-          "Referer" => address_book_url
+        "Cookie" => @cookies,
+        "X-Requested-With" => "XMLHttpRequest",
+        "Referer" => address_book_url
         )
 
         if resp.code_type != Net::HTTPOK
-        raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
+          raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
         end
-        
+
         if more_data =~ /"TotalABContacts":(\d+)/
           total = $1.to_i
           ((total / 50.0).ceil).times do |i|
@@ -69,25 +69,25 @@ class Contacts
             url = URI.parse(contact_list_url.sub("bucket=1","bucket=#{i}").sub("_crumb=crumb","_crumb=#{crumb}").sub("time", Time.now.to_f.to_s.sub(".","")[0...-2]))
             http = open_http(url)
             resp, more_data = http.get("#{url.path}?#{url.query}",
-              "Cookie" => @cookies,
-              "X-Requested-With" => "XMLHttpRequest",
-              "Referer" => address_book_url
+            "Cookie" => @cookies,
+            "X-Requested-With" => "XMLHttpRequest",
+            "Referer" => address_book_url
             )
 
             if resp.code_type != Net::HTTPOK
-            raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
+              raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
             end
 
             parse more_data
           end
         end
-        
+
         @contacts
       end
     end
 
-  private
-    
+    private
+
     def parse(data, options={})
       @contacts ||= []
       @contacts += Contacts.parse_json(data)["response"]["ResultSet"]["Contacts"].to_a.select{|contact|!contact["email"].to_s.empty?}.map do |contact|
@@ -96,8 +96,8 @@ class Contacts
       end if data =~ /^\{"response":/
       @contacts
     end
-    
+
   end
 
   TYPES[:yahoo] = Yahoo
-end
+end

data/lib/contacts_cn.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)+"/contacts/")
 
 require 'rubygems'
 unless Object.const_defined?('ActiveSupport')
-	require 'activesupport'
+  require 'activesupport'
 end
 require 'base'
 require 'gmail'

data/test/unit/net_ease_contact_importer_test.rb

@@ -1,5 +1,5 @@
-dir = File.dirname(__FILE__)
-require "#{dir}/../test_helper"
+dir = File.dirname(__FILE__)
+require "#{dir}/../test_helper"
 require 'contacts'
 class NetEaseContactImporterTest < ContactImporterTestCase
   def setup

data/test/unit/sina_contact_importer_test.rb

@@ -1,5 +1,5 @@
-dir = File.dirname(__FILE__)
-require "#{dir}/../test_helper"
+dir = File.dirname(__FILE__)
+require "#{dir}/../test_helper"
 require 'contacts'
 class SinaContactImporterTest < ContactImporterTestCase
   def setup

data/test/unit/test_accounts_test.rb

@@ -4,20 +4,20 @@ require "#{dir}/../test_helper"
 class TestAccountsTest < ContactImporterTestCase
   def test_test_accounts_loads_data_from_example_accounts_file
     account = TestAccounts.load(File.dirname(__FILE__) + "/../example_accounts.yml")[:gmail]
-    
+
     assert_equal :gmail, account.type
     assert_equal "<changeme>", account.username
     assert_equal "<changeme>", account.password
     assert_equal [["FirstName1 LastName1", "firstname1@example.com"], ["FirstName2 LastName2", "firstname2@example.com"]], account.contacts
   end
-  
+
   def test_test_accounts_blows_up_if_file_doesnt_exist
     assert_raise(RuntimeError) do
       TestAccounts.load("file_that_does_not_exist.yml")
     end
   end
-  
+
   def test_we_can_load_from_account_file
     assert_not_nil TestAccounts[:gmail].username
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: contacts_cn
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 2
-  - 6
-  version: 1.2.6
+  - 7
+  version: 1.2.7
 platform: ruby
 authors: 
 - Lucas Carlson
@@ -16,7 +16,7 @@ autorequire: contacts
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 +08:00
+date: 2011-12-19 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,32 +62,32 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/contacts/yahoo.rb
-- lib/contacts/hash_ext.rb
+- lib/contacts_cn.rb
+- lib/contacts/base.rb
+- lib/contacts/json_picker.rb
+- lib/contacts/gmail.rb
 - lib/contacts/sina.rb
 - lib/contacts/plaxo.rb
-- lib/contacts/aol.rb
-- lib/contacts/gmail.rb
-- lib/contacts/base.rb
 - lib/contacts/net_ease.rb
+- lib/contacts/aol.rb
+- lib/contacts/hash_ext.rb
 - lib/contacts/hotmail.rb
-- lib/contacts/json_picker.rb
+- lib/contacts/yahoo.rb
 - lib/contacts/sohu.rb
-- lib/contacts_cn.rb
-- test/example_accounts.yml
 - test/test_helper.rb
-- test/test_suite.rb
-- test/unit/hotmail_contact_importer_test.rb
+- test/unit/gmail_contact_importer_test.rb
 - test/unit/aol_contact_importer_test.rb
-- test/unit/sina_contact_importer_test.rb
-- test/unit/test_accounts_test.rb
 - test/unit/sohu_contact_importer_test.rb
 - test/unit/net_ease_contact_importer_test.rb
+- test/unit/sina_contact_importer_test.rb
 - test/unit/yahoo_csv_contact_importer_test.rb
-- test/unit/gmail_contact_importer_test.rb
+- test/unit/hotmail_contact_importer_test.rb
+- test/unit/test_accounts_test.rb
+- test/example_accounts.yml
+- test/test_suite.rb
+- README
 - Rakefile
 - LICENSE
-- README
 - examples/grab_contacts.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/contacts
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - A json parser, the gdata ruby gem
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A universal interface to grab contact list information from various providers including Yahoo, AOL, Gmail, Hotmail, 126, 163, Yeah, Sohu, Sina and Plaxo.It is extended from contacts gem.