sorcery 0.1.4 → 0.2.0

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

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

@@ -1,9 +1,9 @@
 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 no submodules (core)" do
   before(:all) do
-    plugin_model_configure
+    sorcery_reload!
   end
 
   describe User, "when app has plugin loaded" do
@@ -36,55 +36,55 @@ describe "User with no submodules (core)" do
     end
   
     it "should enable configuration option 'username_attribute_name'" do
-      plugin_set_model_config_property(:username_attribute_name, :email)
+      sorcery_model_property_set(:username_attribute_name, :email)
       User.sorcery_config.username_attribute_name.should equal(:email)    
     end
   
     it "should enable configuration option 'password_attribute_name'" do
-      plugin_set_model_config_property(:password_attribute_name, :mypassword)
+      sorcery_model_property_set(:password_attribute_name, :mypassword)
       User.sorcery_config.password_attribute_name.should equal(:mypassword)
     end
     
     it "should enable configuration option 'email_attribute_name'" do
-      plugin_set_model_config_property(:email_attribute_name, :my_email)
+      sorcery_model_property_set(:email_attribute_name, :my_email)
       User.sorcery_config.email_attribute_name.should equal(:my_email)
     end
 
     it "should enable configuration option 'crypted_password_attribute_name'" do
-      plugin_set_model_config_property(:crypted_password_attribute_name, :password)
+      sorcery_model_property_set(:crypted_password_attribute_name, :password)
       User.sorcery_config.crypted_password_attribute_name.should equal(:password)
     end
     
     it "should enable configuration option 'salt_attribute_name'" do
-      plugin_set_model_config_property(:salt_attribute_name, :my_salt)
+      sorcery_model_property_set(:salt_attribute_name, :my_salt)
       User.sorcery_config.salt_attribute_name.should equal(:my_salt)
     end
 
     it "should enable configuration option 'encryption_algorithm'" do
-      plugin_set_model_config_property(:encryption_algorithm, :none)
+      sorcery_model_property_set(:encryption_algorithm, :none)
       User.sorcery_config.encryption_algorithm.should equal(:none)
     end
 
     it "should enable configuration option 'encryption_key'" do
-      plugin_set_model_config_property(:encryption_key, 'asdadas424234242')
+      sorcery_model_property_set(:encryption_key, 'asdadas424234242')
       User.sorcery_config.encryption_key.should == 'asdadas424234242'
     end
 
     it "should enable configuration option 'custom_encryption_provider'" do
-      plugin_set_model_config_property(:encryption_algorithm, :custom)
-      plugin_set_model_config_property(:custom_encryption_provider, Array)
+      sorcery_model_property_set(:encryption_algorithm, :custom)
+      sorcery_model_property_set(:custom_encryption_provider, Array)
       User.sorcery_config.custom_encryption_provider.should equal(Array)
     end
   
     it "should enable configuration option 'salt_join_token'" do
       salt_join_token = "--%%*&-"
-      plugin_set_model_config_property(:salt_join_token, salt_join_token)
+      sorcery_model_property_set(:salt_join_token, salt_join_token)
       User.sorcery_config.salt_join_token.should equal(salt_join_token)
     end
     
     it "should enable configuration option 'stretches'" do
       stretches = 15
-      plugin_set_model_config_property(:stretches, stretches)
+      sorcery_model_property_set(:stretches, stretches)
       User.sorcery_config.stretches.should equal(stretches)
     end
   
@@ -93,7 +93,7 @@ describe "User with no submodules (core)" do
   # ----------------- PLUGIN ACTIVATED -----------------------
   describe User, "when activated with sorcery" do
     before(:all) do
-      plugin_model_configure()
+      sorcery_reload!()
     end
   
     before(:each) do
@@ -124,7 +124,7 @@ describe "User with no submodules (core)" do
   describe User, "registration" do
   
     before(:all) do
-      plugin_model_configure()
+      sorcery_reload!()
     end
 
     before(:each) do
@@ -159,9 +159,9 @@ describe "User with no submodules (core)" do
     it "should not clear the virtual password field if save failed due to exception" do
       create_new_user
       @user.password = 'blupush'
-      @user.email = nil
+      @user.username = nil
       begin
-        @user.save # triggers SQL exception since email field is defined not null.
+        @user.save # triggers SQL exception since username field is defined not null.
       rescue
       end
       @user.password.should_not be_nil
@@ -186,7 +186,7 @@ describe "User with no submodules (core)" do
   # ----------------- PASSWORD ENCRYPTION -----------------------
   describe User, "special encryption cases" do
     before(:all) do
-      plugin_model_configure()
+      sorcery_reload!()
       @text = "Some Text!"
     end
   
@@ -199,7 +199,7 @@ describe "User with no submodules (core)" do
     end
   
     it "should work with no password encryption" do
-      plugin_set_model_config_property(:encryption_algorithm, :none)
+      sorcery_model_property_set(:encryption_algorithm, :none)
       create_new_user
       User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'secret').should be_true
     end
@@ -214,66 +214,66 @@ describe "User with no submodules (core)" do
           crypted = encrypt(*tokens)
         end
       end
