sorcery 0.7.0 → 0.8.0

data/spec/rails3_mongoid/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
-  remote: ../../../
+  remote: ../../
   specs:
-    sorcery (0.6.1)
+    sorcery (0.7.13)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.5.0)
+      oauth2 (~> 0.8.0)
 
 GEM
   remote: http://rubygems.org/
@@ -36,48 +36,51 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.6)
     archive-tar-minitar (0.5.2)
-    arel (2.0.6)
+    arel (2.0.10)
     bcrypt-ruby (3.0.1)
-    bson (1.3.0)
-    bson_ext (1.3.0)
+    bson (1.6.0)
+    bson_ext (1.6.0)
+      bson (= 1.6.0)
     builder (2.1.2)
-    columnize (0.3.2)
-    diff-lcs (1.1.2)
+    columnize (0.3.6)
+    diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.7.4)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.0)
-      rack (< 2, >= 1.1.0)
-    i18n (0.5.0)
-    linecache19 (0.5.11)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    httpauth (0.2.0)
+    i18n (0.6.0)
+    jwt (0.1.5)
+      multi_json (>= 1.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)
-      activemodel (~> 3.0)
+    mime-types (1.17.2)
+    mongo (1.6.0)
+      bson (= 1.6.0)
+    mongoid (2.2.6)
+      activemodel (~> 3.0.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.5.1)
-      faraday (~> 0.7.4)
-      multi_json (~> 1.0.3)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    multi_json (1.1.0)
+    multipart-post (1.1.5)
+    oauth (0.4.7)
+    oauth2 (0.8.0)
+      faraday (~> 0.8)
+      httpauth (~> 0.1)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      rack (~> 1.2)
+    polyglot (0.3.3)
+    rack (1.2.5)
+    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)
@@ -92,12 +95,12 @@ GEM
       activesupport (= 3.0.3)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.8.7)
+    rake (0.9.2.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)
@@ -106,7 +109,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)
@@ -114,22 +117,24 @@ 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.6.1)
+      multi_json (~> 1.0)
+      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.31)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt-ruby (~> 3.0.0)
   bson_ext (~> 1.3)
   mongoid (~> 2.0)
   rails (= 3.0.3)

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 => ""
@@ -101,6 +106,20 @@ class ApplicationController < ActionController::Base
     end
   end
   
+  def test_create_from_provider_with_block
+    provider = params[:provider]
+    login_from(provider)
+    @user = create_from(provider) do |user|
+      # check uniqueness of username
+      User.where(:username => user.username).empty?
+    end
+    if @user 
+      redirect_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+  
   protected
   
   

data/spec/rails3_mongoid/config/mongoid.yml

@@ -4,4 +4,4 @@ development:
 
 test:
   host: localhost
-  database: app_root_test
+  database: app_root_test

data/spec/rails3_mongoid/spec/controller_activity_logging_spec.rb

@@ -0,0 +1,105 @@
+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.utc.to_s.should >= now.utc.to_s
+      @user.last_login_at.utc.to_s.should <= (now.utc+2).to_s
+    end
+
+    it "should log logout time on logout" do
+      login_user
+      now = Time.now.utc
+      logout_user
+      User.first.last_logout_at.utc.should_not be_nil
+      User.first.last_logout_at.utc.to_s.should >= now.utc.to_s
+      User.first.last_logout_at.utc.to_s.should <= (now.utc+2).to_s
+    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.utc.should >= now.utc
+      User.first.last_activity_at.utc.should <= (now.utc+2)
+    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
+      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.in_time_zone
+      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.in_time_zone
+      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.in_time_zone
+      login_user
+      get :some_action
+      @user.last_activity_at.should be_nil
+    end
+  end
+end

data/spec/rails3_mongoid/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,7 +69,35 @@ 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
       session[:user_id] = @user.id
@@ -94,6 +127,17 @@ describe ApplicationController do
     end
     
     specify { should respond_to(:require_login) }
