gplus 1.0.1 → 2.0.0

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## v2.0.0: 2012/01/03
+
+### Breaking API changes
+
+* Rename `#authorize` to `#get_token` and change method signature to match `OAuth2::Strategy::AuthCode#get_token`.
+  Convert `access_token = authorize(params[:code])` to `access_token = get_token(params[:code])` in your OAuth callback action.
+* Define new `#authorize` method, for authorization a client instance with a user's `token`, `refresh_token` and `token_expires_at` after initialization.
+* `#search_people` and `#search_activities` now take a mandatory query parameter, followed by an options hash.
+  Convert `search_people(:query => 'Frankie', :maxResults => 5)` to `search_people('Frankie', :maxResults => 5)`.
+* `#authorize_url` now accepts an options hash, instead of just a `redirect_uri` parameter. Use the options hash to request a different `access_type` amongst other things.
+  Convert `authorize_url('http://example.org/callback')` to `authorize_url(:redirect_uri => 'http://example.org/callback')`.
+
+### Other changes
+
+* Bugfix: Authorized requests with params now call OAuth2 methods correctly
+* Bugfix: Fixed access token refreshing
+* `Activity`, `Comment` and `Person` are now modules included in `Client`
+* Better YARD documentation
+* Files are now autoloaded
+* Added link to Rails 3.1 example app
+
 ## v1.0.1: 2011/12/30
 
 * Fix bug in `#access_token` where `@access_token` was not being returned correctly

data/README.md

@@ -11,11 +11,16 @@ It currently has full support for the People, Activities and Comments APIs, usin
 * [Documentation](http://rubydoc.info/github/nfm/gplus/master/frames)
 * [Issues](https://github.com/nfm/gplus/issues)
 * [Changelog](https://github.com/nfm/gplus/blob/master/CHANGELOG.md)
+* [Example Rails 3.1 app](https://github.com/nfm/gplus-rails-demo)
 
 ## Installation
 
 Add `gplus` to your Gemfile, then run `bundle install`.
 
+## Example Rails application
+
+Take a look at the [example Rails 3.1 application](https://github.com/nfm/gplus-rails-demo) to see gplus in action. You can either browse the repository to see how I'm using it, or clone it and follow the instructions in that repositories README to test it.
+
 ## Creating and configuring your application
 
 To make requests, you need to [create an application](https://code.google.com/apis/console) with access to the Google+ API.
@@ -46,9 +51,9 @@ First, create an API client using your Client ID, Client Secret, and one of the
       :redirect_uri => 'http://example.com/oauth/callback'
     )
 
-Generate an authorization URL, and use it in a view:
+Generate an authorization URL, and use it in a view. You may want to request offline access:
 
-    @auth_url = @gplus.authorize_url
+    @auth_url = @gplus.authorize_url(:access_type => 'offline')
     => https://accounts.google.com/o/oauth2/auth?response_type=code&client_id=YOUR_CLIENT_ID&redirect_uri= ...
 
     = link_to 'Authorize This App', @auth_url
@@ -57,7 +62,7 @@ After the user authorizes your app, they will be redirected to your `redirect_ur
 
     class OauthController < ApplicationController
       def callback
-        access_token = @gplus.authorize(params[:code])
+        access_token = @gplus.get_token(params[:code])
         current_user.update_attributes(
           :token => access_token.token,
           :refresh_token => access_token.refresh_token,
@@ -77,10 +82,16 @@ Now you can create an authorized client instance using the stored OAuth token:
       :redirect_uri => 'http://example.com/oauth/callback'
     )
 
+Alternatively, you can authorize an existing client instance (after you initialize it) by calling `authorize` and passing in the stored `token`, `refresh_token` and `token_expires_at`:
+
+    @gplus.authorize(current_user.token, current_user.refresh_token, current_user.token_expires_at)
+
 ## Refreshing OAuth tokens
 
 Google+ OAuth tokens are currently only valid for 3600 seconds (one hour). You can use the `:refresh_token` to get a new OAuth token after your existing token expires, without requiring the user to re-authorize your application.
 
+*Note* that you will only receive a `refresh_token` if you request `:access_type => 'offline'` when you generate your `authorize_url`.
+
 Gplus will automatically request a new token if the provided token has expired. You should check to see if this has occured so that you can store the new token. Otherwise, after the initial token expires, you'll be requesting a new token from Google each time you initialize an API client. This is slow!
 
 You can determine whether a token has been refreshed by calling `access_token_refreshed?`:
@@ -111,7 +122,7 @@ The person's profile will be returned as a nested hash:
 
 Search for public profiles with `.search_people`:
 
-    people = @gplus.search_people(:query => 'Larry Page')
+    people = @gplus.search_people('Larry Page')
 
 Matching profiles will be returned in a nested hash. The actual profiles are in the `:items` array:
 
@@ -122,14 +133,12 @@ Matching profiles will be returned in a nested hash. The actual profiles are in
 By default, this will fetch 10 profiles. You can fetch between 1 and 20 by passing a `:maxResults` option:
 
     # Get 20 results
-    @gplus.search_people(:query => 'Larry Page', :maxResults => 20)
+    @gplus.search_people('Larry Page', :maxResults => 20)
 
 If you want more than 20 results, take the `:nextPageToken` returned from your first request, and pass it as a `:pageToken` option:
 
-    people = @gplus.search_people(:query => 'Larry Page', :maxResults => 20)
-    more_people = @gplus.search_people(:query => 'Larry Page', :maxResults => 20, :pageToken => people[:nextPageToken])
-
-Omitting the `:query` option will simply return all profiles.
+    people = @gplus.search_people('Larry Page', :maxResults => 20)
+    more_people = @gplus.search_people('Larry Page', :maxResults => 20, :pageToken => people[:nextPageToken])
 
 See the Google+ API documentation for [People](http://developers.google.com/+/api/latest/people), [People: get](http://developers.google.com/+/api/latest/people/get) and [People: search](http://developers.google.com/+/api/latest/people/search).
 
@@ -167,7 +176,7 @@ If you want more than 100 results, take the `:nextPageToken` returned from your
 
 Search for public activities with `.search_activities`:
 
-    activities = @gplus.search_activities(:query => 'Programming')
+    activities = @gplus.search_activities('Programming')
 
 Matching activities will be returned in a nested hash. The actual activities are in the `:items` array:
 
@@ -178,18 +187,16 @@ Matching activities will be returned in a nested hash. The actual activities are
 By default, this will fetch 10 activities. You can fetch between 1 and 20 by passing a `:maxResults` option:
 
     # Get 20 results
-    @gplus.search_activities(:query => 'Programming', :maxResults => 20)
+    @gplus.search_activities('Programming', :maxResults => 20)
 
 If you want more than 20 results, take the `:nextPageToken` returned from your first request, and pass it as a `:pageToken` option:
 
-    activities = @gplus.search_activities(:query => 'Programming', :maxResults => 20)
-    more_activities = @gplus.search_activities(:query => 'Programming', :maxResults => 20, :pageToken => activities[:nextPageToken])
-
-Omitting the `:query` option will simply return all activities.
+    activities = @gplus.search_activities('Programming', :maxResults => 20)
+    more_activities = @gplus.search_activities('Programming', :maxResults => 20, :pageToken => activities[:nextPageToken])
 
 You can specify an order for the activities that are returned by passing an `:orderBy` option. Acceptable values are "best" and "recent" (the default).
 
-    activities = @gplus.search_activities(:query => 'Programming', :orderBy => "best")
+    activities = @gplus.search_activities('Programming', :orderBy => "best")
 
 See the Google+ API documentation for [Activities](http://developers.google.com/+/api/latest/activities), [Activities: get](http://developers.google.com/+/api/latest/activities/get), [Activities: list](http://developers.google.com/+/api/latest/activities/list), and [Activities: search](http://developers.google.com/+/api/latest/activities/search).
 

data/Rakefile

@@ -4,3 +4,10 @@ require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new('spec')
 task :default => :spec
+
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new(:yard)
+rescue LoadError
+  puts "You need to install YARD. Run `bundle install`."
+end

data/gplus.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'webmock'
   gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'yard'
 end

data/lib/gplus.rb

@@ -1,4 +1,11 @@
 require 'oauth2'
 
-require "gplus/version"
-require "gplus/client"
+# gplus: A complete implementation of the Google+ API for Ruby
+# @see https://developers.google.com/+/api/ The official Google+ API documentation
+module Gplus
+  autoload :Version, 'gplus/version'
+  autoload :Client, 'gplus/client'
+  autoload :Activity, 'gplus/activity'
+  autoload :Comment, 'gplus/comment'
+  autoload :Person, 'gplus/person'
+end

data/lib/gplus/activity.rb

@@ -1,35 +1,38 @@
 module Gplus
-  class Client
+  # A collection of methods for Google+ Activities API calls.
+  # @see https://developers.google.com/+/api/latest/activities The Google+ Activities documentation.
+  module Activity
     # Get an Activity by its unique ID.
-    # See http://developers.google.com/+/api/latest/activities/get for more details.
+    # @see https://developers.google.com/+/api/latest/activities/get The Google+ 'Activities: get' documentation.
     #
     # @param [String] id The unique ID of the activity you want to retrieve.
-    # @return [Hash] A nested hash representation of an {http://developers.google.com/+/api/latest/activities#resource Activity resource}.
+    # @return [Hash] A nested hash representation of an {https://developers.google.com/+/api/latest/activities#resource Activity resource}.
     def get_activity(id)
       get("activities/#{id}")
     end
 
     # List a Person's Google+ activities.
-    # See http://developers.google.com/+/api/latest/activities/list for more details.
+    # @see https://developers.google.com/+/api/latest/activities/list The Google+ 'Activities: list' documentation.
+    # @see https://developers.google.com/+/api/#pagination The Google+ pagination documentation.
     #
     # @param [String] person_id The unique ID of the person whose activities you want to list. Pass the string 'me' to list the activities for the person that the API client is authorized as.
-    # @option options [Integer] maxResults The number of activities, between 1 and 100, to return. Defaults to 20.
+    # @option options [Integer] maxResults (20) The number of activities, between 1 and 100, to return.
     # @option options [String] pageToken The page of activities to fetch. Pass the value of :nextPageToken from the previous result set to get the next page of results.
-    # @return [Hash] A nested hash representation of a {http://developers.google.com/+/api/latest/activities/list#response list of activities}.
+    # @return [Hash] A nested hash representation of a {https://developers.google.com/+/api/latest/activities/list#response list of activities}.
     def list_activities(person_id, options = {})
       get("people/#{person_id}/activities/public", options)
     end
 
     # Search all public Google+ activities.
-    # See https://developers.google.com/+/api/latest/activities/search for more details
+    # @see https://developers.google.com/+/api/latest/activities/search The Google+ 'Activities: search' documentation.
     #
-    # @option options [String] query The full text query to search for
-    # @option options [Integer] maxResults The number of activities, between 1 and 20, to return. Defaults to 10.
+    # @param [String] query The full text query to search for.
+    # @option options [Integer] maxResults (10) The number of activities, between 1 and 20, to return.
     # @option options [String] pageToken The page of activities to fetch. Pass the value of :nextPageToken from the previous result set to get the next page of results.
-    # @option options [String] orderBy Specifies how to order search results. Acceptable values are "best" and "recent". Defaults to "recent".
-    # @return [Hash] A nested hash representation of a {http://developers.google.com/+/api/latest/activities/search#response search result for activities}.
-    def search_activities(options = {})
-      get("activities", options)
+    # @option options [String] orderBy ('recent') Specifies how to order search results. Acceptable values are 'best' and 'recent'.
+    # @return [Hash] A nested hash representation of a {https://developers.google.com/+/api/latest/activities/search#response search result for activities}.
+    def search_activities(query, options = {})
+      get("activities", options.merge(:query => query))
     end
   end
 end

data/lib/gplus/client.rb

@@ -1,10 +1,13 @@
-require 'gplus/activity'
-require 'gplus/comment'
-require 'gplus/person'
-
 module Gplus
+  # The main Gplus class, containing methods for initializing a Google+ client and requesting authorization
   class Client
+    include Activity
+    include Comment
+    include Person
+
+    # The default Google+ API endpoint that all requests are sent to.
     DEFAULT_ENDPOINT = 'https://www.googleapis.com/plus'
+    # The default version of the Google+ API to send requests to.
     DEFAULT_API_VERSION = 'v1'
 
     attr_accessor :endpoint, :api_version
@@ -42,20 +45,39 @@ module Gplus
     end
 
     # Generate an authorization URL where a user can authorize your application to access their Google+ data.
+    # @see https://code.google.com/apis/accounts/docs/OAuth2WebServer.html#formingtheurl The set of query string parameters supported by the Google Authorization Server for web server applications.
     #
-    # @param [String] redirect_uri An optional over-ride for the redirect_uri you initialized the API client with.
+    # @param [Hash] options Additional parameters used in the OAuth request.
+    # @option options [String] :redirect_uri An optional over-ride for the redirect_uri you initialized the API client with.
+    # @option options [String] :access_type ('online'). Indicates if your application needs to access a Google API when the user is not present at the browser. Allowed values are 'online' and 'offline'.
     # @return [String] A Google account authorization URL for your application.
-    def authorize_url(redirect_uri = @redirect_uri)
-      @oauth_client.auth_code.authorize_url(:redirect_uri => redirect_uri, :scope => 'https://www.googleapis.com/auth/plus.me')
+    def authorize_url(options = {})
+      defaults = { :scope => 'https://www.googleapis.com/auth/plus.me', :redirect_uri => @redirect_uri }
+      options = defaults.merge(options)
+      @oauth_client.auth_code.authorize_url(options)
     end
 
-    # Authorize an API client instance to access the user's private data.
+    # Retrieve an OAuth access token using the short-lived authentication code given to you after a user authorizes your application.
     #
     # @param [String] auth_code The code returned to your redirect_uri after the user authorized your application to access their Google+ data.
-    # @param [String] redirect_uri An optional over-ride for the redirect_uri you initialized the API client with.
-    # @return [OAuth2::AccessToken] An OAuth access token. Store access_token[:token] and access_token[:refresh_token] to get persistent access to the user's data until access_token[:expires_at].
-    def authorize(auth_code, redirect_uri = @redirect_uri)
-      @access_token = @oauth_client.auth_code.get_token(auth_code, :redirect_uri => redirect_uri)
+    # @param [Hash] params Additional parameters for the token endpoint (passed through to OAuth2::Client#get_token)
+    # @param [Hash] opts Additional access token options (passed through to OAuth2::Client#get_token)
+    # @return [OAuth2::AccessToken] An OAuth access token. Store access_token[:token], access_token[:refresh_token] and access_token[:expires_at] to get persistent access to the user's data until access_token[:expires_at].
+    def get_token(auth_code, params = {}, opts = {})
+      @access_token = @oauth_client.auth_code.get_token(auth_code, params, opts)
+    end
+
+    # Authorize a Gplus::Client instance to access the user's private data, after initialization
+    #
+    # @param [String] :token The OAuth token to authorize the API client for authenticated requests (for non-public data).
+    # @param [String] :refresh_token The OAuth refresh_token, to request a new token if the provided token has expired.
+    # @param [Integer] :token_expires_at The time that the OAuth token expires at in seconds since the epoch.
+    # @return An OAuth2::AccessToken
+    def authorize(token, refresh_token, token_expires_at)
+      @token = token
+      @refresh_token = refresh_token
+      @token_expires_at = token_expires_at
+      access_token
     end
 
     # Retrieve or create an OAuth2::AccessToken, using the :token and :refresh_token specified when the API client instance was initialized
@@ -65,7 +87,7 @@ module Gplus
       if @token
         @access_token ||= OAuth2::AccessToken.new(@oauth_client, @token, :refresh_token => @refresh_token, :expires_at => @token_expires_at)
         if @access_token.expired?
-          @access_token.refresh!
+          @access_token = @access_token.refresh!
           @access_token_refreshed = true
         end
         @access_token
@@ -80,7 +102,7 @@ module Gplus
   private
     def get(path, params = {})
       if access_token
-        response = access_token.get("#{self.api_version}/#{path}", params)
+        response = access_token.get("#{self.api_version}/#{path}", :params => params)
       else
         response = @oauth_client.request(:get, "#{self.api_version}/#{path}", { :params => params.merge(:key => @api_key) })
       end

data/lib/gplus/comment.rb

@@ -1,21 +1,24 @@
 module Gplus
-  class Client
+  # A collection of methods for Google+ Comments API calls.
+  # @see https://developers.google.com/+/api/latest/comments The Google+ Comments documentation
+  module Comment
     # Get a Comment by its unique ID.
-    # See https://developers.google.com/+/api/latest/comments/get for more details.
+    # @see https://developers.google.com/+/api/latest/comments/get The Google+ 'Comments: get' documentation
     #
     # @param [String] id The unique ID of the comment you want to retrieve.
-    # @returb [Hash] A nested hash representation of a {https://developers.google.com/+/api/latest/comments#resource Comment resource}.
+    # @return [Hash] A nested hash representation of a {https://developers.google.com/+/api/latest/comments#resource Comment resource}.
     def get_comment(id)
       get("comments/#{id}")
     end
 
     # List an activity's comments.
-    # See http://developers.google.com/+/api/latest/comments/list for more details.
+    # @see https://developers.google.com/+/api/latest/comments/list The Google+ 'Comments: list' documentation.
+    # @see https://developers.google.com/+/api/#pagination The Google+ pagination documentation.
     #
     # @param [String] activity_id The unique ID of the activity whose comments you want to list.
-    # @option options [Integer] maxResults The number of comments, between 0 and 100, to return. Defaults to 20.
+    # @option options [Integer] maxResults (20) The number of comments, between 0 and 100, to return.
     # @option options [String] pageToken The page of comments to fetch. Pass the value of :nextPageToken from the previous result set to get the next page of results.
-    # @return [Hash] A nested hash representation of a {http://developers.google.com/+/api/latest/comments/list#response list of comments}.
+    # @return [Hash] A nested hash representation of a {https://developers.google.com/+/api/latest/comments/list#response list of comments}.
     def list_comments(activity_id, options = {})
       get("activities/#{activity_id}/comments", options)
     end

data/lib/gplus/person.rb

@@ -1,23 +1,27 @@
 module Gplus
-  class Client
+  # A collection of methods for Google+ People API calls.
+  # @see https://developers.google.com/+/api/latest/people The Google+ People documentation.
+  module Person
     # Get a person's Google+ profile.
-    # See http://developers.google.com/+/api/latest/people/get for more details.
+    # @ https://developers.google.com/+/api/latest/people/get The Google+ 'People: get' documentation.
     #
     # @param [String] id The unique ID of the person whose profile you want to retrieve. Pass the string 'me' to fetch the profile for the person that the API client is authorized as.
-    # @return [Hash] A nested hash representation of a {http://developers.google.com/+/api/latest/people#resource Person resource}
+    # @return [Hash] A nested hash representation of a {https://developers.google.com/+/api/latest/people#resource Person resource}
     def get_person(id)
       get("people/#{id}")
     end
 
     # Search all public Google+ profiles.
-    # See https://developers.google.com/+/api/latest/people/search for more details
+    # @see https://developers.google.com/+/api/latest/people/search The Google+ 'People: search' documentation.
+    # @see https://developers.google.com/+/api/#pagination The Google+ pagination documentation.
     #
-    # @option options [String] query The full text query to search for
-    # @option options [Integer] maxResults The number of profiles, between 1 and 20, to return. Defaults to 10.
+    # @param [String] query The full text query to search for.
+    # @option options [String] language The preferred language to search with. See {https://developers.google.com/+/api/search#available-languages the official list of allowed language codes}.
+    # @option options [Integer] maxResults (10) The number of profiles, between 1 and 20, to return.
     # @option options [String] pageToken The page of profiles to fetch. Pass the value of :nextPageToken from the previous result set to get the next page of results.
-    # @return [Hash] A nested hash representation of a {http://developers.google.com/+/api/latest/people/search#response search result for people}.
-    def search_people(options = {})
-      get("people", options)
+    # @return [Hash] A nested hash representation of a {https://developers.google.com/+/api/latest/people/search#response search result for people}.
+    def search_people(query, options = {})
+      get("people", options.merge(:query => query))
     end
   end
 end

data/lib/gplus/version.rb

@@ -1,3 +1,5 @@
 module Gplus
-  VERSION = "1.0.1"
+  # The version of Gplus that you're using. I use semantic versioning to version Gplus.
+  # @see http://semver.org/
+  VERSION = "2.0.0"
 end

data/spec/gplus/activity_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gplus::Client do
+describe Gplus::Activity do
   before do
     @api_key = '1234567'
     @client = Gplus::Client.new(:api_key => @api_key)
@@ -47,28 +47,23 @@ describe Gplus::Client do
       @activities, @activities_json = fixture('activities.json')
     end
 
-    it "should list all public activities" do
-      stub_api_request(:get, "activities").to_return(:body => @activities)
-      @client.search_activities.should == @activities_json
-    end
-
-    it "should accept a :query argument" do
+    it "should require a :query parameter" do
       stub_api_request(:get, "activities", :query => @activity_json['title']).to_return(:body => @activity)
-      @client.search_activities(:query => @activity_json['title']).should == @activity_json
+      @client.search_activities(@activity_json['title']).should == @activity_json
     end
 
     it "should accept a :maxResults argument" do
       @results = 2
 
-      stub_api_request(:get, "activities", :maxResults => @results.to_s).to_return(:body => @activities)
-      @client.search_activities(:maxResults => @results).should == @activities_json
+      stub_api_request(:get, "activities", :query => @activity_json['title'], :maxResults => @results.to_s).to_return(:body => @activities)
+      @client.search_activities(@activity_json['title'], :maxResults => @results).should == @activities_json
     end
 
     it "should accept a :pageToken argument" do
       @page = '1234567'
 
-      stub_api_request(:get, "activities", :pageToken => @page).to_return(:body => @activities)
-      @client.search_activities(:pageToken => @page).should == @activities_json
+      stub_api_request(:get, "activities", :query => @activity_json['title'], :pageToken => @page).to_return(:body => @activities)
+      @client.search_activities(@activity_json['title'], :pageToken => @page).should == @activities_json
     end
   end
 end

data/spec/gplus/client_spec.rb

@@ -13,6 +13,10 @@ describe Gplus::Client do
     pending
   end
 
+  describe '.get_token' do
+    pending
+  end
+
   describe '.access_token' do
     pending
   end

data/spec/gplus/comment_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gplus::Client do
+describe Gplus::Comment do
   before do
     @api_key = '1234567'
     @client = Gplus::Client.new(:api_key => @api_key)

data/spec/gplus/person_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gplus::Client do
+describe Gplus::Person do
   before do
     @api_key = '1234567'
     @client = Gplus::Client.new(:api_key => @api_key)
@@ -20,28 +20,23 @@ describe Gplus::Client do
       @people, @people_json = fixture('people.json')
     end
 
-    it "should list all public profiles" do
-      stub_api_request(:get, "people").to_return(:body => @people)
-      @client.search_people.should == @people_json
-    end
-
-    it "should accept a :query argument" do
+    it "should require a :query parameter" do
       stub_api_request(:get, "people", :query => @person_json['displayName']).to_return(:body => @person)
-      @client.search_people(:query => @person_json['displayName']).should == @person_json
+      @client.search_people(@person_json['displayName']).should == @person_json
     end
 
-    it "should accept a :maxResults argument" do
+    it "should accept a :maxResults option" do
       @results = 2
 
-      stub_api_request(:get, "people", :maxResults => @results.to_s).to_return(:body => @people)
-      @client.search_people(:maxResults => @results).should == @people_json
+      stub_api_request(:get, "people", :query => @person_json['displayName'], :maxResults => @results.to_s).to_return(:body => @people)
+      @client.search_people(@person_json['displayName'], :maxResults => @results).should == @people_json
     end
 
-    it "should accept a :pageToken argument" do
+    it "should accept a :pageToken option" do
       @page = '1234567'
 
-      stub_api_request(:get, "people", :pageToken => @page).to_return(:body => @people)
-      @client.search_people(:pageToken => @page).should == @people_json
+      stub_api_request(:get, "people", :query => @person_json['displayName'], :pageToken => @page).to_return(:body => @people)
+      @client.search_people(@person_json['displayName'], :pageToken => @page).should == @people_json
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gplus
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000 Z
+date: 2012-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &13724120 !ruby/object:Gem::Requirement
+  requirement: &10358020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *13724120
+  version_requirements: *10358020
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &13723180 !ruby/object:Gem::Requirement
+  requirement: &10357520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *13723180
+  version_requirements: *10357520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13701640 !ruby/object:Gem::Requirement
+  requirement: &10356960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13701640
+  version_requirements: *10356960
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &13700100 !ruby/object:Gem::Requirement
+  requirement: &10356360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13700100
+  version_requirements: *10356360
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &13697420 !ruby/object:Gem::Requirement
+  requirement: &10355760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13697420
+  version_requirements: *10355760
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &10355100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *10355100
 description: A complete implementation of the Google plus API for Ruby
 email:
 - nicholas@2suggestions.com.au
@@ -123,3 +134,4 @@ specification_version: 3
 summary: Google+ API implementation with support for authorized requests, People,
   and Activities
 test_files: []
+has_rdoc: