adamhunter-contacts 1.1.16 → 1.1.17

data/lib/contacts/base.rb

@@ -8,7 +8,7 @@ require "thread"
 
 class Contacts
   TYPES = {}
-  VERSION = "1.1.16"
+  VERSION = "1.1.17"
   
   class Base
     def initialize(login, password)

data/lib/contacts/gmail.rb

@@ -1,93 +1,33 @@
-# Use ActiveSupport's version of JSON if available
-if Object.const_defined?('ActiveSupport') && ActiveSupport.const_defined?('JSON')
-  class JSON
-    def self.parse(i)
-      ActiveSupport::JSON.decode(i)
-    end
-  end
-else
-  require 'json/add/rails'
-end
-
 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%3Fui%3Dhtml%26zy%3Dl&ltmpl=yj_blanco&ltmplcache=2&hl=en"
-    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"
+    
+    CONTACTS_SCOPE = 'http://www.google.com/m8/feeds/'
+    CONTACTS_FEED = CONTACTS_SCOPE + 'contacts/default/full/'
+    
+    def contacts
+      return @contacts if @contacts
+      real_connect
+    end
     
     def real_connect
-      postdata =  "ltmpl=yj_blanco"
-      postdata += "&continue=%s" % CGI.escape(URL)
-      postdata += "&ltmplcache=2"
-      postdata += "&service=mail"
-      postdata += "&rm=false"
-      postdata += "&ltmpl=yj_blanco"
-      postdata += "&hl=en"
-      postdata += "&Email=%s" % CGI.escape(login)
-      postdata += "&Passwd=%s" % CGI.escape(password)
-      postdata += "&rmShown=1"
-      postdata += "&null=Sign+in"
-            
-      time =      Time.now.to_i
-      time_past = Time.now.to_i - 8 - rand(12)
-      cookie =    "GMAIL_LOGIN=T#{time_past}/#{time_past}/#{time}"
+      @client = GData::Client::Contacts.new
+      @client.clientlogin(@login, @password)
       
-      data, resp, cookies, forward, old_url = post(LOGIN_URL, postdata, cookie, LOGIN_REFERER_URL) + [LOGIN_URL]
+      feed = @client.get(CONTACTS_FEED).to_xml
       
-      cookies = remove_cookie("GMAIL_LOGIN", cookies)
-
-      if data.index("Username and password do not match") || data.index("New to Gmail? It's free and easy")
-        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
+      @contacts = []
+      feed.elements.each('entry') do |entry|
+        title = entry.elements['title'].text
+        email = nil
+        entry.elements.each('gd:email') do |e|
+          if e.attribute('primary')
+            email = e.attribute('address').value
+          end
+        end
+        @contacts << [title, email] unless email.nil?
       end
-      
-      cookies = remove_cookie("LSID", cookies)
-      cookies = remove_cookie("GV", cookies)
-
-      @cookies = cookies
+      @contacts
     end
     
-  private
-    
-    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
-
-      @contacts = JSON.parse(data)['Body']['Contacts'] || {}
-
-      # Determine in which format to return the data.
-      
-      # Return the full JSON Hash. 
-      return @contacts if(options[:details])
-
-      # Default format.
-      # ['Name', 'Email1', 'Email2', ...]
-      if @contacts != nil
-        @contacts = @contacts.delete_if {|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
-        end
-      else
-        []
-      end
-    end    
   end
-
-  TYPES[:gmail] = Gmail
 end

data/lib/contacts.rb

@@ -9,6 +9,4 @@ require 'base'
 require 'gmail'
 require 'hotmail'
 require 'yahoo'
-require 'plaxo'
-
-require 'gdatamail'
+require 'plaxo'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adamhunter-contacts
 version: !ruby/object:Gem::Version 
-  version: 1.1.16
+  version: 1.1.17
 platform: ruby
 authors: 
 - Lucas Carlson
@@ -42,7 +42,6 @@ extra_rdoc_files: []
 
 files: 
 - lib/contacts/base.rb
-- lib/contacts/gdatamail.rb
 - lib/contacts/gmail.rb
 - lib/contacts/hotmail.rb
 - lib/contacts/plaxo.rb

data/lib/contacts/gdatamail.rb

@@ -1,33 +0,0 @@
-class Contacts
-  class GDataMail < Base
-    
-    CONTACTS_SCOPE = 'http://www.google.com/m8/feeds/'
-    CONTACTS_FEED = CONTACTS_SCOPE + 'contacts/default/full/'
-    
-    def contacts
-      return @contacts if @contacts
-      real_connect
-    end
-    
-    def real_connect
-      @client = GData::Client::Contacts.new
-      @client.clientlogin(@login, @password)
-      
-      feed = @client.get(CONTACTS_FEED).to_xml
-      
-      @contacts = []
-      feed.elements.each('entry') do |entry|
-        title = entry.elements['title'].text
-        email = nil
-        entry.elements.each('gd:email') do |e|
-          if e.attribute('primary')
-            email = e.attribute('address').value
-          end
-        end
-        @contacts << [title, email] unless email.nil?
-      end
-      @contacts
-    end
-    
-  end
-end