-      plugin_set_model_config_property(:encryption_algorithm, :custom)
-      plugin_set_model_config_property(:custom_encryption_provider, MyCrypto)
+      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
     end
   
     it "if encryption algo is aes256, it should set key to crypto provider" do
-      plugin_set_model_config_property(:encryption_algorithm, :aes256)
-      plugin_set_model_config_property(:encryption_key, nil)
+      sorcery_model_property_set(:encryption_algorithm, :aes256)
+      sorcery_model_property_set(:encryption_key, nil)
       expect{User.encrypt(@text)}.to raise_error(ArgumentError)
-      plugin_set_model_config_property(:encryption_key, "asd234dfs423fddsmndsflktsdf32343")
+      sorcery_model_property_set(:encryption_key, "asd234dfs423fddsmndsflktsdf32343")
       expect{User.encrypt(@text)}.to_not raise_error(ArgumentError)
     end
     
     it "if encryption algo is aes256, it should set key to crypto provider, even if attributes are set in reverse" do
-      plugin_set_model_config_property(:encryption_key, nil)
-      plugin_set_model_config_property(:encryption_algorithm, :none)
-      plugin_set_model_config_property(:encryption_key, "asd234dfs423fddsmndsflktsdf32343")
-      plugin_set_model_config_property(:encryption_algorithm, :aes256)
+      sorcery_model_property_set(:encryption_key, nil)
+      sorcery_model_property_set(:encryption_algorithm, :none)
+      sorcery_model_property_set(:encryption_key, "asd234dfs423fddsmndsflktsdf32343")
+      sorcery_model_property_set(:encryption_algorithm, :aes256)
       expect{User.encrypt(@text)}.to_not raise_error(ArgumentError)
     end
   
     it "if encryption algo is md5 it should work" do
-      plugin_set_model_config_property(:encryption_algorithm, :md5)
+      sorcery_model_property_set(:encryption_algorithm, :md5)
       User.encrypt(@text).should == Sorcery::CryptoProviders::MD5.encrypt(@text)
     end
   
     it "if encryption algo is sha1 it should work" do
-      plugin_set_model_config_property(:encryption_algorithm, :sha1)
+      sorcery_model_property_set(:encryption_algorithm, :sha1)
       User.encrypt(@text).should == Sorcery::CryptoProviders::SHA1.encrypt(@text)
     end
   
     it "if encryption algo is sha256 it should work" do
-      plugin_set_model_config_property(:encryption_algorithm, :sha256)
+      sorcery_model_property_set(:encryption_algorithm, :sha256)
       User.encrypt(@text).should == Sorcery::CryptoProviders::SHA256.encrypt(@text)
     end
   
     it "if encryption algo is sha512 it should work" do
-      plugin_set_model_config_property(:encryption_algorithm, :sha512)
+      sorcery_model_property_set(:encryption_algorithm, :sha512)
       User.encrypt(@text).should == Sorcery::CryptoProviders::SHA512.encrypt(@text)
     end
   
     it "salt should be random for each user and saved in db" do
-      plugin_set_model_config_property(:salt_attribute_name, :salt)
+      sorcery_model_property_set(:salt_attribute_name, :salt)
       create_new_user
       @user.salt.should_not be_nil
     end
     
     it "if salt is set should use it to encrypt" do
-      plugin_set_model_config_property(:salt_attribute_name, :salt)
-      plugin_set_model_config_property(:encryption_algorithm, :sha512)
+      sorcery_model_property_set(:salt_attribute_name, :salt)
+      sorcery_model_property_set(:encryption_algorithm, :sha512)
       create_new_user
       @user.crypted_password.should_not == Sorcery::CryptoProviders::SHA512.encrypt('secret')
       @user.crypted_password.should == Sorcery::CryptoProviders::SHA512.encrypt('secret',@user.salt)
     end
     
     it "if salt_join_token is set should use it to encrypt" do
-      plugin_set_model_config_property(:salt_attribute_name, :salt)
-      plugin_set_model_config_property(:salt_join_token, "-@=>")
-      plugin_set_model_config_property(:encryption_algorithm, :sha512)
+      sorcery_model_property_set(:salt_attribute_name, :salt)
+      sorcery_model_property_set(:salt_join_token, "-@=>")
+      sorcery_model_property_set(:encryption_algorithm, :sha512)
       create_new_user
       @user.crypted_password.should_not == Sorcery::CryptoProviders::SHA512.encrypt('secret')
       Sorcery::CryptoProviders::SHA512.join_token = ""
@@ -283,5 +283,35 @@ describe "User with no submodules (core)" do
     end
     
   end
+  
+  describe User, "external users" do
+    before(:all) do
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/oauth")
+      sorcery_reload!()
+    end
+  
+    after(:all) do
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/oauth")
+    end
+    
+    before(:each) do
+      User.delete_all
+    end
+    
+    it "should respond to 'external?'" do
+      create_new_user
+      @user.should respond_to(:external?)
+    end
+    
+    it "external? should be false for regular users" do
+      create_new_user
+      @user.external?.should be_false
+    end
+    
+    it "external? should be true for external users" do
+      create_new_external_user(:twitter)
+      @user.external?.should be_true
+    end
+  end
 
 end