sorcery 0.7.6 → 0.8.0

data/spec/rails3_mongoid/Gemfile.lock

@@ -1,12 +1,10 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.5)
+    sorcery (0.7.13)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
-      oauth (~> 0.4.4)
-      oauth2 (~> 0.5.1)
-      oauth2 (~> 0.5.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.4.0)
-    bson_ext (1.4.0)
+    bson (1.6.0)
+    bson_ext (1.6.0)
+      bson (= 1.6.0)
     builder (2.1.2)
-    columnize (0.3.5)
+    columnize (0.3.6)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      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.4.0)
-      bson (= 1.4.0)
-    mongoid (2.2.4)
-      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.4)
-    oauth (0.4.5)
-    oauth2 (0.5.1)
-      faraday (~> 0.7.4)
-      multi_json (~> 1.0.3)
+    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.4)
+    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)
@@ -132,6 +134,7 @@ 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

@@ -106,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,28 @@ describe ApplicationController do
     end
 
     it "should log login time on login" do
-      now = Time.now
+      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
+      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
+      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
@@ -102,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

@@ -152,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'

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

data/spec/shared_examples/user_activation_shared_examples.rb

@@ -34,9 +34,18 @@ shared_examples_for "rails_3_activation_model" 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)
     end
+
+    it "should enable configuration option 'activation_mailer_disabled'" 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 on activation, throw exception!" do
-      expect{sorcery_reload!([:user_activation])}.to raise_error(ArgumentError)
+    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
+
+    it "if mailer is disabled and mailer is nil, do NOT throw exception" do
+      expect{sorcery_reload!([:user_activation], :activation_mailer_disabled => true)}.to_not raise_error
     end
   end
 
@@ -64,46 +73,67 @@ shared_examples_for "rails_3_activation_model" do
       @user2.activation_state.should == "active"
       User.find_by_activation_token(activation_token).should be_nil
     end
-    
-    it "should send the user an activation email" do
-      old_size = ActionMailer::Base.deliveries.size
-      create_new_user
-      ActionMailer::Base.deliveries.size.should == old_size + 1
-    end
-    
-    it "subsequent saves do not send activation email" do
-      old_size = ActionMailer::Base.deliveries.size
-      @user.username = "Shauli"
-      @user.save!
-      ActionMailer::Base.deliveries.size.should == old_size
-    end
-    
-    it "should 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 + 1
-    end
-    
-    it "subsequent saves do not send activation success email" do
-      @user.activate!
-      old_size = ActionMailer::Base.deliveries.size
-      @user.username = "Shauli"
-      @user.save!
-      ActionMailer::Base.deliveries.size.should == old_size
-    end
-    
-    it "activation needed email is optional" do
-      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
+
+
+    context "mailer is enabled" do
+      it "should send the user an activation email" do
+        old_size = ActionMailer::Base.deliveries.size
+        create_new_user
+        ActionMailer::Base.deliveries.size.should == old_size + 1
+      end
+
+      it "subsequent saves do not send activation email" do
+        old_size = ActionMailer::Base.deliveries.size
+        @user.username = "Shauli"
+        @user.save!
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
+
+      it "should 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 + 1
+      end
+
+      it "subsequent saves do not send activation success email" do
+        @user.activate!
+        old_size = ActionMailer::Base.deliveries.size
+        @user.username = "Shauli"
+        @user.save!
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
+
+      it "activation needed email is optional" do
+        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
+        sorcery_model_property_set(:activation_success_email_method_name, nil)
+        old_size = ActionMailer::Base.deliveries.size
+        @user.activate!
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
     end
-    
-    it "activation success email is optional" do
-      sorcery_model_property_set(:activation_success_email_method_name, nil)
-      old_size = ActionMailer::Base.deliveries.size
-      @user.activate!
-      ActionMailer::Base.deliveries.size.should == old_size
+
+    context "mailer has been disabled" do
+      before(:each) do
+        sorcery_reload!([:user_activation], :activation_mailer_disabled => true, :user_activation_mailer => ::SorceryMailer)
+      end
+
+      it "should not send the user an activation email" do
+        old_size = ActionMailer::Base.deliveries.size
+        create_new_user
+        ActionMailer::Base.deliveries.size.should == old_size
+      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
     end
   end
 

