aeden-contacts 0.2.18 → 0.2.19

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 18
+:patch: 19
 :major: 0

data/lib/contacts/yahoo.rb

@@ -105,9 +105,13 @@ module Contacts
     # * path <String>:: The path of the redirect request that Yahoo sent to you
     # after authenticating the user
     #
-    def contacts(path)
+    def contacts(token)
       begin
-        validate_signature(path)
+        if token.is_a?(YahooToken)
+          @token = token.token
+        else
+          validate_signature(token)
+        end
         credentials = access_user_credentials()
         parse_credentials(credentials)
         contacts_json = access_address_book_api()
@@ -213,10 +217,11 @@ module Contacts
     def self.parse_contacts(json)
       contacts = []
       people = JSON.parse(json)
-
       people['contacts'].each do |contact|
         name = nil
         email = nil
+        firstname = nil
+        lastname = nil
         contact['fields'].each do |field|
           case field['type']
           when 'email'
@@ -225,12 +230,23 @@ module Contacts
           when 'name'
             name = "#{field['first']} #{field['last']}"
             name.strip!
+            lastname = field['last']
+            firstname = field['first']
           end
         end
-        contacts.push Contact.new(email, name)
+        yahoo_contact = Contact.new(email, name, nil, firstname, lastname)
+        yahoo_contact.service_id = contact['cid']
+
+        contacts.push yahoo_contact
       end
       return contacts
     end
 
   end
+  class YahooToken
+    attr_reader :token
+    def initialize(token)
+      @token = token
+    end
+  end
 end

data/spec/yahoo/yahoo_spec.rb

@@ -20,11 +20,11 @@ describe Contacts::Yahoo do
     redirect_path = '/?appid=i%3DB%26p%3DUw70JGIdHWVRbpqYItcMw--&token=AB.KoEg8vBwvJKFkwfcDTJEMKhGeAD6KhiDe0aZLCvoJzMeQG00-&appdata=&ts=1218501215&sig=d381fba89c7e9d3c14788720733c3fbf'
                             
     results = @yahoo.contacts(redirect_path)
-    results.should have_contact('Hugo Barauna', 'hugo.barauna@gmail.com')
-    results.should have_contact('Nina Benchimol', 'nina@hotmail.com')
-    results.should have_contact('Andrea Dimitri', 'and@yahoo.com')
-    results.should have_contact('Ricardo Fiorelli', 'ricardo@poli.usp.br')
-    results.should have_contact('Priscila', 'pizinha@yahoo.com.br')
+    results.should have_contact('Hugo Barauna', 'hugo.barauna@gmail.com', 4)
+    results.should have_contact('Nina Benchimol', 'nina@hotmail.com', 5)
+    results.should have_contact('Andrea Dimitri', 'and@yahoo.com',1)
+    results.should have_contact('Ricardo Fiorelli', 'ricardo@poli.usp.br',3)
+    results.should have_contact('Priscila', 'pizinha@yahoo.com.br', 2)
   end
 
   it 'should validate yahoo redirect signature' do
@@ -57,11 +57,11 @@ describe Contacts::Yahoo do
   it 'should parse the contacts json response' do
     json = read_file('yh_contacts.txt')
     
-    Contacts::Yahoo.parse_contacts(json).should have_contact('Hugo Barauna', 'hugo.barauna@gmail.com')
-    Contacts::Yahoo.parse_contacts(json).should have_contact('Nina Benchimol', 'nina@hotmail.com')
-    Contacts::Yahoo.parse_contacts(json).should have_contact('Andrea Dimitri', 'and@yahoo.com')
-    Contacts::Yahoo.parse_contacts(json).should have_contact('Ricardo Fiorelli', 'ricardo@poli.usp.br')
-    Contacts::Yahoo.parse_contacts(json).should have_contact('Priscila', 'pizinha@yahoo.com.br')
+    Contacts::Yahoo.parse_contacts(json).should have_contact('Hugo Barauna', 'hugo.barauna@gmail.com', 4)
+    Contacts::Yahoo.parse_contacts(json).should have_contact('Nina Benchimol', 'nina@hotmail.com', 5)
+    Contacts::Yahoo.parse_contacts(json).should have_contact('Andrea Dimitri', 'and@yahoo.com', 1)
+    Contacts::Yahoo.parse_contacts(json).should have_contact('Ricardo Fiorelli', 'ricardo@poli.usp.br', 3)
+    Contacts::Yahoo.parse_contacts(json).should have_contact('Priscila', 'pizinha@yahoo.com.br', 2)
   end
 
   it 'should can be initialized by a YAML file' do
@@ -73,10 +73,10 @@ describe Contacts::Yahoo do
     File.open(@path + file, 'r+').read
   end
 
-  def have_contact(name, email)
+  def have_contact(name, email, cid)
     matcher_class = Class.new()
     matcher_class.instance_eval do 
-      define_method(:matches?) {|some_contacts| some_contacts.any? {|a_contact| a_contact.name == name && a_contact.emails.include?(email)}}
+      define_method(:matches?) {|some_contacts| some_contacts.any? {|a_contact| a_contact.name == name && a_contact.emails.include?(email) && a_contact.service_id == cid}}
     end
     matcher_class.new
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aeden-contacts
 version: !ruby/object:Gem::Version 
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors: 
 - "Mislav Marohni\xC6\x92\xC3\xA1"
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-10 00:00:00 -07:00
+date: 2009-07-23 00:00:00 -07:00
 default_executable: 
 dependencies: []