sorcery 0.8.4 → 0.8.5

data/spec/rails_app/db/migrate/external/20101224223628_create_authentications_and_user_providers.rb

@@ -0,0 +1,22 @@
+class CreateAuthenticationsAndUserProviders < ActiveRecord::Migration
+  def self.up
+    create_table :authentications do |t|
+      t.integer :user_id, null: false
+      t.string :provider, :uid, null: false
+
+      t.timestamps
+    end
+
+    create_table :user_providers do |t|
+      t.integer :user_id, null: false
+      t.string :provider, :uid, null: false
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :authentications
+    drop_table :user_providers
+  end
+end

data/spec/shared_examples/controller_oauth_shared_examples.rb

@@ -5,7 +5,7 @@ shared_examples_for "oauth_controller" do
       User.delete_all
       Authentication.delete_all
     end
-      
+
     it "should create a new user" do
       sorcery_model_property_set(:authentications_class, Authentication)
       sorcery_controller_external_property_set(:twitter, :user_info_mapping, {:username => "screen_name"})
@@ -14,7 +14,7 @@ shared_examples_for "oauth_controller" do
       end.should change(User, :count).by(1)
       User.first.username.should == "nbenari"
     end
-    
+
     it "should support nested attributes" do
       sorcery_model_property_set(:authentications_class, Authentication)
       sorcery_controller_external_property_set(:twitter, :user_info_mapping, {:username => "status/text"})
@@ -23,7 +23,7 @@ shared_examples_for "oauth_controller" do
       end.should change(User, :count).by(1)
       User.first.username.should == "coming soon to sorcery gem: twitter and facebook authentication support."
     end
-    
+
     it "should not crash on missing nested attributes" do
       sorcery_model_property_set(:authentications_class, Authentication)
       sorcery_controller_external_property_set(:twitter, :user_info_mapping, {:username => "status/text", :created_at => "does/not/exist"})
@@ -33,15 +33,29 @@ 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
-    
+
+    it "binds new provider" do
+      sorcery_model_property_set(:authentications_class, UserProvider)
+
+      current_user = custom_create_new_external_user(:facebook, UserProvider)
+      login_user(current_user)
+
+      lambda do
+        get :test_add_second_provider, :provider => "twitter"
+      end.should change(UserProvider, :count).by(1)
+
+      UserProvider.where(:user_id => current_user.id).should have(2).items
+      User.should have(1).item
+    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"})
@@ -49,7 +63,7 @@ shared_examples_for "oauth_controller" do
           get :test_create_from_provider_with_block, :provider => "twitter"
         end.should_not change(User, :count)
       end
-    
+
     end
   end
-end
+end

data/spec/shared_examples/user_activation_shared_examples.rb

@@ -4,32 +4,32 @@ shared_examples_for "rails_3_activation_model" do
     before(:all) do
       sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
-  
+
     after(:each) do
       User.sorcery_config.reset!
       sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
-    
+
     it "should enable configuration option 'activation_state_attribute_name'" do
       sorcery_model_property_set(:activation_state_attribute_name, :status)
-      User.sorcery_config.activation_state_attribute_name.should equal(:status)    
+      User.sorcery_config.activation_state_attribute_name.should equal(:status)
     end
-    
+
     it "should enable configuration option 'activation_token_attribute_name'" do
       sorcery_model_property_set(:activation_token_attribute_name, :code)
-      User.sorcery_config.activation_token_attribute_name.should equal(:code)    
+      User.sorcery_config.activation_token_attribute_name.should equal(:code)
     end
-    
+
     it "should enable configuration option 'user_activation_mailer'" do
       sorcery_model_property_set(:user_activation_mailer, TestMailer)
-      User.sorcery_config.user_activation_mailer.should equal(TestMailer)    
+      User.sorcery_config.user_activation_mailer.should equal(TestMailer)
     end
-    
+
     it "should enable configuration option 'activation_needed_email_method_name'" do
       sorcery_model_property_set(:activation_needed_email_method_name, :my_activation_email)
       User.sorcery_config.activation_needed_email_method_name.should equal(:my_activation_email)
     end
-    
+
     it "should enable configuration option 'activation_success_email_method_name'" 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)
@@ -39,7 +39,7 @@ shared_examples_for "rails_3_activation_model" 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 and mailer is enabled, throw exception!" do
       expect{sorcery_reload!([:user_activation], :activation_mailer_disabled => false)}.to raise_error(ArgumentError)
     end
@@ -54,17 +54,17 @@ shared_examples_for "rails_3_activation_model" do
     before(:all) do
       sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
-    
+
     before(:each) do
       create_new_user
     end
-    
+
     it "should initialize user state to 'pending'" do
       @user.activation_state.should == "pending"
     end
-    
+
     specify { @user.should respond_to(:activate!) }
