contacts 1.0.19 → 1.2.0

data/README

@@ -1,12 +1,12 @@
 == Welcome to Contacts
 
-Contacts is a universal interface to grab contact list information from various providers including Hotmail, Gmail and Yahoo.
+Contacts is a universal interface to grab contact list information from various providers including Hotmail, AOL, Gmail and Yahoo.
 
 == Download
 
 * gem install contacts
-* http://rubyforge.org/projects/contacts
-* svn co svn://rubyforge.org/var/svn/contacts
+* http://github.com/cardmagic/contacts
+* git clone git://github.com/cardmagic/contacts.git
 
 == Background
 
@@ -40,6 +40,7 @@ See the examples/ directory.
 * 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
+* Brian McQuay from Onomojo (mailto:brian@onomojo.com) - http://onomojo.com
 
 This library is released under the terms of the BSD.
 

data/Rakefile

@@ -43,7 +43,7 @@ spec = Gem::Specification.new do |s|
 
   #### Basic information.
 
-  s.name = 'contacts'
+  s.name = 'adamhunter-contacts'
   s.version = PKG_VERSION
   s.summary = <<-EOF
    Ridiculously easy contact list information from various providers including Yahoo, Gmail, and Hotmail
@@ -62,7 +62,8 @@ spec = Gem::Specification.new do |s|
   s.autorequire = 'contacts'
 
   s.add_dependency('json', '>= 0.4.1')
-  s.requirements << "A json parser"
+  s.add_dependency('gdata', '= 1.1.1')
+  s.requirements << "A json parser, the gdata ruby gem"
 
   #### Documentation and testing.
 

data/lib/contacts.rb

@@ -1,9 +1,11 @@
 $:.unshift(File.dirname(__FILE__)+"/contacts/")
 
 require 'rubygems'
+
 require 'base'
 require 'gmail'
 require 'hotmail'
 require 'yahoo'
 require 'plaxo'
-require 'aol'
+require 'aol'
+require 'json_picker'

data/lib/contacts/base.rb

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

data/lib/contacts/gmail.rb

@@ -1,97 +1,35 @@
-# Use ActiveSupport's version of JSON if available
-if Object.const_defined?('ActiveSupport') && ActiveSupport.const_defined?('JSON') && ActiveSupport::JSON.is_a?(Class)
-  class JSON
-    def self.parse(i)
-      ActiveSupport::JSON.decode(i)
-    end
-  end
-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
+require 'gdata'
 
 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%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 = {
-        "Email" => login,
-        "Passwd" => password,
-        "PersistentCookie" => "yes",
-        "asts" => "",
-        "rmShown" => "1",
-        "signIn" => CGI.escape("Sign in")
-      }
-            
-      # 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"]
-
-      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"
-      elsif data.index("Required field must not be blank")
-        raise AuthenticationError, "Login and password must not be blank"
-      elsif data.index("errormsg_0_logincaptcha")
-        raise AuthenticationError, "Captcha error"
-      elsif data.index("Invalid request")
-        raise ConnectionError, PROTOCOL_ERROR
-      elsif cookies == ""
-        raise ConnectionError, PROTOCOL_ERROR
-      end
-      
-      cookies = remove_cookie("LSID", cookies)
-      cookies = remove_cookie("GV", cookies)
-
-      @cookies = cookies
-    end
+    CONTACTS_SCOPE = 'http://www.google.com/m8/feeds/'
+    CONTACTS_FEED = CONTACTS_SCOPE + 'contacts/default/full/?max-results=1000'
     
-  private
+    def contacts
+      return @contacts if @contacts
+    end
     
-    def parse(data, options)
-      data.gsub!(/^while \(true\); &&&START&&&/, '')
-      data.gsub!(/ &&&END&&&$/, '')
-      data.gsub!(/\t/, ' ') # tabs in the note field cause errors with JSON.parse
-      data.gsub!(/[\t\x00-\x1F]/, " ") # strip control characters
+    def real_connect
+      @client = GData::Client::Contacts.new
+      @client.clientlogin(@login, @password)
       