+
+    it "should call the configured 'not_authenticated_action' when session[:user_id] isn't found" do
+      # If someone passes in a bogus user_id than no big deal, but if a user is deleted
+      # and there is still an active session out there for him this causes problems.
+      user              = User.create(:email => 'test@example.com', :password => 'password')
+      session[:user_id] = user.id
+      user.destroy
+      sorcery_controller_property_set(:not_authenticated_action, :test_not_authenticated_action)
+      get :test_logout
+      response.body.should == "test_not_authenticated_action"      
+    end
     
     it "should call the configured 'not_authenticated_action' when authenticate before_filter fails" do
       session[:user_id] = nil
@@ -108,6 +152,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'
@@ -127,4 +178,4 @@ describe ApplicationController do
     end
   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/controller_oauth2_shared_examples.rb

@@ -32,6 +32,25 @@ shared_examples_for "oauth2_controller" do
       end.should change(User, :count).by(1)
       User.first.username.should == "Noam Ben Ari"
       User.first.created_at.should_not be_nil
-    end 
+    end
+   
+    describe "with a block" do
+      
+      before(:each) do
+        user = User.new(:username => 'Noam Ben Ari')
+        user.save!(:validate => false)
+        user.authentications.create(:provider => 'twitter', :uid => '456')
+      end
+      
+      it "should not create user" do
+        sorcery_model_property_set(:authentications_class, Authentication)
+        sorcery_controller_external_property_set(:facebook, :user_info_mapping, {:username => "name"})
+        lambda do
+          # test_create_from_provider_with_block in controller will check for uniqueness of username
+          get :test_create_from_provider_with_block, :provider => "facebook"
+        end.should_not change(User, :count)
+      end
+    
+    end
   end
 end

data/spec/shared_examples/controller_oauth_shared_examples.rb

@@ -33,5 +33,23 @@ shared_examples_for "oauth_controller" do
       User.first.username.should == "coming soon to sorcery gem: twitter and facebook authentication support."
       User.first.created_at.should_not be_nil
     end
+    
+    describe "with a block" do
+      
+      before(:each) do
+        user = User.new(:username => 'nbenari')
+        user.save!(:validate => false)
+        user.authentications.create(:provider => 'github', :uid => '456')
+      end
+      
+      it "should not create user" do
+        sorcery_model_property_set(:authentications_class, Authentication)
+        sorcery_controller_external_property_set(:twitter, :user_info_mapping, {:username => "screen_name"})
+        lambda do
+          get :test_create_from_provider_with_block, :provider => "twitter"
+        end.should_not change(User, :count)
+      end
+    
+    end
   end
 end

data/spec/shared_examples/user_activation_shared_examples.rb

@@ -34,9 +34,18 @@ shared_examples_for "rails_3_activation_model" do
       sorcery_model_property_set(:activation_success_email_method_name, :my_activation_email)
       User.sorcery_config.activation_success_email_method_name.should equal(:my_activation_email)
     end
+
+    it "should enable configuration option 'activation_mailer_disabled'" do
+      sorcery_model_property_set(:activation_mailer_disabled, :my_activation_mailer_disabled)
+      User.sorcery_config.activation_mailer_disabled.should equal(:my_activation_mailer_disabled)
+    end
     
-    it "if mailer is nil on activation, throw exception!" do
-      expect{sorcery_reload!([:user_activation])}.to raise_error(ArgumentError)
+    it "if mailer is nil and mailer is enabled, throw exception!" do
+      expect{sorcery_reload!([:user_activation], :activation_mailer_disabled => false)}.to raise_error(ArgumentError)
+    end
+
+    it "if mailer is disabled and mailer is nil, do NOT throw exception" do
+      expect{sorcery_reload!([:user_activation], :activation_mailer_disabled => true)}.to_not raise_error
     end
   end
 
@@ -64,46 +73,67 @@ shared_examples_for "rails_3_activation_model" do
       @user2.activation_state.should == "active"
       User.find_by_activation_token(activation_token).should be_nil
     end
