googlecontacts 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/google_contacts/base.rb

@@ -22,6 +22,7 @@ module GoogleContacts
       end
 
       @proxies = HashWithIndifferentAccess.new
+      register_base_proxies
     end
 
     def attributes=(attrs)
@@ -29,19 +30,19 @@ module GoogleContacts
         send("#{key}=", value)
       end
     end
-    
+
     def insert_xml(tag, attributes = {}, &blk)
       self.class.insert_xml(@xml, tag, attributes, &blk)
     end
-    
+
     def remove_xml(tag)
       @xml.xpath(tag).remove
     end
-    
+
     def self.feed_for_batch
       new_xml_document('feed').root
     end
-    
+
     # Create new XML::Document that can be used in a
     # Google Contacts batch operation.
     def entry_for_batch(operation)
@@ -52,54 +53,74 @@ module GoogleContacts
       if operation == :update || operation == :delete
         root.at('./xmlns:id').content = url(:edit)
       end
-      
+
       self.class.insert_xml(root, 'batch:id')
       self.class.insert_xml(root, 'batch:operation', :type => operation)
-      
+
       root
     end
-    
+
     def new?
       xml.at_xpath('./xmlns:id').nil?
     end
-    
-    def id
+
+    def href
       xml.at_xpath('./xmlns:id').text.strip unless new?
     end
-    
+
     def updated_at
       Time.parse xml.at_xpath('./xmlns:updated').text.strip unless new?
     end
-    
+
     def url(rel)
       rel = 'http://schemas.google.com/contacts/2008/rel#photo' if rel == :photo
       xml.at_xpath(%{xmlns:link[@rel="#{rel}"]})[:href]
     end
-    
+
     def changed?
       @proxies.values.any?(&:changed?)
     end
-    
+
     def save
       return unless changed?
       synchronize_proxies
       @wrapper.append_operation(self, new? ? :insert : :update)
     end
-    
+
     def delete
       return if new?
       @wrapper.append_operation(self, :delete)
     end
-    
+
+    # Hash-like access to extended properties of both contacts and groups.
+    def [](prop)
+      properties[prop]
+    end
+
+    def []=(prop, value)
+      properties[prop] = value
+    end
+
+    # Alias the xmlns:title tag be be accessible using #name(=)?
+    alias_attribute :name, :title
+
     protected
     def register_proxy(name, proxy)
       @proxies[name.to_sym] = proxy
     end
-    
+
     def synchronize_proxies
       @proxies.values.map(&:synchronize)
     end
-    
+
+    def register_base_proxies
+      register_proxy :title,  Proxies::Tag.new(self, :tag => 'xmlns:title')
+      register_proxy :properties, Proxies::Hash.new(self,
+        :tag   => 'gd:extendedProperty',
+        :key   => 'name',
+        :value => 'value')
+    end
+
     # Try to proxy missing method to one of the proxies
     def method_missing(sym, *args, &blk)
       if sym.to_s =~ /^(\w+)(=)?$/ && @proxies[$1]
@@ -112,13 +133,13 @@ module GoogleContacts
         super
       end
     end
-    
+
     def self.namespace(node, prefix)
       node.namespace_definitions.find do |ns|
         ns.prefix == prefix
       end
     end
-    
+
     def self.insert_xml(parent, tag, attributes = {}, &blk)
       # Construct new node with the right namespace
       matches = tag.match /^((\w+):)?(\w+)$/
@@ -130,12 +151,12 @@ module GoogleContacts
       attributes.each_pair do |k,v|
         node[k.to_s] = v.to_s
       end
-      
+
       parent << node
       yield node if block_given?
       node
     end
-    
+
     def self.new_xml_document(root)
       doc = Nokogiri::XML::Document.new
       if root.is_a?(Nokogiri::XML::Element)
@@ -146,7 +167,7 @@ module GoogleContacts
       decorate_document_with_namespaces(doc)
       doc
     end
-    
+
     def self.initialize_xml_document
       doc = new_xml_document('entry')
       insert_xml(doc.root, 'atom:category', {
@@ -155,7 +176,7 @@ module GoogleContacts
       })
       doc
     end
-    
+
     def self.decorate_document_with_namespaces(doc)
       doc.root.default_namespace = NAMESPACES['atom']
       NAMESPACES.each_pair do |prefix, href|

data/lib/google_contacts/contact.rb

@@ -5,33 +5,22 @@ module GoogleContacts
     alias_attribute :name, :title
     def initialize(*args)
       super
