googlecontacts 0.1.8 → 0.2.0

data/lib/google_contacts/version.rb

@@ -0,0 +1,3 @@
+module GoogleContacts
+  VERSION = "0.2.0"
+end

data/lib/google_contacts/wrapper.rb

@@ -17,7 +17,7 @@ module GoogleContacts
     end
 
     def get(url, options = {})
-      query = options.map { |k,v| "#{k}=#{v}" }.join('&')
+      query = options.map { |k,v| "#{k}=#{v}" }.join("&")
       url += "?#{query}" if query.size > 0
 
       body = consumer.get(url).body
@@ -25,7 +25,7 @@ module GoogleContacts
     end
 
     def post(url, body)
-      consumer.post(url, body, 'Content-Type' => 'application/atom+xml')
+      consumer.post(url, body, "Content-Type" => "application/atom+xml")
     end
 
     def batch(options = {}, &blk)
@@ -52,19 +52,19 @@ module GoogleContacts
     end
 
     def find(what, options = {}, &blk)
-      options['max-results'] ||= 200
-      options['start-index'] = 1
+      options["max-results"] ||= 200
+      options["start-index"] = 1
 
       result = []
       begin
         xml = get("http://www.google.com/m8/feeds/#{what}/default/full", options)
-        result.concat xml.xpath('/xmlns:feed/xmlns:entry').map(&blk)
+        result.concat xml.xpath("/xmlns:feed/xmlns:entry").map(&blk)
 
-        total_results = xml.at('//openSearch:totalResults').text.to_i
-        start_index   = xml.at('//openSearch:startIndex'  ).text.to_i
-        per_page      = xml.at('//openSearch:itemsPerPage').text.to_i
-        options['start-index'] = start_index + per_page
-      end while (options['start-index'] <= total_results)
+        total_results = xml.at("//openSearch:totalResults").text.to_i
+        start_index   = xml.at("//openSearch:startIndex"  ).text.to_i
+        per_page      = xml.at("//openSearch:itemsPerPage").text.to_i
+        options["start-index"] = start_index + per_page
+      end while (options["start-index"] <= total_results)
 
       result
     end
@@ -78,9 +78,9 @@ module GoogleContacts
 
     def append_to_batch(entry)
       if @batching
-        if @batch.present?
-          batch_term = @batch.last.at('./atom:category')['term']
-          entry_term =       entry.at('./atom:category')['term']
+        if @batch.length > 0
+          batch_term = @batch.last.at("./atom:category")["term"]
+          entry_term =       entry.at("./atom:category")["term"]
           raise "Cannot mix Contact and Group in one batch" if batch_term != entry_term
         end
 
@@ -93,9 +93,9 @@ module GoogleContacts
     end
 
     # Use the <category/> tag of the first entry to find out
-    # which type we're flushing
+    # which type we"re flushing
     def flush_batch(document)
-      url = case document.at('./xmlns:entry[1]/xmlns:category')['term']
+      url = case document.at("./xmlns:entry[1]/xmlns:category")["term"]
       when /#contact$/i
         CONTACTS_BATCH
       when /#group$/i
@@ -118,7 +118,7 @@ module GoogleContacts
       def initialize(wrapper, klass)
         @wrapper    = wrapper
         @klass      = klass
-        @collection = klass.name.demodulize.pluralize.underscore
+        @collection = klass.name.split("::").last.downcase + "s"
       end
 
       # :what - all, ID, whatever, currently unused

data/lib/googlecontacts.rb

@@ -1,2 +1,2 @@
 # For convenience
-require 'google_contacts'
+require "google_contacts"

data/spec/base_spec.rb

@@ -1,13 +1,13 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require "spec_helper"
 
 class GoogleContacts::BaseTester < GoogleContacts::Base