-    
+
     it "should clear activation code and change state to 'active' on activation" do
       activation_token = @user.activation_token
       @user.activate!
@@ -82,9 +82,15 @@ shared_examples_for "rails_3_activation_model" do
         ActionMailer::Base.deliveries.size.should == old_size + 1
       end
 
+      it "should call send_activation_needed_email! method of user" do
+        user = build_new_user
+        user.should_receive(:send_activation_needed_email!).once
+        user.save!
+      end
+
       it "subsequent saves do not send activation email" do
         old_size = ActionMailer::Base.deliveries.size
-        @user.username = "Shauli"
+        @user.email = "Shauli"
         @user.save!
         ActionMailer::Base.deliveries.size.should == old_size
       end
@@ -95,10 +101,15 @@ shared_examples_for "rails_3_activation_model" do
         ActionMailer::Base.deliveries.size.should == old_size + 1
       end
 
+      it "should call send_activation_success_email! method of user on activation" do
+        @user.should_receive(:send_activation_success_email!).once
+        @user.activate!
+      end
+
       it "subsequent saves do not send activation success email" do
         @user.activate!
         old_size = ActionMailer::Base.deliveries.size
-        @user.username = "Shauli"
+        @user.email = "Shauli"
         @user.save!
         ActionMailer::Base.deliveries.size.should == old_size
       end
@@ -129,11 +140,22 @@ shared_examples_for "rails_3_activation_model" do
         ActionMailer::Base.deliveries.size.should == old_size
       end
 
+      it "should not call send_activation_needed_email! method of user" do
+        user = build_new_user
+        user.should_receive(:send_activation_needed_email!).never
+        user.save!
+      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
+
+      it "should call send_activation_success_email! method of user on activation" do
+        @user.should_receive(:send_activation_success_email!).never
+        @user.activate!
+      end
     end
   end
 
@@ -148,52 +170,52 @@ shared_examples_for "rails_3_activation_model" do
     end
 
     it "should not allow a non-active user to authenticate" do
-      User.authenticate(@user.username,'secret').should be_false
+      User.authenticate(@user.email, 'secret').should be_false
     end
-    
+
     it "should allow a non-active user to authenticate if configured so" do
       sorcery_model_property_set(:prevent_non_active_users_to_login, false)
-      User.authenticate(@user.username,'secret').should be_true
+      User.authenticate(@user.email, 'secret').should be_true
     end
   end
-  
+
   describe User, "load_from_activation_token" do
     before(:all) do
       sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
-    
+
     after(:each) do
       Timecop.return
     end
-    
+
     it "load_from_activation_token should return user when token is found" do
       create_new_user
       User.load_from_activation_token(@user.activation_token).should == @user
     end
-    
+
     it "load_from_activation_token should NOT return user when token is NOT found" do
       create_new_user
       User.load_from_activation_token("a").should == nil
     end
-    
+
     it "load_from_activation_token should return user when token is found and not expired" do
       sorcery_model_property_set(:activation_token_expiration_period, 500)
       create_new_user
       User.load_from_activation_token(@user.activation_token).should == @user
     end
-    
+
     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.in_time_zone+0.5)
       User.load_from_activation_token(@user.activation_token).should == nil
     end
-    
+
     it "load_from_activation_token should return nil if token is blank" do
       User.load_from_activation_token(nil).should == nil
       User.load_from_activation_token("").should == nil
     end
-    
+
     it "load_from_activation_token should always be valid if expiration period is nil" do
       sorcery_model_property_set(:activation_token_expiration_period, nil)
       create_new_user

data/spec/shared_examples/user_reset_password_shared_examples.rb

@@ -1,22 +1,22 @@
 shared_examples_for "rails_3_reset_password_model" do
   # ----------------- PLUGIN CONFIGURATION -----------------------
   describe User, "loaded plugin configuration" do
-  
+
     before(:all) do
       sorcery_reload!([:reset_password], :reset_password_mailer => ::SorceryMailer)
     end
-  
+
     after(:each) do
       User.sorcery_config.reset!
     end
-    
+
     context "API" do
       before(:all) do
         create_new_user
       end
-      
+
       specify { @user.should respond_to(:deliver_reset_password_instructions!) }
-      
+
       specify { @user.should respond_to(:change_password!) }
 
       it "should respond to .load_from_reset_password_token" do
@@ -28,7 +28,7 @@ shared_examples_for "rails_3_reset_password_model" do
       sorcery_model_property_set(:reset_password_token_attribute_name, :my_code)
       User.sorcery_config.reset_password_token_attribute_name.should equal(:my_code)
     end
-    
+
     it "should allow configuration option 'reset_password_mailer'" do
       sorcery_model_property_set(:reset_password_mailer, TestUser)
       User.sorcery_config.reset_password_mailer.should equal(TestUser)