-
-      register_proxy :title,  Proxies::Tag.new(self, :tag => 'xmlns:title')
       register_proxy :emails, Proxies::Emails.new(self)
       register_proxy :groups, Proxies::Array.new(self,
         :tag   => 'gContact:groupMembershipInfo',
         :attr  => 'href')
-      register_proxy :properties, Proxies::Hash.new(self,
-        :tag   => 'gd:extendedProperty',
-        :key   => 'name',
-        :value => 'value')
-    end
-    
-    def [](prop)
-      properties[prop]
     end
 
-    def []=(prop, value)
-      properties[prop] = value
-    end
-    
     def email
       emails.primary.try(:address)
     end
-    
+
     def email=(address)
       emails[address].primary!
     end
 
+    def inspect
+      "\#<GoogleContacts::Contact name=#{name.inspect} email=#{email.inspect}>"
+    end
   end # class Contact
 end # module GoogleContacts

data/lib/google_contacts/group.rb

@@ -1,15 +1,13 @@
 module GoogleContacts
   class Group < Base
     CATEGORY_TERM = 'http://schemas.google.com/g/2005#group'
-    
-    alias_attribute :name, :title
-    def initialize(*args)
-      super
-      register_proxy :title,  Proxies::Tag.new(self, :tag => 'xmlns:title')
-    end
 
     def system_group?
-      @xml.xpath('.//gContact:systemGroup').size > 0
+      @xml.xpath('./gContact:systemGroup').size > 0
+    end
+
+    def inspect
+      "\#<GoogleContacts::Group name=#{name.inspect} system_group=#{system_group?.inspect}>"
     end
   end
 end

data/spec/assets/groups_full.xml

@@ -42,6 +42,7 @@
     <link rel='self' type='application/atom+xml'
       href='http://www.google.com/m8/feeds/groups/jo%40gmail.com/thin/6' />
     <gContact:systemGroup id='Contacts' />
+    <gd:extendedProperty name='foo' value='bar' />
   </entry>
   <entry gd:etag='"Rn05fDVSLyp7ImA9WxRbGEUORQM."'>
     <id>http://www.google.com/m8/feeds/groups/jo%40gmail.com/base/68f415478ba1aa69</id>

data/spec/contact_spec.rb

@@ -8,8 +8,8 @@ describe GoogleContacts::Contact do
       @contact  = @contacts.first
     end
 
-    it "should know its id" do
-      @contact.id.should == 'http://www.google.com/m8/feeds/contacts/liz%40gmail.com/base/c9012de'
+    it "should know its href" do
+      @contact.href.should == 'http://www.google.com/m8/feeds/contacts/liz%40gmail.com/base/c9012de'
     end
 
     it "should know when it was updated" do
@@ -20,15 +20,15 @@ describe GoogleContacts::Contact do
       @contact.groups.should have(1).group
       @contact.groups[0].should == 'http://www.google.com/m8/feeds/groups/liz%40gmail.com/base/270f'
     end
-    
+
     it "should initialize extended properties" do
       @contact[:pet].should == 'hamster'
     end
-    
+
     it "should initialize the title tag" do
       @contact.title.should == 'Fitzwilliam Darcy'
     end
-    
+
     it "should not be changed? initially" do
       @contact.changed?.should be_false
     end
@@ -46,7 +46,7 @@ describe GoogleContacts::Contact do
         @contact.url(:photo).should == 'http://www.google.com/m8/feeds/photos/media/liz%40gmail.com/c9012de'
       end
     end
-    
+
     describe "updating" do
       it "should update the title-tag" do
         @contact.xml.at('./atom:title').content.should == 'Fitzwilliam Darcy'
@@ -56,54 +56,54 @@ describe GoogleContacts::Contact do
       end
     end
   end
-  
+
   describe "from scratch" do
     before(:each) do
       @contact = GoogleContacts::Contact.new(wrapper)
       @root = @contact.xml.document.root
     end
-    
+
     it "should create a new xml root node" do
       @root.name.should == 'entry'
       @root.namespace.href.should == 'http://www.w3.org/2005/Atom'
     end
-    
+
     it "should set the right category term" do
       @root.at_xpath('./atom:category')['term'].should == 'http://schemas.google.com/contact/2008#contact'
     end
-    
-    it "should not have an id" do
-      @contact.id.should be_nil
+
+    it "should not have an href" do
+      @contact.href.should be_nil
     end
-    
+
     it "should not have an updated entry" do
       @contact.updated_at.should be_nil
     end
-    
+
     it "should be new" do
       @contact.new?.should be_true
     end
-    
+
     it "should not be changed" do
       @contact.changed?.should be_false
     end
-    
+
     it "should have no groups" do
       @contact.groups.should be_empty
     end
-    
+
     it "should be possible to set the default email address" do
       @contact.email = 'foo@bar.com'
       @contact.emails['foo@bar.com'].should be_primary
       @contact.emails.size.should == 1
     end
-    
+
     it "should provide access to the contact's primary email address" do
       @contact.email.should be_nil
       @contact.email = 'foo@bar.com'
       @contact.email.should == 'foo@bar.com'
     end
-    
+
     describe "when updating" do
       it "should update the title-tag" do
         @contact.xml.at('./atom:title').should be_nil
@@ -113,18 +113,18 @@ describe GoogleContacts::Contact do
       end
     end
   end
-  
+
   describe "operations" do
     before(:each) do
       @contact = GoogleContacts::Contact.new(wrapper)
       @root = @contact.xml.document.root
     end
-    
+
     describe "on groups" do
       before(:each) do
         @groups = [stub('group1', :href => 'foo'), stub('group2', :href => 'bar')]
       end
-      
+
       it "should be possible to add an array of groups" do
         @contact.groups += @groups
         @contact.groups.should == ['foo', 'bar'].sort
@@ -134,7 +134,7 @@ describe GoogleContacts::Contact do
         @contact.groups += ['foo', 'bar']
         @contact.groups.should == ['foo', 'bar'].sort
       end
-      
+
       describe "with initial content" do
         before(:each) do
           @contact.groups = ['foo', 'bar', 'quux']

data/spec/group_spec.rb

@@ -7,16 +7,20 @@ describe GoogleContacts::Group do
     @group  = @groups.first
   end
 
-  it "should know its id" do
-    @group.id.should == 'http://www.google.com/m8/feeds/groups/jo%40gmail.com/base/6'
+  it "should know its href" do
+    @group.href.should == 'http://www.google.com/m8/feeds/groups/jo%40gmail.com/base/6'
   end
-  
+
   it "should initialize the title tag" do
     @group.title.should == 'System Group: My Contacts'
   end
-  
+
   it "should know when it is a system group" do
     @groups[0].system_group?.should be_true
     @groups[1].system_group?.should be_false
   end
+
+  it "should initialize extended properties" do
+    @group[:foo].should == 'bar'
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Pieter Noordhuis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-14 00:00:00 +01:00
+date: 2010-03-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,7 +109,6 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.md
 - README.rdoc
 files: 
 - .autotest
@@ -144,7 +143,6 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/wrapper_spec.rb
-- README.md
 has_rdoc: true
 homepage: http://github.com/pietern/googlecontacts
 licenses: []

data/README.md

@@ -1,52 +0,0 @@
-*foo*
-
-
-
-
-    gc = GoogleContacts::Wrapper.new
-
-    gc.batch do
-      john = gc.contacts.find_by_email!('john@doe.com')
-
-      # Set this email as primary, overwriting other addresses
-      john.email = 'johnny@walker.com'
-      
-      # return primary email address (string)
-      puts john.email
-    
-      # Add email to the list
-      john.emails << 'fuckinghipster@hotmail.com'
-      
-      john.emails.push('fuckinghipster@hotmail.com', attrs)
-      
-      john.emails['fuckinghipster@hotmail.com'] = attrs
-      
-      # this removes any existing label
-      john.emails['fuckinghipster@hotmail.com'].rel   = 'blaat'
-      
-      # this removes any existing rel
-      john.emails['fuckinghipster@hotmail.com'].label = 'personal use'
-      
-      # access new email address. this can be used as a factory
-      # method to add new addresses
-      john.emails['thisonedidntexistyet@gmail.com'].primary!
-      
-      john.emails.delete('thisonedidntexistyet@gmail.com')
-      
-      
-      [:rel] = 'foo'
-      
-      # Set the last one as primary
-      john.emails.primary('fuckinghipster@hotmail.com')
-    end
-
-
-@wrapper.batch do
-	1000.times do |i|
-		c = @wrapper.contacts.build
-		c.name = "John %03d" % i
-		c.email = "foo%03d@bar.com" % i
-		c.save
-	end
-end
-