-    
-    it "should send the user an activation email" do
-      old_size = ActionMailer::Base.deliveries.size
-      create_new_user
-      ActionMailer::Base.deliveries.size.should == old_size + 1
-    end
-    
-    it "subsequent saves do not send activation email" do
-      old_size = ActionMailer::Base.deliveries.size
-      @user.username = "Shauli"
-      @user.save!
-      ActionMailer::Base.deliveries.size.should == old_size
-    end
-    
-    it "should send the user an activation success email on successful activation" do
-      old_size = ActionMailer::Base.deliveries.size
-      @user.activate!
-      ActionMailer::Base.deliveries.size.should == old_size + 1
-    end
-    
-    it "subsequent saves do not send activation success email" do
-      @user.activate!
-      old_size = ActionMailer::Base.deliveries.size
-      @user.username = "Shauli"
-      @user.save!
-      ActionMailer::Base.deliveries.size.should == old_size
-    end
-    
-    it "activation needed email is optional" do
-      sorcery_model_property_set(:activation_needed_email_method_name, nil)
-      old_size = ActionMailer::Base.deliveries.size
-      create_new_user
-      ActionMailer::Base.deliveries.size.should == old_size
+
+
+    context "mailer is enabled" do
+      it "should send the user an activation email" do
+        old_size = ActionMailer::Base.deliveries.size
+        create_new_user
+        ActionMailer::Base.deliveries.size.should == old_size + 1
+      end
+
+      it "subsequent saves do not send activation email" do
+        old_size = ActionMailer::Base.deliveries.size
+        @user.username = "Shauli"
+        @user.save!
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
+
+      it "should send the user an activation success email on successful activation" do
+        old_size = ActionMailer::Base.deliveries.size
+        @user.activate!
+        ActionMailer::Base.deliveries.size.should == old_size + 1
+      end
+
+      it "subsequent saves do not send activation success email" do
+        @user.activate!
+        old_size = ActionMailer::Base.deliveries.size
+        @user.username = "Shauli"
+        @user.save!
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
+
+      it "activation needed email is optional" do
+        sorcery_model_property_set(:activation_needed_email_method_name, nil)
+        old_size = ActionMailer::Base.deliveries.size
+        create_new_user
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
+
+      it "activation success email is optional" do
+        sorcery_model_property_set(:activation_success_email_method_name, nil)
+        old_size = ActionMailer::Base.deliveries.size
+        @user.activate!
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
     end
-    
-    it "activation success email is optional" do
-      sorcery_model_property_set(:activation_success_email_method_name, nil)
-      old_size = ActionMailer::Base.deliveries.size
-      @user.activate!
-      ActionMailer::Base.deliveries.size.should == old_size
+
+    context "mailer has been disabled" do
+      before(:each) do
+        sorcery_reload!([:user_activation], :activation_mailer_disabled => true, :user_activation_mailer => ::SorceryMailer)
+      end
+
+      it "should not send the user an activation email" do
+        old_size = ActionMailer::Base.deliveries.size
+        create_new_user
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
+
+      it "should not send the user an activation success email on successful activation" do
+        old_size = ActionMailer::Base.deliveries.size
+        @user.activate!
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
     end
   end
 
@@ -155,7 +185,7 @@ shared_examples_for "rails_3_activation_model" do
     it "load_from_activation_token should NOT return user when token is found and expired" do
       sorcery_model_property_set(:activation_token_expiration_period, 0.1)
       create_new_user
-      Timecop.travel(Time.now+0.5)
+      Timecop.travel(Time.now.in_time_zone+0.5)
       User.load_from_activation_token(@user.activation_token).should == nil
     end
     

data/spec/shared_examples/user_remember_me_shared_examples.rb

@@ -34,7 +34,7 @@ shared_examples_for "rails_3_remember_me_model" do
     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!
-      @user.remember_me_token_expires_at.utc.to_s.should == (Time.now + 2 * 60 * 60 * 24).utc.to_s
+      @user.remember_me_token_expires_at.utc.to_s.should == (Time.now.in_time_zone + 2 * 60 * 60 * 24).utc.to_s
     end
     
     it "should delete the token and expiration on 'forget_me!'" do