yehezkielbs-contacts 1.2.14 → 1.2.15

data/lib/contacts/base.rb

@@ -14,6 +14,7 @@ class Contacts
     def initialize(login, password, options={})
       @login = login
       @password = password
+      @oauth_info = (options[:oauth_info] && options[:oauth_info].size > 0) ? options[:oauth_info] : nil
       @captcha_token = options[:captcha_token]
       @captcha_response = options[:captcha_response]
       @connections = {}
@@ -21,7 +22,9 @@ class Contacts
     end
 
     def connect
-      raise AuthenticationError, "Login and password must not be nil, login: #{@login.inspect}, password: #{@password.inspect}" if @login.nil? || @login.empty? || @password.nil? || @password.empty?
+      unless @oauth_info
+        raise AuthenticationError, "Login and password must not be nil, login: #{@login.inspect}, password: #{@password.inspect}" if @login.nil? || @login.empty? || @password.nil? || @password.empty?
+      end
       real_connect
     end
 

data/lib/contacts/gmail.rb

@@ -3,7 +3,7 @@ require 'gdata'
 class Contacts
   class Gmail < Base
     
-    CONTACTS_SCOPE = 'http://www.google.com/m8/feeds/'
+    CONTACTS_SCOPE = 'https://www.google.com/m8/feeds/'
     CONTACTS_FEED = CONTACTS_SCOPE + 'contacts/default/full/?max-results=1000'
     
     def contacts
@@ -12,10 +12,27 @@ class Contacts
     
     def real_connect
       gclient = GData::Client::Contacts.new
-      gclient.clientlogin(@login, @password, @captcha_token, @captcha_response)
-      
-      feed = gclient.get(CONTACTS_FEED).to_xml
-      
+
+      if (@oauth_info)
+        gclient.oauth_info = @oauth_info
+      else
+        gclient.clientlogin(@login, @password, @captcha_token, @captcha_response)
+      end
+
+      begin
+        response = gclient.get(CONTACTS_FEED)
+      rescue GData::Client::AuthorizationError
+        # if oauth fails, try username & password
+        if @oauth_info && @login && @password
+          gclient.clientlogin(@login, @password, @captcha_token, @captcha_response)
+          response = gclient.get(CONTACTS_FEED)
+        else
+          raise
+        end
+      end
+
+      feed = response.to_xml
+
       @contacts = feed.elements.to_a('entry').collect do |entry|
         title, email = entry.elements['title'].text, nil
         entry.elements.each('gd:email') do |e|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yehezkielbs-contacts
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 2
-  - 14
-  version: 1.2.14
+  - 15
+  version: 1.2.15
 platform: ruby
 authors: 
 - Lucas Carlson
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-24 00:00:00 Z
+date: 2012-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -38,19 +38,19 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: gdata
+  name: yehezkielbs-gdata
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 23
         segments: 
         - 1
         - 1
-        - 1
-        version: 1.1.1
+        - 2
+        version: 1.1.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: grab contacts from Yahoo, AOL, Gmail, Hotmail, Plaxo, GMX.net, Web.de, inbox.lt, seznam.cz, t-online.de