-      @contacts = JSON.parse(data)['Body']['Contacts'] || {}
-
-      # Determine in which format to return the data.
+      feed = @client.get(CONTACTS_FEED).to_xml
       
-      # Return the full JSON Hash. 
-      return @contacts if(options[:details])
-
-      # Default format.
-      # ['Name', 'Email1', 'Email2', ...]
-      if @contacts != nil
-        @contacts = @contacts.select {|c| !c["Emails"].nil?}.map do |c|
-          name, emails = c.values_at "Name", "Emails"
-          # emails are returned in a form of
-          # [{"Address"=>"home.email@gmail.com"}, {"Type"=>{"Id"=>"WORK"}, "Address"=>"work.email@gmail.com"}]
-          emails = emails.collect{|a| a.values_at("Address")}
-          [name, emails].flatten
+      @contacts = feed.elements.to_a('entry').collect do |entry|
+        title, email = entry.elements['title'].text, nil
+        entry.elements.each('gd:email') do |e|
+          email = e.attribute('address').value if e.attribute('primary')
         end
-      else
-        []
+        [title, email] unless email.nil?
       end
-    end    
+      @contacts.compact!
+    rescue GData::Client::AuthorizationError => e
+      raise AuthenticationError, "Username or password are incorrect"
+    end
+    
+    private
+    
+    TYPES[:gmail] = Gmail
   end
-
-  TYPES[:gmail] = Gmail
 end

data/lib/contacts/json_picker.rb

@@ -0,0 +1,16 @@
+if !Object.const_defined?('ActiveSupport')
+  require 'json'
+end
+
+class Contacts
+  def self.parse_json( string )
+    if Object.const_defined?('ActiveSupport') and
+       ActiveSupport.const_defined?('JSON')
+      ActiveSupport::JSON.decode( string )
+    elsif Object.const_defined?('JSON')
+      JSON.parse( string )
+    else
+      raise 'Contacts requires JSON or Rails (with ActiveSupport::JSON)'
+    end
+  end
+end

data/lib/contacts/yahoo.rb

@@ -1,14 +1,3 @@
-# Use ActiveSupport's version of JSON if available
-if Object.const_defined?('ActiveSupport') && ActiveSupport.const_defined?('JSON') && ActiveSupport::JSON.is_a?(Class)
-  class JSON
-    def self.parse(i)
-      ActiveSupport::JSON.decode(i)
-    end
-  end
-else
-  require 'json/add/rails'
-end
-
 class Contacts
   class Yahoo < Base
     URL                 = "http://mail.yahoo.com/"
@@ -106,9 +95,9 @@ class Contacts
     def parse(data, options={})
       @contacts ||= []
       if data =~ /var InitialContacts = (\[.*?\])/
-        @contacts += JSON.parse($1).select{|contact|!contact["email"].to_s.empty?}.map{|contact|[contact["contactName"], contact["email"]]}
+        @contacts += Contacts.parse_json($1).select{|contact|!contact["email"].to_s.empty?}.map{|contact|[contact["contactName"], contact["email"]]}
       elsif data =~ /^\{"response":/
-        @contacts +=  JSON.parse(data)["response"]["ResultSet"]["Contacts"].to_a.select{|contact|!contact["email"].to_s.empty?}.map{|contact|[contact["contactName"], contact["email"]]}
+        @contacts +=  Contacts.parse_json(data)["response"]["ResultSet"]["Contacts"].to_a.select{|contact|!contact["email"].to_s.empty?}.map{|contact|[contact["contactName"], contact["email"]]}
       else
         @contacts
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: contacts
 version: !ruby/object:Gem::Version 
-  version: 1.0.19
+  version: 1.2.0
 platform: ruby
 authors: 
 - Lucas Carlson
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: gdata
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !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.
 email: lucas@rufy.com
 executables: []
@@ -37,6 +47,7 @@ files:
 - examples/grab_contacts.rb
 - lib/contacts.rb
 - lib/contacts/base.rb
+- lib/contacts/json_picker.rb
 - lib/contacts/gmail.rb
 - lib/contacts/aol.rb
 - lib/contacts/hotmail.rb