googlecontacts 0.1.8 → 0.2.0

data/spec/proxies/emails_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require "spec_helper"
 
 describe GoogleContacts::Proxies::Emails do
   describe "with existing entries" do
@@ -14,21 +14,21 @@ describe GoogleContacts::Proxies::Emails do
     end
 
     it "should initialize on creation" do
-      @proxy['foo@bar.example.com'].address .should == 'foo@bar.example.com'
-      @proxy['foo@bar.example.com'].name    .should == 'Foo Bar'
-      @proxy['foo@bar.example.com'].label   .should == 'Personal'
-      @proxy['foo@bar.example.com'].rel     .should be_nil
-      @proxy['foo@bar.example.com']         .should_not be_primary
+      @proxy["foo@bar.example.com"].address .should == "foo@bar.example.com"
+      @proxy["foo@bar.example.com"].name    .should == "Foo Bar"
+      @proxy["foo@bar.example.com"].label   .should == "Personal"
+      @proxy["foo@bar.example.com"].rel     .should be_nil
+      @proxy["foo@bar.example.com"]         .should_not be_primary
 
-      @proxy['fubar@gmail.com'    ].address .should == 'fubar@gmail.com'
-      @proxy['fubar@gmail.com'    ].name    .should be_nil
-      @proxy['fubar@gmail.com'    ].label   .should be_nil
-      @proxy['fubar@gmail.com'    ].rel     .should == 'http://schemas.google.com/g/2005#home'
-      @proxy['fubar@gmail.com'    ]         .should be_primary
+      @proxy["fubar@gmail.com"    ].address .should == "fubar@gmail.com"
+      @proxy["fubar@gmail.com"    ].name    .should be_nil
+      @proxy["fubar@gmail.com"    ].label   .should be_nil
+      @proxy["fubar@gmail.com"    ].rel     .should == "http://schemas.google.com/g/2005#home"
+      @proxy["fubar@gmail.com"    ]         .should be_primary
     end
 
     it "should be able to return the primary address" do
-      @proxy.primary.should == @proxy['fubar@gmail.com']
+      @proxy.primary.should == @proxy["fubar@gmail.com"]
     end
 
     it "should initially be unchanged" do
@@ -41,23 +41,23 @@ describe GoogleContacts::Proxies::Emails do
       end
 
       it "when switching primary" do
-        @proxy['foo@bar.example.com'].primary!
+        @proxy["foo@bar.example.com"].primary!
       end
 
       it "when modifying name" do
-        @proxy['foo@bar.example.com'].name = 'Quux'
+        @proxy["foo@bar.example.com"].name = "Quux"
       end
 
       it "when modifying rel" do
-        @proxy['foo@bar.example.com'].rel = 'http://some.rel'
+        @proxy["foo@bar.example.com"].rel = "http://some.rel"
       end
 
       it "when adding a new address" do
-        @proxy << 'john@doe.com'
+        @proxy << "john@doe.com"
       end
 
       it "when removing an address" do
-        @proxy.delete 'foo@bar.example.com'
+        @proxy.delete "foo@bar.example.com"
       end
     end
   end
@@ -72,59 +72,59 @@ describe GoogleContacts::Proxies::Emails do
 
     it "should be possible to add email address" do
       lambda {
-        @proxy['foo@bar.com']
+        @proxy["foo@bar.com"]
       }.should change(@proxy, :size).by(1)
 
       lambda {
-        @proxy << 'quux@bar.com'
+        @proxy << "quux@bar.com"
       }.should change(@proxy, :size).by(1)
     end
 
     it "should raise when adding a duplicate" do
-      @proxy << 'quux@bar.com'
+      @proxy << "quux@bar.com"
       lambda {
-        @proxy << 'quux@bar.com'
+        @proxy << "quux@bar.com"
       }.should raise_error
     end
 
     it "should provide sensible defaults for new addresses" do
-      @proxy['john@doe.com'].address.should == 'john@doe.com'
-      @proxy['john@doe.com'].rel.should == 'http://schemas.google.com/g/2005#home'
-      @proxy['john@doe.com'].label.should be_nil
+      @proxy["john@doe.com"].address.should == "john@doe.com"
+      @proxy["john@doe.com"].rel.should == "http://schemas.google.com/g/2005#home"
+      @proxy["john@doe.com"].label.should be_nil
     end
 
     it "should set the first created entry to be primary" do
-      @proxy['john@doe.com'].should be_primary
+      @proxy["john@doe.com"].should be_primary
     end
 
     it "should only allow one entry to be primary" do
