oauth-plugin 0.3.5 → 0.3.6

data/CHANGELOG

@@ -1,5 +1,6 @@
 7/21/2009
-  - made a github gem
+  - Twitter, Agree2 and FireEagle tokens are working in consumer.
+  - made it a gem
   - more thorough tests of OAuth 1.0 consumer
   - Add support for a OAUTH_10_SUPPORT constant to switch on support for OAuth 1.0 in provider
 7/19/2009

data/README.rdoc

@@ -24,12 +24,12 @@ You need to install the oauth gem (0.3.5) which is the core OAuth ruby library.
 
 The plugin can now be installed as an gem from github, which is the easiest way to keep it up to date.
 
-  sudo gem install pelle-oauth-plugin
+  sudo gem install oauth-plugin
   
 You should add the following in the gem dependency section of environment.rb
 
   config.gem "oauth"
-  config.gem "pelle-oauth-plugin", :source => "http://gems.github.com"
+  config.gem "oauth-plugin"
 
 Alternatively you can install it in vendors/plugin:
 
@@ -319,7 +319,7 @@ This allows you to add a has_one association in your user model:
 
 And you could do:
 
-  @location=@user.fire_eagle.client.get "/api/0.1/user.json"
+  @location=@user.fire_eagle.client.location
 
 The client method gives you a OAuth::AccessToken which you can use to perform rest operations on the client site - see http://oauth.rubyforge.org/rdoc/classes/OAuth/AccessToken.html
 
@@ -327,9 +327,10 @@ The client method gives you a OAuth::AccessToken which you can use to perform re
 
 Before creating the FireEagleToken model the plugin checks if a class already exists by that name or if we provide an api wrapper for it. This allows you to create a better token model that uses an existing ruby gem.
 
-Currently we provide the following untested tokens:
+Currently we provide the following semi tested tokens wrappers:
 
-* Twitter (Will work when the twitter gem is updated to support OAuth 0.3.5)
+* FireEagle
+* Twitter (requires Paul Singh's version of twitter gem until main gem is updated to 0.3.5 - sudo gem install paulsingh-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.5
+0.3.6

data/generators/oauth_consumer/templates/oauth_config.rb

@@ -12,6 +12,10 @@
 #     :key=>"",
 #     :secret=>""
 #   },
+#   :fireeagle=>{
+#     :key=>"",
+#     :secret=>""
+#   },
 #   :hour_feed=>{
 #     :key=>"",
 #     :secret=>"",

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

@@ -1,11 +1,12 @@
 require 'agree2'
 class Agree2Token < ConsumerToken
-  def self.agree2_client
-    @agree2_client||=Agree2::Client.new OAUTH_CREDENTIALS[:agree2][:key],OAUTH_CREDENTIALS[:agree2][:secret]
+  AGREE2_SETTINGS={:site=>"https://agree2.com"}
+  def self.consumer
+    @consumer||=OAuth::Consumer.new credentials[:key],credentials[:secret],AGREE2_SETTINGS
   end
   
-  def self.consumer
-    agree2_client.consumer
+  def self.agree2_client
+    @agree2_client||=Agree2::Client.new credentials[:key],credentials[:secret]
   end
   
   def client

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

@@ -0,0 +1,39 @@
+require 'fireeagle'
+# For more information on FireEagle
+# http://fireeagle.rubyforge.org/
+class FireeagleToken < ConsumerToken
+  FIREEAGLE_SETTINGS={
+    :site=>"https://fireeagle.yahooapis.com",
+    :authorize_url=>"https://fireeagle.yahoo.net/oauth/authorize"}
+    
+  def self.consumer
+    @consumer||=OAuth::Consumer.new credentials[:key],credentials[:secret],FIREEAGLE_SETTINGS
+  end
+  
+  def client
+    @client||=FireEagle::Client.new :consumer_key => FireeagleToken.consumer.key,
+                                    :consumer_secret => FireeagleToken.consumer.secret, 
+                                    :access_token => token, 
+                                    :access_token_secret => secret
+  end
+  
+  # Returns the FireEagle User object
+  # http://fireeagle.rubyforge.org/classes/FireEagle/User.html
+  def fireeagle_user
+    @fireeagle_user||=client.user
+  end
+  
+  # gives you the best guess of a location for user.
+  # This returns the FireEagle Location object:
+  # http://fireeagle.rubyforge.org/classes/FireEagle/Location.html
+  def location
+    fireeagle_user.best_guess.name
+  end
+  
+  # Updates thes users location
+  # see: http://fireeagle.rubyforge.org/classes/FireEagle/Client.html#M000026
+  def update_location(location={})
+    client.update(location)
+  end
+end
+

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

@@ -1,17 +1,16 @@
+gem 'paulsingh-twitter' # go back to regular twitter gem when it is bumped to oauth 0.3.5
 require 'twitter'
 class TwitterToken < ConsumerToken
-  def self.twitter
-    @twitter||=Twitter::OAuth.new( OAUTH_CREDENTIALS[:twitter][:key],OAUTH_CREDENTIALS[:twitter][:secret]).consumer
-  end
-  
+  TWITTER_SETTINGS={:site=>"http://twitter.com"}
   def self.consumer
-    @twitter.consumer
+    @consumer||=OAuth::Consumer.new credentials[:key],credentials[:secret],TWITTER_SETTINGS
   end
   
   def client
     unless @client
-      @client=TwitterToken.twitter.clone
-      @client.authorize_from_access token,secret
+      @twitter_oauth=Twitter::OAuth.new TwitterToken.consumer.key,TwitterToken.consumer.secret
+      @twitter_oauth.authorize_from_access token,secret
+      @client=Twitter::Base.new(@twitter_oauth)
     end
     
     @client

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

@@ -37,7 +37,7 @@ module Oauth
             create :user_id=>user.id,:token=>access_token.token,:secret=>access_token.secret
           end
           
-          private
+          protected
           
           def credentials
             @credentials||=OAUTH_CREDENTIALS[service_name]

data/oauth-plugin.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth-plugin}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pelle Braendgaard"]
@@ -76,6 +76,7 @@ Gem::Specification.new do |s|
      "lib/oauth/controllers/provider_controller.rb",
      "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/twitter_token.rb",
      "lib/oauth/models/consumers/token.rb",
      "oauth-plugin.gemspec",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oauth-plugin
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -94,6 +94,7 @@ files:
 - lib/oauth/controllers/provider_controller.rb
 - 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/twitter_token.rb
 - lib/oauth/models/consumers/token.rb
 - oauth-plugin.gemspec