gmail_contacts 1.1 → 1.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.2 / 2009-05-05
+
+* 2 minor enhancements
+  * Allow for saved session tokens in GmailContacts#fetch
+  * Switched to minitest
+
 === 1.1 / 2009-04-30
 
 * 1 minor enhancement

data/Rakefile

@@ -8,8 +8,11 @@ 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.testlib = :minitest
+
   p.extra_deps << ['gdata', '~> 1.1']
   p.extra_deps << ['nokogiri', '~> 1.2']
+  p.extra_dev_deps << ['minitest', '~> 1.3']
 end
 
 # vim: syntax=Ruby

data/lib/gmail_contacts.rb

@@ -10,7 +10,7 @@ require 'nokogiri'
 
 class GmailContacts
 
-  VERSION = '1.1'
+  VERSION = '1.2'
 
   Contact = Struct.new :title, :emails, :ims, :phone_numbers, :addresses,
                        :photo_url
@@ -85,7 +85,7 @@ class GmailContacts
   ##
   # Fetches contacts from google for +email+.
 
-  def fetch(email)
+  def fetch(email, revoke = true)
     get_token
 
     uri = "http://www.google.com/m8/feeds/contacts/#{email}/full"
@@ -105,7 +105,7 @@ class GmailContacts
 
     yield if block_given?
   ensure
-    revoke_token if token?
+    revoke_token if revoke and token?
   end
 
   ##

data/lib/gmail_contacts/test_stub.rb

@@ -186,10 +186,12 @@ class GData::Client::Contacts
   def authsub_token=(token)
     @stub_token = token
     auth_handler = Object.new
-    def auth_handler.upgrade() @upgraded = true end
-    def auth_handler.upgraded?() @upgraded end
+    auth_handler.instance_variable_set :@revoked, nil
+    auth_handler.instance_variable_set :@upgraded, nil
     def auth_handler.revoke() @revoked = true end
     def auth_handler.revoked?() @revoked end
+    def auth_handler.upgrade() @upgraded = true end
+    def auth_handler.upgraded?() @upgraded end
     self.auth_handler = auth_handler
   end
 

data/test/test_gmail_contacts.rb

@@ -1,9 +1,10 @@
-require 'test/unit'
+require 'rubygems'
+require 'minitest/autorun'
 require 'gmail_contacts'
 require 'gmail_contacts/test_stub'
 require 'pp'
 
-class TestGmailContacts < Test::Unit::TestCase
+class TestGmailContacts < MiniTest::Unit::TestCase
 
   def setup
     @gc = GmailContacts.new 'token'
@@ -43,7 +44,7 @@ class TestGmailContacts < Test::Unit::TestCase
       raise GData::Client::AuthorizationError, res
     end
 
-    assert_raise GData::Client::AuthorizationError do
+    assert_raises GData::Client::AuthorizationError do
       @gc.fetch 'notme@example.com'
     end
 
@@ -57,6 +58,24 @@ class TestGmailContacts < Test::Unit::TestCase
     assert @api.auth_handler.revoked?
   end
 
+  def test_fetch_no_revoke
+    @api.stub_data << GmailContacts::TestStub::CONTACTS
+    @api.stub_data << GmailContacts::TestStub::CONTACTS2
+
+    @gc.fetch 'eric@example.com', false
+
+    assert_equal 3, @gc.contacts.length
+
+    assert_equal 2, @api.stub_urls.length
+    assert_equal 'http://www.google.com/m8/feeds/contacts/eric@example.com/full',
+                 @api.stub_urls.shift
+    assert_equal 'http://www.google.com/m8/feeds/contacts/eric%40example.com/full?start-index=3&max-results=2',
+                 @api.stub_urls.shift
+
+    assert @api.auth_handler.upgraded?
+    refute @api.auth_handler.revoked?
+  end
+
   def test_fetch_photo
     @api.stub_data << 'THIS IS A PHOTO!'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gmail_contacts
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  version: "1.2"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -30,7 +30,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2009-05-01 00:00:00 -07:00
+date: 2009-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.2"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.3"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -112,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.2.2179
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: Simple Gmail contacts extraction using GData