sorcery 0.6.1 → 0.7.1

data/spec/rails3/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
-  remote: ../../../
+  remote: ../../
   specs:
-    sorcery (0.6.0)
+    sorcery (0.7.0)
       bcrypt-ruby (~> 3.0.0)
-      oauth (>= 0.4.4)
-      oauth (>= 0.4.4)
-      oauth2 (>= 0.1.1)
-      oauth2 (>= 0.1.1)
+      mongo_mapper
+      oauth (~> 0.4.4)
+      oauth (~> 0.4.4)
+      oauth2 (~> 0.4.1)
+      oauth2 (~> 0.4.1)
 
 GEM
   remote: http://rubygems.org/
@@ -40,37 +41,48 @@ GEM
     activesupport (3.0.3)
     addressable (2.2.6)
     archive-tar-minitar (0.5.2)
-    arel (2.0.6)
-    bcrypt-ruby (3.0.0)
+    arel (2.0.10)
+    bcrypt-ruby (3.0.1)
+    bson (1.4.1)
     builder (2.1.2)
-    columnize (0.3.2)
-    diff-lcs (1.1.2)
+    columnize (0.3.4)
+    diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
-      rack (< 2, >= 1.1.0)
-    i18n (0.5.0)
-    linecache19 (0.5.11)
+      rack (>= 1.1.0, < 2)
+    i18n (0.6.0)
+    launchy (2.0.5)
+      addressable (~> 2.2.6)
+    linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    mail (2.2.13)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    mongo (1.4.1)
+      bson (= 1.4.1)
+    mongo_mapper (0.9.2)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      plucky (~> 0.3.8)
     multi_json (1.0.3)
     multipart-post (1.1.3)
     oauth (0.4.5)
     oauth2 (0.4.1)
       faraday (~> 0.6.1)
       multi_json (>= 0.0.5)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    plucky (0.3.8)
+      mongo (~> 1.3)
+    polyglot (0.3.2)
+    rack (1.2.4)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
     rails (3.0.3)
       actionmailer (= 3.0.3)
@@ -85,12 +97,12 @@ GEM
       activesupport (= 3.0.3)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.8.7)
+    rake (0.9.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
       rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
+    rspec-core (2.5.2)
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
@@ -99,7 +111,7 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.5.0)
-    ruby-debug-base19 (0.11.24)
+    ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby_core_source (>= 0.1.4)
@@ -107,22 +119,27 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
+    ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    simplecov (0.3.9)
-      simplecov-html (>= 0.3.7)
-    simplecov-html (0.3.9)
-    sqlite3-ruby (1.3.2)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    sqlite3 (1.3.4)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
     thor (0.14.6)
     timecop (0.3.5)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  launchy (~> 2.0.5)
   rails (= 3.0.3)
   rspec (~> 2.5.0)
   rspec-rails (~> 2.5.0)

data/spec/rails3/app/controllers/application_controller.rb

@@ -2,78 +2,88 @@ require 'oauth'
 
 class ApplicationController < 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]
-  
+
   def index
-    render :text => ""
   end
   
   def some_action
     render :nothing => true
   end
-  
+
   def test_login
     @user = login(params[:username], params[:password])
     render :text => ""
   end
   
+  def test_auto_login
+    @user = User.find(:first)
+    auto_login(@user)
+    @result = current_user
+    render :text => ""
+  end
+
   def test_return_to
     @user = login(params[:username], params[:password])
     redirect_back_or_to(:index, :notice => 'haha!')
   end
-  
+
   def test_logout
     logout
     render :text => ""
   end
-  
+
   def test_logout_with_remember
     remember_me!
     logout
     render :text => ""
   end
-  
+
   def test_login_with_remember
     @user = login(params[:username], params[:password])
     remember_me!
-    
+
     render :text => ""
   end
-  
+
   def test_login_with_remember_in_login
     @user = login(params[:username], params[:password], params[:remember])
-    
+
     render :text => ""
   end
-  
+
   def test_login_from_cookie
     @user = current_user
     render :text => ""
   end
-  
+
   def test_not_authenticated_action
     render :text => "test_not_authenticated_action"
   end
-  
+
   def test_should_be_logged_in
     render :text => ""
   end
-  
+
   def test_http_basic_auth
     render :text => "HTTP Basic Auth"
   end
-  
+
   def login_at_test
     login_at(:twitter)
   end
-  
+
   def login_at_test2
     login_at(:facebook)
   end
-  
+
+  def login_at_test3
+    login_at(:github)
+  end
+
   def test_login_from
     if @user = login_from(:twitter)
       redirect_to "bla", :notice => "Success!"
