aeden-contacts 0.2.19 → 0.2.20

data/VERSION.yml

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

data/lib/contacts.rb

@@ -6,8 +6,8 @@ module Contacts
   
   # An object that represents a single contact
   class Contact
-    attr_reader :emails, :ims, :phones, :addresses, :organizations, :firstname, :lastname
-    attr_accessor :name, :username, :service_id, :note
+    attr_reader   :organizations, :firstname, :lastname
+    attr_accessor :name, :username, :service_id, :note, :emails, :ims,:phones, :addresses
     
     def initialize(email, name = nil, username = nil, firstname = nil, lastname = nil)
       @emails = []

data/lib/contacts/windows_live.rb

@@ -126,7 +126,7 @@ module Contacts
 
       response = nil
       http.start do |http|
-         request = Net::HTTP::Get.new("/users/@L@#{@consent_token.locationid}/rest/invitationsbyemail", {"Authorization" => "DelegatedToken dt=\"#{@consent_token.delegationtoken}\""})
+         request = Net::HTTP::Get.new("/users/@L@#{@consent_token.locationid}/rest/LiveContacts", {"Authorization" => "DelegatedToken dt=\"#{@consent_token.delegationtoken}\""})
          response = http.request(request)
       end
 
@@ -141,32 +141,49 @@ module Contacts
     #
     def self.parse_xml(xml)
       doc = Hpricot::XML(xml)
-
       contacts = []
-      doc.search('/livecontacts/contacts/contact').each do |contact|
-        email = contact.at('/preferredemail').inner_text
-        email.strip!
-
-        first_name = last_name = nil
-        if first_name = contact.at('/profiles/personal/firstname')
-          first_name = first_name.inner_text.strip
-        end
-
-        if last_name = contact.at('/profiles/personal/lastname')
-          last_name = last_name.inner_text.strip
-        end
+      doc.search('/LiveContacts/Contacts/Contact') do |contact|
         
-        name = nil
-        if !first_name.nil? || !last_name.nil?
-          name = "#{first_name} #{last_name}"
-          name.strip!
-        end
-        new_contact = Contact.new(email, name, nil, first_name, last_name)
-        contacts << new_contact
-      end
+          contact_id = text_value contact, "ID"
+          
+          first_name = text_value contact, "Profiles/Personal/FirstName"
+          last_name  = text_value contact, "Profiles/Personal/LastName"
+          name = "#{first_name} #{last_name}".strip
+          emails     = contact.search('Emails/Email').collect {|e| text_value e, "Address"}
+          
+          phones     = contact.search('Phones/Phone').collect do |e| 
+            type=convert_type(text_value(e, "PhoneType"))
+            { "type" => type, "value" => (text_value e, "Number") }
+          end
+          
+          addresses = contact.search('Locations/Location').collect do |e|
+            street       = text_value(e, "StreetLine")
+            postal_code  = text_value(e, "PostalCode")
+            sub_division = text_value(e, "Subdivision")
+            city         = text_value(e, "PrimaryCity")
+            country_code = text_value(e, "CountryRegion")
+            formatted    = [street, city, sub_division, postal_code, country_code].compact.join(", ")
+            type         = convert_type(text_value(e, "LocationType"))
+            { "formatted" => formatted, "type" => type, "streetAddress" => street, "locality" => city, "region" => sub_division, "postalCode" => postal_code, "country" => country_code}
+          end
 
+          new_contact = Contact.new(nil, name, nil, first_name, last_name)
+          new_contact.emails      = emails
+          new_contact.phones      = phones
+          new_contact.addresses   = addresses
+          new_contact.service_id  = contact_id
+          contacts << new_contact
+      end  
       return contacts
     end
+    
+    def self.text_value(elem,path)
+      elem.at(path).inner_text rescue nil
+    end
+    
+    def self.convert_type(t)
+      {"personal" => "home", "business" => "work"}[t.downcase] || "other"
+    end
   end
 
 end

data/lib/contacts/yahoo.rb

@@ -58,7 +58,7 @@ module Contacts
     AUTH_PATH = "/WSLogin/V1/wslogin?appid=#appid&ts=#ts"
     CREDENTIAL_PATH = "/WSLogin/V1/wspwtoken_login?appid=#appid&ts=#ts&token=#token"
     ADDRESS_BOOK_DOMAIN = "address.yahooapis.com"
-    ADDRESS_BOOK_PATH = "/v1/searchContacts?format=json&fields=name,email&appid=#appid&WSSID=#wssid"
+    ADDRESS_BOOK_PATH = "/v1/searchContacts?format=json&fields=all&appid=#appid&WSSID=#wssid"
     CONFIG_FILE = File.dirname(__FILE__) + '/../config/contacts.yml'
 
     attr_reader :appid, :secret, :token, :wssid, :cookie
