oauth-plugin 0.4.0.rc2 → 0.4.0

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

@@ -3,7 +3,7 @@ require 'oauth/controllers/consumer_controller'
 # Goes through the entries in your OAUTH_CREDENTIALS and either loads the class required
 # or subclasses ConsumerToken with the name.
 #
-# So an entry called "my_service" will create a class MyServiceToken which you can 
+# So an entry called "my_service" will create a class MyServiceToken which you can
 # connect with has_one to your user model.
 if defined? ConsumerToken && defined? OAUTH_CREDENTIALS
   require File.join(File.dirname(__FILE__), 'services', 'oauth2_token')

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

@@ -4,11 +4,11 @@ class Agree2Token < ConsumerToken
   def self.consumer
     @consumer||=OAuth::Consumer.new credentials[:key],credentials[:secret],AGREE2_SETTINGS
   end
-  
+
   def self.agree2_client
     @agree2_client||=Agree2::Client.new credentials[:key],credentials[:secret]
   end
-  
+
   def client
     @client||=Agree2Token.agree2_client.user(token,secret)
   end

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

@@ -5,31 +5,31 @@ 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, 
+                                    :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={})

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

@@ -1,27 +1,27 @@
 require 'oauth2'
 class Oauth2Token < ConsumerToken
-  
+
   def self.consumer
     @consumer||=create_consumer
-  end 
-  
+  end
+
   def self.create_consumer(options={})
     @consumer||=OAuth2::Client.new credentials[:key],credentials[:secret],credentials[:options]
   end
-    
+
   def self.authorize_url(callback_url)
     options = {:redirect_uri=>callback_url}
     options[:scope] = credentials[:scope] if credentials[:scope].present?
-    consumer.web_server.authorize_url(options)
+    consumer.auth_code.authorize_url(options)
   end
-  
+
   def self.access_token(user, code, redirect_uri)
-    access_token = consumer.web_server.get_access_token(code, :redirect_uri => redirect_uri)
+    access_token = consumer.auth_code.get_token(code, :redirect_uri => redirect_uri)
     find_or_create_from_access_token user, access_token
   end
-  
+
   def client
     @client ||= OAuth2::AccessToken.new self.class.consumer, token
   end
-    
+
 end

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

@@ -1,15 +1,15 @@
 require 'opentransact'
 class OpenTransactToken < ConsumerToken
-  
+
 #  def self.server
 #    @consumer||=OpenTransact::Server.new credentials
 #  end
-  
+
 #  def self.consumer
 #    @consumer||=server.consumer
 #  end
-  
-  def client    
+
+  def client
     @client ||= OpenTransact::Client.new self.class.credentials.merge( {:token=>token, :secret=>secret})
   end
 end

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

@@ -8,8 +8,8 @@ class PicomoneyToken < OpenTransactToken
         :consumer_key => super[:key],
         :consumer_secret => super[:secret]
       }.merge(super)
-  end  
-  
+  end
+
   def about_user
     client.get("/about_user")
   end

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

@@ -5,20 +5,20 @@ class TwitterToken < ConsumerToken
     :authorize_path => "/oauth/authorize",
     :access_token_path => "/oauth/access_token",
   }
-  
+
   def self.consumer(options={})
     @consumer ||= OAuth::Consumer.new(credentials[:key], credentials[:secret], TWITTER_SETTINGS.merge(options))
   end
-  
+
   def client
     @client ||= begin 
-      if credentials[:client].to_sym==:oauth_gem  
+      if self.class.credentials[:client].to_sym == :oauth_gem
         super
       else
         require 'twitter'
-        Twitter::Client.new(:consumer_key => TwitterToken.consumer.key, :consumer_secret => TwitterToken.consumer.secret)
+        Twitter::Client.new(:consumer_key => self.class.consumer.key, :consumer_secret => self.class.consumer.secret)
       end
     end
   end
-  
+
 end

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

@@ -5,12 +5,12 @@ module Oauth
       # 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
@@ -41,9 +41,9 @@ module Oauth
             logger.debug "Got Response code: #{response.code}"
             false
           end
-          
+
         end
-        
+
       end
     end
   end

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

@@ -14,13 +14,13 @@ module Oauth
           model.send(:extend, ClassMethods)
 
         end
-        
+
         module ClassMethods
-          
+
           def service_name
             @service_name||=self.to_s.underscore.scan(/^(.*?)(_token)?$/)[0][0].to_sym
           end
-          
+
           def consumer
             options = credentials[:options] || {}
             @consumer||=OAuth::Consumer.new credentials[:key],credentials[:secret],options
@@ -37,7 +37,7 @@ module Oauth
             access_token=request_token.get_access_token options
             find_or_create_from_access_token user, access_token
           end
-          
+
           def find_or_create_from_access_token(user,access_token)
             secret = access_token.respond_to?(:secret) ? access_token.secret : nil
             if user
@@ -45,26 +45,25 @@ module Oauth
             else
               token = self.find_or_initialize_by_token(access_token.token)
             end
-            
+
             # set or update the secret
             token.secret = secret
             token.save! if token.new_record? or token.changed?
 
             token
           end
-          
+
           def build_user_from_token
           end
-          protected
           
           def credentials
             @credentials||=OAUTH_CREDENTIALS[service_name]
           end
-          
+
         end
-        
+
         module InstanceMethods
-          
+
           # Main client for interfacing with remote service. Override this to use
           # preexisting library eg. Twitter gem.
           def client
@@ -74,19 +73,19 @@ module Oauth
           def simple_client
             @simple_client||=SimpleClient.new client
           end
-          
+
           # Override this to return user data from service
           def params_for_user
             {}
           end
-          
+
           def create_user
             self.user ||= begin
               User.new params_for_user
               user.save(:validate=>false)
             end
-          end  
-          
+          end
+
         end
       end
     end

data/oauth-plugin.gemspec

@@ -34,6 +34,6 @@ Gem::Specification.new do |s|
   s.add_dependency "multi_json"
   s.add_dependency("oauth", ["~> 0.4.4"])
   s.add_dependency("rack")
-  s.add_dependency("oauth2")
+  s.add_dependency("oauth2", '>= 0.5.0')
 end
 

metadata

@@ -1,147 +1,199 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oauth-plugin
-version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 0.4.0.rc2
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Pelle Braendgaard
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: opentransact
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fuubar
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: growl
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: oauth
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.4.4
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: oauth2
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oauth2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 description: Rails plugin for implementing an OAuth Provider or Consumer
 email: oauth-ruby@googlegroups.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
@@ -309,32 +361,29 @@ files:
 - uninstall.rb
 homepage: http://github.com/pelle/oauth-plugin
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: oauth
-rubygems_version: 1.8.11
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails Plugin for OAuth Provider and Consumer
-test_files: 
+test_files:
 - spec/dummy_provider_models.rb
 - spec/oauth/provider/authorizer_spec.rb
 - spec/rack/oauth_filter_spec.rb