sorcery 0.1.4 → 0.2.1

data/spec/rails3/{user_activation_spec.rb → app_root/spec/user_activation_spec.rb}

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/app_root/app/mailers/sorcery_mailer')
+require File.expand_path(File.dirname(__FILE__) + '/../app/mailers/sorcery_mailer')
 
 describe "User with activation submodule" do
   before(:all) do
@@ -13,53 +13,53 @@ describe "User with activation submodule" do
   # ----------------- PLUGIN CONFIGURATION -----------------------
   describe User, "loaded plugin configuration" do
     before(:all) do
-      plugin_model_configure([:user_activation], :user_activation_mailer => ::SorceryMailer)
+      sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
   
     after(:each) do
       User.sorcery_config.reset!
-      plugin_model_configure([:user_activation], :user_activation_mailer => ::SorceryMailer)
+      sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
     
     it "should enable configuration option 'activation_state_attribute_name'" do
-      plugin_set_model_config_property(:activation_state_attribute_name, :status)
+      sorcery_model_property_set(:activation_state_attribute_name, :status)
       User.sorcery_config.activation_state_attribute_name.should equal(:status)    
     end
     
-    it "should enable configuration option 'activation_code_attribute_name'" do
-      plugin_set_model_config_property(:activation_code_attribute_name, :code)
-      User.sorcery_config.activation_code_attribute_name.should equal(:code)    
+    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)    
     end
     
     it "should enable configuration option 'user_activation_mailer'" do
-      plugin_set_model_config_property(:user_activation_mailer, TestMailer)
+      sorcery_model_property_set(:user_activation_mailer, TestMailer)
       User.sorcery_config.user_activation_mailer.should equal(TestMailer)    
     end
     
     it "should enable configuration option 'activation_needed_email_method_name'" do
-      plugin_set_model_config_property(:activation_needed_email_method_name, :my_activation_email)
+      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
-      plugin_set_model_config_property(:activation_success_email_method_name, :my_activation_email)
+      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 "if mailer is nil on activation, throw exception!" do
-      expect{plugin_model_configure([:user_activation])}.to raise_error(ArgumentError)
+      expect{sorcery_reload!([:user_activation])}.to raise_error(ArgumentError)
     end
   end
 
   # ----------------- ACTIVATION PROCESS -----------------------
   describe User, "activation process" do
     before(:all) do
-      plugin_model_configure([:user_activation], :user_activation_mailer => ::SorceryMailer)
+      sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
     
     it "should generate an activation code on registration" do
       create_new_user
-      @user.activation_code.should_not be_nil
+      @user.activation_token.should_not be_nil
     end
     
     it "should initialize user state to 'pending'" do
@@ -74,12 +74,12 @@ describe "User with activation submodule" do
     
     it "should clear activation code and change state to 'active' on activation" do
       create_new_user
-      activation_code = @user.activation_code
+      activation_token = @user.activation_token
       @user.activate!
       @user2 = User.find(@user.id) # go to db to make sure it was saved and not just in memory
-      @user2.activation_code.should be_nil
+      @user2.activation_token.should be_nil
       @user2.activation_state.should == "active"
-      User.find_by_activation_code(activation_code).should be_nil
+      User.find_by_activation_token(activation_token).should be_nil
     end
     
     it "should send the user an activation email" do
@@ -113,14 +113,14 @@ describe "User with activation submodule" do
     end
     
     it "activation needed email is optional" do
-      plugin_set_model_config_property(:activation_needed_email_method_name, nil)
+      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
-      plugin_set_model_config_property(:activation_success_email_method_name, nil)
+      sorcery_model_property_set(:activation_success_email_method_name, nil)
       create_new_user
       old_size = ActionMailer::Base.deliveries.size
       @user.activate!
@@ -130,7 +130,7 @@ describe "User with activation submodule" do
 
   describe User, "prevent non-active login feature" do
     before(:all) do
-      plugin_model_configure([:user_activation], :user_activation_mailer => ::SorceryMailer)
+      sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
     
     it "should not allow a non-active user to authenticate" do
@@ -140,9 +140,49 @@ describe "User with activation submodule" do
     
     it "should allow a non-active user to authenticate if configured so" do
       create_new_user
