google_contacts_api 0.3.3 → 0.4.0

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 rvm:
-  - "1.8.7"
-  - "1.9.2"
   - "1.9.3"
-  - jruby-18mode # JRuby in 1.8 mode
+  - "2.0.0"
+  - "2.1.1"
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
+  - rbx-19mode
+  - rbx-2

data/Gemfile

@@ -11,7 +11,7 @@ gem "hashie"
 group :test, :development do
   gem "shoulda"
   gem "simplecov"
-  gem "rspec"
+  gem "rspec", "~> 3.0"
   gem "rdoc"
 end
 

data/Rakefile

@@ -16,7 +16,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/aliang/google_contacts_api"
   gem.license = "MIT"
   gem.summary = %Q{Lets you read from the Google Contacts API}
-  gem.description = %Q{Lets you read from the Google Contacts API. Posting to come later. Tests to come later.}
+  gem.description = %Q{Lets you read from the Google Contacts API. Posting to come later.}
   gem.email = "ayliang@gmail.com"
   gem.authors = ["Alvin Liang"]
 end

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/google_contacts_api.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "google_contacts_api"
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alvin Liang"]
-  s.date = "2013-01-15"
-  s.description = "Lets you read from the Google Contacts API. Posting to come later. Tests to come later."
+  s.date = "2014-08-21"
+  s.description = "Lets you read from the Google Contacts API. Posting to come later."
   s.email = "ayliang@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<hashie>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<hashie>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 3.0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -83,7 +83,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<hashie>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 3.0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/lib/google_contacts_api/api.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/core_ext'
 
 module GoogleContactsApi
@@ -20,9 +21,9 @@ module GoogleContactsApi
     # ":" is replaced with $, element content is keyed with $t
     # Raise UnauthorizedError if not authorized.
     def get(link, params = {}, headers = {})
-      params["alt"] = "json"
+      merged_params = params_with_defaults(params)
       begin
-        result = @oauth.get("#{BASE_URL}#{link}?#{params.to_query}", headers)
+        result = @oauth.get("#{BASE_URL}#{link}?#{merged_params.to_query}", headers)
       rescue => e
         # TODO: OAuth 2.0 will raise a real error
         raise UnauthorizedError if defined?(e.response) && self.class.parse_response_code(e.response) == 401
@@ -63,5 +64,15 @@ module GoogleContactsApi
     def self.parse_response_code(response)
       (defined?(response.code) ? response.code : response.status).to_i
     end
+
+    private
+
+    def params_with_defaults(params)
+      p = params.merge({
+        "alt" => "json"
+      })
+      p['v'] = '3' unless p['v']
+      p
+    end
   end
 end

data/lib/google_contacts_api/contact.rb

@@ -83,5 +83,76 @@ module GoogleContactsApi
     def ims
       self["gd$im"] ? self["gd$im"].map { |i| i.address } : []
     end
+
+    def nested_t_field_or_nil(level1, level2)
+      if self[level1]
+        self[level1][level2] ? self[level1][level2]['$t']: nil
+      end
+    end
+    def given_name
+      nested_t_field_or_nil 'gd$name', 'gd$givenName'
+    end
+    def family_name
+      nested_t_field_or_nil 'gd$name', 'gd$familyName'
+    end
+    def full_name
+      nested_t_field_or_nil 'gd$name', 'gd$fullName'
+    end
+    def additional_name
+      nested_t_field_or_nil 'gd$name', 'gd$additionalName'
+    end
+    def name_prefix
+      nested_t_field_or_nil 'gd$name', 'gd$namePrefix'
+    end
+    def name_suffix
+      nested_t_field_or_nil 'gd$name', 'gd$nameSuffix'
+    end
+
+    def relations
+      self['gContact$relation'] ? self['gContact$relation'] : []
+    end
+    def spouse
+      spouse_rel = relations.find {|r| r.rel = 'spouse'}
+      spouse_rel['$t'] if spouse_rel
+    end
+
+    def addresses
+      self['gd$structuredPostalAddress'] ? self['gd$structuredPostalAddress'].map(&method(:format_address)) : []
+    end
+    def phone_numbers_full
+      self["gd$phoneNumber"] ? self["gd$phoneNumber"].map(&method(:format_phone_number)) : []
+    end
+    def emails_full
+      self["gd$email"] ? self["gd$email"].map(&method(:format_email)) : []
+    end
+
+  private
+    def format_address(unformatted)
+      formatted = {}
+      formatted[:rel] = unformatted['rel'] ? unformatted['rel'].gsub('http://schemas.google.com/g/2005#', '') : 'work'
+      unformatted.delete 'rel'
+      unformatted.each do |key, value|
+        formatted[key.sub('gd$', '').underscore.to_sym] = value['$t']
+      end
+      formatted
+    end
+
+    def format_email_or_phone(unformatted)
+      formatted = {}
+      unformatted.each do |key, value|
+        formatted[key.underscore.to_sym] = value ? value.gsub('http://schemas.google.com/g/2005#', '') : value
+      end
+      formatted[:primary] = unformatted['primary'] ? unformatted['primary'] == 'true' : false
+      formatted
+    end
+
+    def format_phone_number(unformatted)
+      unformatted[:number] = unformatted['$t']
+      unformatted.delete '$t'
+      format_email_or_phone unformatted
+    end
+    def format_email(unformatted)
+      format_email_or_phone unformatted
+    end
   end
 end