@@ -81,7 +91,7 @@ class ApplicationController < ActionController::Base
       redirect_to "blu", :alert => "Failed!"
     end
   end
-  
+
   def test_login_from2
     if @user = login_from(:facebook)
       redirect_to "bla", :notice => "Success!"
@@ -89,7 +99,15 @@ class ApplicationController < ActionController::Base
       redirect_to "blu", :alert => "Failed!"
     end
   end
-  
+
+  def test_login_from3
+    if @user = login_from(:github)
+      redirect_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+
   def test_create_from_provider
     provider = params[:provider]
     login_from(provider)
@@ -99,9 +117,9 @@ class ApplicationController < ActionController::Base
       redirect_to "blu", :alert => "Failed!"
     end
   end
-  
+
   protected
-  
-  
+
+
 
 end

data/spec/rails3/app/views/application/index.html.erb

@@ -0,0 +1,17 @@
+<%= form_tag :action => :test_login, :method => :post do %>
+  <div class="field">
+    <%= label_tag :username %><br />
+    <%= text_field_tag :username %>
+  </div>
+  <div class="field">
+    <%= label_tag :password %><br />
+    <%= password_field_tag :password %>
+  </div>
+  <div class="actions">
+    <%= submit_tag "Login" %>
+  </div>
+  <div>
+  	<%= label_tag "keep me logged in" %><br />
+    <%= check_box_tag :remember %>
+  </div>
+<% end %>

data/spec/rails3/spec/controller_activity_logging_spec.rb

@@ -78,5 +78,28 @@ describe ApplicationController do
       subject.current_users[1].should == user2
       subject.current_users[2].should == user3
     end
+    
+    it "should not register login time if configured so" do
+      sorcery_controller_property_set(:register_login_time, false)
+      now = Time.now.utc
+      login_user
+      @user.last_login_at.should be_nil
+    end
+    
+    it "should not register logout time if configured so" do
+      sorcery_controller_property_set(:register_logout_time, false)
+      now = Time.now.utc
+      login_user
+      logout_user
+      @user.last_logout_at.should be_nil
+    end
+    
+    it "should not register last activity time if configured so" do
+      sorcery_controller_property_set(:register_last_activity_time, false)
+      now = Time.now.utc
+      login_user
+      get :some_action
+      @user.last_activity_at.should be_nil
+    end
   end
 end

data/spec/rails3/spec/controller_oauth2_spec.rb

@@ -15,78 +15,107 @@ describe ApplicationController do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
     sorcery_reload!([:external])
-    sorcery_controller_property_set(:external_providers, [:facebook])
+    sorcery_controller_property_set(:external_providers, [:facebook, :github])
     sorcery_controller_external_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
     sorcery_controller_external_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
     sorcery_controller_external_property_set(:facebook, :callback_url, "http://blabla.com")
+    sorcery_controller_external_property_set(:github, :key, "eYVNBjBDi33aa9GkA3w")
+    sorcery_controller_external_property_set(:github, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+    sorcery_controller_external_property_set(:github, :callback_url, "http://blabla.com")
   end
-  
+
   after(:all) do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
   end
   # ----------------- OAuth -----------------------
   describe ApplicationController, "with OAuth features" do
-  
+
     before(:each) do
       stub_all_oauth2_requests!
     end
-      
+
     after(:each) do
       User.delete_all
       Authentication.delete_all
     end
-    
+
     it "login_at redirects correctly" do
       create_new_user
       get :login_at_test2
       response.should be_a_redirect
-      #response.should redirect_to("http://myapi.com/oauth/authorize?client_id=key&redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access&type=web_server")
       response.should redirect_to("http://myapi.com/oauth/authorize?client_id=key&redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access&response_type=code")
     end
-    
+
     it "'login_from' logins if user exists" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_external_user(:facebook)
       get :test_login_from2
       flash[:notice].should == "Success!"
     end
-    
+
     it "'login_from' fails if user doesn't exist" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_user
       get :test_login_from2
       flash[:alert].should == "Failed!"
     end
+
+  # provider: github
+    it "login_at redirects correctly (github)" do
+      create_new_user
+      get :login_at_test3
+      response.should be_a_redirect
+      response.should redirect_to("http://myapi.com/oauth/authorize?client_id=key&redirect_uri=http%3A%2F%2Fblabla.com&scope=&response_type=code")
+    end
+
+    it "'login_from' logins if user exists (github)" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:github)
+      get :test_login_from3
+      flash[:notice].should == "Success!"
+    end
+
+    it "'login_from' fails if user doesn't exist (github)" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_user
+      get :test_login_from3
+      flash[:alert].should == "Failed!"
+    end
+
   end
