contacts_cn 1.2.5 → 1.2.6

data/Rakefile

@@ -71,7 +71,7 @@ spec = Gem::Specification.new do |s|
 
   #### Author and project details.
 
-  s.authors = ["Lucas Carlson", "Wolfer"]
+  s.authors = ["Lucas Carlson", "kame"]
   s.email = ["lucas@rufy.com,","kamechb@gmail.com"]
   s.homepage = "http://rubyforge.org/projects/contacts"
 end

data/examples/grab_contacts.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__)+"/../lib/contacts_cn"
-=begin
+
 login = ARGV[0]
 password = ARGV[1]
-
+#login is your email
 Contacts::Gmail.new(login, password).contacts
 
 Contacts.new(:gmail, login, password).contacts
@@ -10,6 +10,14 @@ Contacts.new(:gmail, login, password).contacts
 Contacts.new("gmail", login, password).contacts
 
 Contacts.guess(login, password).contacts
-=end
 
-p Contacts.new(:sina,'nonobo_t@sina.cn','123456').contacts
+Contacts.new(:yahoo,login,password).contacts
+
+Contacts.new(:hotmail,login,password).contacts
+
+#net_ease support 163.com, 126.com, yeah.net
+Contacts.new(:net_ease,login,password).contacts
+
+Contacts.new(:sina,login,password).contacts
+
+Contacts.new(:sohu,login,password).contacts

data/lib/contacts/base.rb

@@ -9,7 +9,7 @@ require "erb"
 
 class Contacts
   TYPES = {}
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 
   class Base
     def initialize(login, password, options={})

data/lib/contacts/net_ease.rb

@@ -102,7 +102,10 @@ class Contacts
 			#get mail server and sid
 			enter_mail_url = ENTER_MAIL_URL[@mail_type] % @login
 			data, resp, cookies, forward = get(enter_mail_url,@cookies)
-			unless data.match(/<a.*?(http.*?)main.jsp\?sid=(.*?)\">/)
+			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

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: contacts_cn
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 2
-  - 5
-  version: 1.2.5
+  - 6
+  version: 1.2.6
 platform: ruby
 authors: 
 - Lucas Carlson
-- Wolfer
+- kame
 autorequire: contacts
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 +08:00
+date: 2011-03-03 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency