oauth-plugin 0.4.0.pre5 → 0.4.0.pre6

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.4.0-pre6
+  - fixes issue with erb generator in rails 3 [pelleb]
+  - various cleanups in generators [akonan]
 0.4.0-pre5
   - protect oauth consumer relay with :expose configuration option. It's off by default. [pelle]
   - Reenable twitter client. It is now configurable for twitter tokens. :client=>:twitter_gem or :oauth_gem [pelle]
@@ -40,7 +43,7 @@
   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 
+  - 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
@@ -58,11 +61,11 @@
   - Added invalidate action to provider, which allows a token to invalidate itself /oauth/invalidate
   - Added capabilities action to provider. Lets you expand to allow auto discovery of permissions and services that token provides.
   - Can override how authorize form indicates an authorization. To get around ugly checkbox
-  
+
     def user_authorizes_token?
       params[:commit] == 'Authorize'
     end
-  
+
 7/23/2009
   0.3.8
   - Fixed Gem Plugins Loading

data/README.rdoc

@@ -28,7 +28,7 @@ You need to install the oauth gem (0.4.4) which is the core OAuth ruby library.
 
 Add the plugin to your Gemfile:
 
-  gem "oauth-plugin", ">=0.4.0.pre1"
+  gem "oauth-plugin", ">= 0.4.0.pre1"
 
 And install it:
 
@@ -90,7 +90,7 @@ The generator supports the defaults you have created in your application.rb file
 Add the following lines to your user model:
 
   has_many :client_applications
-  has_many :tokens, :class_name=>"OauthToken",:order=>"authorized_at desc",:include=>[:client_application]
+  has_many :tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application]
 
 == OAuth Provider generator (Rails 2)
 
@@ -115,7 +115,7 @@ These can of course be used individually as well.
 Add the following lines to your user model:
 
   has_many :client_applications
-  has_many :tokens, :class_name=>"OauthToken",:order=>"authorized_at desc",:include=>[:client_application]
+  has_many :tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application]
 
 === Migrate database
 
@@ -141,13 +141,13 @@ Make it look like this:
 
   class UpgradeOauth < ActiveRecord::Migration
     def self.up
-      add_column :oauth_tokens,:callback_url,:string
-      add_column :oauth_tokens,:verifier,:string,:limit => 20
+      add_column :oauth_tokens, :callback_url, :string
+      add_column :oauth_tokens, :verifier, :string, :limit => 20
     end
 
     def self.down
-      remove_column :oauth_tokens,:callback_url
-      remove_column :oauth_tokens,:verifier
+      remove_column :oauth_tokens, :callback_url
+      remove_column :oauth_tokens, :verifier
     end
   end
 
@@ -168,7 +168,7 @@ Add the following towards the top of the model class
 Then change the create_request_token method to the following:
 
   def create_request_token
-    RequestToken.create :client_application =>self,:callback_url=>token_callback_url
+    RequestToken.create :client_application => self, :callback_url => token_callback_url
   end
 
 === Changes in request_token.rb
@@ -191,7 +191,7 @@ Make sure it looks like this:
   
     def exchange!
       return false unless authorized?
-      return false unless oauth10? || verifier==provided_oauth_verifier
+      return false unless oauth10? || verifier == provided_oauth_verifier
     
       RequestToken.transaction do
         access_token = AccessToken.create(:user => user, :client_application => client_application)
@@ -204,12 +204,12 @@ Make sure it looks like this:
       if oauth10?
         super
       else
-        "#{super}&oauth_callback_confirmed=true"
+        "#{super}&oauth_callback_confirmed = true"
       end
     end
   
     def oob?
-      self.callback_url=='oob'
+      self.callback_url == 'oob'
     end
   
     def oauth10?
@@ -286,8 +286,8 @@ If you want to give oauth access to everything a registered user can do, just re
 
 If you want to restrict consumers to the index and show methods of your controller do the following:
 
-  before_filter :login_required,:except=>[:show,:index]
-  before_filter :login_or_oauth_required,:only=>[:show,:index]
+  before_filter :login_required, :except => [:show,:index]
+  before_filter :login_or_oauth_required, :only => [:show,:index]
 
 If you have an action you only want used via oauth:
 
@@ -330,33 +330,33 @@ All configuration of applications is done in
 
 Add entries to OAUTH_CREDENTIALS for all OAuth Applications you wish to connect to. Get this information by registering your application at the particular applications developer page.
 
-  OAUTH_CREDENTIALS={
-    :twitter=>{
-      :key=>"key",
-      :secret=>"secret",
-      :client=>:twitter_gem, # :twitter_gem or :oauth_gem (defaults to :twitter_gem)
+  OAUTH_CREDENTIALS = {
+    :twitter => {
+      :key => "key",
+      :secret => "secret",
+      :client => :twitter_gem, # :twitter_gem or :oauth_gem (defaults to :twitter_gem)
       :expose => false, # set to true to expose client via the web
     },
-    :agree2=>{
-      :key=>"key",
-      :secret=>"secret",
+    :agree2 => {
+      :key => "key",
+      :secret => "secret",
       :expose => false, # set to true to expose client via the web
     },
-    :hour_feed=>{
-      :key=>"",
-      :secret=>"",
-      :options={
-        :site=>"http://hourfeed.com" 
+    :hour_feed => {
+      :key => "",
+      :secret => "",
+      :options = {
+        :site => "http://hourfeed.com" 
       }
     },
-    :nu_bux=>{
-      :key=>"",
-      :secret=>"",
-      :super_class=>"OpenTransactToken",  # if a OAuth service follows a particular standard 
+    :nu_bux => {
+      :key => "",
+      :secret => "",
+      :super_class => "OpenTransactToken",  # if a OAuth service follows a particular standard 
                                           # with a token implementation you can set the superclass
                                           # to use
-      :options=>{
-        :site=>"http://nubux.heroku.com"
+      :options => {
+        :site => "http://nubux.heroku.com"
       }
     }
   }
@@ -373,11 +373,11 @@ eg. If you connect to Yahoo's FireEagle you would add the :fire_eagle entry to O
 
 This allows you to add a has_one association in your user model:
 
-  has_one  :fire_eagle, :class_name=>"FireEagleToken", :dependent=>:destroy
+  has_one  :fire_eagle, :class_name => "FireEagleToken", :dependent => :destroy
 
 And you could do:
 
-  @location=@user.fire_eagle.client.location
+  @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
 
@@ -413,11 +413,11 @@ You can specify this url to the service you're calling when you register, but it
 
 This is designed to let your local javascript apps access remote OAuth apis. You have to specifically enable this by adding the expose flag to your oauth config file. eg:
 
-  OAUTH_CREDENTIALS={
-    :twitter=>{
-      :key=>"key",
-      :secret=>"secret",
-      :client=>:oauth_gem, # :twitter_gem or :oauth_gem (defaults to :twitter_gem)
+  OAUTH_CREDENTIALS = {
+    :twitter => {
+      :key => "key",
+      :secret => "secret",
+      :client => :oauth_gem, # :twitter_gem or :oauth_gem (defaults to :twitter_gem)
       :expose => true      # set to true to expose client via the web
     }
       

data/generators/oauth_consumer/templates/controller.rb

@@ -3,7 +3,7 @@ class OauthConsumersController < ApplicationController
   include Oauth::Controllers::ConsumerController
   
   def index
-    @consumer_tokens=ConsumerToken.all :conditions=>{:user_id=>current_user.id}
+    @consumer_tokens=ConsumerToken.all :conditions => {:user_id => current_user.id}
     @services=OAUTH_CREDENTIALS.keys-@consumer_tokens.collect{|c| c.class.service_name}
   end
   

data/generators/oauth_consumer/templates/oauth_config.rb

@@ -3,66 +3,66 @@
 #
 # eg. :twitter => TwitterToken, :hour_feed => HourFeedToken etc.
 #
-# OAUTH_CREDENTIALS={
-#   :twitter=>{
-#     :key=>"",
-#     :secret=>"",
-#     :client=>:twitter_gem, # :twitter_gem or :oauth_gem (defaults to :twitter_gem)
+# OAUTH_CREDENTIALS => {
+#   :twitter => {
+#     :key => "",
+#     :secret => "",
+#     :client => :twitter_gem, # :twitter_gem or :oauth_gem (defaults to :twitter_gem)
 #     :expose => false, # expose client at /oauth_consumers/twitter/client see docs
 #     :allow_login => true # Use :allow_login => true to allow user to login to account
 #   },
-#   :google=>{
-#     :key=>"",
-#     :secret=>"",
+#   :google => {
+#     :key => "",
+#     :secret => "",
 #     :expose => false, # expose client at /oauth_consumers/google/client see docs
-#     :scope=>"" # see http://code.google.com/apis/gdata/faq.html#AuthScopes
+#     :scope => "" # see http://code.google.com/apis/gdata/faq.html#AuthScopes
 #   },
-#   :github=>{
+#   :github => {
 #     :key => "",
 #     :secret => "",
 #     :expose => false, # expose client at /oauth_consumers/twitter/client see docs
 #
 #   },
-#   :facebook=>{
+#   :facebook => {
 #     :key => "",
 #     :secret => ""
 #   },
-#   :agree2=>{
-#     :key=>"",
-#     :secret=>""
+#   :agree2 => {
+#     :key => "",
+#     :secret => ""
 #   },
-#   :fireeagle=>{
-#     :key=>"",
-#     :secret=>""
+#   :fireeagle => {
+#     :key => "",
+#     :secret => ""
 #   },
 #   :oauth2_server => {
-#      :key=>"",
-#      :secret=>"",
+#      :key => "",
+#      :secret => "",
 #      :oauth_version => 2
-#      :options=>{ # OAuth::Consumer options
-#        :site=>"http://hourfeed.com" # Remember to add a site for a generic OAuth site
+#      :options => { # OAuth::Consumer options
+#        :site => "http://hourfeed.com" # Remember to add a site for a generic OAuth site
 #      }
 #   },
-#   :hour_feed=>{
-#     :key=>"",
-#     :secret=>"",
-#     :options=>{ # OAuth::Consumer options
-#       :site=>"http://hourfeed.com" # Remember to add a site for a generic OAuth site
+#   :hour_feed => {
+#     :key => "",
+#     :secret => "",
+#     :options => { # OAuth::Consumer options
+#       :site => "http://hourfeed.com" # Remember to add a site for a generic OAuth site
 #     }
 #   },
-#   :nu_bux=>{
-#     :key=>"",
-#     :secret=>"",
-#     :super_class=>"OpenTransactToken",  # if a OAuth service follows a particular standard 
+#   :nu_bux => {
+#     :key => "",
+#     :secret => "",
+#     :super_class => "OpenTransactToken",  # if a OAuth service follows a particular standard 
 #                                         # with a token implementation you can set the superclass
 #                                         # to use
-#     :options=>{ # OAuth::Consumer options
-#       :site=>"http://nubux.heroku.com" 
+#     :options => { # OAuth::Consumer options
+#       :site => "http://nubux.heroku.com" 
 #     }
 #   }
 # }
 # 
-OAUTH_CREDENTIALS={
+OAUTH_CREDENTIALS = {
 } unless defined? OAUTH_CREDENTIALS
 
 load 'oauth/models/consumers/service_loader.rb'

data/generators/oauth_provider/templates/client_application_test.rb

@@ -15,7 +15,7 @@ class ClientApplicationTest < ActiveSupport::TestCase
   fixtures :users,:client_applications,:oauth_tokens
   
   def setup
-    @application = ClientApplication.create :name=>"Agree2",:url=>"http://agree2.com",:user=>users(:quentin)
+    @application = ClientApplication.create :name => "Agree2", :url => "http://agree2.com", :user => users(:quentin)
     create_consumer
   end
 

data/generators/oauth_provider/templates/clients_controller_spec.rb

@@ -50,7 +50,7 @@ describe OauthClientsController do
   
     it "should assign client_applications" do
       do_get
-      assigns[:client_application].should==current_client_application
+      assigns[:client_application].should == current_client_application
     end
   
     it "should render show template" do
@@ -73,7 +73,7 @@ describe OauthClientsController do
   
     it "should assign client_applications" do
       do_get
-      assigns[:client_application].class.should==ClientApplication
+      assigns[:client_application].class.should == ClientApplication
     end
   
     it "should render show template" do
@@ -95,7 +95,7 @@ describe OauthClientsController do
   
     it "should assign client_applications" do
       do_get
-      assigns[:client_application].should==current_client_application
+      assigns[:client_application].should == current_client_application
     end
   
     it "should render edit template" do
@@ -108,7 +108,7 @@ describe OauthClientsController do
   describe "create" do
     
     def do_valid_post
-      post :create, 'client_application'=>{'name' => 'my site', :url=>"http://test.com"}
+      post :create, 'client_application' => {'name' => 'my site', :url => "http://test.com"}
       @client_application = ClientApplication.last
     end
 
@@ -150,11 +150,11 @@ describe OauthClientsController do
   describe "update" do
   
     def do_valid_update
-      put :update, :id => '1', 'client_application'=>{'name' => 'updated site'}
+      put :update, :id => '1', 'client_application' => {'name' => 'updated site'}
     end
 
     def do_invalid_update
-      put :update, :id => '1', 'client_application'=>{'name' => nil}
+      put :update, :id => '1', 'client_application' => {'name' => nil}
     end
   
     it "should redirect to show client_application" do

data/generators/oauth_provider/templates/clients_controller_test.rb

@@ -54,7 +54,7 @@ class OauthClientsControllerShowTest < ActionController::TestCase
   end
   
   def do_get
-    get :show, :id=>'3'
+    get :show, :id => '3'
   end
   
   def test_should_be_successful
@@ -169,12 +169,12 @@ class OauthClientsControllerCreateTest < ActionController::TestCase
   
   def do_valid_post
     @client_application.expects(:save).returns(true)
-    post :create,'client_application'=>{'name'=>'my site'}
+    post :create,'client_application' => {'name' => 'my site'}
   end
 
   def do_invalid_post
     @client_application.expects(:save).returns(false)
-    post :create,:client_application=>{:name=>'my site'}
+    post :create,:client_application=>{:name => 'my site'}
   end
   
   def test_should_query_current_users_client_applications
@@ -248,12 +248,12 @@ class OauthClientsControllerUpdateTest < ActionController::TestCase
   
   def do_valid_update
     @client_application.expects(:update_attributes).returns(true)
-    put :update, :id => '1', 'client_application' => {'name'=>'my site'}
+    put :update, :id => '1', 'client_application' => {'name' => 'my site'}
   end
 
   def do_invalid_update
     @client_application.expects(:update_attributes).returns(false)
-    put :update, :id=>'1', 'client_application' => {'name'=>'my site'}
+    put :update, :id=>'1', 'client_application' => {'name' => 'my site'}
   end
   
   def test_should_query_current_users_client_applications

data/generators/oauth_provider/templates/oauth2_token.rb

@@ -1,6 +1,6 @@
 class Oauth2Token < AccessToken
   
   def as_json(options={})
-    {:access_token=>token}
+    {:access_token => token}
   end
 end

data/lib/generators/erb/oauth_provider_generator.rb

@@ -5,6 +5,8 @@ module Erb
     class OauthProviderGenerator < Erb::Generators::Base
       source_root File.expand_path('../oauth_provider_templates', __FILE__)
 
+      argument :name, :type => :string, :default => 'Oauth'
+
       def copy_view_files
         template '_form.html.erb',              File.join('app/views', class_path, 'oauth_clients', '_form.html.erb')
         template 'new.html.erb',                File.join('app/views', class_path, 'oauth_clients', 'new.html.erb')

data/lib/generators/oauth_provider/oauth_provider_generator.rb

@@ -34,14 +34,4 @@ class OauthProviderGenerator < Rails::Generators::NamedBase
 
     route "resources :#{file_name}_clients"
   end
-  def add_routes
-    route "match '/oauth',               :to => 'oauth#index',         :as => :oauth"
-    route "match '/oauth/authorize',     :to => 'oauth#authorize',     :as => :authorize"
-    route "match '/oauth/request_token', :to => 'oauth#request_token', :as => :request_token"
-    route "match '/oauth/access_token',  :to => 'oauth#access_token',  :as => :access_token"
-    route "match '/oauth/token',         :to => 'oauth#token',         :as => :token"
-    route "match '/oauth/test_request',  :to => 'oauth#test_request',  :as => :test_request"
-
-    route "resources :#{file_name}_clients"
-  end
 end

data/lib/oauth-plugin/version.rb

@@ -1,5 +1,5 @@
 module Oauth
   module Plugin
-    VERSION = "0.4.0.pre5"
+    VERSION = "0.4.0.pre6"
   end
 end

data/lib/oauth/controllers/provider_controller.rb

@@ -1,6 +1,6 @@
 module OAuth
   module Controllers
-   
+
     module ProviderController
       def self.included(controller)
         controller.class_eval do
@@ -12,7 +12,7 @@ module OAuth
           skip_before_filter :verify_authenticity_token, :only=>[:request_token, :access_token, :invalidate, :test_request]
         end
       end
-      
+
       def request_token
         @token = current_client_application.create_request_token params
         if @token
@@ -20,7 +20,7 @@ module OAuth
         else
           render :nothing => true, :status => 401
         end
-      end 
+      end
 
       def access_token
         @token = current_token && current_token.exchange!
@@ -32,14 +32,14 @@ module OAuth
       end
 
       def token
-        @client_application = ClientApplication.find_by_key params[:client_id]
+        @client_application = ClientApplication.find_by_key! params[:client_id]
         if @client_application.secret != params[:client_secret]
           oauth2_error "invalid_client"
           return
         end
         if ["authorization_code","password","none"].include?(params[:grant_type])
           send "oauth2_token_#{params[:grant_type].underscore}"
-        else 
+        else
           oauth2_error "unsupported_grant_type"
         end
       end
@@ -50,28 +50,30 @@ module OAuth
 
       def authorize
         if params[:oauth_token]
-          @token = ::RequestToken.find_by_token params[:oauth_token]
+          @token = ::RequestToken.find_by_token! params[:oauth_token]
           oauth1_authorize
         elsif ["code","token"].include?(params[:response_type]) # pick flow
           send "oauth2_authorize_#{params[:response_type]}"
+        else
+          render :status=>404, :text=>"No token provided"
         end
       end
 
       def revoke
-        @token = current_user.tokens.find_by_token params[:token]
+        @token = current_user.tokens.find_by_token! params[:token]
         if @token
           @token.invalidate!
           flash[:notice] = "You've revoked the token for #{@token.client_application.name}"
         end
         redirect_to oauth_clients_url
       end
-      
+
       # Invalidate current token
       def invalidate
         current_token.invalidate!
         head :status=>410
       end
-      
+
       # Capabilities of current_token
       def capabilities
         if current_token.respond_to?(:capabilities)
@@ -79,7 +81,7 @@ module OAuth
         else
           @capabilities={:invalidate=>url_for(:action=>:invalidate)}
         end
-        
+
         respond_to do |format|
           format.json {render :json=>@capabilities}
           format.xml {render :xml=>@capabilities}
@@ -87,15 +89,15 @@ module OAuth
       end
 
       protected
-      
+
       def oauth1_authorize
         unless @token
           render :action=>"authorize_failure"
           return
         end
 
-        unless @token.invalidated?    
-          if request.post? 
+        unless @token.invalidated?
+          if request.post?
             if user_authorizes_token?
               @token.authorize!(current_user)
               @redirect_url = URI.parse(@token.oob? ? @token.client_application.callback_url : @token.callback_url)
@@ -186,7 +188,7 @@ module OAuth
           return
         end
         @token = @verification_code.exchange!
-        render :json=>@token    
+        render :json=>@token
       end
 
       # http://tools.ietf.org/html/draft-ietf-oauth-v2-08#section-4.1.2
@@ -197,9 +199,9 @@ module OAuth
           return
         end
         @token = Oauth2Token.create :client_application=>@client_application, :user=>@user, :scope=>params[:scope]
-        render :json=>@token    
+        render :json=>@token
       end
-      
+
       # should authenticate and return a user if valid password. Override in your own controller
       def authenticate_user(username,password)
         User.authenticate(username,password)
@@ -208,13 +210,13 @@ module OAuth
       # autonomous authorization which creates a token for client_applications user
       def oauth2_token_none
         @token = Oauth2Token.create :client_application=>@client_application, :user=>@client_application.user, :scope=>params[:scope]
-        render :json=>@token    
+        render :json=>@token
       end
 
       # Override this to match your authorization page form
       def user_authorizes_token?
         params[:authorize] == '1'
-      end  
+      end
 
       def oauth2_error(error="invalid_grant")
         render :json=>{:error=>error}.to_json

data/oauth-plugin.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
 
   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-08}
+  s.date = %q{2011-06-28}
   s.description = %q{Rails plugin for implementing an OAuth Provider or Consumer}
   s.email = %q{oauth-ruby@googlegroups.com}
   s.extra_rdoc_files = [
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   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}
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "growl"
   s.add_development_dependency "rack-test"
-  
+
   s.add_dependency "multi_json"
   s.add_dependency("oauth", ["~> 0.4.4"])
   s.add_dependency("rack")

metadata

@@ -2,7 +2,7 @@
 name: oauth-plugin
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.4.0.pre5
+  version: 0.4.0.pre6
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 -05:00
-default_executable: 
+date: 2011-06-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: opentransact
@@ -306,7 +305,6 @@ files:
 - spec/spec_helper.rb
 - tasks/oauth_tasks.rake
 - uninstall.rb
-has_rdoc: true
 homepage: http://github.com/pelle/oauth-plugin
 licenses: []
 
@@ -330,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: oauth
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails Plugin for OAuth Provider and Consumer