oauth-plugin 0.4.0.pre2 → 0.4.0.pre3

data/.gitignore

@@ -0,0 +1,8 @@
+doc
+pkg
+*.log
+.DS_Store
+.svn
+*.gem
+.bundle
+.swp

data/CHANGELOG

@@ -1,5 +1,10 @@
-  0.4.0 
-  - Fixed bug with AR ORM Generator [theirix]
+  0.4.0-pre3
+  - Experimental rack filter for OAuth 1.0a:
+    see lib/oauth/rack/oauth_filter.rb for details
+  0.4.0-pre2
+  - mongoid defaults to being embedded
+  - new :auto_login option in oauth_config.rb which lets you use eg. twitter as a primary authentication method
+  0.4.0-pre1
 	- mongoid support in rails 3 [Alexander Semyonov]
 	- OAUTH 2.0 authorization_code and password grant types
 	- Supports OAuth 2.0 draft 10 (Note this is incompatible with previous drafts)

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in oauth-plugin.gemspec
+gemspec

data/Rakefile

@@ -1,43 +1,2 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the oauth plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the oauth plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'OAuth Plugin'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "oauth-plugin"
-    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"
-    gemspec.authors = ["Pelle Braendgaard"]
-    gemspec.add_dependency('oauth', '>= 0.4.4')
-    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
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/UPGRADE.rdoc

@@ -0,0 +1,21 @@
+A few non backwards compatible changes have been made that are really easy to fix.
+
+If you are upgrading a oauth_consumer from 0.3.x to 0.4.x add the following line to your consumer_token model:
+  
+  belongs_to :user
+
+So it looks like this:
+
+  require 'oauth/models/consumers/token'
+  class ConsumerToken < ActiveRecord::Base
+    include Oauth::Models::Consumers::Token
+    belongs_to :user
+  end
+
+You should also upgrade your oauth_consumer_controller as we no longer call login_required in the library. This should make it easier for implementing it with other authentication frameworks:
+
+  require 'oauth/controllers/consumer_controller'
+  class OauthConsumersController < ApplicationController
+    include Oauth::Controllers::ConsumerController
+    # Replace this with the equivalent for your authentication framework
+    before_filter :login_required, :only=>:index

data/VERSION

@@ -1 +1 @@
-0.4.0.pre2
+0.4.0.pre3

data/lib/generators/active_record/oauth_consumer_templates/consumer_token.rb

@@ -1,5 +1,11 @@
 require 'oauth/models/consumers/token'
 class ConsumerToken < ActiveRecord::Base
   include Oauth::Models::Consumers::Token
+  
+  # You can safely remove this callback if you don't allow login from any of your services
+  before_create :create_user
+  
+  # Modify this with class_name etc to match your application
   belongs_to :user
+  
 end

data/lib/generators/mongoid/oauth_consumer_templates/consumer_token.rb

@@ -3,12 +3,37 @@ class ConsumerToken
   include Mongoid::Document
   include Mongoid::Timestamps
   include Oauth::Models::Consumers::Token
+  
+  # You can safely remove this callback if you don't allow login from any of your services
+  before_create :create_user
 
   field :token, :type => String
   field :secret, :type => String
 
-  index :token, :unique => true
+  index :token
 
-  referenced_in :user
+  # Add the following to your user model:
+  # 
+  #   embeds_many :consumer_tokens  
+  #   index "consumer_tokens.token"
+  #
+  embedded_in :user, :inverse_of => :consumer_tokens
+
+  def self.find_or_create_from_access_token(user,access_token)
+    if user
+      user.consumer_tokens.first(:conditions=>{:_type=>self.to_s,:token=>access_token.token}) ||
+        user.consumer_tokens.create!(:_type=>self.to_s,:token=>access_token.token, :secret=>access_token.secret)
+    else
+      # Is there a better way of doing this in mongoid?
+      # Please submit a patch
+      user = User.first(:conditions=>{:_type=>self.to_s,"consumer_tokens.token"=>access_token.token})
+      if user
+        user.consumer_tokens.detect{|t| t.token==access_token.token && t.is_a?(self)} 
+      else
+        user = User.create
+        user.consumer_tokens.create!(:_type=>self.to_s,:token=>access_token.token, :secret=>access_token.secret)
+      end
+    end
+  end
 
 end