@@ -213,34 +213,114 @@ module Contacts
     #
     # ==== Parameters
     # * json <String>:: A String of user's contacts in JSON format
-    #
+    # "fields": [
+    #    {
+    #        "type": "phone",
+    #        "data": "808 123 1234",
+    #        "home": true,
+    #    },
+    #    {
+    #        "type": "email",
+    #        "data": "martin.berner@mail.com",
+    #    },
+    #    
+    #    {
+    #        "type": "otherid",
+    #        "data": "windowslive@msn.com",
+    #        "msn":  true,
+    #    }
+    #  ]
+    #  
     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'
-            email = field['data']
-            email.strip!
-          when 'name'
-            name = "#{field['first']} #{field['last']}"
-            name.strip!
-            lastname = field['last']
-            firstname = field['first']
+        
+        contact_fields=Yahoo.array_to_hash contact['fields']
+
+        emails    = (contact_fields['email'] || []).collect {|e| e['data']}
+        ims       = (contact_fields['otherid'] || []).collect { |im| get_type_value(im) }
+        phones    = (contact_fields['phone'] || []).collect { |phone| get_type_value(phone) }
+        addresses = (contact_fields['address'] || []).collect do |address| 
+          type=get_type(address)
+          type = {"home" => "home", "work" => "work"}[type.downcase] || "other"
+          value = [address['street'], address['city'], address['state'], address['zip'], address['country']].compact.join(", ")
+          {"type" => type, "value" => value}
+        end
+        
+        name_field=(contact_fields['name'] || [])
+        
+        # if name is blank, try go for the yahoo id, and if that's blank too, ignore the record altogether (probably a mailing list)
+        if (name_field.empty?)
+          if contact_fields['yahooid']
+            name = contact_fields['yahooid'][0]['data']
+          else
+            next
           end
+        else
+          name_field = name_field[0]
+          name = "#{name_field['first']} #{name_field['last']}"
+          name.strip!
+          lastname = name_field['last']
+          firstname = name_field['first']
         end
-        yahoo_contact = Contact.new(email, name, nil, firstname, lastname)
+        
+        yahoo_contact            = Contact.new(nil, name, nil, firstname, lastname)
+        yahoo_contact.emails     = emails
+        yahoo_contact.ims        = ims
+        yahoo_contact.phones     = phones
+        yahoo_contact.addresses  = addresses
         yahoo_contact.service_id = contact['cid']
 
         contacts.push yahoo_contact
       end
       return contacts
     end
+    
+    #
+    # grab the type field from each array item 
+    #   and turn it into a "email"=>{}, "phone"=>{} array
+    #
+    private 
+    def self.array_to_hash(a)
+      (a || []).inject({}) {|x,y|
+        x[y['type']] ||= []
+        x[y['type']] << y
+        x
+      }
+    end
+
+    #
+    # return type/value from a datastructure like
+    # {
+    #   "data": "808 456 7890",
+    #   "mobile": true
+    # }
+    # -----> "type"=>"mobile", "value"=>"808 456 7890"
+    #
+    def self.get_type_value(hash)
+      type_field = hash.find{ |x| x[1] == true }
+      type = type_field  ? type_field[0] : nil
+      {"type" => type, "value" => hash["data"]}
+    end
+    
+    #
+    # return just the type from a datastructure like
+    # {
+    #   "data": "808 456 7890",
+    #   "mobile": true
+    # }
+    # -----> "mobile"
+    #
+    def self.get_type(hash)
+      type_field = hash.find{ |x| x[1] == true }
+      type = type_field  ? type_field[0] : nil
+    end
 
   end
   class YahooToken

