oauth-plugin 0.4.0.rc2 → 0.4.0

data/generators/oauth_provider/templates/controller.rb

@@ -1,14 +1,14 @@
 require 'oauth/controllers/provider_controller'
 class OauthController < ApplicationController
   include OAuth::Controllers::ProviderController
-  
+
   protected
   # Override this to match your authorization page form
   # It currently expects a checkbox called authorize
   # def user_authorizes_token?
   #   params[:authorize] == '1'
   # end
-  
+
   # should authenticate and return a user if valid password.
   # This example should work with most Authlogic or Devise. Uncomment it
   # def authenticate_user(username,password)
@@ -19,5 +19,5 @@ class OauthController < ApplicationController
   #     nil
   #   end
   # end
-  
+
 end

data/generators/oauth_provider/templates/index.html.erb

@@ -16,7 +16,7 @@
       </td>
     <%% end %>
   <%% end %>
-  
+
 </table>
 <%% end %>
 <h3>Application Developers</h3>
@@ -33,7 +33,7 @@
   </p>
   <%% @client_applications.each do |client|%>
     <%% div_for client do %>
-      <%%= link_to client.name, oauth_client_path(client) %>- 
+      <%%= link_to client.name, oauth_client_path(client) %>-
         <%%= link_to 'Edit', edit_oauth_client_path(client) %>
         <%%= link_to 'Delete', oauth_client_path(client), :confirm => "Are you sure?", :method => :delete %>
     <%% end %>

data/generators/oauth_provider/templates/index.html.haml

@@ -2,9 +2,9 @@
 %h1 OAuth Client Applications
 - unless @tokens.empty?
 
-  %p 
+  %p
     The following tokens have been issued to applications in your name
-    
+
   %table
     %tr
       %th Application

data/generators/oauth_provider/templates/migration.rb

@@ -12,7 +12,7 @@ class CreateOauthTables < ActiveRecord::Migration
       t.timestamps
     end
     add_index :client_applications, :key, :unique => true
-    
+
     create_table :oauth_tokens do |t|
       t.integer :user_id
       t.string :type, :limit => 20
@@ -22,12 +22,12 @@ class CreateOauthTables < ActiveRecord::Migration
       t.string :callback_url
       t.string :verifier, :limit => 20
       t.string :scope
-      t.timestamp :authorized_at, :invalidated_at, :valid_to
+      t.timestamp :authorized_at, :invalidated_at, :expires_at
       t.timestamps
     end
-    
+
     add_index :oauth_tokens, :token, :unique => true
-    
+
     create_table :oauth_nonces do |t|
       t.string :nonce
       t.integer :timestamp
@@ -35,7 +35,7 @@ class CreateOauthTables < ActiveRecord::Migration
       t.timestamps
     end
     add_index :oauth_nonces,[:nonce, :timestamp], :unique
-    
+
   end
 
   def self.down

data/generators/oauth_provider/templates/oauth2_authorize.html.erb

@@ -6,7 +6,7 @@
   <%%= hidden_field_tag "redirect_uri", params[:redirect_uri]%>
   <%%= hidden_field_tag "state", params[:state]%>
   <%%= hidden_field_tag "scope", params[:scope]%>
-  
+
 <p>
   <%%= check_box_tag 'authorize' %> authorize access
 </p>

data/generators/oauth_provider/templates/oauth_nonce.rb

@@ -3,7 +3,7 @@
 class OauthNonce < ActiveRecord::Base
   validates_presence_of :nonce, :timestamp
   validates_uniqueness_of :nonce, :scope => :timestamp
-  
+
   # Remembers a nonce and it's associated timestamp. It returns false if it has already been used
   def self.remember(nonce, timestamp)
     oauth_nonce = OauthNonce.create(:nonce => nonce, :timestamp => timestamp)

data/generators/oauth_provider/templates/oauth_nonce_spec.rb

@@ -9,15 +9,15 @@ describe OauthNonce do
   it "should be valid" do
     @oauth_nonce.should be_valid
   end
-  
+
   it "should not have errors" do
     @oauth_nonce.errors.full_messages.should == []
   end
-  
+
   it "should not be a new record" do
     @oauth_nonce.should_not be_new_record
   end
-  
+
   it "should not allow a second one with the same values" do
     OauthNonce.remember(@oauth_nonce.nonce,@oauth_nonce.timestamp).should == false
   end

data/generators/oauth_provider/templates/oauth_nonce_test.rb

@@ -3,7 +3,7 @@ require 'oauth/helper'
 
 class ClientNoneTest < ActiveSupport::TestCase
   include OAuth::Helper
-  
+
   def setup
     @oauth_nonce = OauthNonce.remember(generate_key,Time.now.to_i)
   end
@@ -11,15 +11,15 @@ class ClientNoneTest < ActiveSupport::TestCase
   def test_should_be_valid
     assert @oauth_nonce.valid?
   end
-  
+
   def test_should_not_have_errors
     assert_equal [], @oauth_nonce.errors.full_messages
   end
-  
+
   def test_should_not_be_a_new_record
     assert !@oauth_nonce.new_record?
   end
-  
+
   def test_shuold_not_allow_a_second_one_with_the_same_values
     assert_equal false, OauthNonce.remember(@oauth_nonce.nonce, @oauth_nonce.timestamp)
   end

data/generators/oauth_provider/templates/oauth_token.rb

@@ -4,25 +4,25 @@ class OauthToken < ActiveRecord::Base
   validates_uniqueness_of :token
   validates_presence_of :client_application, :token
   before_validation_on_create :generate_keys
-  
+
   def invalidated?
     invalidated_at != nil
   end
-  
+
   def invalidate!
     update_attribute(:invalidated_at, Time.now)
   end
-  
+
   def authorized?
     authorized_at != nil && !invalidated?
   end
-    
+
   def to_query
     "oauth_token=#{token}&oauth_token_secret=#{secret}"
   end
-    
+
   protected
-  
+
   def generate_keys
     self.token = OAuth::Helper.generate_key(40)[0,40]
     self.secret = OAuth::Helper.generate_key(40)[0,40]

data/generators/oauth_provider/templates/oauth_token_spec.rb

@@ -9,11 +9,11 @@ describe RequestToken do
   it "should be valid" do
     @token.should be_valid
   end
-  
+
   it "should not have errors" do
     @token.errors.should_not == []
   end
-  
+
   it "should have a token" do
     @token.token.should_not be_nil
   end
@@ -21,57 +21,57 @@ describe RequestToken do
   it "should have a secret" do
     @token.secret.should_not be_nil
   end
-  
-  it "should not be authorized" do 
+
+  it "should not be authorized" do
     @token.should_not be_authorized
   end
 
   it "should not be invalidated" do
     @token.should_not be_invalidated
   end
-  
+
   it "should not have a verifier" do
     @token.verifier.should be_nil
   end
-  
+
   it "should not be oob" do
     @token.should_not be_oob
   end
-  
+
   describe "OAuth 1.0a" do
-    
+
     describe "with provided callback" do
       before(:each) do
-        @token.callback_url="http://test.com/callback"        
+        @token.callback_url="http://test.com/callback"
       end
 
       it "should not be oauth10" do
         @token.should_not be_oauth10
       end
-      
+
       it "should not be oob" do
         @token.should_not be_oob
       end
 
       describe "authorize request" do
         before(:each) do
-          @token.authorize!(users(:quentin))      
+          @token.authorize!(users(:quentin))
         end
 
         it "should be authorized" do
-          @token.should be_authorized      
+          @token.should be_authorized
         end
 
         it "should have authorized at" do
-          @token.authorized_at.should_not be_nil      
+          @token.authorized_at.should_not be_nil
         end
 
         it "should have user set" do
-          @token.user.should == users(:quentin)      
+          @token.user.should == users(:quentin)
         end
 
         it "should have verifier" do
-          @token.verifier.should_not be_nil      
+          @token.verifier.should_not be_nil
         end
 
         describe "exchange for access token" do
@@ -80,25 +80,25 @@ describe RequestToken do
             @token.provided_oauth_verifier=@token.verifier
             @access = @token.exchange!
           end
-          
+
           it "should be valid" do
             @access.should be_valid
           end
-          
+
           it "should have no error messages" do
             @access.errors.full_messages.should==[]
           end
-          
+
           it "should invalidate request token" do
             @token.should be_invalidated
           end
 
           it "should set user on access token" do
-            @access.user.should == users(:quentin)        
+            @access.user.should == users(:quentin)
           end
-          
+
           it "should authorize accesstoken" do
-            @access.should be_authorized        
+            @access.should be_authorized
           end
         end
 
@@ -148,30 +148,30 @@ describe RequestToken do
       it "should not be oauth10" do
         @token.should_not be_oauth10
       end
-      
+
       it "should be oob" do
         @token.should be_oob
       end
 
       describe "authorize request" do
         before(:each) do
-          @token.authorize!(users(:quentin))      
+          @token.authorize!(users(:quentin))
         end
 
         it "should be authorized" do
-          @token.should be_authorized      
+          @token.should be_authorized
         end
 
         it "should have authorized at" do
-          @token.authorized_at.should_not be_nil      
+          @token.authorized_at.should_not be_nil
         end
 
         it "should have user set" do
-          @token.user.should == users(:quentin)      
+          @token.user.should == users(:quentin)
         end
 
         it "should have verifier" do
-          @token.verifier.should_not be_nil      
+          @token.verifier.should_not be_nil
         end
 
         describe "exchange for access token" do
@@ -186,11 +186,11 @@ describe RequestToken do
           end
 
           it "should set user on access token" do
-            @access.user.should == users(:quentin)        
+            @access.user.should == users(:quentin)
           end
 
           it "should authorize accesstoken" do
-            @access.should be_authorized        
+            @access.should be_authorized
           end
         end
 
@@ -234,34 +234,34 @@ describe RequestToken do
 
   if defined? OAUTH_10_SUPPORT && OAUTH_10_SUPPORT
     describe "OAuth 1.0" do
-    
+
       it "should be oauth10" do
         @token.should be_oauth10
       end
-      
+
       it "should not be oob" do
         @token.should_not be_oob
       end
 
       describe "authorize request" do
         before(:each) do
-          @token.authorize!(users(:quentin))      
+          @token.authorize!(users(:quentin))
         end
 
         it "should be authorized" do
-          @token.should be_authorized      
+          @token.should be_authorized
         end
 
         it "should have authorized at" do
-          @token.authorized_at.should_not be_nil      
+          @token.authorized_at.should_not be_nil
         end
 
         it "should have user set" do
-          @token.user.should == users(:quentin)      
+          @token.user.should == users(:quentin)
         end
 
         it "should not have verifier" do
-          @token.verifier.should be_nil      
+          @token.verifier.should be_nil
         end
 
         describe "exchange for access token" do
@@ -275,11 +275,11 @@ describe RequestToken do
           end
 
           it "should set user on access token" do
-            @access.user.should == users(:quentin)        
+            @access.user.should == users(:quentin)
           end
 
           it "should authorize accesstoken" do
-            @access.should be_authorized        
+            @access.should be_authorized
           end
         end
 

data/generators/oauth_provider/templates/oauth_token_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 class RequestTokenTest < ActiveSupport::TestCase
 
   fixtures :client_applications, :users, :oauth_tokens
-  
+
   def setup
     @token = RequestToken.create :client_application=>client_applications(:one)
   end
@@ -11,11 +11,11 @@ class RequestTokenTest < ActiveSupport::TestCase
   def test_should_be_valid
     assert @token.valid?
   end
-  
+
   def test_should_not_have_errors
     assert @token.errors.empty?
   end
-  
+
   def test_should_have_a_token
     assert_not_nil @token.token
   end
@@ -23,35 +23,35 @@ class RequestTokenTest < ActiveSupport::TestCase
   def test_should_have_a_secret
     assert_not_nil @token.secret
   end
-  
-  def test_should_not_be_authorized 
+
+  def test_should_not_be_authorized
     assert !@token.authorized?
   end
 
   def test_should_not_be_invalidated
     assert !@token.invalidated?
   end
-  
+
   def test_should_authorize_request
     @token.authorize!(users(:quentin))
     assert @token.authorized?
     assert_not_nil @token.authorized_at
     assert_equal users(:quentin), @token.user
   end
-  
+
   def test_should_not_exchange_without_approval
     assert_equal false, @token.exchange!
     assert_equal false, @token.invalidated?
   end
-  
+
   def test_should_not_exchange_without_approval
     @token.authorize!(users(:quentin))
     @access = @token.exchange!
     assert_not_equal false, @access
     assert @token.invalidated?
-    
+
     assert_equal users(:quentin), @access.user
     assert @access.authorized?
   end
-  
+
 end