-      plugin_set_model_config_property(:prevent_non_active_users_to_login, false)
+      sorcery_model_property_set(:prevent_non_active_users_to_login, false)
       User.authenticate(@user.username,'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
+    
+    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
+      sleep 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
+      User.load_from_activation_token(@user.activation_token).should == @user
+    end
+  end
+  
 end

data/spec/rails3/{user_activity_logging_spec.rb → app_root/spec/user_activity_logging_spec.rb}

@@ -10,7 +10,7 @@ describe "User with activity logging submodule" do
   # ----------------- PLUGIN CONFIGURATION -----------------------
   describe User, "loaded plugin configuration" do
     before(:all) do
-      plugin_model_configure([:activity_logging])
+      sorcery_reload!([:activity_logging])
     end
   
     after(:each) do
@@ -18,17 +18,17 @@ describe "User with activity logging submodule" do
     end
     
     it "should allow configuration option 'last_login_at_attribute_name'" do
-      plugin_set_model_config_property(:last_login_at_attribute_name, :login_time)
+      sorcery_model_property_set(:last_login_at_attribute_name, :login_time)
       User.sorcery_config.last_login_at_attribute_name.should equal(:login_time)
     end
     
     it "should allow configuration option 'last_logout_at_attribute_name'" do
-      plugin_set_model_config_property(:last_logout_at_attribute_name, :logout_time)
+      sorcery_model_property_set(:last_logout_at_attribute_name, :logout_time)
       User.sorcery_config.last_logout_at_attribute_name.should equal(:logout_time)
     end
     
     it "should allow configuration option 'last_activity_at_attribute_name'" do
-      plugin_set_model_config_property(:last_activity_at_attribute_name, :activity_time)
+      sorcery_model_property_set(:last_activity_at_attribute_name, :activity_time)
       User.sorcery_config.last_activity_at_attribute_name.should equal(:activity_time)
     end
   end

data/spec/rails3/{user_brute_force_protection_spec.rb → app_root/spec/user_brute_force_protection_spec.rb}

@@ -13,7 +13,7 @@ describe "User with brute_force_protection submodule" do
   describe User, "loaded plugin configuration" do
   
     before(:all) do
-      plugin_model_configure([:brute_force_protection])
+      sorcery_reload!([:brute_force_protection])
       create_new_user
     end
   
@@ -30,22 +30,22 @@ describe "User with brute_force_protection submodule" do
     end
  
     it "should enable configuration option 'failed_logins_count_attribute_name'" do
-      plugin_set_model_config_property(:failed_logins_count_attribute_name, :my_count)
+      sorcery_model_property_set(:failed_logins_count_attribute_name, :my_count)
       User.sorcery_config.failed_logins_count_attribute_name.should equal(:my_count)    
     end
     
     it "should enable configuration option 'lock_expires_at_attribute_name'" do
-      plugin_set_model_config_property(:lock_expires_at_attribute_name, :expires)
+      sorcery_model_property_set(:lock_expires_at_attribute_name, :expires)
       User.sorcery_config.lock_expires_at_attribute_name.should equal(:expires)    
     end
     
     it "should enable configuration option 'consecutive_login_retries_amount_allowed'" do
-      plugin_set_model_config_property(:consecutive_login_retries_amount_allowed, 34)
-      User.sorcery_config.consecutive_login_retries_amount_allowed.should equal(34)    
+      sorcery_model_property_set(:consecutive_login_retries_amount_limit, 34)
+      User.sorcery_config.consecutive_login_retries_amount_limit.should equal(34)    
     end
     
     it "should enable configuration option 'login_lock_time_period'" do
-      plugin_set_model_config_property(:login_lock_time_period, 2.hours)
+      sorcery_model_property_set(:login_lock_time_period, 2.hours)
       User.sorcery_config.login_lock_time_period.should == 2.hours    
     end
   end
@@ -54,7 +54,7 @@ describe "User with brute_force_protection submodule" do
   describe User, "when activated with sorcery" do
   
     before(:all) do
-      plugin_model_configure([:brute_force_protection])
+      sorcery_reload!([:brute_force_protection])
     end
   
     before(:each) do

data/spec/rails3/app_root/spec/user_oauth_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "User with oauth submodule" do
+  before(:all) do
+    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/oauth")
+  end
+  
+  after(:all) do
+    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/oauth")
+  end
+
+  # ----------------- PLUGIN CONFIGURATION -----------------------
+  describe User, "loaded plugin configuration" do
+  
+    before(:all) do
+      sorcery_reload!([:oauth])
+      sorcery_controller_property_set(:oauth_providers, [:twitter])
+      sorcery_model_property_set(:authentications_class, Authentication)
+      sorcery_controller_oauth_property_set(:twitter, :key, "eYVNBjBDi33aa9GkA3w")
+      sorcery_controller_oauth_property_set(:twitter, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+      sorcery_controller_oauth_property_set(:twitter, :callback_url, "http://blabla.com")
+      create_new_external_user(:twitter)
+    end
+    
+    it "should respond to 'load_from_provider'" do
+      User.should respond_to(:load_from_provider)
+    end
+    
+    it "'load_from_provider' should load user if exists" do
+      User.load_from_provider(:twitter,123).should == @user
+    end
+    
+    it "'load_from_provider' should return nil if user doesn't exist" do
+      User.load_from_provider(:twitter,980342).should be_nil
+    end
+    
+  end
+  
+end

data/spec/rails3/{user_remember_me_spec.rb → app_root/spec/user_remember_me_spec.rb}

@@ -12,7 +12,7 @@ describe "User with remember_me submodule" do
   # ----------------- PLUGIN CONFIGURATION -----------------------
   describe User, "loaded plugin configuration" do
     before(:all) do
-      plugin_model_configure([:remember_me])
+      sorcery_reload!([:remember_me])
     end
   
     after(:each) do
@@ -20,12 +20,12 @@ describe "User with remember_me submodule" do
     end
     
     it "should allow configuration option 'remember_me_token_attribute_name'" do
-      plugin_set_model_config_property(:remember_me_token_attribute_name, :my_token)
+      sorcery_model_property_set(:remember_me_token_attribute_name, :my_token)
       User.sorcery_config.remember_me_token_attribute_name.should equal(:my_token)
     end
 
     it "should allow configuration option 'remember_me_token_expires_at_attribute_name'" do
-      plugin_set_model_config_property(:remember_me_token_expires_at_attribute_name, :my_expires)
+      sorcery_model_property_set(:remember_me_token_expires_at_attribute_name, :my_expires)
       User.sorcery_config.remember_me_token_expires_at_attribute_name.should equal(:my_expires)
     end
     
@@ -48,7 +48,7 @@ describe "User with remember_me submodule" do
     
     it "should set an expiration based on 'remember_me_for' attribute" do
       create_new_user
-      plugin_set_model_config_property(:remember_me_for, 2 * 60 * 60 * 24)
+      sorcery_model_property_set(:remember_me_for, 2 * 60 * 60 * 24)
       @user.remember_me!
       @user.remember_me_token_expires_at.to_s.should == (Time.now + 2 * 60 * 60 * 24).utc.to_s
     end

data/spec/rails3/{user_reset_password_spec.rb → app_root/spec/user_reset_password_spec.rb}

@@ -13,7 +13,7 @@ describe "User with reset_password submodule" do
   describe User, "loaded plugin configuration" do
   
     before(:all) do
-      plugin_model_configure([:reset_password], :reset_password_mailer => ::SorceryMailer)
+      sorcery_reload!([:reset_password], :reset_password_mailer => ::SorceryMailer)
     end
   
     after(:each) do
@@ -25,11 +25,6 @@ describe "User with reset_password submodule" do
       @user.should respond_to(:deliver_reset_password_instructions!)
     end
     
-    it "should respond to 'reset_password_token_valid?'" do
-      create_new_user
-      @user.should respond_to(:reset_password_token_valid?)
-    end
-    
     it "should respond to 'reset_password!" do
       create_new_user
       @user.should respond_to(:reset_password!)
@@ -41,32 +36,32 @@ describe "User with reset_password submodule" do
     end
     
     it "should allow configuration option 'reset_password_token_attribute_name'" do
-      plugin_set_model_config_property(:reset_password_token_attribute_name, :my_code)
+      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
-      plugin_set_model_config_property(:reset_password_mailer, TestUser)
+      sorcery_model_property_set(:reset_password_mailer, TestUser)
       User.sorcery_config.reset_password_mailer.should equal(TestUser)
     end
     
     it "should allow configuration option 'reset_password_email_method_name'" do
-      plugin_set_model_config_property(:reset_password_email_method_name, :my_mailer_method)
+      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
-      plugin_set_model_config_property(:reset_password_expiration_period, 16)
+      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
-      plugin_set_model_config_property(:reset_password_email_sent_at_attribute_name, :blabla)
+      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
-      plugin_set_model_config_property(:reset_password_time_between_emails, 16)
+      sorcery_model_property_set(:reset_password_time_between_emails, 16)
       User.sorcery_config.reset_password_time_between_emails.should equal(16)
     end
   end
@@ -75,7 +70,7 @@ describe "User with reset_password submodule" do
   describe User, "when activated with sorcery" do
   
     before(:all) do
-      plugin_model_configure([:reset_password], :reset_password_mailer => ::SorceryMailer)
+      sorcery_reload!([:reset_password], :reset_password_mailer => ::SorceryMailer)
     end
   
     before(:each) do
@@ -96,19 +91,26 @@ describe "User with reset_password submodule" do
     
     it "load_from_reset_password_token should return user when token is found and not expired" do
       create_new_user
-      plugin_set_model_config_property(:reset_password_expiration_period, 500)
+      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
-      plugin_set_model_config_property(:reset_password_expiration_period, 0.1)
+      sorcery_model_property_set(:reset_password_expiration_period, 0.1)
       @user.deliver_reset_password_instructions!
       sleep 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
@@ -123,7 +125,7 @@ describe "User with reset_password submodule" do
 
     it "the reset_password_token should be random" do
       create_new_user
-      plugin_set_model_config_property(:reset_password_time_between_emails, 0)
+      sorcery_model_property_set(:reset_password_time_between_emails, 0)
       @user.deliver_reset_password_instructions!
       old_password_code = @user.reset_password_token
       @user.deliver_reset_password_instructions!
@@ -146,31 +148,9 @@ describe "User with reset_password submodule" do
       @user.reset_password_token.should be_nil
     end
     
-    it "code isn't valid if expiration passed" do
-      create_new_user
-      plugin_set_model_config_property(:reset_password_expiration_period, 0.1)
-      @user.deliver_reset_password_instructions!
-      sleep 0.5
-      @user.reset_password_token_valid?.should == false
-    end
-    
-    it "code is valid if it's the same code and expiration period did not pass" do
-      create_new_user
-      plugin_set_model_config_property(:reset_password_expiration_period, 300)
-      @user.deliver_reset_password_instructions!
-      @user.reset_password_token_valid?.should == true
-    end
-    
-    it "code is valid if it's the same code and expiration period is nil" do
-      create_new_user
-      plugin_set_model_config_property(:reset_password_expiration_period, nil)
-      @user.deliver_reset_password_instructions!
-      @user.reset_password_token_valid?.should == true
-    end
-    
     it "should not send an email if time between emails has not passed since last email" do
       create_new_user
-      plugin_set_model_config_property(:reset_password_time_between_emails, 10000)
+      sorcery_model_property_set(:reset_password_time_between_emails, 10000)
       old_size = ActionMailer::Base.deliveries.size
       @user.deliver_reset_password_instructions!
       ActionMailer::Base.deliveries.size.should == old_size + 1
@@ -180,7 +160,7 @@ describe "User with reset_password submodule" do
     
     it "should send an email if time between emails has passed since last email" do
       create_new_user
-      plugin_set_model_config_property(:reset_password_time_between_emails, 0.5)
+      sorcery_model_property_set(:reset_password_time_between_emails, 0.5)
       old_size = ActionMailer::Base.deliveries.size
       @user.deliver_reset_password_instructions!
       ActionMailer::Base.deliveries.size.should == old_size + 1
@@ -190,7 +170,7 @@ describe "User with reset_password submodule" do
     end
     
     it "if mailer is nil on activation, throw exception!" do
-      expect{plugin_model_configure([:reset_password])}.to raise_error(ArgumentError)
+      expect{sorcery_reload!([:reset_password])}.to raise_error(ArgumentError)
     end
     
   end