-      @proxy['john@doe.com'].should be_primary
-      @proxy['jane@doe.com'].should_not be_primary
-      @proxy['jane@doe.com'].primary!
-      @proxy['john@doe.com'].should_not be_primary
-      @proxy['jane@doe.com'].should be_primary
+      @proxy["john@doe.com"].should be_primary
+      @proxy["jane@doe.com"].should_not be_primary
+      @proxy["jane@doe.com"].primary!
+      @proxy["john@doe.com"].should_not be_primary
+      @proxy["jane@doe.com"].should be_primary
     end
 
     it "should only allow either rel or label to be set" do
-      @proxy['john@doe.com'].rel   = 'foo'
-      @proxy['john@doe.com'].label = 'foo'
-      @proxy['john@doe.com'].rel.should be_nil
+      @proxy["john@doe.com"].rel   = "foo"
+      @proxy["john@doe.com"].label = "foo"
+      @proxy["john@doe.com"].rel.should be_nil
 
-      @proxy['john@doe.com'].label = 'foo'
-      @proxy['john@doe.com'].rel   = 'foo'
-      @proxy['john@doe.com'].label.should be_nil
+      @proxy["john@doe.com"].label = "foo"
+      @proxy["john@doe.com"].rel   = "foo"
+      @proxy["john@doe.com"].label.should be_nil
     end
 
     it "should raise when attempting to modify the address" do
       lambda {
-        @proxy['john@doe.com'].address = 'foo'
+        @proxy["john@doe.com"].address = "foo"
       }.should raise_error(/cannot modify/i)
     end
 
     it "should allow email addresses to be removed" do
-      @proxy << 'john@doe.com'
+      @proxy << "john@doe.com"
       lambda {
-        @proxy.delete('john@doe.com')
+        @proxy.delete("john@doe.com")
       }.should change(@proxy, :size).from(1).to(0)
     end
   end
@@ -138,28 +138,30 @@ describe GoogleContacts::Proxies::Emails do
     end
 
     it "should clear existing email tags" do
-      @proxy << 'john@doe.com'
-      @parent.expects(:remove_xml).with('./gd:email')
-      @parent.stubs(:insert_xml)
+      @proxy << "john@doe.com"
+      @parent.should_receive(:remove_xml).with("./gd:email")
+      @parent.stub(:insert_xml)
       @proxy.synchronize
     end
 
     it "should add every email address" do
-      @proxy << 'john@doe.com'
-      @proxy << 'jane@doe.com'
-
-      @parent.stubs(:remove_xml)
-      @parent.expects(:insert_xml).with('gd:email', has_entries(
-        'address' => 'john@doe.com',
-        'primary' => 'true'))
-      @parent.expects(:insert_xml).with('gd:email', has_entries(
-        'address' => 'jane@doe.com'))
+      @proxy << "john@doe.com"
+      @proxy << "jane@doe.com"
+
+      @parent.stub(:remove_xml)
+      @parent.should_receive(:insert_xml).
+        with("gd:email", include(
+          "address" => "john@doe.com",
+          "primary" => "true"))
+      @parent.should_receive(:insert_xml).
+        with("gd:email", include(
+          "address" => "jane@doe.com"))
       @proxy.synchronize
     end
   end
 
   def create_proxy_from_xml(str)
-    @parent = stub('parent', :xml => Nokogiri::XML.parse(str).root)
+    @parent = stub("parent", :xml => Nokogiri::XML.parse(str).root)
     @proxy  = GoogleContacts::Proxies::Emails.new(@parent)
   end
 end

data/spec/proxies/hash_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require "spec_helper"
 
 describe GoogleContacts::Proxies::Hash do
   describe "with existing entries" do
@@ -11,7 +11,7 @@ describe GoogleContacts::Proxies::Hash do
     end
 
     it "should initialize on creation" do
-      @proxy[:foo].should == 'bar'
+      @proxy[:foo].should == "bar"
       @proxy.should have(1).entry
     end
   end
@@ -22,13 +22,13 @@ describe GoogleContacts::Proxies::Hash do
     end
 
     it "should allow setting a value" do
-      @proxy[:foo] = 'bar'
+      @proxy[:foo] = "bar"
       @proxy.should have(1).entry
-      @proxy[:foo].should == 'bar'
+      @proxy[:foo].should == "bar"
     end
 
     it "should allow clearing" do
-      @proxy[:foo] = 'bar'
+      @proxy[:foo] = "bar"
       @proxy.clear
       @proxy.should have(:no).entries
     end