data/lib/generators/oauth_consumer/USAGE

@@ -1,8 +1,11 @@
-This creates an OAuth Provider controller as well as requisite models.
+This creates an OAuth Consumer controller as well as requisite models.
 
 It requires an authentication framework such as acts_as_authenticated, restful_authentication or restful_open_id_authentication that provides the methods "login_required" and "current_user".
 
+See comments in generated controller for more info about overriding these.
+
 If you generated the migration file (true by default), make sure you run
-rake db:migrate
+
+  rake db:migrate
 
 See README.rdoc for more.

data/lib/generators/oauth_consumer/templates/controller.rb

@@ -1,6 +1,11 @@
 require 'oauth/controllers/consumer_controller'
 class OauthConsumersController < ApplicationController
   include Oauth::Controllers::ConsumerController
+  # Replace this with the equivalent for your authentication framework
+  # Eg. for devise
+  #
+  #   before_filter :authenticate_user!, :only=>:index
+  before_filter :login_required, :only=>:index
   
   def index
     @consumer_tokens=ConsumerToken.all :conditions=>{:user_id=>current_user.id}
@@ -16,4 +21,30 @@ class OauthConsumersController < ApplicationController
     redirect_to root_url
   end
   
+  # The plugin requires logged_in? to return true or false if the user is logged in. Uncomment and
+  # call your auth frameworks equivalent below if different. eg. for devise:
+  #
+  # def logged_in?
+  #   user_signed_in?
+  # end
+    
+  # The plugin requires current_user to return the current logged in user. Uncomment and
+  # call your auth frameworks equivalent below if different.
+  # def current_user
+  #   current_person
+  # end
+
+  # The plugin requires a way to log a user in. Call your auth frameworks equivalent below 
+  # if different. eg. for devise:
+  #
+  # def current_user=(user)
+  #   sign_in(user)
+  # end
+  
+  # Override this to deny the user or redirect to a login screen depending on your framework and app
+  # if different. eg. for devise:
+  #
+  # def deny_access!
+  #   raise Acl9::AccessDenied
+  # end
 end

data/lib/generators/oauth_consumer/templates/oauth_config.rb

@@ -6,7 +6,8 @@
 # OAUTH_CREDENTIALS={
 #   :twitter=>{
 #     :key=>"",
-#     :secret=>""
+#     :secret=>"",
+#     :allow_login => true # Use :allow_login => true to allow user to login to account
 #   },
 #   :google=>{
 #     :key=>"",

data/lib/oauth/controllers/application_controller_methods.rb

@@ -44,10 +44,19 @@ module OAuth
         def params
           controller.send :params
         end
+        
         def request
           controller.send :request
         end
         
+        def env
+          request.env
+        end
+        
+        def using_rack_filter?
+          request.env["oauth_plugin"]
+        end
+        
         def allow?
           if @strategies.any? do |strategy| 
               @strategy  = strategy.to_sym
@@ -77,22 +86,32 @@ module OAuth
         end
 
         def oauth10_token
-          begin
-            if ClientApplication.verify_request(request) do |request_proxy|
-                @oauth_token = ClientApplication.find_token(request_proxy.token)
-                if @oauth_token.respond_to?(:provided_oauth_verifier=)
-                  @oauth_token.provided_oauth_verifier=request_proxy.oauth_verifier 
-                end
-                # return the token secret and the consumer secret
-                [(@oauth_token.nil? ? nil : @oauth_token.secret), (@oauth_token.client_application.nil? ? nil : @oauth_token.client_application.secret)]
-              end
+          if using_rack_filter?
+            if env["oauth.token"]
+              @oauth_token = env["oauth.token"]
               controller.send :current_token=, @oauth_token
               true
             else
               false
             end