data/spec/google_contacts_api_spec.rb

@@ -12,18 +12,29 @@ describe "GoogleContactsApi" do
   describe "Api" do
     before(:each) do
       @oauth = double("oauth")
-      @oauth.stub(:get).and_return("get response")
+      allow(@oauth).to receive(:get).and_return("get response")
       @api = GoogleContactsApi::Api.new(@oauth)
     end
 
-    it "should perform a get request using oauth returning json" do
-      # expectation should come before execution
-      @oauth.should_receive(:get).with(
-        GoogleContactsApi::Api::BASE_URL + "any_url?alt=json&param=param", {"header" => "header"})
-      @api.get("any_url",
-        {"param" => "param"},
-        {"header" => "header"}).should == ("get response")
+    describe ".get" do
+      it "should perform a get request using oauth returning json with version 3" do
+        # expectation should come before execution
+        expect(@oauth).to receive(:get).with(
+          GoogleContactsApi::Api::BASE_URL + "any_url?alt=json&param=param&v=3", {"header" => "header"})
+        expect(@api.get("any_url",
+          {"param" => "param"},
+          {"header" => "header"})).to eq("get response")
+      end
+
+      it "should perform a get request using oauth with the version specified" do
+        expect(@oauth).to receive(:get).with(
+          GoogleContactsApi::Api::BASE_URL + "any_url?alt=json&param=param&v=2", {"header" => "header"})
+        expect(@api.get("any_url",
+          {"param" => "param", "v" => "2"},
+          {"header" => "header"})).to eq("get response")
+      end
     end
+
     # Not implemented yet
     pending "should perform a post request using oauth"
     pending "should perform a put request using oauth"
@@ -32,21 +43,21 @@ describe "GoogleContactsApi" do
     it "should raise UnauthorizedError if OAuth 1.0 returns unauthorized" do
       oauth = double("oauth")
       error_html = load_file(File.join('errors', 'auth_sub_401.html'))
-      oauth.stub(:get).and_return(Net::HTTPUnauthorized.new("1.1", 401, error_html))
+      allow(oauth).to receive(:get).and_return(Net::HTTPUnauthorized.new("1.1", 401, error_html))
       api = GoogleContactsApi::Api.new(oauth)
-      lambda { api.get("any url",
+      expect { api.get("any url",
         {"param" => "param"},
-        {"header" => "header"}) }.should raise_error(GoogleContactsApi::UnauthorizedError)
+        {"header" => "header"}) }.to raise_error(GoogleContactsApi::UnauthorizedError)
     end
     
     it "should raise UnauthorizedError if OAuth 2.0 returns unauthorized" do
       oauth = double("oauth2")
       oauth2_response = Struct.new(:status)
-      oauth.stub(:get).and_raise(MockOAuth2Error.new(oauth2_response.new(401)))
+      allow(oauth).to receive(:get).and_raise(MockOAuth2Error.new(oauth2_response.new(401)))
       api = GoogleContactsApi::Api.new(oauth)
-      lambda { api.get("any url",
+      expect { api.get("any url",
         {"param" => "param"},
-        {"header" => "header"}) }.should raise_error(GoogleContactsApi::UnauthorizedError)
+        {"header" => "header"}) }.to raise_error(GoogleContactsApi::UnauthorizedError)
     end
     
     describe "parsing response code" do