-  CATEGORY_TERM = "i'm not used here"
+  CATEGORY_TERM = %{i'm not used here}
 end
 
 describe GoogleContacts::Base do
   it "should not be possible to create" do
     lambda {
-      GoogleContacts::Base.new(wrapper, 'some xml')
+      GoogleContacts::Base.new(wrapper, "some xml")
     }.should raise_error(/cannot create instance/i)
   end
 
@@ -17,38 +17,38 @@ describe GoogleContacts::Base do
     end
 
     it "should default namespace to document default" do
-      node = @t.insert_xml 'tag'
-      node.namespace.href.should == 'http://www.w3.org/2005/Atom'
-      @t.xml.xpath('atom:tag').should have(1).node
+      node = @t.insert_xml "tag"
+      node.namespace.href.should == "http://www.w3.org/2005/Atom"
+      @t.xml.xpath("atom: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.xml.xpath('gd:extendedProperty').should have(1).node
+      node = @t.insert_xml "gd:extendedProperty"
+      node.namespace.href.should == "http://schemas.google.com/g/2005"
+      @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.xml.xpath('gContact:birthday').should have(1).node
+      node = @t.insert_xml "gContact:birthday"
+      node.namespace.href.should == "http://schemas.google.com/contact/2008"
+      @t.xml.xpath("gContact:birthday").should have(1).node
     end
 
     it "should raise on unknown namespace" do
       lambda {
-        @t.insert_xml 'unknown:foo'
+        @t.insert_xml "unknown:foo"
       }.should raise_error(/unknown namespace/i)
     end
 
     it "should also set attributes if given" do
-      node = @t.insert_xml 'tag', :foo => 'bar'
-      node['foo'].should == 'bar'
+      node = @t.insert_xml "tag", :foo => "bar"
+      node["foo"].should == "bar"
     end
 
     it "should allow removing xml" do
-      @t.insert_xml 'gd:extendedProperty'
-      @t.xml.xpath('./gd:extendedProperty').should have(1).node
+      @t.insert_xml "gd:extendedProperty"
+      @t.xml.xpath("./gd:extendedProperty").should have(1).node
 
-      @t.remove_xml 'gd:extendedProperty'
-      @t.xml.xpath('./gd:extendedProperty').should have(:no).nodes
+      @t.remove_xml "gd:extendedProperty"
+      @t.xml.xpath("./gd:extendedProperty").should have(:no).nodes
     end
   end
 
@@ -60,39 +60,39 @@ describe GoogleContacts::Base do
 
     # It is not sane to try and save a default entry
     it "should not save when an entry is new but has no changed fields" do
-      @entry.stubs(:new? => true, :changed? => false)
-      @wrapper.expects(:append_operation).never
+      @entry.stub(:new? => true, :changed? => false)
+      @wrapper.should_not_receive(:append_operation)
       @entry.save
     end
 
     it "should save when an entry is new and has changed fields" do
-      @entry.stubs(:new? => true, :changed? => true)
-      @wrapper.expects(:append_operation).with(@entry, :insert)
+      @entry.stub(:new? => true, :changed? => true)
+      @wrapper.should_receive(:append_operation).with(@entry, :insert)
       @entry.save
     end
 
     it "should save when an entry has changed fields" do
-      @entry.stubs(:new? => false, :changed? => true)
-      @wrapper.expects(:append_operation).with(@entry, :update)
+      @entry.stub(:new? => false, :changed? => true)
+      @wrapper.should_receive(:append_operation).with(@entry, :update)
       @entry.save
     end
 
     it "should not delete when an entry is new" do
-      @entry.stubs(:new? => true)
-      @wrapper.expects(:append_operation).never
+      @entry.stub(:new? => true)
+      @wrapper.should_not_receive(:append_operation)
       @entry.delete
     end
 
     it "should delete when an entry is not new" do
-      @entry.stubs(:new? => false)
-      @wrapper.expects(:append_operation).with(@entry, :delete)
+      @entry.stub(:new? => false)
+      @wrapper.should_receive(:append_operation).with(@entry, :delete)
       @entry.delete
     end
   end
 
   describe "prepare for batch operation" do
     before(:all) do
-      @t = GoogleContacts::BaseTester.new(wrapper, parsed_asset('contacts_full').at('feed > entry'))
+      @t = GoogleContacts::BaseTester.new(wrapper, parsed_asset("contacts_full").at("feed > entry"))
       @batch = @t.entry_for_batch(:update)
     end
 
@@ -101,15 +101,15 @@ describe GoogleContacts::Base do
     end
 
     it "should create a duplicate node without link tags" do
-      @batch.xpath('./atom:link').should be_empty
+      @batch.xpath("./atom:link").should be_empty
     end
 
     it "should not touch the category tag" do
-      @batch.xpath('./atom:category').should_not be_nil
+      @batch.xpath("./atom:category").should_not be_nil
     end
 
     it "should remove the updated tag (not useful when updating)" do
-      @batch.xpath('./atom:updated').should be_empty
+      @batch.xpath("./atom:updated").should be_empty
     end
 
     it "should be possible to combine feed_for_batch and entry_for_batch" do
@@ -118,9 +118,9 @@ describe GoogleContacts::Base do
     end
 
     it "should corretly set the batch:operation tag" do
-      %(insert update delete).each do |op|
+      %w(insert update delete).each do |op|
         batch = @t.entry_for_batch(op.to_sym)
-        batch.at('./batch:operation')['type'].should == op
+        batch.at("./batch:operation")["type"].should == op
       end
     end
   end

data/spec/contact_spec.rb

@@ -1,15 +1,15 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require "spec_helper"
 
 describe GoogleContacts::Contact do
   describe "when loaded" do
     before(:each) do
-      entries = parsed_asset('contacts_full').search('feed > entry')
+      entries = parsed_asset("contacts_full").search("feed > entry")
       @contacts = entries.map { |entry| GoogleContacts::Contact.new(wrapper, entry) }
       @contact  = @contacts.first
     end
 
     it "should know its href" do
-      @contact.href.should == 'http://www.google.com/m8/feeds/contacts/liz%40gmail.com/base/c9012de'
+      @contact.href.should == "http://www.google.com/m8/feeds/contacts/liz%40gmail.com/base/c9012de"
     end
 
     it "should know when it was updated" do
@@ -18,15 +18,15 @@ describe GoogleContacts::Contact do
 
     it "should initialize with groups from xml" do
       @contact.groups.should have(1).group
-      @contact.groups[0].should == 'http://www.google.com/m8/feeds/groups/liz%40gmail.com/base/270f'
+      @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'
+      @contact[:pet].should == "hamster"
     end
 
     it "should initialize the title tag" do
-      @contact.title.should == 'Fitzwilliam Darcy'
+      @contact.title.should == "Fitzwilliam Darcy"
     end
 
     it "should not be changed? initially" do
@@ -35,24 +35,24 @@ describe GoogleContacts::Contact do
 
     describe "urls" do
       it "should know its self url" do
-        @contact.url(:self).should == 'http://www.google.com/m8/feeds/contacts/liz%40gmail.com/full/c9012de'
+        @contact.url(:self).should == "http://www.google.com/m8/feeds/contacts/liz%40gmail.com/full/c9012de"
       end
 
       it "should know its edit url" do
-        @contact.url(:edit).should == 'http://www.google.com/m8/feeds/contacts/liz%40gmail.com/full/c9012de'
+        @contact.url(:edit).should == "http://www.google.com/m8/feeds/contacts/liz%40gmail.com/full/c9012de"
       end
 
       it "should know its photo url" do
-        @contact.url(:photo).should == 'http://www.google.com/m8/feeds/photos/media/liz%40gmail.com/c9012de'
+        @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'
-        @contact.title = 'foo'
+        @contact.xml.at("./atom:title").content.should == "Fitzwilliam Darcy"
+        @contact.title = "foo"
         @contact.title.synchronize
-        @contact.xml.at('./atom:title').content.should == 'foo'
+        @contact.xml.at("./atom:title").content.should == "foo"
       end
     end
   end
@@ -64,12 +64,12 @@ describe GoogleContacts::Contact do
     end
 
     it "should create a new xml root node" do
-      @root.name.should == 'entry'
-      @root.namespace.href.should == 'http://www.w3.org/2005/Atom'
+      @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'
+      @root.at_xpath("./atom:category")["term"].should == "http://schemas.google.com/contact/2008#contact"
     end
 
     it "should not have an href" do
@@ -93,23 +93,23 @@ describe GoogleContacts::Contact do
     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.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'
+      @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
-        @contact.title = 'foo'
+        @contact.xml.at("./atom:title").should be_nil
+        @contact.title = "foo"
         @contact.title.synchronize
-        @contact.xml.at('./atom:title').content.should == 'foo'
+        @contact.xml.at("./atom:title").content.should == "foo"
       end
     end
   end
@@ -122,32 +122,32 @@ describe GoogleContacts::Contact do
 
     describe "on groups" do
       before(:each) do
-        @groups = [stub('group1', :href => 'foo'), stub('group2', :href => 'bar')]
+        @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
+        @contact.groups.should == ["foo", "bar"].sort
       end
 
       it "should be possible to add an array of urls" do
-        @contact.groups += ['foo', 'bar']
-        @contact.groups.should == ['foo', 'bar'].sort
+        @contact.groups += ["foo", "bar"]
+        @contact.groups.should == ["foo", "bar"].sort
       end
 
       describe "with initial content" do
         before(:each) do
-          @contact.groups = ['foo', 'bar', 'quux']
+          @contact.groups = ["foo", "bar", "quux"]
         end
 
         it "should be possible to remove an array of groups" do
           @contact.groups -= @groups
-          @contact.groups.should == ['quux']
+          @contact.groups.should == ["quux"]
         end
 
         it "should be possible to remove an array of urls" do
-          @contact.groups -= ['foo', 'bar']
-          @contact.groups.should == ['quux']
+          @contact.groups -= ["foo", "bar"]
+          @contact.groups.should == ["quux"]
         end
       end
     end

data/spec/group_spec.rb

@@ -1,18 +1,18 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require "spec_helper"
 
 describe GoogleContacts::Group do
   before(:each) do
-    entries = parsed_asset('groups_full').search('feed > entry')
+    entries = parsed_asset("groups_full").search("feed > entry")
     @groups = entries.map { |entry| GoogleContacts::Group.new(wrapper, entry) }
     @group  = @groups.first
   end
 
   it "should know its href" do
-    @group.href.should == 'http://www.google.com/m8/feeds/groups/jo%40gmail.com/base/6'
+    @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'
+    @group.title.should == "System Group: My Contacts"
   end
 
   it "should know when it is a system group" do
@@ -21,6 +21,6 @@ describe GoogleContacts::Group do
   end
 
   it "should initialize extended properties" do
-    @group[:foo].should == 'bar'
+    @group[:foo].should == "bar"
   end
 end

data/spec/proxies/array_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require "spec_helper"
 
 describe GoogleContacts::Proxies::Array do
   describe "with existing entries" do
@@ -8,7 +8,7 @@ describe GoogleContacts::Proxies::Array do
 
     it "should initialize on creation" do
       @proxy.size.should == 1
-      @proxy[0].should == 'http://some.group'
+      @proxy[0].should == "http://some.group"
     end
   end
 
@@ -18,20 +18,20 @@ describe GoogleContacts::Proxies::Array do
     end
 
     it "should allow pushing a plain value" do
-      @proxy << 'http://foo'
+      @proxy << "http://foo"
       @proxy.should have(1).group
-      @proxy[0].should == 'http://foo'
+      @proxy[0].should == "http://foo"
     end
 
     it "should allow pushing an object that responds to href" do
-      @proxy << mock('Group', :href => 'http://foo')
+      @proxy << mock("Group", :href => "http://foo")
       @proxy.should have(1).group
-      @proxy[0].should == 'http://foo'
+      @proxy[0].should == "http://foo"
     end
 
     it "should filter duplicates" do
-      @proxy << 'http://foo'
-      @proxy << 'http://foo'
+      @proxy << "http://foo"
+      @proxy << "http://foo"
       @proxy.should have(1).group
     end
 
@@ -41,7 +41,7 @@ describe GoogleContacts::Proxies::Array do
     end
 
     it "should allow clearing" do
-      @proxy << 'http://foo'
+      @proxy << "http://foo"
       @proxy.clear
       @proxy.should have(:no).groups
     end
@@ -59,13 +59,13 @@ describe GoogleContacts::Proxies::Array do
 
     it "should work after pushing a new entry" do
       lambda {
-        @proxy << 'http://foo'
+        @proxy << "http://foo"
       }.should change(@proxy, :changed?).from(false).to(true)
     end
 
     it "should not be changed when a duplicate is added" do
       lambda {
-        @proxy << 'http://some.group'
+        @proxy << "http://some.group"
       }.should_not change(@proxy, :changed?).from(false)
     end
 
@@ -77,7 +77,7 @@ describe GoogleContacts::Proxies::Array do
 
     it "should not be influenced by order" do
       lambda {
-        @proxy.replace ['http://another.group', 'http://some.group']
+        @proxy.replace ["http://another.group", "http://some.group"]
       }.should_not change(@proxy, :changed?).from(false)
     end
   end
@@ -88,18 +88,18 @@ describe GoogleContacts::Proxies::Array do
     end
 
     it "should update the group entries" do
-      @proxy << 'http://another.group'
-      @proxy << 'http://some.group'
-      @parent.expects(:remove_xml).with('./group')
-      @parent.expects(:insert_xml).with('group', { 'href' => 'http://another.group' })
-      @parent.expects(:insert_xml).with('group', { 'href' => 'http://some.group'    })
+      @proxy << "http://another.group"
+      @proxy << "http://some.group"
+      @parent.should_receive(:remove_xml).with("./group")
+      @parent.should_receive(:insert_xml).with("group", { "href" => "http://another.group" })
+      @parent.should_receive(:insert_xml).with("group", { "href" => "http://some.group"    })
       @proxy.synchronize
     end
   end
 
   def create_proxy_from_xml(str)
-    @parent = mock('parent', :xml => Nokogiri::XML.parse(str).root)
-    @proxy  = GoogleContacts::Proxies::Array.new(@parent, :tag => 'group', :attr => 'href')
+    @parent = mock("parent", :xml => Nokogiri::XML.parse(str).root)
+    @proxy  = GoogleContacts::Proxies::Array.new(@parent, :tag => "group", :attr => "href")
   end
 end