-          rescue
-            false
+          else  
+            begin
+              if ClientApplication.verify_request(request) do |request_proxy|
+                  @oauth_token = ClientApplication.find_token(request_proxy.token)
+                  if @oauth_token.respond_to?(:provided_oauth_verifier=)
+                    @oauth_token.provided_oauth_verifier=request_proxy.oauth_verifier 
+                  end
+                  # return the token secret and the consumer secret
+                  [(@oauth_token.nil? ? nil : @oauth_token.secret), (@oauth_token.client_application.nil? ? nil : @oauth_token.client_application.secret)]
+                end
+                controller.send :current_token=, @oauth_token
+                true
+              else
+                false
+              end
+            rescue
+              false
+            end
           end
         end
 
@@ -109,23 +128,30 @@ module OAuth
         end
         
         def two_legged
-          begin
-            if ClientApplication.verify_request(request) do |request_proxy|
-                @client_application = ClientApplication.find_by_key(request_proxy.consumer_key)
+          if using_rack_filter?
+            if env["oauth.client_application"]
+              @client_application = env["oauth.client_application"]
+              controller.send :current_client_application=, @client_application
+            end
+          else
+            begin
+              if ClientApplication.verify_request(request) do |request_proxy|
+                  @client_application = ClientApplication.find_by_key(request_proxy.consumer_key)
 
-                # Store this temporarily in client_application object for use in request token generation 
-                @client_application.token_callback_url=request_proxy.oauth_callback if request_proxy.oauth_callback
+                  # Store this temporarily in client_application object for use in request token generation 
+                  @client_application.token_callback_url=request_proxy.oauth_callback if request_proxy.oauth_callback
 
-                # return the token secret and the consumer secret
-                [nil, @client_application.secret]
+                  # return the token secret and the consumer secret
+                  [nil, @client_application.secret]
+                end
+                controller.send :current_client_application=, @client_application
+                true
+              else
+                false
               end
-              controller.send :current_client_application=, @client_application
-              true
-            else
+            rescue
               false
             end
-          rescue
-            false
           end
         end
         

data/lib/oauth/controllers/consumer_controller.rb

@@ -3,7 +3,6 @@ module Oauth
     module ConsumerController
       def self.included(controller)
         controller.class_eval do  
-          before_filter :login_required
           before_filter :load_consumer, :except=>:index
           skip_before_filter :verify_authenticity_token,:only=>:callback
         end
@@ -13,8 +12,7 @@ module Oauth
         @consumer_tokens=ConsumerToken.all :conditions=>{:user_id=>current_user.id}
         # The services the user hasn't already connected to
         @services=OAUTH_CREDENTIALS.keys-@consumer_tokens.collect{|c| c.class.service_name}
-      end
-      
+      end      
       
       # creates request token and redirects on to oauth provider's auth page
       # If user is already connected it displays a page with an option to disconnect and redo
@@ -31,11 +29,19 @@ module Oauth
       end
 
       def callback
+        logger.info "CALLBACK"
         @request_token_secret=session[params[:oauth_token]]
         if @request_token_secret
-          @token=@consumer.create_from_request_token(current_user,params[:oauth_token],@request_token_secret,params[:oauth_verifier])
+          @token=@consumer.find_or_create_from_request_token(current_user,params[:oauth_token],@request_token_secret,params[:oauth_verifier])
+          session[params[:oauth_token]] = nil
           if @token
-            flash[:notice] = "#{params[:id].humanize} was successfully connected to your account"
+            # Log user in
+            if logged_in?
+              flash[:notice] = "#{params[:id].humanize} was successfully connected to your account"
+            else
+              self.current_user = @token.user 
+              flash[:notice] = "You logged in with #{params[:id].humanize}"
+            end
             go_back
           else
             flash[:error] = "An error happened, please try connecting again"
@@ -67,8 +73,14 @@ module Oauth
       def load_consumer
         consumer_key=params[:id].to_sym
         throw RecordNotFound unless OAUTH_CREDENTIALS.include?(consumer_key)
+        deny_access! unless logged_in? || OAUTH_CREDENTIALS[consumer_key][:allow_login]
         @consumer="#{consumer_key.to_s.camelcase}Token".constantize
-        @token=@consumer.find_by_user_id current_user.id
+        @token=@consumer.find_by_user_id current_user.id if logged_in?
+      end
+      
+      # Override this in you controller to deny user or redirect to login screen.
+      def deny_access!
+        head 401
       end
       
     end

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

@@ -10,6 +10,7 @@ if defined? ConsumerToken && defined? OAUTH_CREDENTIALS
     class_name=value[:class_name]||"#{key.to_s.classify}Token"
     unless Object.const_defined?(class_name.to_sym)
       if File.exists?(File.join(File.dirname(__FILE__), "services","#{key.to_s}_token.rb"))
+        Rails.logger.info File.join(File.dirname(__FILE__), "services","#{key.to_s}_token")
         require File.join(File.dirname(__FILE__), "services","#{key.to_s}_token")
       else
         begin

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

@@ -0,0 +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    
+    @client ||= OpenTransact::Client.new self.class.credentials.merge( {:token=>token, :secret=>secret})
+  end
+end

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

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__),'opentransact_token')
+
+class PicomoneyToken < OpenTransactToken
+
+  def self.credentials
+    @credentials||={
+        :site=>"https://picomoney.com",
+        :consumer_key => super[:key],
+        :consumer_secret => super[:secret]
+      }.merge(super)
+  end  
+  
+  def about_user
+    client.get("/about_user")
+  end
+
+end

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

@@ -26,17 +26,30 @@ module Oauth
           end
 
           def get_request_token(callback_url)
+            Rails.logger.info "OAUTH_CONSUMER #{consumer.inspect}"
             consumer.get_request_token(:oauth_callback=>callback_url)
           end
 
-          def create_from_request_token(user,token,secret,oauth_verifier)
+          def find_or_create_from_request_token(user,token,secret,oauth_verifier)
             request_token=OAuth::RequestToken.new consumer,token,secret
             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
+            find_or_create_from_access_token user, access_token
           end
           
+          def find_or_create_from_access_token(user,access_token)
+            if user
+              user.consumer_tokens.first(:conditions=>{:type=>self.to_s,:token=>access_token.token}) ||
+                user.consumer_tokens.create!(:type=>self.to_s,:token=>access_token.token, :secret=>access_token.secret)
+            else
+              ConsumerToken.first( :token=>access_token.token,:type=>self.to_s) ||
+                create(:type=>self.to_s,:token=>access_token.token, :secret=>access_token.secret)
+            end
+          end
+          
+          def build_user_from_token
+          end
           protected
           
           def credentials
@@ -50,13 +63,25 @@ module Oauth
           # Main client for interfacing with remote service. Override this to use
           # preexisting library eg. Twitter gem.
           def client
-            @client||=OAuth::AccessToken.new self.class.consumer,token,secret
+            @client||=OAuth::AccessToken.new slelf.class.consumer,token,secret
           end
 
           def simple_client
-            @simple_client||=SimpleClient.new OAuth::AccessToken.new( self.class.consumer,token,secret)
+            @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

data/lib/oauth/rack/oauth_filter.rb