@@ -45,13 +45,13 @@ describe GoogleContacts::Proxies::Hash do
 
     it "should work when a new value was set" do
       lambda {
-        @proxy[:foo] = 'quux'
+        @proxy[:foo] = "quux"
       }.should change(@proxy, :changed?).from(false).to(true)
     end
 
     it "should not be changed when the new value equals the old one" do
       lambda {
-        @proxy[:foo] = 'foo'
+        @proxy[:foo] = "foo"
       }.should_not change(@proxy, :changed?).from(false)
     end
   end
@@ -62,17 +62,17 @@ describe GoogleContacts::Proxies::Hash do
     end
 
     it "should update the group entries" do
-      @proxy[:foo] = 'quux'
-      @proxy[:baz] = 'bar'
-      @parent.expects(:remove_xml).with('./prop')
-      @parent.expects(:insert_xml).with('prop', { 'name' => 'foo', 'value' => 'quux' })
-      @parent.expects(:insert_xml).with('prop', { 'name' => 'baz', 'value' => 'bar'  })
+      @proxy[:foo] = "quux"
+      @proxy[:baz] = "bar"
+      @parent.should_receive(:remove_xml).with("./prop")
+      @parent.should_receive(:insert_xml).with("prop", { "name" => "foo", "value" => "quux" })
+      @parent.should_receive(:insert_xml).with("prop", { "name" => "baz", "value" => "bar"  })
       @proxy.synchronize
     end
   end
 
   def create_proxy_from_xml(str)
-    @parent = stub('parent', :xml => Nokogiri::XML.parse(str).root)
-    @proxy  = GoogleContacts::Proxies::Hash.new(@parent, :tag => 'prop', :key => 'name', :value => 'value')
+    @parent = stub("parent", :xml => Nokogiri::XML.parse(str).root)
+    @proxy  = GoogleContacts::Proxies::Hash.new(@parent, :tag => "prop", :key => "name", :value => "value")
   end
 end

data/spec/proxies/tag_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require "spec_helper"
 
 describe GoogleContacts::Proxies::Tag do
   describe "with existing entries" do
@@ -11,7 +11,7 @@ describe GoogleContacts::Proxies::Tag do
     end
 
     it "should initialize" do
-      @proxy.should == 'Example'
+      @proxy.should == "Example"
     end
 
     it "should not be changed when initialized" do
@@ -32,7 +32,7 @@ describe GoogleContacts::Proxies::Tag do
     end
 
     it "should not create the tag when initializing" do
-      @parent.xml.xpath('./atom:title').should have(:no).entries
+      @parent.xml.xpath("./atom:title").should have(:no).entries
     end
 
     it "should not be changed when initialized" do
@@ -55,8 +55,9 @@ describe GoogleContacts::Proxies::Tag do
       end
 
       it "should create the tag" do
-        @node = mock('node') { expects(:content=).with('Example') }
-        @parent.expects(:insert_xml).with('atom:title').returns(@node)
+        @node = double("node")
+        @node.should_receive(:content=).with("Example")
+        @parent.should_receive(:insert_xml).with("atom:title").and_return(@node)
         @proxy.replace("Example")
         @proxy.synchronize
       end
@@ -74,14 +75,14 @@ describe GoogleContacts::Proxies::Tag do
       it "should update the tag" do
         @proxy.replace("Replacement")
         @proxy.synchronize
-        @parent.xml.at('./atom:title').content.should == 'Replacement'
+        @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  = GoogleContacts::Proxies::Tag.new(@parent, :tag => 'atom:title')
+    @parent = stub("parent", :xml => Nokogiri::XML.parse(str).root)
+    @proxy  = GoogleContacts::Proxies::Tag.new(@parent, :tag => "atom:title")
   end
 end
 

data/spec/spec_helper.rb

@@ -1,18 +1,10 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems'
-require 'spec'
-require 'spec/autorun'
-require 'pp'
-
-require 'fakeweb'
-FakeWeb.allow_net_connect = false
-
-require 'google_contacts'
+require "rspec"
+require "fakeweb"
+require "google_contacts"
 
 module Helpers
   def consumer
-    ::OAuth::AccessToken.new(GoogleContacts::Auth.consumer, 'key', 'secret')
+    ::OAuth::AccessToken.new(GoogleContacts::Auth.consumer, "key", "secret")
   end
 
   def wrapper
@@ -28,7 +20,8 @@ module Helpers
   end
 end
 
-Spec::Runner.configure do |config|
-  config.include(Helpers)
-  config.mock_with :mocha
+FakeWeb.allow_net_connect = false
+
+RSpec.configure do |config|
+  config.include Helpers
 end

data/spec/wrapper_spec.rb

@@ -1,15 +1,15 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require "spec_helper"
 
 describe GoogleContacts::Wrapper do
   describe "fetching" do
     before(:each) do
-      @options = { 'max-results' => 200, 'start-index' => 1 }
+      @options = { "max-results" => 200, "start-index" => 1 }
     end
 
     def params(overrides)
       @options.merge(overrides).map do |tuple|
-        tuple.join('=')
-      end.join('&')
+        tuple.join("=")
+      end.join("&")
     end
 
     def register(type, options = {})
@@ -18,27 +18,27 @@ describe GoogleContacts::Wrapper do
     end
 
     it "should be able to get list of contacts" do
-      register(:contacts) { asset('contacts_full') }
+      register(:contacts) { asset("contacts_full") }
       result = wrapper.contacts.find(:all)
       result.should have(1).contact
       result.first.should be_a GoogleContacts::Contact
     end
 
     it "should be able to get list of contacts when result is paginated" do
-      register(:contacts, 'start-index' =>  1) { asset('contacts_full_page1') }
-      register(:contacts, 'start-index' => 26) { asset('contacts_full_page2') }
+      register(:contacts, "start-index" =>  1) { asset("contacts_full_page1") }
+      register(:contacts, "start-index" => 26) { asset("contacts_full_page2") }
       result = wrapper.contacts.find(:all)
       result.should have(2).contacts
     end
 
     it "should be possible to specify the max-results parameter" do
-      register(:contacts, 'max-results' => 25) { asset('contacts_full') }
-      result = wrapper.contacts.find(:all, 'max-results' => 25)
+      register(:contacts, "max-results" => 25) { asset("contacts_full") }
+      result = wrapper.contacts.find(:all, "max-results" => 25)
       result.should have(1).contact
     end
 
     it "should be able to get list of groups" do
-      register(:groups) { asset('groups_full') }
+      register(:groups) { asset("groups_full") }
       result = wrapper.groups.find(:all)
       result.should have(2).groups
       result.first.should be_a GoogleContacts::Group
@@ -53,48 +53,48 @@ describe GoogleContacts::Wrapper do
     end
 
     it "should collect operations in a batch" do
-      wrapper.expects(:post).never
+      wrapper.should_not_receive(:post)
       document = wrapper.batch(:return_documents => true) do
-        wrapper.contacts.build(:name => 'c1').save
-        wrapper.contacts.build(:name => 'c2').save
+        wrapper.contacts.build(:name => "c1").save
+        wrapper.contacts.build(:name => "c2").save
       end.first
 
-      document.xpath('.//xmlns:entry').should have(2).entries
-      document.xpath('.//batch:operation').each do |operation|
-        operation['type'].should == 'insert'
+      document.xpath(".//xmlns:entry").should have(2).entries
+      document.xpath(".//batch:operation").each do |operation|
+        operation["type"].should == "insert"
       end
     end
 
     it "should flush batches in chunks of 100" do
-      wrapper.expects(:post).with(regexp_matches(%r!/contacts/!), is_a(String)).twice
+      wrapper.should_receive(:post).with(%r@/contacts/@, kind_of(String)).twice
       wrapper.batch do
-        contact = wrapper.contacts.build(:name => 'contact')
+        contact = wrapper.contacts.build(:name => "contact")
         101.times { contact.save }
       end
     end
 
     it "should not flush when there are no operations to execute" do
-      wrapper.expects(:post).never
+      wrapper.should_not_receive(:post)
       wrapper.batch {}
     end
 
     it "should raise when mixing contacts and groups in one batch" do
       lambda {
         wrapper.batch {
-          wrapper.contacts.build(:name => 'contact').save
-          wrapper.groups.build(:name => 'group').save
+          wrapper.contacts.build(:name => "contact").save
+          wrapper.groups.build(:name => "group").save
         }
       }.should raise_error(/cannot mix/i)
     end
 
     it "should POST a single-operation batch to contacts when not batching" do
-      wrapper.expects(:post).with(regexp_matches(%r!/contacts/!), is_a(String))
-      wrapper.contacts.build(:name => 'contact').save
+      wrapper.should_receive(:post).with(%r@/contacts/@, kind_of(String))
+      wrapper.contacts.build(:name => "contact").save
     end
 
     it "should POST a single-operation batch to groups when not batching" do
-      wrapper.expects(:post).with(regexp_matches(%r!/groups/!), is_a(String))
-      wrapper.groups.build(:name => 'group').save
+      wrapper.should_receive(:post).with(%r@/groups/@, kind_of(String))
+      wrapper.groups.build(:name => "group").save
     end
   end
 end