contacts 1.2.1 → 1.2.2

data/README

@@ -42,6 +42,9 @@ See the examples/ directory.
 * Glenn Sidney from Glenn Fu (mailto:glenn@glennfu.com) - http://glennfu.com
 * Brian McQuay from Onomojo (mailto:brian@onomojo.com) - http://onomojo.com
 * Adam Hunter (mailto:adamhunter@me.com) - http://adamhunter.me/
+* Glenn Ford (mailto:glenn@glennfu.com) - http://www.glennfu.com/
+* Leonardo Wong (mailto:mac@boy.name)
+* Rusty Burchfield
 
 This library is released under the terms of the BSD.
 

data/lib/contacts/aol.rb

@@ -1,12 +1,3 @@
-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
   require 'hpricot'
   require 'csv'
@@ -53,12 +44,12 @@ 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]
@@ -68,19 +59,19 @@ class Contacts
       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, postdata.to_query_string, cookies, LOGIN_REFERER_URL) + [LOGIN_REFERER_URL]
+      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]
@@ -97,20 +88,20 @@ 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
@@ -118,7 +109,7 @@ class Contacts
         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|
@@ -126,7 +117,7 @@ class Contacts
         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
@@ -147,7 +138,14 @@ class Contacts
         ["#{person[0]} #{person[1]}", person[4]] if person[4] && !person[4].empty?
       end.compact
     end    
+ 
+    def h_to_query_string(hash)
+      u = ERB::Util.method(:u)
+      hash.map { |k, v|
+        u.call(k) + "=" + u.call(v)
+      }.join("&")
+    end
   end
-
+ 
   TYPES[:aol] = Aol
 end

data/lib/contacts/base.rb

@@ -9,7 +9,7 @@ require "erb"
 
 class Contacts
   TYPES = {}
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
   
   class Base
     def initialize(login, password)
@@ -167,14 +167,14 @@ class Contacts
     
     def uncompress(resp, data)
       case resp.response['content-encoding']
-      when 'gzip':
+      when 'gzip'
         gz = Zlib::GzipReader.new(StringIO.new(data))
         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
-      when 'deflate':
+      when 'deflate'
         data = Zlib::Inflate.inflate(data)
         resp.response['content-encoding'] = nil
       end

data/lib/contacts/hotmail.rb

@@ -98,7 +98,7 @@ class Contacts
             c_info[2]
           end
           
-          go = resp.body.include?("Next page")
+          go = resp.body.include?("ContactList_next")
           index += 1
         end
         

data/lib/contacts/yahoo.rb

@@ -94,7 +94,7 @@ class Contacts
     
     def parse(data, options={})
       @contacts ||= []
-      if data =~ /var InitialContacts = (\[.*?\])/
+      if data =~ /var InitialContacts = (\[.*?\]);/
         @contacts += Contacts.parse_json($1).select{|contact|!contact["email"].to_s.empty?}.map{|contact|[contact["contactName"], contact["email"]]}
       elsif data =~ /^\{"response":/
         @contacts +=  Contacts.parse_json(data)["response"]["ResultSet"]["Contacts"].to_a.select{|contact|!contact["email"].to_s.empty?}.map{|contact|[contact["contactName"], contact["email"]]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: contacts
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Lucas Carlson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-06 00:00:00 -07:00
+date: 2010-01-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.1
     version: 
-description: A universal interface to grab contact list information from various providers including Yahoo, Gmail, Hotmail, and Plaxo.
+description: A universal interface to grab contact list information from various providers including Yahoo, AOL, Gmail, Hotmail, and Plaxo.
 email: lucas@rufy.com
 executables: []
 
@@ -80,6 +80,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: A universal interface to grab contact list information from various providers including Yahoo, Gmail, Hotmail, and Plaxo.
+summary: A universal interface to grab contact list information from various providers including Yahoo, AOL, Gmail, Hotmail, and Plaxo.
 test_files: []