data/spec/shared_examples/user_reset_password_shared_examples.rb

@@ -33,7 +33,20 @@ shared_examples_for "rails_3_reset_password_model" do
       sorcery_model_property_set(:reset_password_mailer, TestUser)
       User.sorcery_config.reset_password_mailer.should equal(TestUser)
     end
+
+    it "should enable configuration option 'reset_password_mailer_disabled'" 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    
+
     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)
@@ -125,11 +138,69 @@ shared_examples_for "rails_3_reset_password_model" do
       @user.reset_password_token.should_not == old_password_code
     end
 
-    it "should send an email on reset" do
-      create_new_user
-      old_size = ActionMailer::Base.deliveries.size
-      @user.deliver_reset_password_instructions!
-      ActionMailer::Base.deliveries.size.should == old_size + 1
+    context "mailer is enabled" do
+      it "should send an email on reset" do
+        create_new_user
+        old_size = ActionMailer::Base.deliveries.size
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size + 1
+      end
+
+      it "should not send an email 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!
+        ActionMailer::Base.deliveries.size.should == old_size + 1
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size + 1
+      end
+
+      it "should send an email if time between emails has passed since last email" do
+        create_new_user
+        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
+        Timecop.travel(Time.now.in_time_zone+0.5)
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size + 2
+      end
+    end
+
+    context "mailer is disabled" do
+
+      before(:all) do
+        sorcery_reload!([:reset_password], :reset_password_mailer_disabled => true, :reset_password_mailer => ::SorceryMailer)
+      end
+
+      it "should send an email on reset" do
+        create_new_user
+        old_size = ActionMailer::Base.deliveries.size
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
+
+      it "should not send an email 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!
+        ActionMailer::Base.deliveries.size.should == old_size
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
+
+      it "should send an email if time between emails has passed since last email" do
+        create_new_user
+        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
+        Timecop.travel(Time.now.in_time_zone+0.5)
+        @user.deliver_reset_password_instructions!
+        ActionMailer::Base.deliveries.size.should == old_size
+      end
     end
 
     it "when change_password! is called, should delete reset_password_token" do
@@ -140,35 +211,13 @@ shared_examples_for "rails_3_reset_password_model" do
       @user.save!
       @user.reset_password_token.should be_nil
     end
-    
-    it "should not send an email 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!
-      ActionMailer::Base.deliveries.size.should == old_size + 1
-      @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
-      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
-      Timecop.travel(Time.now.in_time_zone+0.5)
-      @user.deliver_reset_password_instructions!
-      ActionMailer::Base.deliveries.size.should == old_size + 2
-    end
 
     it "should encrypt properly on reset" do
       create_new_user
@@ -177,9 +226,5 @@ shared_examples_for "rails_3_reset_password_model" do
       Sorcery::CryptoProviders::BCrypt.matches?(@user.crypted_password,"blagu",@user.salt).should be_true
     end
 
-    it "if mailer is nil on activation, throw exception!" do
-      expect{sorcery_reload!([:reset_password])}.to raise_error(ArgumentError)
-    end
-
   end
 end

data/spec/sorcery_crypto_providers_spec.rb

@@ -181,6 +181,15 @@ describe "Crypto Providers wrappers" do
     it "matches? returns false when no match" do
       Sorcery::CryptoProviders::BCrypt.matches?(@digest, 'Some Dude').should be_false
     end
+
+    it "respond_to?(:stretches) returns true" do
+      Sorcery::CryptoProviders::BCrypt.respond_to?(:stretches).should be_true
+    end
+
+    it "sets cost when stretches is set" do
+      Sorcery::CryptoProviders::BCrypt.stretches = 4
+      Sorcery::CryptoProviders::BCrypt.cost.should == 4
+    end
     
   end