@@ -55,41 +66,41 @@ describe "GoogleContactsApi" do
         @Oauth2 = Struct.new(:status)
       end
       it "should parse something that looks like an oauth gem response" do
-        GoogleContactsApi::Api.parse_response_code(@Oauth.new("401")).should == 401
+        expect(GoogleContactsApi::Api.parse_response_code(@Oauth.new("401"))).to eq(401)
       end
-      
+
       it "should parse something that looks like an oauth2 gem response" do
-        GoogleContactsApi::Api.parse_response_code(@Oauth2.new(401)).should == 401
+        expect(GoogleContactsApi::Api.parse_response_code(@Oauth2.new(401))).to eq(401)
       end
     end
   end
-  
+
   describe "User" do
     before(:each) do
       @oauth = double("oauth")
       @user = GoogleContactsApi::User.new(@oauth)
-      @user.api.stub(:get).and_return(Hashie::Mash.new({
+      allow(@user.api).to receive(:get).and_return(Hashie::Mash.new({
         "body" => "some response", # could use example response here
         "code" => 200
       }))
-      GoogleContactsApi::GroupSet.stub(:new).and_return("group set")
-      GoogleContactsApi::ContactSet.stub(:new).and_return("contact set")
+      allow(GoogleContactsApi::GroupSet).to receive(:new).and_return("group set")
+      allow(GoogleContactsApi::ContactSet).to receive(:new).and_return("contact set")
     end
     # Should hit the right URLs and return the right stuff
     it "should be able to get groups including system groups" do
-      @user.api.should_receive(:get).with("groups/default/full", hash_including(:v => 2))
-      @user.groups.should == "group set"
+      expect(@user.api).to receive(:get).with("groups/default/full", hash_including(:v => 2))
+      expect(@user.groups).to eq("group set")
     end
     it "should be able to get contacts" do
-      @user.api.should_receive(:get).with("contacts/default/full", anything)
-      @user.contacts.should == "contact set"
+      expect(@user.api).to receive(:get).with("contacts/default/full", anything)
+      expect(@user.contacts).to eq("contact set")
     end
   end
-  
+
   describe "ResultSet" do
     # no testing, it's just an implementation detail to use inheritance
   end
-  
+
   describe "ContactSet" do
     describe "with entries" do
       before(:all) do
@@ -98,31 +109,31 @@ describe "GoogleContactsApi" do
       end
 
       it "should return the right starting index" do
-        @contact_set.start_index.should == 1
+        expect(@contact_set.start_index).to eq(1)
       end
       it "should return the right number of results per page" do
-        @contact_set.items_per_page.should == 25
+        expect(@contact_set.items_per_page).to eq(25)
       end
       it "should return the right number of total results" do
-        @contact_set.total_results.should == 500
+        expect(@contact_set.total_results).to eq(500)
       end
       it "should tell me if there are more results" do
         # yeah this is an awkward assertion and matcher
-        @contact_set.should be_has_more
-        @contact_set.has_more?.should == true
+        expect(@contact_set).to be_has_more
+        expect(@contact_set.has_more?).to eq(true)
       end
       it "should parse results into Contacts" do
-        @contact_set.to_a.first.should be_instance_of(GoogleContactsApi::Contact)
+        expect(@contact_set.to_a.first).to be_instance_of(GoogleContactsApi::Contact)
       end
     end
     it "should parse nil results into an empty array" do
       @empty_contact_set_json = empty_contact_set_json
       @empty_contact_set = GoogleContactsApi::ContactSet.new(@empty_contact_set_json)
-      @empty_contact_set.total_results.should == 0
-      @empty_contact_set.instance_variable_get("@results").should == []
+      expect(@empty_contact_set.total_results).to eq(0)
+      expect(@empty_contact_set.instance_variable_get("@results")).to eq([])
     end
   end
-  
+
   describe "GroupSet" do
     before(:all) do
       @group_set_json = group_set_json
@@ -130,28 +141,28 @@ describe "GoogleContactsApi" do
     end
 
     it "should return the right starting index" do
-      @group_set.start_index.should == 1
+      expect(@group_set.start_index).to eq(1)
     end
     it "should return the right number of results per page" do
-      @group_set.items_per_page.should == 25
+      expect(@group_set.items_per_page).to eq(25)
     end
     it "should return the right number of total results" do
-      @group_set.total_results.should == 5
+      expect(@group_set.total_results).to eq(5)
     end
     it "should tell me if there are more results" do
       # yeah this is an awkward assertion and matcher
-      @group_set.should_not be_has_more
-      @group_set.has_more?.should == false
+      expect(@group_set).not_to be_has_more
+      expect(@group_set.has_more?).to eq(false)
     end
     it "should parse results into Groups" do
-      @group_set.to_a.first.should be_instance_of(GoogleContactsApi::Group)
+      expect(@group_set.to_a.first).to be_instance_of(GoogleContactsApi::Group)
     end
   end
-  
+
   describe "Result" do
     # no testing, it's just an implementation detail to inherit
   end
-  
+
   describe "Contact" do
     before(:all) do
       @contact_json_hash = contact_json_hash
@@ -159,72 +170,193 @@ describe "GoogleContactsApi" do
     end
     # ok, these tests are kind of silly
     it "should return the right title" do
-      @contact.title.should == "Contact 1"
+      expect(@contact.title).to eq("Contact 1")
     end
     it "should return the right id" do
-      @contact.id.should == "http://www.google.com/m8/feeds/contacts/example%40gmail.com/base/0"
+      expect(@contact.id).to eq("http://www.google.com/m8/feeds/contacts/example%40gmail.com/base/0")
     end
     it "should return the right content" do
       # TODO: Nothing in source, oops
-      @contact.content.should == nil
+      expect(@contact.content).to eq(nil)
     end
     it "should return the right updated time" do
       # different representation slightly
-      @contact.updated.to_s.should == "2011-07-07T21:02:42+00:00"
+      expect(@contact.updated.to_s).to eq("2011-07-07T21:02:42+00:00")
     end
     it "should return the right self link" do
-      @contact.self_link.should == "https://www.google.com/m8/feeds/contacts/example%40gmail.com/full/0"
+      expect(@contact.self_link).to eq("https://www.google.com/m8/feeds/contacts/example%40gmail.com/full/0")
     end
     it "should return the right photo link" do
-      @contact.photo_link.should == "https://www.google.com/m8/feeds/photos/media/example%40gmail.com/0"
+      expect(@contact.photo_link).to eq("https://www.google.com/m8/feeds/photos/media/example%40gmail.com/0")
     end
     it "should return the right edit link" do
-      @contact.edit_link.should == "https://www.google.com/m8/feeds/contacts/example%40gmail.com/full/0"
+      expect(@contact.edit_link).to eq("https://www.google.com/m8/feeds/contacts/example%40gmail.com/full/0")
     end
     it "should return the right edit photo link" do
       # TODO: there isn't one in this contact, hahah
-      @contact.edit_photo_link.should == nil
+      expect(@contact.edit_photo_link).to eq(nil)
     end
     it "should try to fetch a photo" do
-      @oauth = mock("oauth")
-      @oauth.stub(:get).and_return(Hashie::Mash.new({
+      @oauth = double("oauth")
+      allow(@oauth).to receive(:get).and_return(Hashie::Mash.new({
         "body" => "some response", # could use example response here
         "code" => 200
       }))
       # @api = GoogleContactsApi::Api.new(@oauth)
-      @api = mock("api")
-      @api.stub(:oauth).and_return(@oauth)
+      @api = double("api")
+      allow(@api).to receive(:oauth).and_return(@oauth)
       @contact = GoogleContactsApi::Contact.new(@contact_json_hash, nil, @api)
-      @oauth.should_receive("get").with(@contact.photo_link)
+      expect(@oauth).to receive("get").with(@contact.photo_link)
       @contact.photo
     end
     # TODO: there isn't any phone number in here
     pending "should return all phone numbers"
     it "should return all e-mail addresses" do
-      @contact.emails.should == ["contact1@example.com"]
+      expect(@contact.emails).to eq(["contact1@example.com"])
     end
     it "should return the right primary e-mail address" do
-      @contact.primary_email.should == "contact1@example.com"
+      expect(@contact.primary_email).to eq("contact1@example.com")
     end
     it "should return an empty array if there are no e-mail addresses" do
       @contact = GoogleContactsApi::Contact.new(contact_no_emails_json_hash)
-      @contact.emails.should == []
+      expect(@contact.emails).to eq([])
     end
     it "should return nil if there is no primary e-mail address" do
       @contact2 = GoogleContactsApi::Contact.new(contact_no_emails_json_hash)
-      @contact2.primary_email.should be_nil
+      expect(@contact2.primary_email).to be_nil
       @contact3 = GoogleContactsApi::Contact.new(contact_no_primary_email_json_hash)
-      @contact3.primary_email.should be_nil
+      expect(@contact3.primary_email).to be_nil
     end
     it "should return all instant messaging accounts" do
-      @contact.ims.should == ["contact1@example.com"]
+      expect(@contact.ims).to eq(["contact1@example.com"])
     end
     it "should return an empty array if there are no instant messaging accounts" do
       @contact = GoogleContactsApi::Contact.new(contact_no_emails_json_hash)
-      @contact.ims.should == []
+      expect(@contact.ims).to eq([])
+    end
+
+    #
+    describe 'Contacts API v3 fields' do
+      before do
+        @empty = GoogleContactsApi::Contact.new
+
+        @partly_empty = GoogleContactsApi::Contact.new(
+          'gd$name' => {},
+          'gContact$relation' => []        
+        )
+
+        @contact_v3 = GoogleContactsApi::Contact.new(
+          'gd$name' => {
+            'gd$givenName' => { '$t' => 'John' },
+            'gd$familyName' => { '$t' => 'Doe' },
+            'gd$fullName' => { '$t' => 'John Doe' }
+          },
+          'gContact$relation' => [ { '$t' => 'Jane', 'rel' => 'spouse' } ],
+          'gd$structuredPostalAddress' => [
+            {
+              'gd$country' => { '$t' => 'United States of America' },
+              'gd$formattedAddress' => { '$t' => "2345 Long Dr. #232\nSomwhere\nIL\n12345\nUnited States of America" },
+              'gd$city' => { '$t' => 'Somwhere' },
+              'gd$street' => { '$t' => '2345 Long Dr. #232' },
+              'gd$region' => { '$t' => 'IL' },
+              'gd$postcode' => { '$t' => '12345' }
+            },
+            {
+              'rel' => 'http://schemas.google.com/g/2005#home',
+              'gd$country' => { '$t' => 'United States of America' },
+              'gd$formattedAddress' => { '$t' => "123 Far Ln.\nAnywhere\nMO\n67891\nUnited States of America" },
+              'gd$city' => { '$t' => 'Anywhere' },
+              'gd$street' => { '$t' => '123 Far Ln.' },
+              'gd$region' => { '$t' => 'MO' },
+              'gd$postcode' => { '$t' => '67891' }
+            }
+          ],
+          'gd$email' => [
+            {
+              'primary' => 'true',
+              'rel' => 'http://schemas.google.com/g/2005#other',
+              'address' => 'johnsmith@example.com'
+            }
+          ],
+          'gd$phoneNumber' => [
+            {
+              'primary' => 'true',
+              '$t' => '(123) 334-5158',
+              'rel' => 'http://schemas.google.com/g/2005#mobile'
+            }
+          ]
+        )
+      end
+
+      it 'should catch nil values for nested fields' do
+        expect(@empty.nested_t_field_or_nil('gd$name', 'gd$givenName')).to be_nil
+        expect(@partly_empty.nested_t_field_or_nil('gd$name', 'gd$givenName')).to be_nil
+        expect(@contact_v3.nested_t_field_or_nil('gd$name', 'gd$givenName')).to eq('John')
+      end
+
+      it 'has given_name' do
+        expect(@contact_v3).to receive(:nested_t_field_or_nil).with('gd$name', 'gd$givenName').and_return('val')
+        expect(@contact_v3.given_name).to eq('val')
+      end
+
+      it 'has family_name' do
+        expect(@contact_v3).to receive(:nested_t_field_or_nil).with('gd$name', 'gd$familyName').and_return('val')
+        expect(@contact_v3.family_name).to eq('val')
+      end
+
+      it 'has full_name' do
+        expect(@contact_v3).to receive(:nested_t_field_or_nil).with('gd$name', 'gd$fullName').and_return('val')
+        expect(@contact_v3.full_name).to eq('val')
+      end
+
+      it 'has relations' do
+        expect(@empty.relations).to eq([])
+        expect(@partly_empty.relations).to eq([])
+        expect(@contact_v3.relations).to eq([ { '$t' => 'Jane', 'rel' => 'spouse' } ])
+      end
+      it 'has spouse' do
+        expect(@empty.spouse).to be_nil
+        expect(@partly_empty.spouse).to be_nil
+        expect(@contact_v3.spouse).to eq('Jane')
+      end
+      
+      it 'has addresses' do
+        expect(@empty.addresses).to eq([])
+
+        formatted_addresses = [
+          {
+              :rel => 'work',
+              :country => 'United States of America',
+              :formatted_address => "2345 Long Dr. #232\nSomwhere\nIL\n12345\nUnited States of America",
+              :city => 'Somwhere',
+              :street => '2345 Long Dr. #232',
+              :region => 'IL',
+              :postcode => '12345'
+          },
+          {
+              :rel => 'home',
+              :country => 'United States of America',
+              :formatted_address => "123 Far Ln.\nAnywhere\nMO\n67891\nUnited States of America",
+              :city => 'Anywhere',
+              :street => '123 Far Ln.',
+              :region => 'MO',
+              :postcode => '67891'
+          }
+        ]
+        expect(@contact_v3.addresses).to eq(formatted_addresses)
+      end
+
+      it 'has full phone numbers' do
+        expect(@empty.phone_numbers_full).to eq([])
+        expect(@contact_v3.phone_numbers_full).to eq([ { :primary => true, :number => '(123) 334-5158', :rel => 'mobile' } ])
+      end
+      it 'has full emails' do
+        expect(@empty.emails_full).to eq([])
+        expect(@contact_v3.emails_full).to eq([ { :primary => true, :address => 'johnsmith@example.com', :rel => 'other' } ])
+      end
     end
   end
-  
+
   describe "Group" do
     before(:all) do
       @group_json_hash = group_json_hash
@@ -232,31 +364,31 @@ describe "GoogleContactsApi" do
     end
     # ok, these tests are kind of silly
     it "should return the right title" do
-      @group.title.should == "System Group: My Contacts"
+      expect(@group.title).to eq("System Group: My Contacts")
     end
     it "should return the right id" do
-      @group.id.should == "http://www.google.com/m8/feeds/groups/example%40gmail.com/base/6"
+      expect(@group.id).to eq("http://www.google.com/m8/feeds/groups/example%40gmail.com/base/6")
     end
     it "should return the right content" do
       # TODO: Nothing in source, oops
-      @group.content.should == "System Group: My Contacts"
+      expect(@group.content).to eq("System Group: My Contacts")
     end
     it "should return the right updated time" do
       # different representation slightly
-      @group.updated.to_s.should == "1970-01-01T00:00:00+00:00"
+      expect(@group.updated.to_s).to eq("1970-01-01T00:00:00+00:00")
     end
     it "should tell me if it's a system group" do
-      @group.should be_system_group
+      expect(@group).to be_system_group
     end
     it "should get contacts from the group and cache them" do
-      @api = mock("api")
-      @api.stub(:get).and_return(Hashie::Mash.new({
+      @api = double("api")
+      allow(@api).to receive(:get).and_return(Hashie::Mash.new({
         "body" => "some response", # could use example response here
         "code" => 200
       }))
-      GoogleContactsApi::ContactSet.stub(:new).and_return("contact set")
+      allow(GoogleContactsApi::ContactSet).to receive(:new).and_return("contact set")
       @group = GoogleContactsApi::Group.new(@contact_json_hash, nil, @api)
-      @api.should_receive("get").with(an_instance_of(String),
+      expect(@api).to receive("get").with(an_instance_of(String),
         hash_including({"group" => @group.id})).once
       @group.contacts
       @group.contacts

data/spec/spec_helper.rb

@@ -13,7 +13,6 @@ puts "Testing version #{GoogleContactsApi::VERSION}"
 # Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  config.mock_framework = :rspec
 end
 
 def load_file(filename)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_contacts_api
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,17 +112,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -187,8 +187,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Lets you read from the Google Contacts API. Posting to come later. Tests
-  to come later.
+description: Lets you read from the Google Contacts API. Posting to come later.
 email: ayliang@gmail.com
 executables: []
 extensions: []
@@ -235,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4068781390085911167
+      hash: -813692119890348937
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: