sorcery 0.8.5 → 0.9.0

data/spec/rails_app/app/controllers/sorcery_controller.rb

@@ -3,181 +3,246 @@ require 'oauth'
 class SorceryController < ActionController::Base
   protect_from_forgery
 
-  #before_filter :validate_session, :only => [:test_should_be_logged_in] if defined?(:validate_session)
-  before_filter :require_login_from_http_basic, :only => [:test_http_basic_auth]
-  before_filter :require_login, :only => [:test_logout, :test_should_be_logged_in, :some_action]
+  before_filter :require_login_from_http_basic, only: [:test_http_basic_auth]
+  before_filter :require_login, only: [:test_logout, :test_should_be_logged_in, :some_action]
 
   def index
   end
 
   def some_action
-    render :nothing => true
+    render nothing: true
   end
 
   def some_action_making_a_non_persisted_change_to_the_user
-    current_user.email = "to_be_ignored"
-    render :nothing => true
+    current_user.email = 'to_be_ignored'
+    render nothing: true
   end
 
   def test_login
     @user = login(params[:email], params[:password])
-    render :text => ""
+    render nothing: true
   end
 
   def test_auto_login
-    @user = User.find(:first)
+    @user = User.first
     auto_login(@user)
     @result = current_user
-    render :text => ""
+    render nothing: true
   end
 
   def test_return_to
     @user = login(params[:email], params[:password])
-    redirect_back_or_to(:index, :notice => 'haha!')
+    redirect_back_or_to(:index, notice: 'haha!')
   end
 
   def test_logout
     logout
-    render :text => ""
+    render nothing: true
   end
 
   def test_logout_with_remember
     remember_me!
     logout
-    render :text => ""
+    render nothing: true
   end
 
   def test_login_with_remember
     @user = login(params[:email], params[:password])
     remember_me!
 
-    render :text => ""
+    render nothing: true
   end
 
   def test_login_with_remember_in_login
     @user = login(params[:email], params[:password], params[:remember])
 
-    render :text => ""
+    render nothing: true
   end
 
   def test_login_from_cookie
     @user = current_user
-    render :text => ""
+    render nothing: true
   end
 
   def test_not_authenticated_action
-    render :text => "test_not_authenticated_action"
+    render text: 'test_not_authenticated_action'
   end
 
   def test_should_be_logged_in
-    render :text => ""
+    render nothing: true
   end
 
   def test_http_basic_auth
-    render :text => "HTTP Basic Auth"
+    render text: 'HTTP Basic Auth'
   end
 
-  def login_at_test
+  def login_at_test_twitter
     login_at(:twitter)
   end
 
-  def login_at_test2
+  alias :login_at_test :login_at_test_twitter
+
+  def login_at_test_facebook
     login_at(:facebook)
   end
 
-  def login_at_test3
+  def login_at_test_github
     login_at(:github)
   end
 
-  def login_at_test4
+  def login_at_test_google
     login_at(:google)
   end
 
-  def login_at_test5
+  def login_at_test_liveid
     login_at(:liveid)
   end
 
+  def login_at_test_jira
+    login_at(:jira)
+  end
+
+  def login_at_test_vk
+    login_at(:vk)
+  end
+
+  def login_at_test_salesforce
+    login_at(:salesforce)
+  end
+
   def login_at_test_with_state
-    login_at(:facebook, {:state => "bla"})
+    login_at(:facebook, {state: 'bla'})
   end
 
-  def test_login_from
+  def test_login_from_twitter
     if @user = login_from(:twitter)
-      redirect_to "bla", :notice => "Success!"
+      redirect_to 'bla', notice: 'Success!'
     else
-      redirect_to "blu", :alert => "Failed!"
+      redirect_to 'blu', alert: 'Failed!'
     end
   end
 
-  def test_login_from2
+  alias :test_login_from :test_login_from_twitter
+
+  def test_login_from_facebook
     if @user = login_from(:facebook)
-      redirect_to "bla", :notice => "Success!"
+      redirect_to 'bla', notice: 'Success!'
     else
-      redirect_to "blu", :alert => "Failed!"
+      redirect_to 'blu', alert: 'Failed!'
     end
   end
 
-  def test_login_from3
+  def test_login_from_github
     if @user = login_from(:github)
-      redirect_to "bla", :notice => "Success!"
+      redirect_to 'bla', notice: 'Success!'
     else
-      redirect_to "blu", :alert => "Failed!"
+      redirect_to 'blu', alert: 'Failed!'
     end
   end
 
-  def test_login_from4
+  def test_login_from_google
     if @user = login_from(:google)
-      redirect_to "bla", :notice => "Success!"
+      redirect_to 'bla', notice: 'Success!'
     else
-      redirect_to "blu", :alert => "Failed!"
+      redirect_to 'blu', alert: 'Failed!'
     end
   end
 
-  def test_login_from5
+  def test_login_from_liveid
     if @user = login_from(:liveid)
-      redirect_to "bla", :notice => "Success!"
+      redirect_to 'bla', notice: 'Success!'
     else
-      redirect_to "blu", :alert => "Failed!"
+      redirect_to 'blu', alert: 'Failed!'
     end
   end
 
-  def test_return_to_with_external
+  def test_login_from_vk
+    if @user = login_from(:vk)
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_login_from_jira
+    if @user = login_from(:jira)
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_login_from_salesforce
+    if @user = login_from(:salesforce)
+      redirect_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_return_to_with_external_twitter
     if @user = login_from(:twitter)
-      redirect_back_or_to "bla", :notice => "Success!"
+      redirect_back_or_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_return_to_with_external_jira
+    if @user = login_from(:jira)
+      redirect_back_or_to 'bla', notice: 'Success!'
     else
-      redirect_to "blu", :alert => "Failed!"
+      redirect_to 'blu', alert: 'Failed!'
     end
   end
 
-  def test_return_to_with_external2
+  alias :test_return_to_with_external :test_return_to_with_external_twitter
+
+  def test_return_to_with_external_facebook
     if @user = login_from(:facebook)
-      redirect_back_or_to "bla", :notice => "Success!"
+      redirect_back_or_to 'bla', notice: 'Success!'
     else
-      redirect_to "blu", :alert => "Failed!"
+      redirect_to 'blu', alert: 'Failed!'
     end
   end
 
-  def test_return_to_with_external3
+  def test_return_to_with_external_github
     if @user = login_from(:github)
-      redirect_back_or_to "bla", :notice => "Success!"
+      redirect_back_or_to 'bla', notice: 'Success!'
     else
-      redirect_to "blu", :alert => "Failed!"
+      redirect_to 'blu', alert: 'Failed!'
     end
   end
 
-  def test_return_to_with_external4
+  def test_return_to_with_external_google
     if @user = login_from(:google)
-      redirect_back_or_to "bla", :notice => "Success!"
+      redirect_back_or_to 'bla', notice: 'Success!'
     else
-      redirect_to "blu", :alert => "Failed!"
+      redirect_to 'blu', alert: 'Failed!'
     end
   end
 
-  def test_return_to_with_external5
+  def test_return_to_with_external_liveid
     if @user = login_from(:liveid)
-      redirect_back_or_to "bla", :notice => "Success!"
+      redirect_back_or_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_return_to_with_external_vk
+    if @user = login_from(:vk)
+      redirect_back_or_to 'bla', notice: 'Success!'
+    else
+      redirect_to 'blu', alert: 'Failed!'
+    end
+  end
+
+  def test_return_to_with_external_salesforce
+    if @user = login_from(:salesforce)
+      redirect_back_or_to 'bla', notice: 'Success!'
     else
-      redirect_to "blu", :alert => "Failed!"
+      redirect_to 'blu', alert: 'Failed!'
     end
   end
 
@@ -185,9 +250,9 @@ class SorceryController < ActionController::Base
     provider = params[:provider]
     login_from(provider)
     if @user = create_from(provider)
-      redirect_to "bla", :notice => "Success!"
+      redirect_to 'bla', notice: 'Success!'
     else
-      redirect_to "blu", :alert => "Failed!"
+      redirect_to 'blu', alert: 'Failed!'
     end
   end
 
@@ -207,12 +272,13 @@ class SorceryController < ActionController::Base
     login_from(provider)
     @user = create_from(provider) do |user|
       # check uniqueness of email
-      User.where(:email => user.email).empty?
+      # User.where(email: user.email).empty?
+      false
     end
     if @user
-      redirect_to "bla", :notice => "Success!"
+      redirect_to 'bla', notice: 'Success!'
     else
-      redirect_to "blu", :alert => "Failed!"
+      redirect_to 'blu', alert: 'Failed!'
     end
   end
 

data/spec/rails_app/app/data_mapper/authentication.rb

@@ -0,0 +1,8 @@
+class Authentication
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :uid, Integer
+  property :provider, String
+  belongs_to :user
+end

data/spec/rails_app/app/data_mapper/user.rb

@@ -0,0 +1,7 @@
+class User
+  include DataMapper::Resource
+  property :id, Serial
+  property :username, String
+
+  has n, :authentications, :constraint => :destroy
+end

data/spec/rails_app/app/mongo_mapper/user.rb

@@ -1,5 +1,7 @@
 class User
   include MongoMapper::Document
 
+  key :username
+
   many :authentications, :dependent => :destroy
 end

data/spec/rails_app/config/routes.rb

@@ -15,23 +15,37 @@ AppRoot::Application.routes.draw do
     get :test_create_from_provider
     get :test_add_second_provider
     get :test_return_to_with_external
-    get :test_login_from5
-    get :test_login_from4
-    get :test_login_from2
-    get :test_login_from3
-    get :test_return_to_with_external5
-    get :login_at_test2
-    get :login_at_test3
-    get :login_at_test4
-    get :test_return_to_with_external2
-    get :test_return_to_with_external3
-    get :test_return_to_with_external4
+    get :test_login_from
+    get :test_login_from_twitter
+    get :test_login_from_facebook
+    get :test_login_from_github
+    get :test_login_from_google
+    get :test_login_from_liveid
+    get :test_login_from_vk
+    get :test_login_from_jira
+    get :test_login_from_salesforce
+    get :login_at_test
+    get :login_at_test_twitter
+    get :login_at_test_facebook
+    get :login_at_test_github
+    get :login_at_test_google
+    get :login_at_test_liveid
+    get :login_at_test_vk
+    get :login_at_test_jira
+    get :login_at_test_salesforce
+    get :test_return_to_with_external
+    get :test_return_to_with_external_twitter
+    get :test_return_to_with_external_facebook
+    get :test_return_to_with_external_github
+    get :test_return_to_with_external_google
+    get :test_return_to_with_external_liveid
+    get :test_return_to_with_external_vk
+    get :test_return_to_with_external_jira
+    get :test_return_to_with_external_salesforce
     get :test_http_basic_auth
     get :some_action_making_a_non_persisted_change_to_the_user
     post :test_login_with_remember
     get :test_create_from_provider_with_block
-    get :login_at_test
-    get :login_at_test5
     get :login_at_test_with_state
   end
 end

data/spec/rails_app/db/migrate/core/20101224223620_create_users.rb

@@ -3,8 +3,8 @@ class CreateUsers < ActiveRecord::Migration
     create_table :users do |t|
       t.string :username,         :null => false
       t.string :email,            :default => nil
-      t.string :crypted_password, :default => nil
-      t.string :salt,             :default => nil
+      t.string :crypted_password
+      t.string :salt
 
       t.timestamps
     end