googlecontacts 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/google_contacts.rb

@@ -13,3 +13,4 @@ require 'google_contacts/group'
 require 'google_contacts/proxies/array'
 require 'google_contacts/proxies/hash'
 require 'google_contacts/proxies/emails'
+require 'google_contacts/proxies/tag'

data/lib/google_contacts/base.rb

@@ -15,7 +15,7 @@ module GoogleContacts
       raise "Cannot create instance of Base" if self.class.name.split(/::/).last == 'Base'
       @wrapper = wrapper
       @xml     = self.class.decorate_with_namespaces(xml || initialize_xml_document)
-      @proxies = {}
+      @proxies = HashWithIndifferentAccess.new
     end
     
     def self.namespace(node, prefix)
@@ -27,7 +27,7 @@ module GoogleContacts
     def self.insert_xml(parent, tag, attributes = {}, &blk)
       # Construct new node with the right namespace
       matches = tag.match /^((\w+):)?(\w+)$/
-      ns      = matches[2] || 'atom'
+      ns      = matches[2] == 'xmlns' ? 'atom' : (matches[2] || 'atom')
       tag     = matches[3]
       node = Nokogiri::XML::Node.new(tag, parent)
       node.namespace = namespace(parent, ns) || raise("Unknown namespace: #{ns}")
@@ -80,32 +80,20 @@ module GoogleContacts
     end
     
     def new?
-      at('id').nil?
+      xml.at_xpath('./xmlns:id').nil?
     end
     
     def id
-      at('id').text.strip unless new?
+      xml.at_xpath('./xmlns:id').text.strip unless new?
     end
     
     def updated_at
-      Time.parse at('updated').text.strip unless new?
+      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
-      at_xpath(%{xmlns:link[@rel="#{rel}"]})[:href]
-    end
-
-    def at(*args)
-      xml.at(*args)
-    end
-
-    def at_xpath(*args)
-      xml.at_xpath(*args)
-    end
-
-    def xpath(*args)
-      xml.xpath(*args)
+      xml.at_xpath(%{xmlns:link[@rel="#{rel}"]})[:href]
     end
     
     def changed?
@@ -131,9 +119,9 @@ module GoogleContacts
     def method_missing(sym, *args, &blk)
       if sym.to_s =~ /^(\w+)(=)?$/ && @proxies[$1.to_sym]
         if $2
-          @proxies[sym].replace(args.first)
+          @proxies[$1].replace(args.first)
         else
-          @proxies[sym]
+          @proxies[$1]
         end
       else
         super

data/lib/google_contacts/contact.rb

@@ -1,11 +1,12 @@
 module GoogleContacts
   class Contact < Base
     CATEGORY_TERM = 'http://schemas.google.com/contact/2008#contact'
-    
-    # attr_reader :groups
+
+    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',

data/lib/google_contacts/proxies/emails.rb

@@ -47,6 +47,10 @@ module GoogleContacts
           @parent.insert_xml('gd:email', email)
         end
       end
+
+      def inspect
+        @new.values.inspect
+      end
       
       private
       def add(address)
@@ -104,7 +108,7 @@ module GoogleContacts
         def dup
           self.class.new(@parent, self)
         end
-
+        
         def method_missing(sym, *args, &blk)
           if sym.to_s =~ /^(\w+)(=|\?)?$/
             case $2

data/lib/google_contacts/proxies/tag.rb

@@ -0,0 +1,46 @@
+module GoogleContacts
+  module Proxies
+    class Tag < BlankSlate
+      def initialize(parent, options)
+        @parent = parent
+        @tag    = options[:tag]
+
+        reinitialize
+      end
+      
+      def reinitialize
+        @current = node.try(:content)
+        @new     = @current ? @current.dup : nil
+      end
+      
+      def changed?
+        @current != @new
+      end
+      
+      def replace(content)
+        @new = content.to_s
+      end
+      
+      def synchronize
+        (node || insert_node).content = @new
+      end
+      
+      private
+      def node
+        @parent.xml.at_xpath("./#{@tag}")
+      end
+      
+      def insert_node
+        @parent.insert_xml(@tag)
+      end
+      
+      def method_missing(sym, *args, &blk)
+        if @new.respond_to?(sym)
+          @new.send(sym, *args, &blk)
+        else
+          super
+        end
+      end
+    end # class Tag
+  end # module Proxies
+end # module GoogleContacts

data/spec/base_spec.rb

@@ -19,17 +19,17 @@ describe Base do
     it "should default namespace to document default" do
       node = @t.insert_xml 'tag'
       node.namespace.href.should == 'http://www.w3.org/2005/Atom'
-      @t.xpath('xmlns:tag').should have(1).node
+      @t.xml.xpath('xmlns:tag').should have(1).node
     end
     
     it "should set namespace when specified in tag" do
       node = @t.insert_xml 'gd:extendedProperty'
       node.namespace.href.should == 'http://schemas.google.com/g/2005'
-      @t.xpath('gd:extendedProperty').should have(1).node
+      @t.xml.xpath('gd:extendedProperty').should have(1).node
       
       node = @t.insert_xml 'gContact:birthday'
       node.namespace.href.should == 'http://schemas.google.com/contact/2008'