@@ -38,30 +38,30 @@ shared_examples_for "rails_3_reset_password_model" do
       sorcery_model_property_set(:reset_password_mailer_disabled, :my_reset_password_mailer_disabled)
       User.sorcery_config.reset_password_mailer_disabled.should equal(:my_reset_password_mailer_disabled)
     end
-    
+
     it "if mailer is nil and mailer is enabled, throw exception!" do
       expect{sorcery_reload!([:reset_password], :reset_password_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!([:reset_password], :reset_password_mailer_disabled => true)}.to_not raise_error
-    end    
+    end
 
     it "should allow configuration option 'reset_password_email_method_name'" do
       sorcery_model_property_set(:reset_password_email_method_name, :my_mailer_method)
       User.sorcery_config.reset_password_email_method_name.should equal(:my_mailer_method)
     end
-    
+
     it "should allow configuration option 'reset_password_expiration_period'" do
       sorcery_model_property_set(:reset_password_expiration_period, 16)
       User.sorcery_config.reset_password_expiration_period.should equal(16)
     end
-    
+
     it "should allow configuration option 'reset_password_email_sent_at_attribute_name'" do
       sorcery_model_property_set(:reset_password_email_sent_at_attribute_name, :blabla)
       User.sorcery_config.reset_password_email_sent_at_attribute_name.should equal(:blabla)
     end
-    
+
     it "should allow configuration option 'reset_password_time_between_emails'" do
       sorcery_model_property_set(:reset_password_time_between_emails, 16)
       User.sorcery_config.reset_password_time_between_emails.should equal(16)
@@ -70,38 +70,38 @@ shared_examples_for "rails_3_reset_password_model" do
 
   # ----------------- PLUGIN ACTIVATED -----------------------
   describe User, "when activated with sorcery" do
-  
+
     before(:all) do
       sorcery_reload!([:reset_password], :reset_password_mailer => ::SorceryMailer)
     end
-  
+
     before(:each) do
       User.delete_all
     end
-    
+
     after(:each) do
       Timecop.return
     end
-    
+
     it "load_from_reset_password_token should return user when token is found" do
       create_new_user
       @user.deliver_reset_password_instructions!
       User.load_from_reset_password_token(@user.reset_password_token).should == @user
     end
-    
+
     it "load_from_reset_password_token should NOT return user when token is NOT found" do
       create_new_user
       @user.deliver_reset_password_instructions!
       User.load_from_reset_password_token("a").should == nil
     end
-    
+
     it "load_from_reset_password_token should return user when token is found and not expired" do
       create_new_user
       sorcery_model_property_set(:reset_password_expiration_period, 500)
       @user.deliver_reset_password_instructions!
       User.load_from_reset_password_token(@user.reset_password_token).should == @user
     end
-    
+
     it "load_from_reset_password_token should NOT return user when token is found and expired" do
       create_new_user
       sorcery_model_property_set(:reset_password_expiration_period, 0.1)
@@ -109,19 +109,19 @@ shared_examples_for "rails_3_reset_password_model" do
       Timecop.travel(Time.now.in_time_zone+0.5)
       User.load_from_reset_password_token(@user.reset_password_token).should == nil
     end
-    
+
     it "load_from_reset_password_token should always be valid if expiration period is nil" do
       create_new_user
       sorcery_model_property_set(:reset_password_expiration_period, nil)
       @user.deliver_reset_password_instructions!
       User.load_from_reset_password_token(@user.reset_password_token).should == @user
     end
-    
+
     it "load_from_reset_password_token should return nil if token is blank" do
       User.load_from_reset_password_token(nil).should == nil
       User.load_from_reset_password_token("").should == nil
     end
-    
+
     it "'deliver_reset_password_instructions!' should generate a reset_password_token" do
       create_new_user
       @user.reset_password_token.should be_nil
@@ -145,6 +145,12 @@ shared_examples_for "rails_3_reset_password_model" do
         @user.deliver_reset_password_instructions!
         ActionMailer::Base.deliveries.size.should == old_size + 1
       end
+      
+      it "should call send_reset_password_email! on reset" do
+        create_new_user
+        @user.should_receive(:send_reset_password_email!).once
+        @user.deliver_reset_password_instructions!
+      end
 
       it "should not send an email if time between emails has not passed since last email" do
         create_new_user
@@ -180,6 +186,12 @@ shared_examples_for "rails_3_reset_password_model" do
         @user.deliver_reset_password_instructions!
         ActionMailer::Base.deliveries.size.should == old_size
       end
+      
+      it "should not call send_reset_password_email! on reset" do
+        create_new_user
+        @user.should_receive(:send_reset_password_email!).never
+        @user.deliver_reset_password_instructions!
+      end
 
       it "should not send an email if time between emails has not passed since last email" do
         create_new_user