sorcery 0.7.4 → 0.8.0

data/spec/rails3_mongo_mapper/Gemfile.lock

@@ -1,12 +1,10 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.2)
+    sorcery (0.7.13)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
-      oauth (~> 0.4.4)
-      oauth2 (~> 0.4.1)
-      oauth2 (~> 0.4.1)
+      oauth2 (~> 0.8.0)
 
 GEM
   remote: http://rubygems.org/
@@ -38,23 +36,24 @@ 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.10)
     bcrypt-ruby (3.0.1)
-    bson (1.3.1)
-    bson_ext (1.3.1)
+    bson (1.6.0)
+    bson_ext (1.6.0)
+      bson (= 1.6.0)
     builder (2.1.2)
-    coderay (0.9.8)
-    columnize (0.3.4)
+    coderay (1.0.5)
+    columnize (0.3.6)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.6.1)
-      addressable (~> 2.2.4)
-      multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
+    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.19)
@@ -62,30 +61,31 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.6.7)
-      ruby_parser (>= 2.3.1)
+    method_source (0.7.1)
     mime-types (1.17.2)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
-    mongo_mapper (0.9.2)
+    mongo (1.6.0)
+      bson (= 1.6.0)
+    mongo_mapper (0.11.0)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
-      plucky (~> 0.3.8)
-    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)
-      mongo (~> 1.3)
-    polyglot (0.3.2)
-    pry (0.9.7.3)
-      coderay (~> 0.9.8)
-      method_source (~> 0.6.7)
-      ruby_parser (>= 2.3.1)
-      slop (~> 2.1.0)
-    rack (1.2.4)
+      plucky (~> 0.4.0)
+    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)
+    plucky (0.4.4)
+      mongo (~> 1.5)
+    polyglot (0.3.3)
+    pry (0.9.8.3)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+    rack (1.2.5)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
@@ -127,27 +127,25 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    ruby_parser (2.3.1)
-      sexp_processor (~> 3.0)
-    sexp_processor (3.0.7)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    slop (2.1.0)
+    slop (2.4.4)
     thor (0.14.6)
     timecop (0.3.5)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt-ruby (~> 3.0.0)
   bson_ext (~> 1.3)
-  mongo_mapper
+  mongo_mapper (~> 0.11.0)
   pry
   rails (= 3.0.3)
   rspec (~> 2.5.0)

data/spec/rails3_mongo_mapper/app/controllers/application_controller.rb

@@ -101,6 +101,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_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
@@ -108,6 +141,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 +167,4 @@ describe ApplicationController do
     end
   end
   
-end
+end

data/spec/rails3_mongoid/Gemfile

@@ -1,5 +1,6 @@
 source 'http://rubygems.org'
 
+gem 'bcrypt-ruby', '~> 3.0.0'
 gem 'rails', '3.0.3'
 gem "sorcery", '>= 0.1.0', :path => '../../'
 gem "mongoid", "~> 2.0"

data/spec/rails3_mongoid/Gemfile.lock

@@ -1,12 +1,10 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.2)
+    sorcery (0.7.13)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
-      oauth (~> 0.4.4)
-      oauth2 (~> 0.4.1)
-      oauth2 (~> 0.4.1)
+      oauth2 (~> 0.8.0)
 
 GEM
   remote: http://rubygems.org/
@@ -38,22 +36,23 @@ 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.10)
     bcrypt-ruby (3.0.1)
-    bson (1.3.1)
-    bson_ext (1.3.1)
+    bson (1.6.0)
+    bson_ext (1.6.0)
+      bson (= 1.6.0)
     builder (2.1.2)
-    columnize (0.3.4)
+    columnize (0.3.6)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.6.1)
-      addressable (~> 2.2.4)
-      multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
+    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.19)
@@ -62,20 +61,23 @@ 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)
-      activemodel (~> 3.0)
+    mongo (1.6.0)
+      bson (= 1.6.0)
+    mongoid (2.2.6)
+      activemodel (~> 3.0.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    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)
-    polyglot (0.3.2)
-    rack (1.2.4)
+    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.7)
@@ -117,8 +119,8 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     thor (0.14.6)
@@ -126,12 +128,13 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
+    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

@@ -23,28 +23,35 @@ describe ApplicationController do
     end
 
     it "should log login time on login" do
-      now = Time.now.in_time_zone
+      now = Time.now.utc
       login_user
       @user.last_login_at.should_not be_nil
-      @user.last_login_at.to_s(:db).should >= now.to_s(:db)
-      @user.last_login_at.to_s(:db).should <= (now+2).to_s(:db)
+      @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.in_time_zone
+      now = Time.now.utc
       logout_user
-      User.first.last_logout_at.should_not be_nil
-      User.first.last_logout_at.to_s(:db).should >= now.to_s(:db)
-      User.first.last_logout_at.to_s(:db).should <= (now+2).to_s(:db)
+      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.in_time_zone
+      now = Time.now.utc
       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)
+      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
@@ -95,4 +102,4 @@ describe ApplicationController do
       @user.last_activity_at.should be_nil
     end
   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
@@ -119,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'
@@ -138,4 +178,4 @@ describe ApplicationController do
     end
   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