oauth-plugin 0.3.11 → 0.3.12

data/CHANGELOG

@@ -1,3 +1,12 @@
+9/30/2009
+  - Added a simple PortableContacts adapter for GoogleToken
+  - Added a SimpleClient wrapper to provide really simple wrapper for OAuth based json web services
+  - Increased token size in consumer_tokens table because of Yahoo's oversized tokens 
+  - Added support for Yahoo
+  - Added support for Google (Boon Low)
+9/26/2009
+  0.3.11
+  - Moved twitter tokens dependency back to regular twitter gem
 7/29/2009
   0.3.10
   - Closed blocks in erb template (jcrosby) while pelle is hiding under his desk

data/README.rdoc

@@ -330,7 +330,7 @@ Before creating the FireEagleToken model the plugin checks if a class already ex
 Currently we provide the following semi tested tokens wrappers:
 
 * FireEagle
-* Twitter (requires Paul Singh's version of twitter gem until main gem is updated to 0.3.5 - sudo gem install paulsingh-twitter)
+* Twitter
 * Agree2
 
 These can be found in lib/oauth/models/consulers/services. Contributions will be warmly accepted for your favorite OAuth service.

data/VERSION

@@ -1 +1 @@
-0.3.11
+0.3.12

data/generators/oauth_consumer/templates/migration.rb

@@ -4,7 +4,7 @@ class CreateOauthConsumerTokens < ActiveRecord::Migration
     create_table :consumer_tokens do |t|
       t.integer :user_id
       t.string :type, :limit => 30
-      t.string :token
+      t.string :token, :limit => 1024 # This has to be huge because of Yahoo's excessively large tokens
       t.string :secret
       t.timestamps
     end

data/generators/oauth_consumer/templates/oauth_config.rb

@@ -8,6 +8,15 @@
 #     :key=>"",
 #     :secret=>""
 #   },
+#   :google=>{
+#     :key=>"",
+#     :secret=>"",
+#     :scope=>"" # see http://code.google.com/apis/gdata/faq.html#AuthScopes
+#   },
+#   :yahoo=>{
+#     :key=>"",
+#     :secret=>"",
+#   },
 #   :agree2=>{
 #     :key=>"",
 #     :secret=>""

data/generators/oauth_provider/templates/client_application.rb

@@ -28,6 +28,7 @@ class ClientApplication < ActiveRecord::Base
       value = signature.verify
       value
     rescue OAuth::Signature::UnknownSignatureMethod => e
+      logger.info "ERROR"+e.to_s
       false
     end
   end

data/lib/oauth/controllers/application_controller_methods.rb

@@ -18,11 +18,6 @@ module OAuth
         return verified && current_token.is_a?(::AccessToken)
       end
       
-      # Skip the authenticity filter if we have an oauth token
-      def verify_authenticity_token
-        super unless oauth?
-      end
-      
       def oauth?
         current_token!=nil
       end
@@ -74,7 +69,7 @@ module OAuth
       end
 
       def verify_oauth_request_token
-        verify_oauth_signature && current_token.is_a?(RequestToken)
+        verify_oauth_signature && current_token.is_a?(::RequestToken)
       end
 
       def invalid_oauth_response(code=401,message="Invalid OAuth Request")

data/lib/oauth/models/consumers/services/google_token.rb

@@ -0,0 +1,41 @@
+class GoogleToken < ConsumerToken
+  GOOGLE_SETTINGS={
+    :site=>"https://www.google.com", 
+    :request_token_path => "/accounts/OAuthGetRequestToken",
+    :authorize_path => "/accounts/OAuthAuthorizeToken",
+    :access_token_path => "/accounts/OAuthGetAccessToken",
+  }
+  
+  def self.consumer
+    @consumer||=create_consumer
+  end 
+  
+  def self.create_consumer(options={})
+    OAuth::Consumer.new credentials[:key],credentials[:secret],GOOGLE_SETTINGS.merge(options)
+  end
+  
+  def self.portable_contacts_consumer
+    @portable_contacts_consumer||= create_consumer :site=>"http://www-opensocial.googleusercontent.com"
+  end
+  
+  
+  def self.get_request_token(callback_url, scope=nil)
+    consumer.get_request_token({:oauth_callback=>callback_url}, :scope=>scope||credentials[:scope]||"http://www-opensocial.googleusercontent.com/api/people")
+  end
+  
+  def portable_contacts
+    @portable_contacts||= GooglePortableContacts.new(OAuth::AccessToken.new( self.class.portable_contacts_consumer, token, secret))
+  end
+  
+  class GooglePortableContacts < Oauth::Models::Consumers::SimpleClient
+    
+    def me
+      get("/api/people/@me/@self")
+    end
+
+    def all
+      get("/api/people/@me/@all")
+    end
+
+  end
+end

data/lib/oauth/models/consumers/services/twitter_token.rb

@@ -1,4 +1,3 @@
-gem 'paulsingh-twitter' # go back to regular twitter gem when it is bumped to oauth 0.3.5
 require 'twitter'
 class TwitterToken < ConsumerToken
   TWITTER_SETTINGS={:site=>"http://twitter.com"}

data/lib/oauth/models/consumers/services/yahoo_token.rb

@@ -0,0 +1,109 @@
+class YahooToken < ConsumerToken
+  YAHOO_SETTINGS={
+    :site=>"https://www.yahoo.com", 
+    :request_token_url => "https://api.login.yahoo.com/oauth/v2/get_request_token",
+    :authorize_url => "https://api.login.yahoo.com/oauth/v2/request_auth",
+    :access_token_url => "https://api.login.yahoo.com/oauth/v2/get_token"
+  }
+  
+  def self.consumer
+    @consumer||=create_consumer
+  end
+  
+  def self.create_consumer(options={})
+    OAuth::Consumer.new credentials[:key],credentials[:secret],YAHOO_SETTINGS.merge(options)
+  end
+  
+  def self.social_apis_consumer
+    @social_api_consumer||=create_consumer :site=>"http://social.yahooapis.com/v1"
+  end
+  
+  def self.get_request_token(callback_url, scope=nil)
+    YahooRequestToken.new consumer.get_request_token({:oauth_callback=>callback_url}, :scope=>scope||credentials[:scope])
+  end
+  
+  # We need to do some special handling to handle this strange parameter:
+  # 
+  class YahooRequestToken < OAuth::RequestToken
+    def initialize(real_token)
+      super real_token.consumer,real_token.token,real_token.secret
+      @params=real_token.params
+    end
+    
+    # handle xoauth_request_auth_url
+    def authorize_url(params = nil)
+      if @params[:xoauth_request_auth_url]
+        return @params[:xoauth_request_auth_url]
+      else
+        super params
+      end
+    end
+  end
+  
+  def social_api
+    @social_api ||= SocialAPI.new(OAuth::AccessToken.new( self.class.social_apis_consumer, token, secret))
+  end
+  
+  class SocialAPI < Oauth::Models::Consumers::SimpleClient
+    # initial implementation of this
+    # http://developer.yahoo.com/social/rest_api_guide/index.html
+    # Please fork and submit improvements here
+    def guid
+      @guid||=get("/v1/me/guid")["guid"]["value"]
+    end
+    
+    def usercard
+      get("/v1/user/#{guid}/profile/usercard")
+    end
+    
+    def idcard
+      get("/v1/user/#{guid}/profile/idcard")
+    end
+    
+    def tinyusercard
+      get("/v1/user/#{guid}/profile/tinyusercard")
+    end
+    
+    def profile
+      get("/v1/user/#{guid}/profile")
+    end
+    
+    def contacts
+      get("/v1/user/#{guid}/contacts")
+    end
+
+  end
+end
+
+
+# I have reported this as a bug to Yahoo, but on certain occassions their tokens are returned with spaces that confuse CGI.parse.
+# The only change below is that it strips the response.body. Once Yahoo fixes this I will remove this whole section.
+module OAuth
+  class Consumer
+    
+    def token_request(http_method, path, token = nil, request_options = {}, *arguments)
+      response = request(http_method, path, token, request_options, *arguments)
+
+      case response.code.to_i
+
+      when (200..299)
+        # symbolize keys
+        # TODO this could be considered unexpected behavior; symbols or not?
+        # TODO this also drops subsequent values from multi-valued keys
+        
+        CGI.parse(response.body.strip).inject({}) do |h,(k,v)|
+          h[k.to_sym] = v.first
+          h[k]        = v.first
+          h
+        end
+      when (300..399)
+        # this is a redirect
+        response.error!
+      when (400..499)
+        raise OAuth::Unauthorized, response
+      else
+        response.error!
+      end
+    end
+  end
+end

data/lib/oauth/models/consumers/simple_client.rb

@@ -0,0 +1,50 @@
+require 'json'
+module Oauth
+  module Models
+    module Consumers
+      # This is just a simple
+      class SimpleClient
+        attr_reader :token
+  
+        def initialize(token)
+          @token = token
+        end
+  
+  
+        def put(path,params={})
+          parse(token.put(path,params, {'Accept' => 'application/json'}))
+        end
+
+        def delete(path)
+          parse(token.delete(path, {'Accept' => 'application/json'}))
+        end
+
+        def post(path,params={})
+          parse(token.post(path,params, {'Accept' => 'application/json'}))
+        end
+
+        def get(path)
+          parse(token.get(path, {'Accept' => 'application/json'}))
+        end
+
+        protected
+
+        def parse(response)
+          return false unless response
+          if ["200","201"].include? response.code
+            unless response.body.blank?
+              JSON.parse(response.body)
+            else
+              true
+            end
+          else
+            logger.debug "Got Response code: #{response.code}"
+            false
+          end
+          
+        end
+        
+      end
+    end
+  end
+end

data/lib/oauth/models/consumers/token.rb

@@ -1,4 +1,6 @@
 require 'oauth/consumer'
+require File.join(File.dirname(__FILE__), 'simple_client')
+
 module Oauth
   module Models
     module Consumers
@@ -29,11 +31,10 @@ module Oauth
           end
 
           def create_from_request_token(user,token,secret,oauth_verifier)
-            logger.info "create_from_request_token"
             request_token=OAuth::RequestToken.new consumer,token,secret
-            access_token=request_token.get_access_token :oauth_verifier=>oauth_verifier
-            logger.info self.inspect
-            logger.info user.inspect
+            options={}
+            options[:oauth_verifier]=oauth_verifier if oauth_verifier
+            access_token=request_token.get_access_token options
             create :user_id=>user.id,:token=>access_token.token,:secret=>access_token.secret
           end
           
@@ -52,6 +53,10 @@ module Oauth
           def client
             @client||=OAuth::AccessToken.new self.class.consumer,token,secret
           end
+
+          def simple_client
+            @simple_client||=SimpleClient.new OAuth::AccessToken.new( self.class.consumer,token,secret)
+          end
           
         end
       end

data/oauth-plugin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth-plugin}
-  s.version = "0.3.11"
+  s.version = "0.3.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pelle Braendgaard"]
-  s.date = %q{2009-09-10}
+  s.date = %q{2009-09-30}
   s.description = %q{Rails plugin for implementing an OAuth Provider or Consumer}
   s.email = %q{oauth-ruby@googlegroups.com}
   s.extra_rdoc_files = [
@@ -83,7 +83,10 @@ Gem::Specification.new do |s|
      "lib/oauth/models/consumers/service_loader.rb",
      "lib/oauth/models/consumers/services/agree2_token.rb",
      "lib/oauth/models/consumers/services/fireeagle_token.rb",
+     "lib/oauth/models/consumers/services/google_token.rb",
      "lib/oauth/models/consumers/services/twitter_token.rb",
+     "lib/oauth/models/consumers/services/yahoo_token.rb",
+     "lib/oauth/models/consumers/simple_client.rb",
      "lib/oauth/models/consumers/token.rb",
      "oauth-plugin.gemspec",
      "rails/init.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oauth-plugin
 version: !ruby/object:Gem::Version 
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-10 00:00:00 -04:00
+date: 2009-09-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,7 +98,10 @@ files:
 - lib/oauth/models/consumers/service_loader.rb
 - lib/oauth/models/consumers/services/agree2_token.rb
 - lib/oauth/models/consumers/services/fireeagle_token.rb
+- lib/oauth/models/consumers/services/google_token.rb
 - lib/oauth/models/consumers/services/twitter_token.rb
+- lib/oauth/models/consumers/services/yahoo_token.rb
+- lib/oauth/models/consumers/simple_client.rb
 - lib/oauth/models/consumers/token.rb
 - oauth-plugin.gemspec
 - rails/init.rb