sorcery 0.6.1 → 0.7.1

data/spec/rails3_mongoid/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,46 +41,51 @@ GEM
     activesupport (3.0.3)
     addressable (2.2.6)
     archive-tar-minitar (0.5.2)
-    arel (2.0.6)
-    bcrypt-ruby (3.0.0)
-    bson (1.3.0)
-    bson_ext (1.3.0)
+    arel (2.0.10)
+    bcrypt-ruby (3.0.1)
+    bson (1.4.1)
+    bson_ext (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)
+    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.3.0)
-      bson (>= 1.3.0)
-    mongoid (2.0.1)
+    mongo (1.4.1)
+      bson (= 1.4.1)
+    mongo_mapper (0.9.2)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      plucky (~> 0.3.8)
+    mongoid (2.2.3)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
     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)
@@ -94,12 +100,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)
@@ -108,7 +114,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)
@@ -116,17 +122,18 @@ 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)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.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)
-    will_paginate (3.0.pre2)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby

data/spec/rails3_mongoid/spec/controller_activity_logging_spec.rb

@@ -0,0 +1,98 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ApplicationController do
+  
+  # ----------------- ACTIVITY LOGGING -----------------------
+  describe ApplicationController, "with activity logging features" do
+    before(:all) do
+      sorcery_reload!([:activity_logging])
+    end
+
+    before(:each) do
+      create_new_user
+    end
+
+    after(:each) do
+      User.delete_all
+    end
+    
+    specify { subject.should respond_to(:current_users) }
+
+    it "'current_users' should be empty when no users are logged in" do
+      subject.current_users.size.should == 0
+    end
+
+    it "should log login time on login" do
+      now = Time.now.utc
+      login_user
+      @user.last_login_at.should_not be_nil
+      @user.last_login_at.to_s(:db).should >= now.to_s(:db)
+      @user.last_login_at.to_s(:db).should <= (now+2).to_s(:db)
+    end
+
+    it "should log logout time on logout" do
+      login_user
+      now = Time.now.utc
+      logout_user
+      User.first.last_logout_at.should_not be_nil
+      User.first.last_logout_at.to_s(:db).should >= now.to_s(:db)
+      User.first.last_logout_at.to_s(:db).should <= (now+2).to_s(:db)
+    end
+
+    it "should log last activity time when logged in" do
+      login_user
+      now = Time.now.utc
+      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 "'current_users' should hold the user object when 1 user is logged in" do
+      login_user
+      get :some_action
+      subject.current_users.size.should == 1
+      subject.current_users[0].should == @user
+    end
+
+    it "'current_users' should show all current_users, whether they have logged out before or not." do
+      user1 = create_new_user({:username => 'gizmo1', :email => "bla1@bla.com", :password => 'secret1'})
+      login_user(user1)
+      get :some_action
+      clear_user_without_logout
+      user2 = create_new_user({:username => 'gizmo2', :email => "bla2@bla.com", :password => 'secret2'})
+      login_user(user2)
+      get :some_action
+      clear_user_without_logout
+      user3 = create_new_user({:username => 'gizmo3', :email => "bla3@bla.com", :password => 'secret3'})
+      login_user(user3)
+      get :some_action
+      subject.current_users.size.should == 3
+      subject.current_users[0].should == user1
+      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_mongoid/spec/controller_spec.rb

@@ -0,0 +1,130 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ApplicationController do
+ 
+  # ----------------- PLUGIN CONFIGURATION -----------------------
+  describe ApplicationController, "plugin configuration" do
+    before(:all) do
+      sorcery_reload!
+    end
+    
+    after(:each) do
+      Sorcery::Controller::Config.reset!
+      sorcery_reload!
+    end
+    
+    it "should enable configuration option 'user_class'" do
+      sorcery_controller_property_set(:user_class, "TestUser")
+      Sorcery::Controller::Config.user_class.should == "TestUser"
+    end
+    
+    it "should enable configuration option 'not_authenticated_action'" do
+      sorcery_controller_property_set(:not_authenticated_action, :my_action)
+      Sorcery::Controller::Config.not_authenticated_action.should equal(:my_action)
+    end
+    
+  end
+
+  # ----------------- PLUGIN ACTIVATED -----------------------
+  describe ApplicationController, "when activated with sorcery" do
+    before(:all) do
+      sorcery_reload!
+      User.delete_all
+      create_new_user
+    end
+  
+    after(:each) do
+      Sorcery::Controller::Config.reset!
+      sorcery_controller_property_set(:user_class, User)
+      sorcery_model_property_set(:username_attribute_names, [:username, :email])
+    end
+    
+    specify { should respond_to(:login) }
+
+    specify { should respond_to(:logout) }
+  
+    specify { should respond_to(:logged_in?) }
+    
+    specify { should respond_to(:current_user) }
+  
+    it "login(username,password) should return the user when success and set the session with user.id" do
+      get :test_login, :username => 'gizmo', :password => 'secret'
+      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!'
+      assigns[:user].should be_nil
+      session[:user_id].should be_nil
+    end
+  
+    it "logout should clear the session" do
+      cookies[:remember_me_token] = nil
+      session[:user_id] = @user.id
+      get :test_logout
+      session[:user_id].should be_nil
+    end
+  
+    it "logged_in? should return true if logged in" do
+      session[:user_id] = @user.id
+      subject.logged_in?.should be_true
+    end
+  
+    it "logged_in? should return false if not logged in" do
+      session[:user_id] = nil
+      subject.logged_in?.should be_false
+    end
+    
+    it "current_user should return the user instance if logged in" do
+      create_new_user
+      session[:user_id] = @user.id
+      subject.current_user.should == @user
+    end
+    
+    it "current_user should return false if not logged in" do
+      session[:user_id] = nil
+      subject.current_user.should == false
+    end
+    
+    specify { should respond_to(:require_login) }
+    
+    it "should call the configured 'not_authenticated_action' when authenticate before_filter fails" do
+      session[:user_id] = nil
+      sorcery_controller_property_set(:not_authenticated_action, :test_not_authenticated_action)
+      get :test_logout
+      response.body.should == "test_not_authenticated_action"
+    end
+    
+    it "require_login before_filter should save the url that the user originally wanted" do
+      get :some_action
+      session[:return_to_url].should == "http://test.host/application/some_action"
+      response.should redirect_to("http://test.host/")
+    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'
+      response.should redirect_to("http://test.host/some_action")
+      flash[:notice].should == "haha!"
+    end
+    
+    
+    # --- login_user(user) ---
+    specify { should respond_to(:auto_login) }
+        
+    it "auto_login(user) should login a user instance" do
+      create_new_user
+      session[:user_id] = nil
+      subject.auto_login(@user)
+      subject.logged_in?.should be_true
+    end
+  end
+  
+end

