sorcery 0.7.4 → 0.7.5

data/spec/rails3/spec/controller_spec.rb

@@ -63,13 +63,41 @@ describe ApplicationController do
       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 "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
@@ -139,4 +167,4 @@ describe ApplicationController do
     end
   end
   
-end
+end

data/spec/rails3_mongo_mapper/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.2)
+    sorcery (0.7.4)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
       oauth (~> 0.4.4)
@@ -42,8 +42,8 @@ GEM
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
-    bson (1.3.1)
-    bson_ext (1.3.1)
+    bson (1.4.1)
+    bson_ext (1.4.1)
     builder (2.1.2)
     coderay (0.9.8)
     columnize (0.3.4)
@@ -65,22 +65,22 @@ GEM
     method_source (0.6.7)
       ruby_parser (>= 2.3.1)
     mime-types (1.17.2)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
-    mongo_mapper (0.9.2)
+    mongo (1.4.1)
+      bson (= 1.4.1)
+    mongo_mapper (0.10.1)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
-      plucky (~> 0.3.8)
+      plucky (~> 0.4.0)
     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)
-    plucky (0.3.8)
+    plucky (0.4.3)
       mongo (~> 1.3)
-    polyglot (0.3.2)
-    pry (0.9.7.3)
+    polyglot (0.3.3)
+    pry (0.9.7.4)
       coderay (~> 0.9.8)
       method_source (~> 0.6.7)
       ruby_parser (>= 2.3.1)
@@ -140,7 +140,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby

data/spec/rails3_mongo_mapper/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,6 +69,34 @@ 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
@@ -127,4 +160,4 @@ describe ApplicationController do
     end
   end
   
-end
+end

data/spec/rails3_mongoid/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.2)
+    sorcery (0.7.4)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
       oauth (~> 0.4.4)
@@ -42,8 +42,8 @@ GEM
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
-    bson (1.3.1)
-    bson_ext (1.3.1)
+    bson (1.4.1)
+    bson_ext (1.4.1)
     builder (2.1.2)
     columnize (0.3.4)
     diff-lcs (1.1.3)
@@ -62,9 +62,9 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
-    mongoid (2.2.3)
+    mongo (1.4.1)
+      bson (= 1.4.1)
+    mongoid (2.2.4)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
@@ -74,7 +74,7 @@ GEM
     oauth2 (0.4.1)
       faraday (~> 0.6.1)
       multi_json (>= 0.0.5)
-    polyglot (0.3.2)
+    polyglot (0.3.3)
     rack (1.2.4)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -126,7 +126,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby

data/spec/rails3_mongoid/spec/controller_activity_logging_spec.rb

@@ -23,7 +23,7 @@ describe ApplicationController do
     end
 
     it "should log login time on login" do
-      now = Time.now.in_time_zone
+      now = Time.now
       login_user
       @user.last_login_at.should_not be_nil
       @user.last_login_at.to_s(:db).should >= now.to_s(:db)
@@ -32,7 +32,7 @@ describe ApplicationController do
 
     it "should log logout time on logout" do
       login_user
-      now = Time.now.in_time_zone
+      now = Time.now
       logout_user
       User.first.last_logout_at.should_not be_nil
       User.first.last_logout_at.to_s(:db).should >= now.to_s(:db)
@@ -41,7 +41,7 @@ describe ApplicationController do
 
     it "should log last activity time when logged in" do
       login_user
-      now = Time.now.in_time_zone
+      now = Time.now
       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)

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
@@ -138,4 +171,4 @@ describe ApplicationController do
     end
   end
   
-end
+end

data/spec/shared_examples/user_reset_password_shared_examples.rb

@@ -150,6 +150,14 @@ 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 return false if time between emails has not passed since last email" do
+      create_new_user
+      sorcery_model_property_set(:reset_password_time_between_emails, 10000)
+      old_size = ActionMailer::Base.deliveries.size
+      @user.deliver_reset_password_instructions!
+      @user.deliver_reset_password_instructions!.should == false
+    end
     
     it "should send an email if time between emails has passed since last email" do
       create_new_user
@@ -174,4 +182,4 @@ shared_examples_for "rails_3_reset_password_model" do
     end
 
   end
-end
+end

data/spec/sorcery_crypto_providers_spec.rb

@@ -54,7 +54,11 @@ describe "Crypto Providers wrappers" do
     it "matches? returns false when no match" do
       Sorcery::CryptoProviders::SHA1.matches?(@digest, 'Some Dude').should be_false
     end
-    
+
+    it "matches password encrypted using salt and join token from upstream" do
+      Sorcery::CryptoProviders::SHA1.join_token = "test"
+      Sorcery::CryptoProviders::SHA1.encrypt(['password', 'gq18WBnJYNh2arkC1kgH']).should == '894b5bf1643b8d0e1b2eaddb22426be7036dab70'
+    end
   end
 
   describe Sorcery::CryptoProviders::SHA256 do

metadata

@@ -2,7 +2,7 @@
 name: sorcery
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-29 00:00:00 Z
+date: 2011-11-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth
@@ -226,6 +226,8 @@ files:
 - lib/sorcery/controller/submodules/external/protocols/oauth2.rb
 - lib/sorcery/controller/submodules/external/providers/facebook.rb
 - lib/sorcery/controller/submodules/external/providers/github.rb
+- lib/sorcery/controller/submodules/external/providers/google.rb
+- lib/sorcery/controller/submodules/external/providers/liveid.rb
 - lib/sorcery/controller/submodules/external/providers/twitter.rb
 - lib/sorcery/controller/submodules/http_basic_auth.rb
 - lib/sorcery/controller/submodules/remember_me.rb