-  
+
+
   describe ApplicationController do
     it_behaves_like "oauth2_controller"
   end
-  
+
   describe ApplicationController, "OAuth with User Activation features" do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activation")
       sorcery_reload!([:user_activation,:external], :user_activation_mailer => ::SorceryMailer)
-      sorcery_controller_property_set(:external_providers, [:facebook])
+      sorcery_controller_property_set(:external_providers, [:facebook, :github])
       sorcery_controller_external_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
       sorcery_controller_external_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
       sorcery_controller_external_property_set(:facebook, :callback_url, "http://blabla.com")
+      sorcery_controller_external_property_set(:github, :key, "eYVNBjBDi33aa9GkA3w")
+      sorcery_controller_external_property_set(:github, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+      sorcery_controller_external_property_set(:github, :callback_url, "http://blabla.com")
     end
-    
+
     after(:all) do
       ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activation")
     end
-    
+
     after(:each) do
       User.delete_all
     end
-    
+
     it "should not send activation email to external users" do
       old_size = ActionMailer::Base.deliveries.size
       create_new_external_user(:facebook)
       ActionMailer::Base.deliveries.size.should == old_size
     end
-    
+
     it "should not send external users an activation success email" do
       sorcery_model_property_set(:activation_success_email_method_name, nil)
       create_new_external_user(:facebook)
@@ -94,6 +123,20 @@ describe ApplicationController do
       @user.activate!
       ActionMailer::Base.deliveries.size.should == old_size
     end
+
+  # provider: github
+    it "should not send activation email to external users (github)" do
+      old_size = ActionMailer::Base.deliveries.size
+      create_new_external_user(:github)
+      ActionMailer::Base.deliveries.size.should == old_size
+    end
+
+    it "should not send external users an activation success email (github)" do
+      sorcery_model_property_set(:activation_success_email_method_name, nil)
+      create_new_external_user(:github)
+      old_size = ActionMailer::Base.deliveries.size
+      @user.activate!
+      ActionMailer::Base.deliveries.size.should == old_size
+    end
   end
-  
 end

data/spec/rails3/spec/controller_remember_me_spec.rb

@@ -4,6 +4,7 @@ describe ApplicationController do
   
   # ----------------- REMEMBER ME -----------------------
   describe ApplicationController, "with remember me features" do
+    
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/remember_me")
       sorcery_reload!([:remember_me])
@@ -25,25 +26,29 @@ describe ApplicationController do
     
     it "should set cookie on remember_me!" do
       post :test_login_with_remember, :username => 'gizmo', :password => 'secret'
-      cookies["remember_me_token"].should == assigns[:current_user].remember_me_token
+      @request.cookies.merge!(cookies)
+      cookies = ActionDispatch::Cookies::CookieJar.build(@request)
+      cookies.signed["remember_me_token"].should == assigns[:current_user].remember_me_token
     end
     
     it "should clear cookie on forget_me!" do
       cookies["remember_me_token"] == {:value => 'asd54234dsfsd43534', :expires => 3600}
       get :test_logout
-      cookies["remember_me_token"].should == nil
+      cookies["remember_me_token"].should be_nil
     end
     
     it "login(username,password,remember_me) should login and remember" do
       post :test_login_with_remember_in_login, :username => 'gizmo', :password => 'secret', :remember => "1"
-      cookies["remember_me_token"].should_not be_nil
-      cookies["remember_me_token"].should == assigns[:user].remember_me_token
+      @request.cookies.merge!(cookies)
+      cookies = ActionDispatch::Cookies::CookieJar.build(@request)
+      cookies.signed["remember_me_token"].should_not be_nil
+      cookies.signed["remember_me_token"].should == assigns[:user].remember_me_token
     end
     
     it "logout should also forget_me!" do
       session[:user_id] = @user.id
       get :test_logout_with_remember
-      cookies["remember_me_token"].should == nil
+      cookies["remember_me_token"].should be_nil
     end
     
     it "should login_from_cookie" do
@@ -57,9 +62,35 @@ describe ApplicationController do
       assigns[:current_user].should == @user
     end
     
+    it "should not remember_me! when not asked to, even if third parameter is used" do
+      post :test_login_with_remember_in_login, :username => 'gizmo', :password => 'secret', :remember => "0"
+      cookies["remember_me_token"].should be_nil
+    end
+    
     it "should not remember_me! when not asked to" do
       post :test_login, :username => 'gizmo', :password => 'secret'
-      cookies["remember_me_token"].should == nil
+      cookies["remember_me_token"].should be_nil
+    end
+    
+    # --- login_user(user) ---
+    specify { should respond_to(:auto_login) }
+        
+    it "auto_login(user) should login a user instance without remembering" do
+      create_new_user
+      session[:user_id] = nil
+      subject.auto_login(@user)
+      get :test_login_from_cookie
+      assigns[:current_user].should == @user
+      cookies["remember_me_token"].should be_nil
     end
+    
+    it "auto_login(user, true) should login a user instance with remembering" do
+      create_new_user
+      session[:user_id] = nil
+      subject.auto_login(@user, true)
+      get :test_login_from_cookie
+      assigns[:current_user].should == @user
+      cookies["remember_me_token"].should_not be_nil
+    end       
   end
 end

data/spec/rails3/spec/controller_spec.rb

@@ -28,13 +28,20 @@ describe ApplicationController do
   # ----------------- PLUGIN ACTIVATED -----------------------
   describe ApplicationController, "when activated with sorcery" do
     before(:all) do
+      sorcery_reload!
       User.delete_all
+    end
+    
+    before(:each) do
       create_new_user
     end
   
     after(:each) do
       Sorcery::Controller::Config.reset!
+      sorcery_reload!
+      User.delete_all
       sorcery_controller_property_set(:user_class, User)
+      sorcery_model_property_set(:username_attribute_names, [:username, :email])
     end
     
     specify { should respond_to(:login) }
@@ -50,6 +57,12 @@ describe ApplicationController do
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
+    
+    it "login(email,password) should return the user when success and set the session with user.id" do
+      get :test_login, :username => 'bla@bla.com', :password => 'secret'
+      assigns[:user].should == @user
+      session[:user_id].should == @user.id
+    end
   
     it "login(username,password) should return nil and not set the session when failure" do
       get :test_login, :username => 'gizmo', :password => 'opensesame!'
@@ -107,6 +120,23 @@ describe ApplicationController do
       flash[:notice].should == "haha!"
     end
     
+    
+    # --- auto_login(user) ---
+    specify { should respond_to(:auto_login) }
+        
+    it "auto_login(user) should login a user instance" do
+      session[:user_id] = nil
+      subject.auto_login(@user)
+      subject.logged_in?.should be_true
+    end
+    
+    it "auto_login(user) should work even if current_user was already set to false" do
+      get :test_logout
+      session[:user_id].should be_nil
+      subject.current_user.should be_false
+      get :test_auto_login
+      assigns[:result].should == User.find(:first)
+    end
   end
   
 end

data/spec/rails3/spec/integration_spec.rb

@@ -0,0 +1,23 @@
+# require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+# 
+# describe "the login process", :type => :request do
+#   before(:all) do
+#     sorcery_reload!
+#     create_new_user
+#   end
+#   
+#   after(:all) do
+#   end
+# 
+#   it "handles unverified request" do
+#     visit root_path
+#     # save_and_open_page
+#     fill_in 'Username', :with => 'gizmo'
+#     fill_in 'Password', :with => 'secret'
+#     # <input name="authenticity_token" type="hidden" value="+8M9lXnjnhAW/mAuzwI9Mmy6hM+00qZJa8VMQUg+NmM=">
+#     #page.execute_script("$$('hidden').value='mezuza'")
+#     #save_and_open_page
+#     click_button 'Login'
+#     save_and_open_page
+#   end
+# end

data/spec/rails3/spec/spec_helper.rb

@@ -1,9 +1,11 @@
 $: << File.join(File.dirname(__FILE__), '..', '..', 'lib' )
 # This file is copied to spec/ when you run 'rails generate rspec:install'
+
 # Set the default environment to sqlite3's in_memory database
-ENV['RAILS_ENV'] ||= 'in_memory'
-require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
+ENV["RAILS_ENV"] ||= 'in_memory'  
+require File.expand_path("../../config/environment", __FILE__)  
+require 'rspec/rails'  
+#require 'capybara/rspec'
 require 'timecop'
 # require 'simplecov'
 # SimpleCov.root File.join(File.dirname(__FILE__), "..", "..", "rails3" )
@@ -22,8 +24,6 @@ require 'timecop'
 # in spec/support/ and its subdirectories.
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
-
-
 RSpec.configure do |config|
   config.include RSpec::Rails::ControllerExampleGroup, :example_group => { :file_path => /controller(.)*_spec.rb$/ }
   # == Mock Framework
@@ -43,6 +43,7 @@ RSpec.configure do |config|
   # instead of true.
   config.use_transactional_fixtures = true
   
+  #ActiveRecord::Base.logger = Logger.new(STDOUT)
   config.before(:suite) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/core")
   end

data/spec/rails3_mongo_mapper/.gitignore

@@ -0,0 +1,4 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/**/*

data/spec/rails3_mongo_mapper/.rspec

@@ -0,0 +1 @@
+--colour