data/spec/rails3_mongoid/spec/user_spec.rb

@@ -34,4 +34,5 @@ describe "User with no submodules (core)" do
       SubUser.fields.should include("blabla")
     end
   end
+  
 end

data/spec/shared_examples/user_remember_me_shared_examples.rb

@@ -30,6 +30,7 @@ shared_examples_for "rails_3_remember_me_model" do
       @user.remember_me_token.should_not be_nil
     end
     
+    # FIXME: assert on line 37 sometimes fails by a second
     it "should set an expiration based on 'remember_me_for' attribute" do
       sorcery_model_property_set(:remember_me_for, 2 * 60 * 60 * 24)
       @user.remember_me!

data/spec/shared_examples/user_shared_examples.rb

@@ -4,9 +4,9 @@ shared_examples_for "rails_3_core_model" do
       User.sorcery_config.reset!
     end
     
-    it "should enable configuration option 'username_attribute_name'" do
-      sorcery_model_property_set(:username_attribute_name, :email)
-      User.sorcery_config.username_attribute_name.should equal(:email)
+    it "should enable configuration option 'username_attribute_names'" do
+      sorcery_model_property_set(:username_attribute_names, :email)
+      User.sorcery_config.username_attribute_names.should == [:email]
     end
       
     it "should enable configuration option 'password_attribute_name'" do
@@ -56,7 +56,6 @@ shared_examples_for "rails_3_core_model" do
       sorcery_model_property_set(:stretches, stretches)
       User.sorcery_config.stretches.should equal(stretches)
     end
-  
   end
   
   # ----------------- PLUGIN ACTIVATED -----------------------
@@ -76,12 +75,12 @@ shared_examples_for "rails_3_core_model" do
   
     it "authenticate should return true if credentials are good" do
       create_new_user
-      User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'secret').should be_true
+      User.authenticate(@user.send(User.sorcery_config.username_attribute_names.first), 'secret').should be_true
     end
   
     it "authenticate should return false if credentials are bad" do
       create_new_user
-      User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'wrong!').should be_false
+      User.authenticate(@user.send(User.sorcery_config.username_attribute_names.first), 'wrong!').should be_false
     end
   
     specify { User.should respond_to(:encrypt) }
@@ -186,7 +185,7 @@ shared_examples_for "rails_3_core_model" do
     it "should work with no password encryption" do
       sorcery_model_property_set(:encryption_algorithm, :none)
       create_new_user
-      User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'secret').should be_true
+      User.authenticate(@user.send(User.sorcery_config.username_attribute_names.first), 'secret').should be_true
     end
   
     it "should work with custom password encryption" do
@@ -202,7 +201,7 @@ shared_examples_for "rails_3_core_model" do
       sorcery_model_property_set(:encryption_algorithm, :custom)
       sorcery_model_property_set(:custom_encryption_provider, MyCrypto)
       create_new_user
-      User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'secret').should be_true
+      User.authenticate(@user.send(User.sorcery_config.username_attribute_names.first), 'secret').should be_true
     end
   
     it "if encryption algo is aes256, it should set key to crypto provider" do
@@ -268,6 +267,35 @@ shared_examples_for "rails_3_core_model" do
     end
     
   end
+  
+  describe User, "ORM adapter" do
+    before(:all) do
+      sorcery_reload!()
+      User.delete_all
+    end
+    
+    before(:each) do
+      create_new_user
+    end
+
+    after(:each) do
+      User.delete_all
+      User.sorcery_config.reset!
+    end
+
+    it "find_by_username should work as expected" do
+      User.find_by_username("gizmo").should == @user
+    end
+
+    it "find_by_username should work as expected with multiple username attributes" do
+      sorcery_model_property_set(:username_attribute_names, [:username, :email])
+      User.find_by_username("gizmo").should == @user
+    end
+
+    it "find_by_email should work as expected" do
+      User.find_by_email("bla@bla.com").should == @user
+    end
+  end
 end
 
 shared_examples_for "external_user" do