data/spec/feeds/wl_full_contacts.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<LiveContacts>
+
+	<Contacts>
+		<Contact>
+			<ID>abc</ID>
+			<WindowsLiveID>beenthere@hotmail.com</WindowsLiveID>
+
+			<Profiles>
+				<Personal>
+					<FirstName>Mia</FirstName>
+					<LastName>Pia</LastName>
+					<UniqueName>mia</UniqueName>
+				</Personal>
+			</Profiles>
+			<Emails>
+				<Email>
+					<ID>1</ID>
+					<EmailType>Personal</EmailType>
+					<Address>mia@hotmail.com</Address>
+					<IsIMEnabled>false</IsIMEnabled>
+					<IsDefault>false</IsDefault>
+				</Email>
+				<Email>
+					<ID>8</ID>
+					<EmailType>WindowsLiveID</EmailType>
+					<Address>othermia@yahoo.com</Address>
+					<IsIMEnabled>true</IsIMEnabled>
+					<IsDefault>false</IsDefault>
+				</Email>
+			</Emails>
+			<Phones>
+				<Phone>
+					<ID>1</ID>
+					<PhoneType>Personal</PhoneType>
+					<Number>(123) 123 1234</Number>
+					<IsIMEnabled>false</IsIMEnabled>
+					<IsDefault>false</IsDefault>
+				</Phone>
+				<Phone>
+					<ID>3</ID>
+					<PhoneType>Mobile</PhoneType>
+					<Number>(321) 555 1234</Number>
+					<IsIMEnabled>false</IsIMEnabled>
+					<IsDefault>false</IsDefault>
+				</Phone>
+			</Phones>
+			<Locations>
+				<Location>
+					<ID>1</ID>
+					<LocationType>Personal</LocationType>
+					<StreetLine>123 Green St</StreetLine>
+					<PrimaryCity>Middleville</PrimaryCity>
+					<Subdivision>CA</Subdivision>
+					<PostalCode>92123</PostalCode>
+					<CountryRegion>USA</CountryRegion>
+					<IsDefault>false</IsDefault>
+				</Location>
+			</Locations>
+		</Contact>
+		<Contact>
+			<ID>def</ID>
+			<WindowsLiveID>marcus@hotmail.com</WindowsLiveID>
+			<Profiles>
+				<Personal>
+					<UniqueName>marcus</UniqueName>
+					<DisplayName>marietta_ru@hotmail.com</DisplayName>
+				</Personal>
+			</Profiles>
+			<Emails>
+				<Email>
+					<EmailType>WindowsLiveID</EmailType>
+					<Address>marcus@hotmail.com</Address>
+				</Email>
+			</Emails>
+		</Contact>
+	</Contacts>
+</LiveContacts>

data/spec/feeds/yh_contacts.txt

@@ -34,86 +34,45 @@
                "categories":[
                ]
             },
-            {
-               "type":"name",
-               "first":"Nina",
-               "last":"Benchimol",
-               "fid":4,
-               "categories":[
-               ]
-            }
-         ],
-         "cid":5,
-         "categories":[
-         ]
-      },
-      {
-         "type":"contact",
-         "fields":[
-            {
+	   {
                "type":"email",
-               "data":"and@yahoo.com",
-               "fid":7,
+               "data":"nina2@yahoo.com",
+               "fid":5,
                "categories":[
                ]
             },
             {
                "type":"name",
-               "first":"Andrea",
-               "last":"Dimitri",
-               "fid":6,
-               "categories":[
-               ]
-            }
-         ],
-         "cid":1,
-         "categories":[
-         ]
-      },
-      {
-         "type":"contact",
-         "fields":[
-            {
-               "type":"email",
-               "data":"ricardo@poli.usp.br",
-               "fid":11,
+               "first":"Nina",
+               "last":"Benchimol",
+               "fid":4,
                "categories":[
                ]
             },
-            {
-               "type":"name",
-               "first":"Ricardo",
-               "last":"Fiorelli",
-               "fid":10,
-               "categories":[
-               ]
-            }
+	    {
+	      "type": "otherid",
+	      "data": "windowslive@msn.com",
+	      "msn": true
+	    },
+	    {
+	      "type": "phone",
+	      "data": "808 456 7890",
+	      "mobile": true 
+	    },
+	    {
+	      "type": "address",
+	      "street": "123 Home Street",
+	      "city": "Super City",
+	      "state": "HI",
+	      "zip": "96815",
+	      "country": "United States",
+	      "home": true
+	    }
          ],
-         "cid":3,
+         "cid":5,
          "categories":[
          ]
       },
-      {
-         "type":"contact",
-         "fields":[
-            {
-               "type":"email",
-               "data":"pizinha@yahoo.com.br",
-               "fid":14,
-               "categories":[
-               ]
-            },
-            {
-               "type":"name",
-               "first":"Priscila",
-               "fid":13,
-               "categories":[
-               ]
-            }
-         ],
-         "cid":2,
-         "categories":[
-         ]
-      }
+      {"fields": [{"fid": 9, "data": "carl_larsson", "type": "yahooid", "categories": []}], "type": "contact", "categories": [], "cid": 30}
    ]
 }

data/spec/windows_live/windows_live_spec.rb

@@ -10,16 +10,22 @@ describe Contacts::WindowsLive do
   
   it 'parse the XML contacts document' do
     contacts = Contacts::WindowsLive.parse_xml(contacts_xml)
