sorcery 0.7.4 → 0.7.6

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

@@ -9,16 +9,21 @@ class ApplicationController < ActionController::Base
 
   def index
   end
-  
+
   def some_action
     render :nothing => true
   end
 
+  def some_action_making_a_non_persisted_change_to_the_user
+    current_user.username = "to_be_ignored"
+    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)
@@ -84,6 +89,14 @@ class ApplicationController < ActionController::Base
     login_at(:github)
   end
 
+  def login_at_test4
+    login_at(:google)
+  end
+
+  def login_at_test5
+    login_at(:liveid)
+  end
+
   def test_login_from
     if @user = login_from(:twitter)
       redirect_to "bla", :notice => "Success!"
@@ -108,6 +121,22 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def test_login_from4
+    if @user = login_from(:google)
+      redirect_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+
+  def test_login_from5
+    if @user = login_from(:liveid)
+      redirect_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+
   def test_create_from_provider
     provider = params[:provider]
     login_from(provider)

data/spec/rails3/config/environments/in_memory.rb

@@ -0,0 +1,35 @@
+AppRoot::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection = true
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/spec/rails3/spec/controller_activity_logging_spec.rb

@@ -54,6 +54,13 @@ describe ApplicationController do
       User.first.last_activity_at.to_s(:db).should <= (now+2).to_s(:db)
     end
 
+    it "should update nothing but activity fields" do
+      original_user_name = User.first.username
+      login_user
+      get :some_action_making_a_non_persisted_change_to_the_user
+      User.first.username.should == original_user_name
+    end
+    
     it "'current_users' should hold the user object when 1 user is logged in" do
       login_user
       get :some_action

data/spec/rails3/spec/controller_oauth2_spec.rb

@@ -2,26 +2,45 @@ 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", {})
-  @webby = @client.web_server
-  OAuth2::Strategy::WebServer.stub!(:new).and_return(@webby)
-  @webby.stub!(:get_access_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=)
+  access_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.stub(:get_access_token).and_return(access_token)
 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_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
@@ -43,7 +62,7 @@ describe ApplicationController 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&response_type=code")
+      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
 
     it "'login_from' logins if user exists" do
@@ -65,7 +84,7 @@ describe ApplicationController 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")
+      response.should redirect_to("https://github.com/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
@@ -82,6 +101,50 @@ describe ApplicationController do
       flash[:alert].should == "Failed!"
     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%20https%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
+
+  # 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%20wl.emails%20wl.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
+
   end
 
 
@@ -93,13 +156,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
@@ -138,5 +208,35 @@ 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

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
@@ -139,4 +167,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

@@ -5,7 +5,7 @@ $: << File.join(File.dirname(__FILE__), '..', '..', 'lib' )
 ENV["RAILS_ENV"] ||= 'in_memory'  
 require File.expand_path("../../config/environment", __FILE__)  
 require 'rspec/rails'  
-#require 'capybara/rspec'
+require 'capybara/rspec'
 require 'timecop'
 # require 'simplecov'
 # SimpleCov.root File.join(File.dirname(__FILE__), "..", "..", "rails3" )

data/spec/rails3_mongo_mapper/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.2)
+    sorcery (0.7.5)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.4.1)
-      oauth2 (~> 0.4.1)
+      oauth2 (~> 0.5.1)
+      oauth2 (~> 0.5.1)
 
 GEM
   remote: http://rubygems.org/
@@ -42,17 +42,17 @@ GEM
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
-    bson (1.3.1)
-    bson_ext (1.3.1)
+    bson (1.4.0)
+    bson_ext (1.4.0)
     builder (2.1.2)
     coderay (0.9.8)
-    columnize (0.3.4)
+    columnize (0.3.5)
     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)
+    faraday (0.7.5)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.3)
       rack (>= 1.1.0, < 2)
     i18n (0.6.0)
     linecache19 (0.5.12)
@@ -65,22 +65,22 @@ GEM
     method_source (0.6.7)
       ruby_parser (>= 2.3.1)
     mime-types (1.17.2)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
-    mongo_mapper (0.9.2)
+    mongo (1.4.0)
+      bson (= 1.4.0)
+    mongo_mapper (0.10.1)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
-      plucky (~> 0.3.8)
+      plucky (~> 0.4.0)
     multi_json (1.0.3)
