sorcery 0.7.0 → 0.8.0

data/spec/rails3/spec/controller_oauth2_spec.rb

@@ -2,24 +2,51 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/controller_oauth2_shared_examples')
 
 def stub_all_oauth2_requests!
-  @client = OAuth2::Client.new("key","secret", :site => "http://myapi.com")
-  OAuth2::Client.stub!(:new).and_return(@client)
-  @acc_token = OAuth2::AccessToken.new(@client, "asd", {})
-  @client.stub!(:get_token).and_return(@acc_token)
-  @acc_token.stub!(:get).and_return({"id"=>"123", "name"=>"Noam Ben Ari", "first_name"=>"Noam", "last_name"=>"Ben Ari", "link"=>"http://www.facebook.com/nbenari1", "hometown"=>{"id"=>"110619208966868", "name"=>"Haifa, Israel"}, "location"=>{"id"=>"106906559341067", "name"=>"Pardes Hanah, Hefa, Israel"}, "bio"=>"I'm a new daddy, and enjoying it!", "gender"=>"male", "email"=>"nbenari@gmail.com", "timezone"=>2, "locale"=>"en_US", "languages"=>[{"id"=>"108405449189952", "name"=>"Hebrew"}, {"id"=>"106059522759137", "name"=>"English"}, {"id"=>"112624162082677", "name"=>"Russian"}], "verified"=>true, "updated_time"=>"2011-02-16T20:59:38+0000"}.to_json)
+  auth_code       = OAuth2::Strategy::AuthCode.any_instance
+  access_token    = mock(OAuth2::AccessToken)
+  access_token.stub(:token_param=)
+  response        = mock(OAuth2::Response)
+  response.stub(:body).and_return({
+    "id"=>"123",
+    "name"=>"Noam Ben Ari",
+    "first_name"=>"Noam",
+    "last_name"=>"Ben Ari",
+    "link"=>"http://www.facebook.com/nbenari1",
+    "hometown"=>{"id"=>"110619208966868", "name"=>"Haifa, Israel"},
+    "location"=>{"id"=>"106906559341067", "name"=>"Pardes Hanah, Hefa, Israel"},
+    "bio"=>"I'm a new daddy, and enjoying it!",
+    "gender"=>"male",
+    "email"=>"nbenari@gmail.com",
+    "timezone"=>2,
+    "locale"=>"en_US",
+    "languages"=>[{"id"=>"108405449189952", "name"=>"Hebrew"}, {"id"=>"106059522759137", "name"=>"English"}, {"id"=>"112624162082677", "name"=>"Russian"}],
+    "verified"=>true,
+    "updated_time"=>"2011-02-16T20:59:38+0000"}.to_json)
+  access_token.stub(:get).and_return(response)
+  auth_code.stub(:get_token).and_return(access_token)
+end
+
+def set_external_property
+  sorcery_controller_property_set(:external_providers, [:facebook, :github, :google, :liveid])
+  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")
+  sorcery_controller_external_property_set(:google, :key, "eYVNBjBDi33aa9GkA3w")
+  sorcery_controller_external_property_set(:google, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+  sorcery_controller_external_property_set(:google, :callback_url, "http://blabla.com")
+  sorcery_controller_external_property_set(:liveid, :key, "eYVNBjBDi33aa9GkA3w")
+  sorcery_controller_external_property_set(:liveid, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+  sorcery_controller_external_property_set(:liveid, :callback_url, "http://blabla.com")
 end
 
 describe ApplicationController do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
     sorcery_reload!([:external])
-    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")
+    set_external_property
   end
 
   after(:all) do
@@ -37,13 +64,30 @@ describe ApplicationController do
       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?redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access")
+    context "when callback_url begin with /" do 
+      before do
+        sorcery_controller_external_property_set(:facebook, :callback_url, "/oauth/twitter/callback")
+      end
+      it "login_at redirects correctly" do
+        create_new_user
+        get :login_at_test2
+        response.should be_a_redirect
+        response.should redirect_to("https://graph.facebook.com/oauth/authorize?response_type=code&client_id=#{::Sorcery::Controller::Config.facebook.key}&redirect_uri=http%3A%2F%2Ftest.host%2Foauth%2Ftwitter%2Fcallback&scope=email%2Coffline_access&display=page")
+      end
+      after do
+        sorcery_controller_external_property_set(:facebook, :callback_url, "http://blabla.com")
+      end
     end
 
+    context "when callback_url begin with http://" do 
+      it "login_at redirects correctly" do
+        create_new_user
+        get :login_at_test2
+        response.should be_a_redirect
+        response.should redirect_to("https://graph.facebook.com/oauth/authorize?response_type=code&client_id=#{::Sorcery::Controller::Config.facebook.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access&display=page")
+      end
+    end
+    
     it "'login_from' logins if user exists" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_external_user(:facebook)
@@ -58,12 +102,20 @@ describe ApplicationController do
       flash[:alert].should == "Failed!"
     end
 
+    it "on successful login_from the user should be redirected to the url he originally wanted" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:facebook)
+      get :test_return_to_with_external2, {}, :return_to_url => "fuu"
+      response.should redirect_to("fuu")
+      flash[:notice].should == "Success!"
+    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?redirect_uri=http%3A%2F%2Fblabla.com&scope=")
+      response.should redirect_to("https://github.com/login/oauth/authorize?response_type=code&client_id=#{::Sorcery::Controller::Config.github.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope&display")
     end
 
     it "'login_from' logins if user exists (github)" do
@@ -80,6 +132,74 @@ describe ApplicationController do
       flash[:alert].should == "Failed!"
     end
 
+    it "on successful login_from the user should be redirected to the url he originally wanted (github)" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:github)
+      get :test_return_to_with_external3, {}, :return_to_url => "fuu"
+      response.should redirect_to("fuu")
+      flash[:notice].should == "Success!"
+    end
+
+  # provider: google
+    it "login_at redirects correctly (google)" do
+      create_new_user
+      get :login_at_test4
+      response.should be_a_redirect
+      response.should redirect_to("https://accounts.google.com/o/oauth2/auth?response_type=code&client_id=#{::Sorcery::Controller::Config.google.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile&display")
+    end
+
+    it "'login_from' logins if user exists (google)" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:google)
+      get :test_login_from4
+      flash[:notice].should == "Success!"
+    end
+
+    it "'login_from' fails if user doesn't exist (google)" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_user
+      get :test_login_from4
+      flash[:alert].should == "Failed!"
+    end
+
+    it "on successful login_from the user should be redirected to the url he originally wanted (google)" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:google)
+      get :test_return_to_with_external4, {}, :return_to_url => "fuu"
+      response.should redirect_to("fuu")
+      flash[:notice].should == "Success!"
+    end
+
+  # provider: liveid
+    it "login_at redirects correctly (liveid)" do
+      create_new_user
+      get :login_at_test5
+      response.should be_a_redirect
+      response.should redirect_to("https://oauth.live.com/authorize?response_type=code&client_id=#{::Sorcery::Controller::Config.liveid.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope=wl.basic+wl.emails+wl.offline_access&display")
+    end
+
+    it "'login_from' logins if user exists (liveid)" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:liveid)
+      get :test_login_from5
+      flash[:notice].should == "Success!"
+    end
+
+    it "'login_from' fails if user doesn't exist (liveid)" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_user
+      get :test_login_from5
+      flash[:alert].should == "Failed!"
+    end
+
+    it "on successful login_from the user should be redirected to the url he originally wanted (liveid)" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:liveid)
+      get :test_return_to_with_external5, {}, :return_to_url => "fuu"
+      response.should redirect_to("fuu")
+      flash[:notice].should == "Success!"
+    end
+
   end
 
 