+    contacts.size.should == 2
+    contacts[0].service_id == "abc"
+    contacts[0].name.should == "Mia Pia"
+    contacts[0].firstname.should == "Mia"
+    contacts[0].lastname.should == "Pia"
+    contacts[0].emails.should include("mia@hotmail.com", "othermia@yahoo.com")
+    contacts[0].phones.should include({"value"=>"(123) 123 1234", "type"=>"home"}, {"value"=>"(321) 555 1234", "type"=>"other"})
+    contacts[0].addresses.should include({"region"=>"CA", "country"=>"USA", "postalCode"=>"92123", "streetAddress"=>"123 Green St", "type"=>"home", "locality"=>"Middleville", "formatted"=>"123 Green St, Middleville, CA, 92123, USA"})
     
-    contacts[0].name.should be_nil
-    contacts[0].email.should == 'froz@gmail.com'
-    contacts[1].firstname.should == "Rafael"
-    contacts[1].lastname.should == "Timbo"
-    contacts[1].name.should == 'Rafael Timbo'
-    contacts[1].email.should == 'timbo@hotmail.com'
-    contacts[2].name.should be_nil
-    contacts[2].email.should == 'betinho@hotmail.com'
-
+    contacts[0].service_id == "def"
+    contacts[1].name.should == ""
+    contacts[1].firstname.should == nil
+    contacts[1].lastname.should == nil
+    contacts[1].emails.should include("marcus@hotmail.com")
+    contacts[1].phones.should be_empty
+    contacts[1].addresses.should be_empty
   end
 
   it 'should can be initialized by a YAML file' do
@@ -31,6 +37,6 @@ describe Contacts::WindowsLive do
   end
 
   def contacts_xml
-    File.open(@path + 'wl_contacts.xml', 'r+').read
+    File.open(@path + 'wl_full_contacts.xml', 'r+').read
   end
 end

data/spec/yahoo/yahoo_spec.rb

@@ -20,12 +20,7 @@ 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', 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
+    results.size.should == 3  end
 
   it 'should validate yahoo redirect signature' do
     redirect_path = '/?appid=i%3DB%26p%3DUw70JGIdHWVRbpqYItcMw--&token=AB.KoEg8vBwvJKFkwfcDTJEMKhGeAD6KhiDe0aZLCvoJzMeQG00-&appdata=&ts=1218501215&sig=d381fba89c7e9d3c14788720733c3fbf'
@@ -58,10 +53,14 @@ describe Contacts::Yahoo do
     json = read_file('yh_contacts.txt')
     
     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)
+    Contacts::Yahoo.parse_contacts(json).should have_contact('Nina Benchimol', 
+      ['nina@hotmail.com','nina2@yahoo.com'], 
+      5, 
+      [{"type" => "msn", "value" => "windowslive@msn.com"}], 
+      [{"type" => "mobile", "value" => "808 456 7890"}],
+      [{"type" => "home", "value" => "123 Home Street, Super City, HI, 96815, United States"}]
+    )
+    Contacts::Yahoo.parse_contacts(json).should have_contact('carl_larsson','',30) 
   end
 
   it 'should can be initialized by a YAML file' do
@@ -73,10 +72,19 @@ describe Contacts::Yahoo do
     File.open(@path + file, 'r+').read
   end
 
-  def have_contact(name, email, cid)
+  def have_contact(name, email, cid, ims = [], phones = [], addresses = [])
+    email = [email] if email.is_a? String
     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) && a_contact.service_id == cid}}
+      define_method(:matches?) {|some_contacts| some_contacts.any? {|a_contact| 
+          a_contact.name == name && \
+          ((a_contact.emails - email).empty?) && \
+          ((a_contact.ims    - ims).empty?) && \
+          ((a_contact.phones - phones).empty?) && \
+          ((a_contact.addresses - addresses).empty?) && \
+          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.19
+  version: 0.2.20
 platform: ruby
 authors: 
 - "Mislav Marohni\xC6\x92\xC3\xA1"
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-23 00:00:00 -07:00
+date: 2009-07-29 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -43,6 +43,7 @@ files:
 - spec/feeds/google-many.xml
 - spec/feeds/google-single.xml
 - spec/feeds/wl_contacts.xml
+- spec/feeds/wl_full_contacts.xml
 - spec/feeds/yh_contacts.txt
 - spec/feeds/yh_credential.xml
 - spec/flickr/auth_spec.rb
@@ -74,6 +75,7 @@ files:
 - vendor/windowslivelogin.rb
 has_rdoc: true
 homepage: http://github.com/aeden/contacts
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -94,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Ruby library for consuming Google, Yahoo!, Flickr and Windows Live contact APIs