aeden-contacts 0.2.15 → 0.2.16

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 15
+:patch: 16
 :major: 0

data/lib/contacts/google.rb

@@ -46,6 +46,7 @@ module Contacts
     AuthSubPath = '/accounts/AuthSub' # all variants go over HTTPS
     ClientLogin = '/accounts/ClientLogin'
     FeedsPath   = '/m8/feeds/contacts/'
+    GroupsPath  = '/m8/feeds/groups/'
     
     # default options for #authentication_url
     def self.authentication_url_options
@@ -119,19 +120,32 @@ module Contacts
       @token   = token.to_s
       @headers = {
         'Accept-Encoding' => 'gzip',
-        'User-Agent' => Identifier + ' (gzip)'
+        'User-Agent' => Identifier + ' (gzip)',
+        'GData-Version' => '3.0'
       }.update(self.class.authorization_header(@token, client))
       @projection = 'thin'
     end
 
-    def get(params) # :nodoc:
+    def get(params={}) # :nodoc:
       self.class.http_start(false) do |google|
         path = FeedsPath + CGI.escape(@user)
         google_params = translate_parameters(params)
         query = self.class.query_string(google_params)
+        #puts "get query: #{query}"
         google.get("#{path}/#{@projection}?#{query}", @headers)
       end
     end
+    
+    def get_groups(params={})
+      self.class.http_start(false) do |google|
+        path = GroupsPath + CGI.escape(@user)
+        google_params = translate_parameters(params)
+        query = self.class.query_string(google_params)
+        url = "#{path}/full?#{query}"
+        #puts "get_groups url: #{url}"
+        google.get(url, @headers)
+      end
+    end
 
     # Timestamp of last update. This value is available only after the XML
     # document has been parsed; for instance after fetching the contact list.
@@ -164,6 +178,12 @@ module Contacts
       in_chunks(options, :contacts, chunk_size)
     end
     
+    def groups(options = {})
+      params = {}.update(options)
+      response = get_groups(params)
+      parse_groups response_body(response)
+    end
+    
     def response_body(response)
       self.class.response_body(response)
     end
@@ -192,6 +212,24 @@ module Contacts
         returns
       end
       
+      def parse_groups(body)
+        doc = Hpricot::XML body
+        groups_found = {}
+        
+        (doc / '/feed/entry').each do |entry|
+          id_node = entry.at('id')
+          title_node = entry.at('/title')
+          
+          entry_id = id_node.inner_text
+          title = title_node ? title_node.inner_text : ''
+          
+          puts "#{title}: #{entry_id}"
+          groups_found[title] = entry_id
+        end
+        
+        groups_found
+      end
+      
       def parse_contacts(body)
         doc = Hpricot::XML body
         contacts_found = []
@@ -326,6 +364,9 @@ module Contacts
               when :updated_after
                 value = value.strftime("%Y-%m-%dT%H:%M:%S%Z") if value.respond_to? :strftime
                 'updated-min'
+              when :group_name
+                value = groups[value]
+                'group'
               else key
               end
             

data/lib/contacts/windows_live.rb

@@ -153,7 +153,7 @@ module Contacts
           name = "#{first_name} #{last_name}"
           name.strip!
         end
-        new_contact = Contact.new(email, name)
+        new_contact = Contact.new(email, name, nil, first_name, last_name)
         contacts << new_contact
       end
 

data/lib/contacts.rb

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

data/spec/contact_spec.rb

@@ -4,7 +4,7 @@ require 'contacts'
 describe Contacts::Contact do
   describe 'instance' do
     before do
-      @contact = Contacts::Contact.new('max@example.com', 'Max Power', 'maxpower')
+      @contact = Contacts::Contact.new('max@example.com', 'Max Power', 'maxpower', "Max", "Power")
     end
     
     it "should have email" do
@@ -44,6 +44,14 @@ describe Contacts::Contact do
     it "should have username" do
       @contact.username.should == 'maxpower'
     end
+    
+    it "should have firstname" do
+      @contact.firstname.should == 'Max'
+    end
+    
+    it "should have lastname" do
+      @contact.lastname.should == 'Power'
+    end
   end
   
   describe '#inspect' do

data/spec/windows_live/windows_live_spec.rb

@@ -13,6 +13,8 @@ describe Contacts::WindowsLive do
     
     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

metadata

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