oauth-plugin 0.3.12 → 0.3.13

data/CHANGELOG

@@ -1,4 +1,9 @@
+10/05/2009
+  0.3.13
+  - Got rid of yahoo token. To support it correctly requires way too much work. Let them suffer the consequences of their decissions.
+  - GoogleToken now uses portablecontacts gem
 9/30/2009
+  0.3.12
   - 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 

data/Rakefile

@@ -28,11 +28,16 @@ begin
     gemspec.summary = "Ruby on Rails Plugin for OAuth Provider and Consumer"
     gemspec.description = "Rails plugin for implementing an OAuth Provider or Consumer"
     gemspec.email = "oauth-ruby@googlegroups.com"
-    gemspec.homepage = "http://github.com/pelle/oauth-plugin/tree/master"
+    gemspec.homepage = "http://github.com/pelle/oauth-plugin"
     gemspec.authors = ["Pelle Braendgaard"]
     gemspec.add_dependency('oauth', '>= 0.3.5')
     gemspec.rubyforge_project = 'oauth'
   end
+  
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "rdoc"
+  end
+  
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end

data/VERSION

@@ -1 +1 @@
-0.3.12
+0.3.13

data/generators/oauth_consumer/templates/oauth_config.rb

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

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

@@ -1,3 +1,5 @@
+require 'portablecontacts'
+
 class GoogleToken < ConsumerToken
   GOOGLE_SETTINGS={
     :site=>"https://www.google.com", 
@@ -13,29 +15,13 @@ class GoogleToken < ConsumerToken
   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))
+    @portable_contacts||= PortableContacts::Client.new "http://www-opensocial.googleusercontent.com/api/people", client
   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/oauth-plugin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth-plugin}
-  s.version = "0.3.12"
+  s.version = "0.3.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pelle Braendgaard"]
-  s.date = %q{2009-09-30}
+  s.date = %q{2009-10-05}
   s.description = %q{Rails plugin for implementing an OAuth Provider or Consumer}
   s.email = %q{oauth-ruby@googlegroups.com}
   s.extra_rdoc_files = [
@@ -85,7 +85,6 @@ Gem::Specification.new do |s|
      "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",
@@ -93,7 +92,7 @@ Gem::Specification.new do |s|
      "tasks/oauth_tasks.rake",
      "uninstall.rb"
   ]
-  s.homepage = %q{http://github.com/pelle/oauth-plugin/tree/master}
+  s.homepage = %q{http://github.com/pelle/oauth-plugin}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{oauth}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oauth-plugin
 version: !ruby/object:Gem::Version 
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-30 00:00:00 -04:00
+date: 2009-10-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,6 @@ files:
 - 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
@@ -108,7 +107,7 @@ files:
 - tasks/oauth_tasks.rake
 - uninstall.rb
 has_rdoc: true
-homepage: http://github.com/pelle/oauth-plugin/tree/master
+homepage: http://github.com/pelle/oauth-plugin
 licenses: []
 
 post_install_message: 

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

@@ -1,109 +0,0 @@
-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