gplus 0.2.2 → 0.3.0

data/README.md

@@ -6,9 +6,7 @@ GPlus is a complete implementation of the Google+ API, with help from OAuth2 and
 
 I'm aiming to produce something light-weight, well documented, and thoroughly tested.
 
-It currently has full support for People and Activities, and for authorized requests.
-
-Unauthorized requests for public resources is coming in version 0.3.0 (aiming for 2011/09/17)
+It currently has full support for the People and Activities APIs, using either OAuth requests for private data or API key requests for public data.
 
 ## Installation
 
@@ -24,16 +22,24 @@ Next, [create an OAuth 2.0 client ID](http://code.google.com/apis/console#access
 
 You can then specify additional redirect URIs and allowed javascript origins.
 
-You'll need the Client ID and Client secret that are generated. Keep them secure!
+## Unauthorized requests (for public data)
+
+Create an API client using your API key:
+
+    @client = Gplus::Client.new(
+      :api_key => 'YOUR_API_KEY'
+    )
+
+You can now make requests for public data using the methods below for People and Activities.
 
 ## Authorized requests
 
-Create an instance of the client using the credentials from when you set up your application:
+First, create an API client using your Client ID, Client Secret, and one of the redirect URIs you have allowed:
 
     @client = Gplus::Client.new(
       :client_id => 'YOUR_CLIENT_ID',
       :client_secret => 'YOUR_CLIENT_SECRET',
-      :redirect_uri => 'http://example.com/oauth2callback'
+      :redirect_uri => 'http://example.com/oauth/callback'
     )
 
 Generate an authorization URL, and use it in a view:
@@ -45,14 +51,22 @@ Generate an authorization URL, and use it in a view:
 
 After the user authorizes your app, they will be redirected to your `redirect_uri`. Store `params[:code]`:
 
-    def oauth_callback_handler
-      current_user.update_attributes(:oauth_code => params[:code])
+    class OauthController < ApplicationController
+      def callback
+        current_user.update_attributes(:oauth_code => params[:code])
+      end
     end
 
 Finally, create an authorized client instance:
 
     client.authorize(current_user.oauth_code)
 
+If you have an OAuth code stored, you can use it to initialize your API client:
+
+    @client = Gplus::Client.new(
+      :token => current_user.oauth_code,
+    )
+
 ## [People](http://developers.google.com/+/api/latest/people)
 
 Get a person's profile with `client.get_person`:
@@ -83,7 +97,7 @@ The activity will be returned as a nested hash:
 
 List a person's activities with `client.list_activities`:
 
-    activities = client.list_activities(id)
+    activities = client.list_activities(person_id)
 
 The list will be returned as a nested hash. The actual activities are in the `:items` array:
 

data/lib/gplus/activity.rb

@@ -5,7 +5,7 @@ module Gplus
     end
 
     def list_activities(person_id, results = 20, page = nil)
-      get("people/#{person_id}/activities/public?maxResults=#{results}&pageToken=#{page}")
+      get("people/#{person_id}/activities/public", { :maxResults => results, :pageToken => page })
     end
   end
 end

data/lib/gplus/client.rb

@@ -4,6 +4,7 @@ require 'gplus/person'
 module Gplus
   class Client
     def initialize(options = {})
+      @api_key = options[:api_key]
       @client_id = options[:client_id]
       @client_secret = options[:client_secret]
       @redirect_uri = options[:redirect_uri]
@@ -28,11 +29,17 @@ module Gplus
 
   private
     def access_token
-      @access_token ||= OAuth2::AccessToken.new(@oauth_client, @token)
+      if @token
+        @access_token ||= OAuth2::AccessToken.new(@oauth_client, @token)
+      end
     end
 
-    def get(path)
-      response = access_token.get("v1/#{path}")
+    def get(path, params = {})
+      if access_token
+        response = access_token.get("v1/#{path}", params)
+      else
+        response = @oauth_client.request(:get, "v1/#{path}", { :params => params.merge(:key => @api_key) })
+      end
       MultiJson.decode(response.body)
     end
   end

data/lib/gplus/version.rb

@@ -1,3 +1,3 @@
 module Gplus
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gplus
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-16 00:00:00.000000000Z
+date: 2011-09-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &24698140 !ruby/object:Gem::Requirement
+  requirement: &17792180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *24698140
+  version_requirements: *17792180
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &24693860 !ruby/object:Gem::Requirement
+  requirement: &17784300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *24693860
+  version_requirements: *17784300
 description: A complete implementation of the Google plus API for Ruby
 email:
 - nicholas@2suggestions.com.au