gmail_contacts 1.0.1 → 1.1

data/History.txt

@@ -1,6 +1,18 @@
-=== 1.0.0 / 2009-04-08
+=== 1.1 / 2009-04-30
 
-* 1 major enhancement
+* 1 minor enhancement
+  * Allow for saved session tokens
+
+* 1 bug fix
+  * Fix stubs for gdata 1.1
+
+=== 1.0.1 / 2009-04-14
 
+* 1 bug fix
+  * Fix for contacts without an email address
+
+=== 1.0 / 2009-04-08
+
+* 1 major enhancement
   * Birthday!
 

data/Rakefile

@@ -8,7 +8,7 @@ Hoe.new('gmail_contacts', GmailContacts::VERSION) do |p|
   p.rubyforge_name = 'seattlerb' # if different than lowercase project name
   p.developer 'Eric Hodel', 'drbrain@segment7.net'
 
-  p.extra_deps << ['gdata', '~> 1.0']
+  p.extra_deps << ['gdata', '~> 1.1']
   p.extra_deps << ['nokogiri', '~> 1.2']
 end
 

data/lib/gmail_contacts.rb

@@ -10,68 +10,16 @@ require 'nokogiri'
 
 class GmailContacts
 
-  VERSION = '1.0.1'
+  VERSION = '1.1'
 
-  Contact = Struct.new :title, :emails, :ims, :phone_numbers, :addresses
+  Contact = Struct.new :title, :emails, :ims, :phone_numbers, :addresses,
+                       :photo_url
 
   ##
   # Struct containing title, emails, ims, phone_numbers and addresses
 
   class Contact
 
-    def pretty_print(q) # :nodoc:
-      q.text "#{title}"
-      q.breakable
-
-      q.group 2 do
-        q.breakable
-        q.group 2, 'emails: ' do
-          emails.each_with_index do |email, i|
-            unless i == 0 then
-              q.text ','
-              q.breakable
-            end
-
-            email += " (Primary)" if i == 0
-            q.text email
-          end
-        end
-
-        q.breakable
-        q.group 2, 'ims: ' do
-          ims.each_with_index do |(address, type), i|
-            unless i == 0 then
-              q.text ','
-              q.breakable
-            end
-
-            q.text "#{address} (#{type.sub(/.*#/, '')})"
-          end
-        end
-
-        q.breakable
-        q.group 2, 'phone numbers: ' do
-          phone_numbers.each_with_index do |(number, type), i|
-            unless i == 0 then
-              q.text ','
-              q.breakable
-            end
-
-            q.text "#{number} (#{type.sub(/.*#/, '')})"
-          end
-        end
-
-        q.breakable
-        addresses.each do |address, type|
-          q.group 2, "#{type.sub(/.*#/, '')} address:\n" do
-            address = address.split("\n").each do |line|
-              q.text "#{' ' * q.indent}#{line}\n"
-            end
-          end
-        end
-      end
-    end
-
     ##
     # Returns the user's primary email address
 
@@ -121,9 +69,9 @@ class GmailContacts
   # See GData::Client::Base in the gdata gem and
   # http://code.google.com/apis/accounts/docs/AuthSub.html for more details.
 
-  def initialize(authsub_token = nil)
+  def initialize(authsub_token = nil, session_token = false)
     @authsub_token = authsub_token
-    @session_token = false
+    @session_token = session_token
 
     @id = nil
     @title = nil
@@ -154,14 +102,26 @@ class GmailContacts
 
       uri = next_uri['href']
     end
+
+    yield if block_given?
   ensure
     revoke_token if token?
   end
 
+  ##
+  # Fetches the photo data for +contact+
+
+  def fetch_photo(contact)
+    res = @contact_api.get contact.photo_url
+
+    res.body
+  end
+
   ##
   # Fetches an AuthSub session token
 
   def get_token
+    return if @session_token
     @contact_api.authsub_token = @authsub_token
     @contact_api.auth_handler.upgrade
     @session_token = true
@@ -204,7 +164,10 @@ class GmailContacts
         addresses << [address.text, address['rel']]
       end
 
-      contact = Contact.new title, emails, ims, phones, addresses
+      photo_link = entry.xpath('.//xmlns:link[@rel="http://schemas.google.com/contacts/2008/rel#photo"]').first
+      photo_url = photo_link['href'] if photo_link
+
+      contact = Contact.new title, emails, ims, phones, addresses, photo_url
 
       @contacts << contact
     end