@@ -91,13 +211,20 @@ describe ApplicationController 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, :github])
+      sorcery_controller_property_set(:external_providers, [:facebook, :github, :google, :liveid])
       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")
+      sorcery_controller_external_property_set(:google, :key, "eYVNBjBDi33aa9GkA3w")
+      sorcery_controller_external_property_set(:google, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+      sorcery_controller_external_property_set(:google, :callback_url, "http://blabla.com")
+      sorcery_controller_external_property_set(:liveid, :key, "eYVNBjBDi33aa9GkA3w")
+      sorcery_controller_external_property_set(:liveid, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+      sorcery_controller_external_property_set(:liveid, :callback_url, "http://blabla.com")
+
     end
 
     after(:all) do
@@ -136,5 +263,118 @@ describe ApplicationController do
       @user.activate!
       ActionMailer::Base.deliveries.size.should == old_size
     end
+
+  # provider: google
+    it "should not send activation email to external users (google)" do
+      old_size = ActionMailer::Base.deliveries.size
+      create_new_external_user(:google)
+      ActionMailer::Base.deliveries.size.should == old_size
+    end
+
+    it "should not send external users an activation success email (google)" do
+      sorcery_model_property_set(:activation_success_email_method_name, nil)
+      create_new_external_user(:google)
+      old_size = ActionMailer::Base.deliveries.size
+      @user.activate!
+      ActionMailer::Base.deliveries.size.should == old_size
+    end
+
+  # provider: liveid
+    it "should not send activation email to external users (liveid)" do
+      old_size = ActionMailer::Base.deliveries.size
+      create_new_external_user(:liveid)
+      ActionMailer::Base.deliveries.size.should == old_size
+    end
+
+    it "should not send external users an activation success email (liveid)" do
+      sorcery_model_property_set(:activation_success_email_method_name, nil)
+      create_new_external_user(:liveid)
+      old_size = ActionMailer::Base.deliveries.size
+      @user.activate!
+      ActionMailer::Base.deliveries.size.should == old_size
+    end
   end
-end
+
+  describe ApplicationController, "OAuth with user activation features"  do
+    before(:all) do
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activity_logging")
+      sorcery_reload!([:activity_logging, :external])
+    end
+
+    after(:all) do
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activity_logging")
+    end
+
+    %w(facebook github google liveid).each.with_index(2) do |provider, index|
+      context "when #{provider}" do
+        before(:each) do
+          User.delete_all
+          Authentication.delete_all
+          sorcery_controller_property_set(:register_login_time, true)
+          stub_all_oauth2_requests!
+          sorcery_model_property_set(:authentications_class, Authentication)
+          create_new_external_user(provider.to_sym)
+        end
+
+        it "should register login time" do
+          now = Time.now.in_time_zone
+          get "test_login_from#{index}".to_sym
+          User.last.last_login_at.should_not be_nil
+          User.last.last_login_at.to_s(:db).should >= now.to_s(:db)
+          User.last.last_login_at.to_s(:db).should <= (now+2).to_s(:db)
+        end
+
+        it "should not register login time if configured so" do
+          sorcery_controller_property_set(:register_login_time, false)
+          now = Time.now.in_time_zone
+          get "test_login_from#{index}".to_sym
+          User.last.last_login_at.should be_nil
+        end
+      end
+    end
+  end
+
+  describe ApplicationController, "OAuth with session timeout features" do
+    before(:all) do
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
+      sorcery_reload!([:session_timeout, :external])
+    end
+
+    after(:all) do
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
+    end
+
+    %w(facebook github google liveid).each.with_index(2) do |provider, index|
+      context "when #{provider}" do
+        before(:each) do
+          User.delete_all
+          Authentication.delete_all
+          sorcery_model_property_set(:authentications_class, Authentication)
+          sorcery_controller_property_set(:session_timeout,0.5)
+          stub_all_oauth2_requests!
+          create_new_external_user(provider.to_sym)
+        end
+
+        after(:each) do
+          Timecop.return
+        end
+
+        it "should not reset session before session timeout" do
+          get "test_login_from#{index}".to_sym
+          session[:user_id].should_not be_nil
+          flash[:notice].should == "Success!"
+        end
+
+        it "should reset session after session timeout" do
+          get "test_login_from#{index}".to_sym
+          Timecop.travel(Time.now.in_time_zone+0.6)
+          get :test_should_be_logged_in
+          session[:user_id].should be_nil
+          response.should be_a_redirect
+        end
+      end
+    end
+  end
+end

data/spec/rails3/spec/controller_oauth_spec.rb

@@ -43,11 +43,28 @@ describe ApplicationController do
       Authentication.delete_all
     end
     
-    it "login_at redirects correctly" do
-      create_new_user
-      get :login_at_test
-      response.should be_a_redirect
-      response.should redirect_to("http://myapi.com/oauth/authorize?oauth_callback=http%3A%2F%2Fblabla.com&oauth_token=")
+    context "when callback_url begin with /" do 
+      before do
+        sorcery_controller_external_property_set(:twitter, :callback_url, "/oauth/twitter/callback")
+      end
+      it "login_at redirects correctly" do
+        create_new_user
+        get :login_at_test
+        response.should be_a_redirect
+        response.should redirect_to("http://myapi.com/oauth/authorize?oauth_callback=http%3A%2F%2Ftest.host%2Foauth%2Ftwitter%2Fcallback&oauth_token=")
+      end
+      after do
+        sorcery_controller_external_property_set(:twitter, :callback_url, "http://blabla.com")
+      end
+    end
+
+    context "when callback_url begin with http://" do 
+      it "login_at redirects correctly" do
+        create_new_user
+        get :login_at_test
+        response.should be_a_redirect
+        response.should redirect_to("http://myapi.com/oauth/authorize?oauth_callback=http%3A%2F%2Fblabla.com&oauth_token=")
+      end
     end
     
     it "logins if user exists" do
@@ -63,6 +80,15 @@ describe ApplicationController do
       get :test_login_from, :oauth_verifier => "blablaRERASDFcxvSDFA"
       flash[:alert].should == "Failed!"
     end
+
+    it "on successful 'login_from' the user should be redirected to the url he originally wanted" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      create_new_external_user(:twitter)
+      get :test_return_to_with_external, {}, :return_to_url => "fuu"
+      response.should redirect_to("fuu")
+      flash[:notice].should == "Success!"
+    end
+
   end
   
   describe ApplicationController do
@@ -98,4 +124,83 @@ describe ApplicationController do
       ActionMailer::Base.deliveries.size.should == old_size
     end
   end
-end
+
+  describe ApplicationController, "OAuth with user activation features"  do
+    before(:all) do
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activity_logging")
+      sorcery_reload!([:activity_logging, :external])
+    end
+
+    after(:all) do
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activity_logging")
+    end
+
+    context "when twitter" do
+      before(:each) do
+        User.delete_all
+        Authentication.delete_all
+        sorcery_controller_property_set(:register_login_time, true)
+        stub_all_oauth_requests!
+        sorcery_model_property_set(:authentications_class, Authentication)
+        create_new_external_user(:twitter)
+      end
+
+      it "should register login time" do
+        now = Time.now.in_time_zone
+        get :test_login_from
+        User.last.last_login_at.should_not be_nil
+        User.last.last_login_at.to_s(:db).should >= now.to_s(:db)
+        User.last.last_login_at.to_s(:db).should <= (now+2).to_s(:db)
+      end
+
+      it "should not register login time if configured so" do
+        sorcery_controller_property_set(:register_login_time, false)
+        now = Time.now.in_time_zone
+        get :test_login_from
+        User.last.last_login_at.should be_nil
+      end
+    end
+  end
+
+  describe ApplicationController, "OAuth with session timeout features" do
+    before(:all) do
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
+      sorcery_reload!([:session_timeout, :external])
+    end
+
+    after(:all) do
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
+    end
+
+    context "when twitter" do
+      before(:each) do
+        User.delete_all
+        Authentication.delete_all
+        sorcery_model_property_set(:authentications_class, Authentication)
+        sorcery_controller_property_set(:session_timeout,0.5)
+        stub_all_oauth_requests!
+        create_new_external_user(:twitter)
+      end
+
+      after(:each) do
+        Timecop.return
+      end
+
+      it "should not reset session before session timeout" do
+        get :test_login_from
+        session[:user_id].should_not be_nil
+        flash[:notice].should == "Success!"
+      end
+
+      it "should reset session after session timeout" do
+        get :test_login_from
+        Timecop.travel(Time.now.in_time_zone+0.6)
+        get :test_should_be_logged_in
+        session[:user_id].should be_nil
+        response.should be_a_redirect
+      end
+    end
+  end
+end

data/spec/rails3/spec/controller_session_timeout_spec.rb

@@ -23,7 +23,7 @@ describe ApplicationController do
     
     it "should reset session after session timeout" do
       login_user
-      Timecop.travel(Time.now+0.6)
+      Timecop.travel(Time.now.in_time_zone+0.6)
       get :test_should_be_logged_in
       session[:user_id].should be_nil
       response.should be_a_redirect
@@ -33,10 +33,10 @@ describe ApplicationController do
       it "should not logout if there was activity" do
         sorcery_controller_property_set(:session_timeout_from_last_action, true)
         get :test_login, :username => 'gizmo', :password => 'secret'
-        Timecop.travel(Time.now+0.3)
+        Timecop.travel(Time.now.in_time_zone+0.3)
         get :test_should_be_logged_in
         session[:user_id].should_not be_nil
-        Timecop.travel(Time.now+0.3)
+        Timecop.travel(Time.now.in_time_zone+0.3)
         get :test_should_be_logged_in
         session[:user_id].should_not be_nil
         response.should be_a_success
@@ -45,7 +45,7 @@ describe ApplicationController do
       it "with 'session_timeout_from_last_action' should logout if there was no activity" do
         sorcery_controller_property_set(:session_timeout_from_last_action, true)
         get :test_login, :username => 'gizmo', :password => 'secret'
-        Timecop.travel(Time.now+0.6)
+        Timecop.travel(Time.now.in_time_zone+0.6)
         get :test_should_be_logged_in
         session[:user_id].should be_nil
         response.should be_a_redirect

data/spec/rails3/spec/controller_spec.rb

@@ -63,13 +63,41 @@ describe ApplicationController do
       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!'
       assigns[:user].should be_nil
       session[:user_id].should be_nil
     end
+
+    it "login(username,password) should return nil and not set the session when upper case username" do
+      get :test_login, :username => 'GIZMO', :password => 'secret'
+      assigns[:user].should be_nil
+      session[:user_id].should be_nil
+    end
   
+    it "login(username,password) should return the user and set the session with user.id when upper case username and config is downcase before authenticating" do
+      sorcery_model_property_set(:downcase_username_before_authenticating, true)
+      get :test_login, :username => 'GIZMO', :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 user was created with upper case username, config is default, and log in username is lower case" do
+      create_new_user({:username => 'GIZMO1', :email => "bla1@bla.com", :password => 'secret1'})
+      get :test_login, :username => 'gizmo1', :password => 'secret1'
+      assigns[:user].should be_nil
+      session[:user_id].should be_nil
+    end
+
+    it "login(username,password) should return the user and set the session with user.id when user was created with upper case username and config is downcase before authenticating" do
+      sorcery_model_property_set(:downcase_username_before_authenticating, true)
+      create_new_user({:username => 'GIZMO1', :email => "bla1@bla.com", :password => 'secret1'})
+      get :test_login, :username => 'gizmo1', :password => 'secret1'
+      assigns[:user].should == @user
+      session[:user_id].should == @user.id
+    end
+
     it "logout should clear the session" do
       cookies[:remember_me_token] = nil
       session[:user_id] = @user.id
@@ -113,6 +141,13 @@ describe ApplicationController do
       response.should redirect_to("http://test.host/")
     end
     
+    it "require_login before_filter should not save the url that the user originally wanted upon all non-get http methods" do
+      [:post, :put, :delete].each do |m|
+        self.send(m, :some_action)
+        session[:return_to_url].should be_nil
+      end
+    end
+    
     it "on successful login the user should be redirected to the url he originally wanted" do
       session[:return_to_url] = "http://test.host/some_action"
       post :test_return_to, :username => 'gizmo', :password => 'secret'
@@ -139,4 +174,4 @@ describe ApplicationController do
     end
   end
   
-end
+end

data/spec/rails3/spec/integration_spec.rb

@@ -1,21 +1,21 @@
-# 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
+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
+end
+#   it "handles unverified request", :js => true do
 #     visit root_path
-#     # save_and_open_page
-#     fill_in 'Username', :with => 'gizmo'
+#     #save_and_open_page
+#     fill_in 'Username', :with => 'gizmo1'
 #     fill_in 'Password', :with => 'secret'
 #     # <input name="authenticity_token" type="hidden" value="+8M9lXnjnhAW/mAuzwI9Mmy6hM+00qZJa8VMQUg+NmM=">
-#     #page.execute_script("$$('hidden').value='mezuza'")
+#     page.execute_script("$$('hidden').value='mezuza'")
 #     #save_and_open_page
 #     click_button 'Login'
 #     save_and_open_page

data/spec/rails3/spec/spec_helper.rb

@@ -24,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

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

data/spec/{sinatra_modular → rails3_mongo_mapper}/Gemfile

@@ -1,15 +1,16 @@
 source 'http://rubygems.org'
 
-gem 'sinatra', '>= 1.2.0'
-gem 'sqlite3-ruby', :require => 'sqlite3'
-gem 'activerecord', '>= 3.0.3'
-gem 'actionmailer', '>= 3.0.3'
+gem 'bcrypt-ruby', '~> 3.0.0'
+gem 'rails', '3.0.3'
 gem "sorcery", '>= 0.1.0', :path => '../../'
+gem "mongo_mapper", '~> 0.11.0'
+gem "bson_ext", "~> 1.3"
 
 group :development, :test do
-  gem "rake"
   gem "rspec", "~> 2.5.0"
+  gem 'rspec-rails', "~> 2.5.0"
   gem 'ruby-debug19'
   gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
   gem 'timecop'
+  gem 'pry'
 end