@@ -0,0 +1,50 @@
+require "rack"
+require "rack/request"
+require "oauth/signature"
+module OAuth
+  module Rack
+    
+    # An OAuth 1.0a filter to be used together with the oauth-plugin for rails.T
+    # This is still experimental
+    #
+    # Add it as middleware to your config/application.rb:
+    #
+    # require 'oauth/rack/oauth_filter'
+    # config.middleware.use OAuth::Rack::OAuthFilter
+    
+    
+    
+    class OAuthFilter
+      def initialize(app)
+        @app = app
+      end
+      
+      def call(env)        
+        request = ::Rack::Request.new(env)
+        env["oauth_plugin"]=true
+        if ClientApplication.verify_request(request) do |request_proxy|
+            client_application = ClientApplication.find_by_key(request_proxy.consumer_key)
+            env["oauth.client_application_candidate"] = client_application
+            # Store this temporarily in client_application object for use in request token generation 
+            client_application.token_callback_url=request_proxy.oauth_callback if request_proxy.oauth_callback
+            
+            oauth_token = client_application.tokens.first(:conditions=>{:token => request_proxy.token})
+            if oauth_token.respond_to?(:provided_oauth_verifier=)
+              oauth_token.provided_oauth_verifier=request_proxy.oauth_verifier 
+            end
+            env["oauth.token_candidate"] = oauth_token
+            # return the token secret and the consumer secret
+            [(oauth_token.nil? ? nil : oauth_token.secret), (client_application.nil? ? nil : client_application.secret)]
+          end
+          env["oauth.token"] = env["oauth.token_candidate"]
+          env["oauth.client_application"] = env["oauth.client_application_candidate"]
+#          Rails.logger.info "oauth.token = #{env["oauth.token"].inspect}"
+        end
+        env["oauth.client_application_candidate"] = nil
+        env["oauth.token_candidate"] = nil
+        response = @app.call(env)
+      end
+    end
+    
+  end
+end

data/lib/oauth-plugin/version.rb

@@ -0,0 +1,5 @@
+module Oauth
+  module Plugin
+    VERSION = "0.4.0.pre3"
+  end
+end

data/lib/oauth-plugin.rb

@@ -1 +1,22 @@
-# leaving this empty 
+require 'oauth'
+require 'oauth/signature/hmac/sha1'
+require 'oauth/request_proxy/rack_request'
+require 'oauth/server'
+require 'oauth/controllers/application_controller_methods'
+if Rails.version =~ /^3\./
+  require 'oauth/request_proxy/rack_request'
+else
+  require 'oauth/request_proxy/action_controller_request'
+  ActionController::Base.send :include, OAuth::Controllers::ApplicationControllerMethods
+end
+
+
+module OAuth
+  module Plugin
+    class OAuthRailtie < Rails::Railtie
+      initializer "oauth-plugin.configure_rails_initialization" do |app|
+        ActionController::Base.send :include, OAuth::Controllers::ApplicationControllerMethods
+      end
+    end
+  end
+end

data/oauth-plugin.gemspec

@@ -1,199 +1,31 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "oauth-plugin/version"
 
 Gem::Specification.new do |s|
   s.name = %q{oauth-plugin}
