sorcery 0.7.4 → 0.8.0

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,26 +211,12 @@ 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
+
+    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!
-      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
+      @user.deliver_reset_password_instructions!.should == false
     end
 
     it "should encrypt properly on reset" do
@@ -169,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
+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
@@ -177,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
   

metadata

@@ -2,7 +2,7 @@
 name: sorcery
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-29 00:00:00 Z
+date: 2013-01-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth
@@ -30,164 +30,186 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: bcrypt-ruby
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 3.0.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: abstract
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rails
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: json
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug19
+  name: rspec
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: rspec-rails
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: ruby-debug19
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: sqlite3-ruby
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: yard
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.2
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: bundler
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.8
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: timecop
+  name: jeweler
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.8.3
   type: :development
   prerelease: false
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
+  name: simplecov
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.0
-  type: :runtime
+        version: 0.3.8
+  type: :development
   prerelease: false
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: oauth
+  name: timecop
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.4
-  type: :runtime
+        version: "0"
+  type: :development
   prerelease: false
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: oauth2
+  name: capybara
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.1
-  type: :runtime
+        version: "0"
+  type: :development
   prerelease: false
   version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: mongo_mapper
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.4.4
+  type: :development
+  prerelease: false
+  version_requirements: *id018
 description: Provides common authentication needs such as signing in/out, activating by email and resetting password.
 email: nbenari@gmail.com
 executables: []
@@ -200,6 +222,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -226,7 +249,11 @@ 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/linkedin.rb
+- lib/sorcery/controller/submodules/external/providers/liveid.rb
 - lib/sorcery/controller/submodules/external/providers/twitter.rb
+- lib/sorcery/controller/submodules/external/providers/vkontakte.rb
 - lib/sorcery/controller/submodules/http_basic_auth.rb
 - lib/sorcery/controller/submodules/remember_me.rb
 - lib/sorcery/controller/submodules/session_timeout.rb
@@ -278,6 +305,7 @@ files:
 - spec/rails3/app/views/sorcery_mailer/activation_success_email.text.erb
 - spec/rails3/app/views/sorcery_mailer/reset_password_email.html.erb
 - spec/rails3/app/views/sorcery_mailer/reset_password_email.text.erb
+- spec/rails3/app/views/sorcery_mailer/send_unlock_token_email.text.erb
 - spec/rails3/config.ru
 - spec/rails3/config/application.rb
 - spec/rails3/config/boot.rb
@@ -498,7 +526,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Magical authentication for Rails 3 applications