liangzan-contacts 1.2.9 → 1.2.10

data/lib/contacts/base.rb

@@ -34,7 +34,7 @@ class Contacts
       if connected?
         url = URI.parse(contact_list_url)
         http = open_http(url)
-        resp, data = http.get("#{url.path}?#{url.query}",
+        resp = http.get("#{url.path}?#{url.query}",
           "Cookie" => @cookies
         )
 
@@ -42,7 +42,7 @@ class Contacts
           raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
         end
 
-        parse(data, options)
+        parse(resp.body, options)
       end
     end
 
@@ -142,8 +142,8 @@ class Contacts
         "Content-Type" => 'application/x-www-form-urlencoded'
       }
       http_header.reject!{|k, v| k == 'Accept-Encoding'} if skip_gzip?
-      resp, data = http.post(url.path, postdata, http_header)
-      data = uncompress(resp, data)
+      resp = http.post(url.path, postdata, http_header)
+      data = uncompress(resp)
       cookies = parse_cookies(resp.response['set-cookie'], cookies)
       forward = resp.response['Location']
       forward ||= (data =~ /<meta.*?url='([^']+)'/ ? CGI.unescapeHTML($1) : nil)
@@ -156,13 +156,13 @@ class Contacts
     def get(url, cookies="", referer="")
       url = URI.parse(url)
       http = open_http(url)
-      resp, data = http.get("#{url.path}?#{url.query}",
+      resp = 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
       )
-      data = uncompress(resp, data)
+      data = uncompress(resp)
       cookies = parse_cookies(resp.response['set-cookie'], cookies)
       forward = resp.response['Location']
     if (not forward.nil?) && URI.parse(forward).host.nil?
@@ -171,7 +171,8 @@ class Contacts
       return data, resp, cookies, forward
     end
 
-    def uncompress(resp, data)
+    def uncompress(resp)
+      data = resp.body
       case resp.response['content-encoding']
       when 'gzip'
         gz = Zlib::GzipReader.new(StringIO.new(data))
@@ -210,7 +211,12 @@ class Contacts
   end
 
   def self.guess(login, password, options={})
-    TYPES.inject([]) do |a, t|
+    if keys = options[:types]
+      types = TYPES.select{|k, v| keys.include?(k)}
+    end
+    types ||= TYPES
+
+    types.inject([]) do |a, t|
       begin
         a + t[1].new(login, password, options).contacts
       rescue AuthenticationError

data/lib/contacts/hotmail.rb

@@ -62,6 +62,9 @@ class Contacts
         url = URI.parse(contact_list_url)
         data, resp, cookies, forward = get(get_contact_list_url, @cookies )
 
+
+        data.force_encoding('ISO-8859-1')
+
         @contacts = CSV.parse(data, {:headers => true, :col_sep => data[7]}).map do |row|
           name = ""
           name = row["First Name"] if !row["First Name"].nil?

data/lib/contacts/yahoo.rb

@@ -41,7 +41,7 @@ class Contacts
         # 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}",
+        resp = http.get("#{url.path}?#{url.query}",
           "Cookie" => @cookies
         )
 
@@ -49,12 +49,12 @@ class Contacts
           raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
         end
 
-        crumb = data.to_s[/dotCrumb:   '(.*?)'/][13...-1]
+        crumb = resp.body.to_s[/dotCrumb:   '(.*?)'/][13...-1]
 
         # now proceed with the new ".crumb" parameter to get the csv data
         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}",
+        resp = http.get("#{url.path}?#{url.query}",
           "Cookie" => @cookies,
           "X-Requested-With" => "XMLHttpRequest",
           "Referer" => address_book_url
@@ -64,13 +64,13 @@ class Contacts
         raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
         end
 
-        if more_data =~ /"TotalABContacts":(\d+)/
+        if resp.body =~ /"TotalABContacts":(\d+)/
           total = $1.to_i
           ((total / 50.0).ceil).times do |i|
             # now proceed with the new ".crumb" parameter to get the csv data
             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}",
+            resp = http.get("#{url.path}?#{url.query}",
               "Cookie" => @cookies,
               "X-Requested-With" => "XMLHttpRequest",
               "Referer" => address_book_url
@@ -80,7 +80,7 @@ class Contacts
             raise ConnectionError, self.class.const_get(:PROTOCOL_ERROR)
             end
 
-            parse more_data
+            parse resp.body
           end
         end
 

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: liangzan-contacts
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
   prerelease: 
 platform: ruby
 authors:
 - Lucas Carlson
 - Brad Imbierowicz
 - Wong Liang Zan
+- Mateusz Konikowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000Z
+date: 2012-03-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &11509120 !ruby/object:Gem::Requirement
+  requirement: &8102920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +24,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *11509120
+  version_requirements: *8102920
 - !ruby/object:Gem::Dependency
   name: gdata_19
-  requirement: &11507380 !ruby/object:Gem::Requirement
+  requirement: &8101380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +35,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *11507380
+  version_requirements: *8101380
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &11506500 !ruby/object:Gem::Requirement
+  requirement: &8100560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,7 +46,7 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *11506500
+  version_requirements: *8100560
 description: A universal interface to grab contact list information from various providers
   including Yahoo, AOL, Gmail, Hotmail, and Plaxo. Now supporting Ruby 1.9.
 email: zan@liangzan.net