-  s.version = "0.4.0.pre2"
+  s.version = Oauth::Plugin::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pelle Braendgaard"]
-  s.date = %q{2010-12-06}
+  s.date = %q{2010-12-08}
   s.description = %q{Rails plugin for implementing an OAuth Provider or Consumer}
   s.email = %q{oauth-ruby@googlegroups.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
-  s.files = [
-    "CHANGELOG",
-    "MIT-LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "generators/oauth_consumer/USAGE",
-    "generators/oauth_consumer/oauth_consumer_generator.rb",
-    "generators/oauth_consumer/templates/consumer_token.rb",
-    "generators/oauth_consumer/templates/controller.rb",
-    "generators/oauth_consumer/templates/index.html.erb",
-    "generators/oauth_consumer/templates/index.html.haml",
-    "generators/oauth_consumer/templates/migration.rb",
-    "generators/oauth_consumer/templates/oauth_config.rb",
-    "generators/oauth_consumer/templates/show.html.erb",
-    "generators/oauth_consumer/templates/show.html.haml",
-    "generators/oauth_provider/USAGE",
-    "generators/oauth_provider/lib/insert_routes.rb",
-    "generators/oauth_provider/oauth_provider_generator.rb",
-    "generators/oauth_provider/templates/_form.html.erb",
-    "generators/oauth_provider/templates/_form.html.haml",
-    "generators/oauth_provider/templates/access_token.rb",
-    "generators/oauth_provider/templates/authorize.html.erb",
-    "generators/oauth_provider/templates/authorize.html.haml",
-    "generators/oauth_provider/templates/authorize_failure.html.erb",
-    "generators/oauth_provider/templates/authorize_failure.html.haml",
-    "generators/oauth_provider/templates/authorize_success.html.erb",
-    "generators/oauth_provider/templates/authorize_success.html.haml",
-    "generators/oauth_provider/templates/client_application.rb",
-    "generators/oauth_provider/templates/client_application_spec.rb",
-    "generators/oauth_provider/templates/client_application_test.rb",
-    "generators/oauth_provider/templates/client_applications.yml",
-    "generators/oauth_provider/templates/clients_controller.rb",
-    "generators/oauth_provider/templates/clients_controller_spec.rb",
-    "generators/oauth_provider/templates/clients_controller_test.rb",
-    "generators/oauth_provider/templates/controller.rb",
-    "generators/oauth_provider/templates/controller_spec.rb",
-    "generators/oauth_provider/templates/controller_spec_helper.rb",
-    "generators/oauth_provider/templates/controller_test.rb",
-    "generators/oauth_provider/templates/controller_test_helper.rb",
-    "generators/oauth_provider/templates/edit.html.erb",
-    "generators/oauth_provider/templates/edit.html.haml",
-    "generators/oauth_provider/templates/index.html.erb",
-    "generators/oauth_provider/templates/index.html.haml",
-    "generators/oauth_provider/templates/migration.rb",
-    "generators/oauth_provider/templates/new.html.erb",
-    "generators/oauth_provider/templates/new.html.haml",
-    "generators/oauth_provider/templates/oauth2_authorize.html.erb",
-    "generators/oauth_provider/templates/oauth2_authorize.html.haml",
-    "generators/oauth_provider/templates/oauth2_token.rb",
-    "generators/oauth_provider/templates/oauth2_token_spec.rb",
-    "generators/oauth_provider/templates/oauth2_verifier.rb",
-    "generators/oauth_provider/templates/oauth2_verifier_spec.rb",
-    "generators/oauth_provider/templates/oauth_nonce.rb",
-    "generators/oauth_provider/templates/oauth_nonce_spec.rb",
-    "generators/oauth_provider/templates/oauth_nonce_test.rb",
-    "generators/oauth_provider/templates/oauth_nonces.yml",
-    "generators/oauth_provider/templates/oauth_token.rb",
-    "generators/oauth_provider/templates/oauth_token_spec.rb",
-    "generators/oauth_provider/templates/oauth_token_test.rb",
-    "generators/oauth_provider/templates/oauth_tokens.yml",
-    "generators/oauth_provider/templates/request_token.rb",
-    "generators/oauth_provider/templates/show.html.erb",
-    "generators/oauth_provider/templates/show.html.haml",
-    "init.rb",
-    "install.rb",
-    "lib/generators/active_record/oauth_consumer_generator.rb",
-    "lib/generators/active_record/oauth_consumer_templates/consumer_token.rb",
-    "lib/generators/active_record/oauth_consumer_templates/migration.rb",
-    "lib/generators/active_record/oauth_provider_generator.rb",
-    "lib/generators/active_record/oauth_provider_templates/access_token.rb",
-    "lib/generators/active_record/oauth_provider_templates/client_application.rb",
-    "lib/generators/active_record/oauth_provider_templates/migration.rb",
-    "lib/generators/active_record/oauth_provider_templates/oauth2_token.rb",
-    "lib/generators/active_record/oauth_provider_templates/oauth2_verifier.rb",
-    "lib/generators/active_record/oauth_provider_templates/oauth_nonce.rb",
-    "lib/generators/active_record/oauth_provider_templates/oauth_token.rb",
-    "lib/generators/active_record/oauth_provider_templates/request_token.rb",
-    "lib/generators/erb/oauth_consumer_generator.rb",
-    "lib/generators/erb/oauth_consumer_templates/index.html.erb",
-    "lib/generators/erb/oauth_consumer_templates/show.html.erb",
-    "lib/generators/erb/oauth_provider_generator.rb",
-    "lib/generators/erb/oauth_provider_templates/_form.html.erb",
-    "lib/generators/erb/oauth_provider_templates/authorize.html.erb",
-    "lib/generators/erb/oauth_provider_templates/authorize_failure.html.erb",
-    "lib/generators/erb/oauth_provider_templates/authorize_success.html.erb",
-    "lib/generators/erb/oauth_provider_templates/edit.html.erb",
-    "lib/generators/erb/oauth_provider_templates/index.html.erb",
-    "lib/generators/erb/oauth_provider_templates/new.html.erb",
-    "lib/generators/erb/oauth_provider_templates/oauth2_authorize.html.erb",
-    "lib/generators/erb/oauth_provider_templates/show.html.erb",
-    "lib/generators/haml/oauth_consumer_generator.rb",
-    "lib/generators/haml/oauth_consumer_templates/index.html.haml",
-    "lib/generators/haml/oauth_consumer_templates/show.html.haml",
-    "lib/generators/haml/oauth_provider_generator.rb",
-    "lib/generators/haml/oauth_provider_templates/_form.html.haml",
-    "lib/generators/haml/oauth_provider_templates/authorize.html.haml",
-    "lib/generators/haml/oauth_provider_templates/authorize_failure.html.haml",
-    "lib/generators/haml/oauth_provider_templates/authorize_success.html.haml",
-    "lib/generators/haml/oauth_provider_templates/edit.html.haml",
-    "lib/generators/haml/oauth_provider_templates/index.html.haml",
-    "lib/generators/haml/oauth_provider_templates/new.html.haml",
-    "lib/generators/haml/oauth_provider_templates/oauth2_authorize.html.haml",
-    "lib/generators/haml/oauth_provider_templates/show.html.haml",
-    "lib/generators/mongoid/oauth_consumer_generator.rb",
-    "lib/generators/mongoid/oauth_consumer_templates/consumer_token.rb",
-    "lib/generators/mongoid/oauth_provider_generator.rb",
-    "lib/generators/mongoid/oauth_provider_templates/access_token.rb",
-    "lib/generators/mongoid/oauth_provider_templates/client_application.rb",
-    "lib/generators/mongoid/oauth_provider_templates/oauth2_token.rb",
-    "lib/generators/mongoid/oauth_provider_templates/oauth2_verifier.rb",
-    "lib/generators/mongoid/oauth_provider_templates/oauth_nonce.rb",
-    "lib/generators/mongoid/oauth_provider_templates/oauth_token.rb",
-    "lib/generators/mongoid/oauth_provider_templates/request_token.rb",
-    "lib/generators/oauth_consumer/USAGE",
-    "lib/generators/oauth_consumer/oauth_consumer_generator.rb",
-    "lib/generators/oauth_consumer/templates/controller.rb",
-    "lib/generators/oauth_consumer/templates/oauth_config.rb",
-    "lib/generators/oauth_inflections.rb",
-    "lib/generators/oauth_plugin.rb",
-    "lib/generators/oauth_provider/USAGE",
-    "lib/generators/oauth_provider/oauth_provider_generator.rb",
-    "lib/generators/oauth_provider/templates/clients_controller.rb",
-    "lib/generators/oauth_provider/templates/controller.rb",
-    "lib/generators/rspec/oauth_provider_generator.rb",
-    "lib/generators/rspec/templates/client_application_spec.rb",
-    "lib/generators/rspec/templates/client_applications.yml",
-    "lib/generators/rspec/templates/clients_controller_spec.rb",
-    "lib/generators/rspec/templates/controller_spec.rb",
-    "lib/generators/rspec/templates/controller_spec_helper.rb",
-    "lib/generators/rspec/templates/oauth2_token_spec.rb",
-    "lib/generators/rspec/templates/oauth2_verifier_spec.rb",
-    "lib/generators/rspec/templates/oauth_nonce_spec.rb",
-    "lib/generators/rspec/templates/oauth_nonces.yml",
-    "lib/generators/rspec/templates/oauth_token_spec.rb",
-    "lib/generators/rspec/templates/oauth_tokens.yml",
-    "lib/generators/test_unit/oauth_provider_generator.rb",
-    "lib/generators/test_unit/templates/client_application_test.rb",
-    "lib/generators/test_unit/templates/client_applications.yml",
-    "lib/generators/test_unit/templates/clients_controller_test.rb",
-    "lib/generators/test_unit/templates/controller_test.rb",
-    "lib/generators/test_unit/templates/controller_test_helper.rb",
-    "lib/generators/test_unit/templates/oauth_nonce_test.rb",
-    "lib/generators/test_unit/templates/oauth_nonces.yml",
-    "lib/generators/test_unit/templates/oauth_token_test.rb",
-    "lib/generators/test_unit/templates/oauth_tokens.yml",
-    "lib/oauth-plugin.rb",
-    "lib/oauth/controllers/application_controller_methods.rb",
-    "lib/oauth/controllers/consumer_controller.rb",
-    "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/google_token.rb",
-    "lib/oauth/models/consumers/services/twitter_token.rb",
-    "lib/oauth/models/consumers/simple_client.rb",
-    "lib/oauth/models/consumers/token.rb",
-    "oauth-plugin.gemspec",
-    "rails/init.rb",
-    "tasks/oauth_tasks.rake",
-    "uninstall.rb"
-  ]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  
   s.homepage = %q{http://github.com/pelle/oauth-plugin}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{oauth}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby on Rails Plugin for OAuth Provider and Consumer}
+  s.add_development_dependency "twitter"
+  s.add_development_dependency "opentransact"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
-    else
-      s.add_dependency(%q<oauth>, [">= 0.4.4"])
-    end
-  else
-    s.add_dependency(%q<oauth>, [">= 0.4.4"])
-  end
+  s.add_dependency(%q<oauth>, [">= 0.4.4"])
 end
 

data/rails/init.rb

@@ -1,11 +1 @@
-require 'oauth'
-require 'oauth/signature/hmac/sha1'
-if Rails.version =~ /^3\./
-  require 'oauth/request_proxy/rack_request'
-else
-  require 'oauth/request_proxy/action_controller_request'
-end
-require 'oauth/server'
-require 'oauth/controllers/application_controller_methods'
-
-ActionController::Base.send :include, OAuth::Controllers::ApplicationControllerMethods
+require 'oauth-plugin'

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 4
   - 0
-  - pre2
-  version: 0.4.0.pre2
+  - pre3
+  version: 0.4.0.pre3
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -15,13 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -05:00
+date: 2010-12-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: oauth
+  name: twitter
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: opentransact
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: oauth
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,7 +58,7 @@ dependencies:
         - 4
         version: 0.4.4
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id003
 description: Rails plugin for implementing an OAuth Provider or Consumer
 email: oauth-ruby@googlegroups.com
 executables: []
@@ -42,10 +68,13 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
 - CHANGELOG
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- UPGRADE.rdoc
 - VERSION
 - generators/oauth_consumer/USAGE
 - generators/oauth_consumer/oauth_consumer_generator.rb
@@ -188,6 +217,7 @@ files:
 - lib/generators/test_unit/templates/oauth_token_test.rb
 - lib/generators/test_unit/templates/oauth_tokens.yml
 - lib/oauth-plugin.rb
+- lib/oauth-plugin/version.rb
 - lib/oauth/controllers/application_controller_methods.rb
 - lib/oauth/controllers/consumer_controller.rb
 - lib/oauth/controllers/provider_controller.rb
@@ -195,9 +225,12 @@ files:
 - 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/opentransact_token.rb
+- lib/oauth/models/consumers/services/picomoney_token.rb
 - lib/oauth/models/consumers/services/twitter_token.rb
 - lib/oauth/models/consumers/simple_client.rb
 - lib/oauth/models/consumers/token.rb
+- lib/oauth/rack/oauth_filter.rb
 - oauth-plugin.gemspec
 - rails/init.rb
 - tasks/oauth_tasks.rake