sorcery 0.7.6 → 0.7.7

data/spec/rails3/spec/controller_oauth2_spec.rb

@@ -5,7 +5,8 @@ def stub_all_oauth2_requests!
   auth_code       = OAuth2::Strategy::AuthCode.any_instance
   access_token    = mock(OAuth2::AccessToken)
   access_token.stub(:token_param=)
-  access_token.stub(:get).and_return({
+  response        = mock(OAuth2::Response)
+  response.stub(:body).and_return({
     "id"=>"123",
     "name"=>"Noam Ben Ari",
     "first_name"=>"Noam",
@@ -21,7 +22,8 @@ def stub_all_oauth2_requests!
     "languages"=>[{"id"=>"108405449189952", "name"=>"Hebrew"}, {"id"=>"106059522759137", "name"=>"English"}, {"id"=>"112624162082677", "name"=>"Russian"}],
     "verified"=>true,
     "updated_time"=>"2011-02-16T20:59:38+0000"}.to_json)
-  auth_code.stub(:get_access_token).and_return(access_token)
+  access_token.stub(:get).and_return(response)
+  auth_code.stub(:get_token).and_return(access_token)
 end
 
 describe ApplicationController do
@@ -84,7 +86,7 @@ describe ApplicationController do
       create_new_user
       get :login_at_test3
       response.should be_a_redirect
-      response.should redirect_to("https://github.com/oauth/authorize?response_type=code&client_id=#{::Sorcery::Controller::Config.github.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope=&display=")
+      response.should redirect_to("https://github.com/login/oauth/authorize?response_type=code&client_id=#{::Sorcery::Controller::Config.github.key}&redirect_uri=http%3A%2F%2Fblabla.com&scope=&display=")
     end
 
     it "'login_from' logins if user exists (github)" do
@@ -239,4 +241,4 @@ describe ApplicationController do
       ActionMailer::Base.deliveries.size.should == old_size
     end
   end
-end
+end

data/spec/rails3_mongo_mapper/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 "mongo_mapper"

data/spec/rails3_mongo_mapper/Gemfile.lock

@@ -1,11 +1,8 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.5)
-      bcrypt-ruby (~> 3.0.0)
+    sorcery (0.7.6)
       oauth (~> 0.4.4)
-      oauth (~> 0.4.4)
-      oauth2 (~> 0.5.1)
       oauth2 (~> 0.5.1)
 
 GEM
@@ -38,22 +35,23 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.6)
+    addressable (2.2.7)
     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)
-    coderay (0.9.8)
-    columnize (0.3.5)
+    coderay (1.0.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.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
     i18n (0.6.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
@@ -62,30 +60,28 @@ 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.4.0)
-      bson (= 1.4.0)
-    mongo_mapper (0.10.1)
+    mongo (1.6.0)
+      bson (= 1.6.0)
+    mongo_mapper (0.11.0)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
       plucky (~> 0.4.0)
-    multi_json (1.0.3)
-    multipart-post (1.1.4)
+    multi_json (1.1.0)
+    multipart-post (1.1.5)
     oauth (0.4.5)
-    oauth2 (0.5.1)
-      faraday (~> 0.7.4)
-      multi_json (~> 1.0.3)
-    plucky (0.4.3)
-      mongo (~> 1.3)
+    oauth2 (0.5.2)
+      faraday (~> 0.7)
+      multi_json (~> 1.0)
+    plucky (0.4.4)
+      mongo (~> 1.5)
     polyglot (0.3.3)
-    pry (0.9.7.4)
-      coderay (~> 0.9.8)
-      method_source (~> 0.6.7)
-      ruby_parser (>= 2.3.1)
-      slop (~> 2.1.0)
-    rack (1.2.4)
+    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,14 +123,11 @@ 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.8)
-    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)
@@ -146,6 +139,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt-ruby (~> 3.0.0)
   bson_ext (~> 1.3)
   mongo_mapper
   pry

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,11 +1,8 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.5)
-      bcrypt-ruby (~> 3.0.0)
+    sorcery (0.7.6)
       oauth (~> 0.4.4)
-      oauth (~> 0.4.4)
-      oauth2 (~> 0.5.1)
       oauth2 (~> 0.5.1)
 
 GEM
@@ -38,21 +35,22 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.6)
+    addressable (2.2.7)
     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.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
     i18n (0.6.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
@@ -62,20 +60,20 @@ 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)
+    multi_json (1.1.0)
+    multipart-post (1.1.5)
     oauth (0.4.5)
-    oauth2 (0.5.1)
-      faraday (~> 0.7.4)
-      multi_json (~> 1.0.3)
+    oauth2 (0.5.2)
+      faraday (~> 0.7)
+      multi_json (~> 1.0)
     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 +115,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 +130,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt-ruby (~> 3.0.0)
   bson_ext (~> 1.3)
   mongoid (~> 2.0)
   rails (= 3.0.3)

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