data/lib/gmail_contacts/test_stub.rb

@@ -143,7 +143,10 @@ class GmailContacts
 
     def get_token
       if @authsub_token == 'recycled_authsub_token' then
-        raise GData::Client::AuthorizationError, 'recycled token'
+        res = GData::HTTP::Response.new
+        res.status_code = 403
+        res.body = 'recycled token'
+        raise GData::Client::AuthorizationError, res
       end
       old_get_token
       @contact_api.stub_reset

data/test/test_gmail_contacts.rb

@@ -15,26 +15,8 @@ class TestGmailContacts < Test::Unit::TestCase
                                  [%w[example http://schemas.google.com/g/2005#AIM]],
                                  [%w[999\ 555\ 1212 http://schemas.google.com/g/2005#mobile]],
                                  [["123 Any Street\nAnyTown, ZZ 99999",
-                                   "http://schemas.google.com/g/2005#home"]])
-  end
-
-  def test_contact_pretty_print
-    str = ''
-    PP.pp @eric, str
-
-    expected = <<-EXPECTED
-Eric
-
-  emails: eric@example.com (Primary), eric@example.net
-  ims: example (AIM)
-  phone numbers: 999 555 1212 (mobile)
-  home address:
-    123 Any Street
-    AnyTown, ZZ 99999
-
-    EXPECTED
-
-    assert_equal expected, str
+                                   "http://schemas.google.com/g/2005#home"]],
+                                 "http://www.google.com/m8/feeds/photos/media/eric%40example.com/18")
   end
 
   def test_fetch
@@ -57,7 +39,8 @@ Eric
 
   def test_fetch_forbidden
     @api.stub_data << proc do
-      raise GData::Client::AuthorizationError
+      res = GData::HTTP::Response.new
+      raise GData::Client::AuthorizationError, res
     end
 
     assert_raise GData::Client::AuthorizationError do
@@ -74,6 +57,14 @@ Eric
     assert @api.auth_handler.revoked?
   end
 
+  def test_fetch_photo
+    @api.stub_data << 'THIS IS A PHOTO!'
+
+    photo = @gc.fetch_photo @eric
+
+    assert_equal 'THIS IS A PHOTO!', photo
+  end
+
   def test_parse
     @gc.parse Nokogiri::XML(GmailContacts::TestStub::CONTACTS)
 
@@ -82,8 +73,11 @@ Eric
     assert_equal 'drbrain', @gc.author_name
     assert_equal 'eric@example.com', @gc.author_email
 
+    photo_url = 'http://www.google.com/m8/feeds/photos/media/eric%40example.com/0'
+
     expected = [
-      GmailContacts::Contact.new('Sean', %w[sean@example.com], [], [], []),
+      GmailContacts::Contact.new('Sean', %w[sean@example.com], [], [], [],
+                                 photo_url),
       @eric
     ]
 
@@ -99,10 +93,15 @@ Eric
     assert_equal 'drbrain', @gc.author_name
     assert_equal 'eric@example.com', @gc.author_email
 
+    sean_photo_url = "http://www.google.com/m8/feeds/photos/media/eric%40example.com/0"
+    coby_photo_url = "http://www.google.com/m8/feeds/photos/media/eric%40example.com/5834fb5d0b47bfd7"
+
     expected = [
-      GmailContacts::Contact.new('Sean', %w[sean@example.com], [], [], []),
+      GmailContacts::Contact.new('Sean', %w[sean@example.com], [], [], [],
+                                 sean_photo_url),
       @eric,
-      GmailContacts::Contact.new('Coby', %w[coby@example.com], [], [], []),
+      GmailContacts::Contact.new('Coby', %w[coby@example.com], [], [], [],
+                                 coby_photo_url),
     ]
 
     assert_equal expected, @gc.contacts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gmail_contacts
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: "1.1"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -30,7 +30,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2009-04-14 00:00:00 -07:00
+date: 2009-05-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.0"
+        version: "1.1"
     version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.1.2162
+rubygems_version: 1.3.2.2179
 signing_key: 
 specification_version: 3
 summary: Simple Gmail contacts extraction using GData