-      @t.xpath('gContact:birthday').should have(1).node
+      @t.xml.xpath('gContact:birthday').should have(1).node
     end
     
     it "should raise on unknown namespace" do
@@ -45,10 +45,10 @@ describe Base do
     
     it "should allow removing xml" do
       @t.insert_xml 'gd:extendedProperty'
-      @t.xpath('./gd:extendedProperty').should have(1).node
+      @t.xml.xpath('./gd:extendedProperty').should have(1).node
 
       @t.remove_xml 'gd:extendedProperty'
-      @t.xpath('./gd:extendedProperty').should have(:no).nodes
+      @t.xml.xpath('./gd:extendedProperty').should have(:no).nodes
     end
   end
   

data/spec/contact_spec.rb

@@ -25,6 +25,10 @@ describe Contact 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
@@ -42,9 +46,18 @@ describe 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('./xmlns:title').content.should == 'Fitzwilliam Darcy'
+        @contact.title = 'foo'
+        @contact.title.synchronize
+        @contact.xml.at('./xmlns:title').content.should == 'foo'
+      end
+    end
   end
   
-  describe "initializing" do
+  describe "from scratch" do
     before(:each) do
       @contact = Contact.new(wrapper)
       @root = @contact.xml.document.root
@@ -76,5 +89,14 @@ describe Contact do
       @contact.emails['foo@bar.com'].should be_primary
       @contact.emails.size.should == 1
     end
+    
+    describe "when updating" do
+      it "should update the title-tag" do
+        @contact.xml.at('./xmlns:title').should be_nil
+        @contact.title = 'foo'
+        @contact.title.synchronize
+        @contact.xml.at('./xmlns:title').content.should == 'foo'
+      end
+    end
   end
 end

data/spec/proxies/tag_spec.rb

@@ -0,0 +1,87 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Proxies::Tag do
+  describe "with existing entries" do
+    before(:each) do
+      create_proxy_from_xml <<-XML
+        <entry xmlns:atom="http://www.w3.org/2005/Atom">
+          <atom:title>Example</atom:title>
+        </entry>
+      XML
+    end
+
+    it "should initialize" do
+      @proxy.should == 'Example'
+    end
+    
+    it "should not be changed when initialized" do
+      @proxy.changed?.should be_false
+    end
+  end
+  
+  describe "without existing entries" do
+    before(:each) do
+      create_proxy_from_xml <<-XML
+        <entry xmlns:atom="http://www.w3.org/2005/Atom">
+        </entry>
+      XML
+    end
+    
+    it "should initialize the value to nil" do
+      @proxy.nil?.should be_true
+    end
+    
+    it "should not create the tag when initializing" do
+      @parent.xml.xpath('./atom:title').should have(:no).entries
+    end
+    
+    it "should not be changed when initialized" do
+      @proxy.changed?.should be_false
+    end
+    
+    it "should be changed when replace is called" do
+      @proxy.replace("Test")
+      @proxy.changed?.should be_true
+    end
+  end
+  
+  describe "synchronize to xml document" do
+    describe "when tag doesn't exist" do
+      before(:each) do
+        create_proxy_from_xml <<-XML
+          <entry xmlns:atom="http://www.w3.org/2005/Atom">
+          </entry>
+        XML
+      end
+      
+      it "should create the tag" do
+        @node = mock('node') { expects(:content=).with('Example') }
+        @parent.expects(:insert_xml).with('atom:title').returns(@node)
+        @proxy.replace("Example")
+        @proxy.synchronize
+      end
+    end
+    
+    describe "when tag exists" do
+      before(:each) do
+        create_proxy_from_xml <<-XML
+          <entry xmlns:atom="http://www.w3.org/2005/Atom">
+            <atom:title>Example</atom:title>
+          </entry>
+        XML
+      end
+      
+      it "should update the tag" do
+        @proxy.replace("Replacement")
+        @proxy.synchronize
+        @parent.xml.at('./atom:title').content.should == 'Replacement'
+      end
+    end
+  end
+  
+  def create_proxy_from_xml(str)
+    @parent = stub('parent', :xml => Nokogiri::XML.parse(str).root)
+    @proxy  = Proxies::Tag.new(@parent, :tag => 'atom:title')
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: googlecontacts
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Pieter Noordhuis
@@ -97,6 +97,7 @@ files:
 - lib/google_contacts/proxies/array.rb
 - lib/google_contacts/proxies/emails.rb
 - lib/google_contacts/proxies/hash.rb
+- lib/google_contacts/proxies/tag.rb
 - lib/google_contacts/wrapper.rb
 - lib/googlecontacts.rb
 - spec/assets/contacts_full.xml
@@ -107,6 +108,7 @@ files:
 - spec/proxies/array_spec.rb
 - spec/proxies/emails_spec.rb
 - spec/proxies/hash_spec.rb
+- spec/proxies/tag_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/wrapper_spec.rb
@@ -146,5 +148,6 @@ test_files:
 - spec/proxies/array_spec.rb
 - spec/proxies/emails_spec.rb
 - spec/proxies/hash_spec.rb
+- spec/proxies/tag_spec.rb
 - spec/spec_helper.rb
 - spec/wrapper_spec.rb