-    multipart-post (1.1.3)
+    multipart-post (1.1.4)
     oauth (0.4.5)
-    oauth2 (0.4.1)
-      faraday (~> 0.6.1)
-      multi_json (>= 0.0.5)
-    plucky (0.3.8)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
+    plucky (0.4.3)
       mongo (~> 1.3)
-    polyglot (0.3.2)
-    pry (0.9.7.3)
+    polyglot (0.3.3)
+    pry (0.9.7.4)
       coderay (~> 0.9.8)
       method_source (~> 0.6.7)
       ruby_parser (>= 2.3.1)
@@ -129,7 +129,7 @@ GEM
       archive-tar-minitar (>= 0.5.2)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.7)
+    sexp_processor (3.0.8)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
@@ -140,7 +140,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby

data/spec/rails3_mongo_mapper/spec/controller_spec.rb

@@ -30,11 +30,16 @@ describe ApplicationController 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
@@ -64,6 +69,34 @@ describe ApplicationController do
       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
@@ -127,4 +160,4 @@ describe ApplicationController do
     end
   end
   
-end
+end

data/spec/rails3_mongoid/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.2)
+    sorcery (0.7.5)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.4.1)
-      oauth2 (~> 0.4.1)
+      oauth2 (~> 0.5.1)
+      oauth2 (~> 0.5.1)
 
 GEM
   remote: http://rubygems.org/
@@ -42,16 +42,16 @@ GEM
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
-    bson (1.3.1)
-    bson_ext (1.3.1)
+    bson (1.4.0)
+    bson_ext (1.4.0)
     builder (2.1.2)
-    columnize (0.3.4)
+    columnize (0.3.5)
     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)
+    faraday (0.7.5)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.3)
       rack (>= 1.1.0, < 2)
     i18n (0.6.0)
     linecache19 (0.5.12)
@@ -62,19 +62,19 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
-    mongoid (2.2.3)
+    mongo (1.4.0)
+      bson (= 1.4.0)
+    mongoid (2.2.4)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
     multi_json (1.0.3)
-    multipart-post (1.1.3)
+    multipart-post (1.1.4)
     oauth (0.4.5)
-    oauth2 (0.4.1)
-      faraday (~> 0.6.1)
-      multi_json (>= 0.0.5)
-    polyglot (0.3.2)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
+    polyglot (0.3.3)
     rack (1.2.4)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -126,7 +126,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby

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

@@ -16,6 +16,11 @@ class ApplicationController < ActionController::Base
     render :nothing => true
   end
   
+  def some_action_making_a_non_persisted_change_to_the_user
+    current_user.username = "to_be_ignored"
+    render :nothing => true
+  end
+  
   def test_login
     @user = login(params[:username], params[:password])
     render :text => ""

data/spec/rails3_mongoid/spec/controller_activity_logging_spec.rb

@@ -23,7 +23,7 @@ describe ApplicationController do
     end
 
     it "should log login time on login" do
-      now = Time.now.in_time_zone
+      now = Time.now
       login_user
       @user.last_login_at.should_not be_nil
       @user.last_login_at.to_s(:db).should >= now.to_s(:db)
@@ -32,7 +32,7 @@ describe ApplicationController do
 
     it "should log logout time on logout" do
       login_user
-      now = Time.now.in_time_zone
+      now = Time.now
       logout_user
       User.first.last_logout_at.should_not be_nil
       User.first.last_logout_at.to_s(:db).should >= now.to_s(:db)
@@ -41,12 +41,19 @@ describe ApplicationController do
 
     it "should log last activity time when logged in" do
       login_user
-      now = Time.now.in_time_zone
+      now = Time.now
       get :some_action
       User.first.last_activity_at.to_s(:db).should >= now.to_s(:db)
       User.first.last_activity_at.to_s(:db).should <= (now+2).to_s(:db)
     end
 
+    it "should update nothing but activity fields" do
+      original_user_name = User.first.username
+      login_user
+      get :some_action_making_a_non_persisted_change_to_the_user
+      User.first.username.should == original_user_name
+    end
+
     it "'current_users' should hold the user object when 1 user is logged in" do
       login_user
       get :some_action