sorcery 0.5.1 → 0.6.0

data/lib/sorcery/test_helpers/internal/rails.rb

@@ -4,7 +4,11 @@ module Sorcery
       module Rails
         include ::Sorcery::TestHelpers::Rails
 
-        SUBMODUELS_AUTO_ADDED_CONTROLLER_FILTERS = [:register_last_activity_time_to_db, :deny_banned_user, :validate_session]
+        SUBMODUELS_AUTO_ADDED_CONTROLLER_FILTERS = [
+          :register_last_activity_time_to_db, 
+          :deny_banned_user, 
+          :validate_session
+        ]
 
         def sorcery_reload!(submodules = [], options = {})
           reload_user_class
@@ -22,6 +26,7 @@ module Sorcery
           ::Sorcery::Controller::Config.submodules = submodules
           ::Sorcery::Controller::Config.user_class = nil
           ActionController::Base.send(:include,::Sorcery::Controller)
+          ::Sorcery::Controller::Config.user_class = "User"
 
           ::Sorcery::Controller::Config.user_config do |user|
             options.each do |property,value|

data/lib/sorcery/test_helpers/internal/sinatra.rb

@@ -43,15 +43,15 @@ module Sorcery
 
           # clear all filters
           ::Sinatra::Application.instance_variable_set(:@filters, {:before => [], :after => []})
-          ::Sinatra::Application.class_eval do
-            load File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec', 'sinatra', 'filters.rb')
-          end
+          load File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec', 'sinatra', 'filters.rb')
+          ::Sinatra::Application.send(:include, ::Filters)
 
           # configure
           ::Sorcery::Controller::Config.submodules = submodules
           ::Sorcery::Controller::Config.user_class = nil
           ::Sinatra::Application.send(:include, Sorcery::Controller::Adapters::Sinatra)
           ::Sinatra::Application.send(:include, Sorcery::Controller)
+          ::Sorcery::Controller::Config.user_class = "User"
 
           ::Sorcery::Controller::Config.user_config do |user|
             options.each do |property, value|

data/lib/sorcery/test_helpers/internal/sinatra_modular.rb

@@ -0,0 +1,74 @@
+module Sorcery
+  module TestHelpers
+    module Internal
+      module SinatraModular
+        include ::Sorcery::TestHelpers::Sinatra::CookieSessionMethods
+        include ::Sorcery::TestHelpers::Sinatra::InstanceMethods
+
+        class ::Modular
+          class << self
+            attr_accessor :sorcery_vars
+          end
+          @sorcery_vars = {}
+
+          # NOTE: see before and after test filters in filters.rb
+
+          def save_instance_vars
+            instance_variables.each do |var|
+              self.class.sorcery_vars[:"#{var.to_s.delete("@")}"] = instance_variable_get(var)
+            end
+          end
+        end
+
+        ::RSpec::Matchers.define :redirect_to do |expected|
+          match do |actual|
+            actual.status == 302 && actual.location == expected
+          end
+        end
+
+        def clear_user_without_logout
+          get_sinatra_app(subject).instance_variable_set(:@current_user, nil)
+        end
+
+        def assigns
+          ::Modular.sorcery_vars
+        end
+
+        def sorcery_reload!(submodules = [], options = {})
+          reload_user_class
+
+          # return to no-module configuration
+          ::Sorcery::Controller::Config.init!
+          ::Sorcery::Controller::Config.reset!
+
+          # clear all filters
+          ::Sinatra::Base.instance_variable_set(:@filters, {:before => [], :after => []})
+          require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec', 'sinatra', 'filters')
+          ::Sinatra::Base.send(:include, ::Filters)
+
+          # configure
+          ::Sorcery::Controller::Config.submodules = submodules
+          ::Sorcery::Controller::Config.user_class = nil
+          ::Sinatra::Base.send(:include, Sorcery::Controller::Adapters::Sinatra)
+          ::Sinatra::Base.send(:include, Sorcery::Controller)
+          ::Sorcery::Controller::Config.user_class = "User"
+
+          ::Sorcery::Controller::Config.user_config do |user|
+            options.each do |property, value|
+              user.send(:"#{property}=", value)
+            end
+          end
+          User.authenticates_with_sorcery!
+        end
+
+        def sorcery_controller_property_set(property, value)
+          ::Sorcery::Controller::Config.send(:"#{property}=", value)
+        end
+
+        def sorcery_controller_external_property_set(provider, property, value)
+          ::Sorcery::Controller::Config.send(provider).send(:"#{property}=", value)
+        end
+      end
+    end
+  end
+end

data/lib/sorcery/test_helpers/internal.rb

@@ -15,7 +15,8 @@ module Sorcery
       end
 
       # a patch to fix a bug in testing that happens when you 'destroy' a session twice.
-      # After the first destroy, the session is an ordinary hash, and then when destroy is called again there's an exception.
+      # After the first destroy, the session is an ordinary hash, and then when destroy 
+      # is called again there's an exception.
       class ::Hash
         def destroy
           clear

data/lib/sorcery.rb

@@ -56,28 +56,26 @@ module Sorcery
     module Internal
       autoload :Rails, 'sorcery/test_helpers/internal/rails'
       autoload :Sinatra, 'sorcery/test_helpers/internal/sinatra'
+      autoload :SinatraModular, 'sorcery/test_helpers/internal/sinatra_modular'
     end
 
   end
 
   if defined?(ActiveRecord)
     ActiveRecord::Base.send(:include, Sorcery::Model)
-    ActiveRecord::Base.send(:include, ::Sorcery::Model::Adapters::ActiveRecord)
+    ActiveRecord::Base.send(:include, Sorcery::Model::Adapters::ActiveRecord)
   end
 
   if defined?(Mongoid)
     Mongoid::Document.module_eval do
       included do
         attr_reader :new_record
-        include Sorcery::Model::Adapters::Mongoid
         include Sorcery::Model
+        include Sorcery::Model::Adapters::Mongoid
       end
     end
   end
 
   require 'sorcery/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
   require 'sorcery/sinatra' if defined?(Sinatra)
-
-
-
 end

data/sorcery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sorcery}
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Noam Ben Ari"]
-  s.date = %q{2011-05-11}
+  s.date = %q{2011-07-30}
   s.description = %q{Provides common authentication needs such as signing in/out, activating by email and resetting password.}
   s.email = %q{nbenari@gmail.com}
   s.extra_rdoc_files = [
@@ -71,6 +71,7 @@ Gem::Specification.new do |s|
     "lib/sorcery/test_helpers/internal.rb",
     "lib/sorcery/test_helpers/internal/rails.rb",
     "lib/sorcery/test_helpers/internal/sinatra.rb",
+    "lib/sorcery/test_helpers/internal/sinatra_modular.rb",
     "lib/sorcery/test_helpers/rails.rb",
     "lib/sorcery/test_helpers/sinatra.rb",
     "sorcery.gemspec",
@@ -217,6 +218,15 @@ Gem::Specification.new do |s|
     "spec/rails3_mongoid/spec/user_reset_password_spec.rb",
     "spec/rails3_mongoid/spec/user_spec.rb",
     "spec/rails3_mongoid/vendor/plugins/.gitkeep",
+    "spec/shared_examples/controller_oauth2_shared_examples.rb",
+    "spec/shared_examples/controller_oauth_shared_examples.rb",
+    "spec/shared_examples/user_activation_shared_examples.rb",
+    "spec/shared_examples/user_activity_logging_shared_examples.rb",
+    "spec/shared_examples/user_brute_force_protection_shared_examples.rb",
+    "spec/shared_examples/user_oauth_shared_examples.rb",
+    "spec/shared_examples/user_remember_me_shared_examples.rb",
+    "spec/shared_examples/user_reset_password_shared_examples.rb",
+    "spec/shared_examples/user_shared_examples.rb",
     "spec/sinatra/Gemfile",
     "spec/sinatra/Gemfile.lock",
     "spec/sinatra/Rakefile",
@@ -229,6 +239,7 @@ Gem::Specification.new do |s|
     "spec/sinatra/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
     "spec/sinatra/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
     "spec/sinatra/filters.rb",
+    "spec/sinatra/modular.rb",
     "spec/sinatra/myapp.rb",
     "spec/sinatra/sorcery_mailer.rb",
     "spec/sinatra/spec/controller_activity_logging_spec.rb",
@@ -243,6 +254,33 @@ Gem::Specification.new do |s|
     "spec/sinatra/spec/spec_helper.rb",
     "spec/sinatra/user.rb",
     "spec/sinatra/views/test_login.erb",
+    "spec/sinatra_modular/Gemfile",
+    "spec/sinatra_modular/Gemfile.lock",
+    "spec/sinatra_modular/Rakefile",
+    "spec/sinatra_modular/authentication.rb",
+    "spec/sinatra_modular/db/migrate/activation/20101224223622_add_activation_to_users.rb",
+    "spec/sinatra_modular/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
+    "spec/sinatra_modular/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
+    "spec/sinatra_modular/db/migrate/core/20101224223620_create_users.rb",
+    "spec/sinatra_modular/db/migrate/external/20101224223628_create_authentications.rb",
+    "spec/sinatra_modular/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
+    "spec/sinatra_modular/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
+    "spec/sinatra_modular/filters.rb",
+    "spec/sinatra_modular/modular.rb",
+    "spec/sinatra_modular/myapp.rb",
+    "spec/sinatra_modular/sorcery_mailer.rb",
+    "spec/sinatra_modular/spec_modular/controller_activity_logging_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_brute_force_protection_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_http_basic_auth_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_oauth2_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_oauth_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_remember_me_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_session_timeout_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_spec.rb",
+    "spec/sinatra_modular/spec_modular/spec.opts",
+    "spec/sinatra_modular/spec_modular/spec_helper.rb",
+    "spec/sinatra_modular/user.rb",
+    "spec/sinatra_modular/views/test_login.erb",
     "spec/sorcery_crypto_providers_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb"
@@ -326,6 +364,15 @@ Gem::Specification.new do |s|
     "spec/rails3_mongoid/spec/user_remember_me_spec.rb",
     "spec/rails3_mongoid/spec/user_reset_password_spec.rb",
     "spec/rails3_mongoid/spec/user_spec.rb",
+    "spec/shared_examples/controller_oauth2_shared_examples.rb",
+    "spec/shared_examples/controller_oauth_shared_examples.rb",
+    "spec/shared_examples/user_activation_shared_examples.rb",
+    "spec/shared_examples/user_activity_logging_shared_examples.rb",
+    "spec/shared_examples/user_brute_force_protection_shared_examples.rb",
+    "spec/shared_examples/user_oauth_shared_examples.rb",
+    "spec/shared_examples/user_remember_me_shared_examples.rb",
+    "spec/shared_examples/user_reset_password_shared_examples.rb",
+    "spec/shared_examples/user_shared_examples.rb",
     "spec/sinatra/authentication.rb",
     "spec/sinatra/db/migrate/activation/20101224223622_add_activation_to_users.rb",
     "spec/sinatra/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
@@ -335,6 +382,7 @@ Gem::Specification.new do |s|
     "spec/sinatra/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
     "spec/sinatra/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
     "spec/sinatra/filters.rb",
+    "spec/sinatra/modular.rb",
     "spec/sinatra/myapp.rb",
     "spec/sinatra/sorcery_mailer.rb",
     "spec/sinatra/spec/controller_activity_logging_spec.rb",
@@ -347,6 +395,28 @@ Gem::Specification.new do |s|
     "spec/sinatra/spec/controller_spec.rb",
     "spec/sinatra/spec/spec_helper.rb",
     "spec/sinatra/user.rb",
+    "spec/sinatra_modular/authentication.rb",
+    "spec/sinatra_modular/db/migrate/activation/20101224223622_add_activation_to_users.rb",
+    "spec/sinatra_modular/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
+    "spec/sinatra_modular/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
+    "spec/sinatra_modular/db/migrate/core/20101224223620_create_users.rb",
+    "spec/sinatra_modular/db/migrate/external/20101224223628_create_authentications.rb",
+    "spec/sinatra_modular/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
+    "spec/sinatra_modular/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
+    "spec/sinatra_modular/filters.rb",
+    "spec/sinatra_modular/modular.rb",
+    "spec/sinatra_modular/myapp.rb",
+    "spec/sinatra_modular/sorcery_mailer.rb",
+    "spec/sinatra_modular/spec_modular/controller_activity_logging_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_brute_force_protection_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_http_basic_auth_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_oauth2_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_oauth_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_remember_me_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_session_timeout_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_spec.rb",
+    "spec/sinatra_modular/spec_modular/spec_helper.rb",
+    "spec/sinatra_modular/user.rb",
     "spec/sorcery_crypto_providers_spec.rb",
     "spec/spec_helper.rb"
   ]

data/spec/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    sorcery (0.5.0)
+    sorcery (0.5.30)
       bcrypt-ruby (~> 2.1.4)
       oauth (>= 0.4.4)
       oauth (>= 0.4.4)

data/spec/rails3/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: ../../../
   specs:
     oauth (0.4.4)
-    sorcery (0.5.0)
+    sorcery (0.5.30)
       bcrypt-ruby (~> 2.1.4)
       oauth (>= 0.4.4)
       oauth (>= 0.4.4)

data/spec/rails3/spec/controller_oauth2_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/controller_oauth2_shared_examples')
 
 def stub_all_oauth2_requests!
   @client = OAuth2::Client.new("key","secret", :site => "http://myapi.com")
@@ -58,30 +59,8 @@ describe ApplicationController do
     end
   end
   
-  describe ApplicationController, "'create_from'" do
-    before(:each) do
-      stub_all_oauth2_requests!
-      User.delete_all
-      Authentication.delete_all
-    end
-      
-    it "should create a new user" do
-      sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_external_property_set(:facebook, :user_info_mapping, {:username => "name"})
-      lambda do
-        get :test_create_from_provider, :provider => "facebook"
-      end.should change(User, :count).by(1)
-      User.first.username.should == "Noam Ben Ari"
-    end
-    
-    it "should support nested attributes" do
-      sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_external_property_set(:facebook, :user_info_mapping, {:username => "hometown/name"})
-      lambda do
-        get :test_create_from_provider, :provider => "facebook"
-      end.should change(User, :count).by(1)
-      User.first.username.should == "Haifa, Israel"
-    end
+  describe ApplicationController do
+    it_behaves_like "oauth2_controller"
   end
   
   describe ApplicationController, "OAuth with User Activation features" do

data/spec/rails3/spec/controller_oauth_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/controller_oauth_shared_examples')
 require 'ostruct'
 
 def stub_all_oauth_requests!
@@ -64,30 +65,8 @@ describe ApplicationController do
     end
   end
   
-  describe ApplicationController, "using 'create_from'" do
-    before(:each) do
-      stub_all_oauth_requests!
-      User.delete_all
-      Authentication.delete_all
-    end
-      
-    it "should create a new 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, :provider => "twitter"
-      end.should change(User, :count).by(1)
-      User.first.username.should == "nbenari"
-    end
-    
-    it "should support nested attributes" do
-      sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_external_property_set(:twitter, :user_info_mapping, {:username => "status/text"})
-      lambda do
-        get :test_create_from_provider, :provider => "twitter"
-      end.should change(User, :count).by(1)
-      User.first.username.should == "coming soon to sorcery gem: twitter and facebook authentication support."
-    end
+  describe ApplicationController do
+    it_behaves_like "oauth_controller"
   end
   
   describe ApplicationController, "using OAuth with User Activation features" do

data/spec/rails3/spec/controller_spec.rb

@@ -14,8 +14,8 @@ describe ApplicationController do
     end
     
     it "should enable configuration option 'user_class'" do
-      sorcery_controller_property_set(:user_class, TestUser)
-      Sorcery::Controller::Config.user_class.should equal(TestUser)
+      sorcery_controller_property_set(:user_class, "TestUser")
+      Sorcery::Controller::Config.user_class.should == "TestUser"
     end
     
     it "should enable configuration option 'not_authenticated_action'" do

data/spec/rails3/spec/user_activation_spec.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require File.expand_path(File.dirname(__FILE__) + '/../app/mailers/sorcery_mailer')
+require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/user_activation_shared_examples')
 
 describe "User with activation submodule" do
   before(:all) do
@@ -10,173 +11,6 @@ describe "User with activation submodule" do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activation")
   end
 
-  # ----------------- PLUGIN CONFIGURATION -----------------------
-  describe User, "loaded plugin configuration" do
-    before(:all) do
-      sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
-    end
-  
-    after(:each) do
-      User.sorcery_config.reset!
-      sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
-    end
-    
-    it "should enable configuration option 'activation_state_attribute_name'" do
-      sorcery_model_property_set(:activation_state_attribute_name, :status)
-      User.sorcery_config.activation_state_attribute_name.should equal(:status)    
-    end
-    
-    it "should enable configuration option 'activation_token_attribute_name'" do
-      sorcery_model_property_set(:activation_token_attribute_name, :code)
-      User.sorcery_config.activation_token_attribute_name.should equal(:code)    
-    end
-    
-    it "should enable configuration option 'user_activation_mailer'" do
-      sorcery_model_property_set(:user_activation_mailer, TestMailer)
-      User.sorcery_config.user_activation_mailer.should equal(TestMailer)    
-    end
-    
-    it "should enable configuration option 'activation_needed_email_method_name'" do
-      sorcery_model_property_set(:activation_needed_email_method_name, :my_activation_email)
-      User.sorcery_config.activation_needed_email_method_name.should equal(:my_activation_email)
-    end
-    
-    it "should enable configuration option 'activation_success_email_method_name'" 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 "if mailer is nil on activation, throw exception!" do
-      expect{sorcery_reload!([:user_activation])}.to raise_error(ArgumentError)
-    end
-  end
-
-  # ----------------- ACTIVATION PROCESS -----------------------
-  describe User, "activation process" do
-    before(:all) do
-      sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
-    end
-    
-    before(:each) do
-      create_new_user
-    end
-    
-    it "should initialize user state to 'pending'" do
-      @user.activation_state.should == "pending"
-    end
-    
-    specify { @user.should respond_to(:activate!) }
-    
-    it "should clear activation code and change state to 'active' on activation" do
-      activation_token = @user.activation_token
-      @user.activate!
-      @user2 = User.find(@user.id) # go to db to make sure it was saved and not just in memory
-      @user2.activation_token.should be_nil
-      @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
-    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
-
-  describe User, "prevent non-active login feature" do
-    before(:all) do
-      sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
-    end
-    
-    it "should not allow a non-active user to authenticate" do
-      create_new_user
-      User.authenticate(@user.username,'secret').should be_false
-    end
-    
-    it "should allow a non-active user to authenticate if configured so" do
-      create_new_user
-      sorcery_model_property_set(:prevent_non_active_users_to_login, false)
-      User.authenticate(@user.username,'secret').should be_true
-    end
-  end
-  
-  describe User, "load_from_activation_token" do
-    before(:all) do
-      sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
-    end
-    
-    after(:each) do
-      Timecop.return
-    end
-    
-    it "load_from_activation_token should return user when token is found" do
-      create_new_user
-      User.load_from_activation_token(@user.activation_token).should == @user
-    end
-    
-    it "load_from_activation_token should NOT return user when token is NOT found" do
-      create_new_user
-      User.load_from_activation_token("a").should == nil
-    end
-    
-    it "load_from_activation_token should return user when token is found and not expired" do
-      sorcery_model_property_set(:activation_token_expiration_period, 500)
-      create_new_user
-      User.load_from_activation_token(@user.activation_token).should == @user
-    end
-    
-    it "load_from_activation_token should NOT return user when token is found and expired" do
-      sorcery_model_property_set(:activation_token_expiration_period, 0.1)
-      create_new_user
-      Timecop.travel(Time.now+0.5)
-      User.load_from_activation_token(@user.activation_token).should == nil
-    end
-    
-    it "load_from_activation_token should return nil if token is blank" do
-      User.load_from_activation_token(nil).should == nil
-      User.load_from_activation_token("").should == nil
-    end
-    
-    it "load_from_activation_token should always be valid if expiration period is nil" do
-      sorcery_model_property_set(:activation_token_expiration_period, nil)
-      create_new_user
-      User.load_from_activation_token(@user.activation_token).should == @user
-    end
-  end
+  it_behaves_like "rails_3_activation_model"
   
 end

data/spec/rails3/spec/user_activity_logging_spec.rb

@@ -1,36 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/user_activity_logging_shared_examples')
 
 describe "User with activity logging submodule" do
-  before(:all) do
-  end
-  
-  after(:all) do
-  end
 
-  # ----------------- PLUGIN CONFIGURATION -----------------------
-  describe User, "loaded plugin configuration" do
-    before(:all) do
-      sorcery_reload!([:activity_logging])
-    end
-  
-    after(:each) do
-      User.sorcery_config.reset!
-    end
-    
-    it "should allow configuration option 'last_login_at_attribute_name'" do
-      sorcery_model_property_set(:last_login_at_attribute_name, :login_time)
-      User.sorcery_config.last_login_at_attribute_name.should equal(:login_time)
-    end
-    
-    it "should allow configuration option 'last_logout_at_attribute_name'" do
-      sorcery_model_property_set(:last_logout_at_attribute_name, :logout_time)
-      User.sorcery_config.last_logout_at_attribute_name.should equal(:logout_time)
-    end
-    
-    it "should allow configuration option 'last_activity_at_attribute_name'" do
-      sorcery_model_property_set(:last_activity_at_attribute_name, :activity_time)
-      User.sorcery_config.last_activity_at_attribute_name.should equal(:activity_time)
-    end
-  end
+  it_behaves_like "rails_3_activity_logging_model"
 
 end

data/spec/rails3/spec/user_brute_force_protection_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/user_brute_force_protection_shared_examples')
 
 describe "User with brute_force_protection submodule" do
   before(:all) do
@@ -9,40 +10,6 @@ describe "User with brute_force_protection submodule" do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/brute_force_protection")
   end
 
-  # ----------------- PLUGIN CONFIGURATION -----------------------
-  describe User, "loaded plugin configuration" do
-  
-    before(:all) do
-      sorcery_reload!([:brute_force_protection])
-      create_new_user
-    end
-  
-    after(:each) do
-      User.sorcery_config.reset!
-    end
-    
-    specify { @user.should respond_to(:failed_logins_count) }
-    specify { @user.should respond_to(:lock_expires_at) }
- 
-    it "should enable configuration option 'failed_logins_count_attribute_name'" do
-      sorcery_model_property_set(:failed_logins_count_attribute_name, :my_count)
-      User.sorcery_config.failed_logins_count_attribute_name.should equal(:my_count)    
-    end
-    
-    it "should enable configuration option 'lock_expires_at_attribute_name'" do
-      sorcery_model_property_set(:lock_expires_at_attribute_name, :expires)
-      User.sorcery_config.lock_expires_at_attribute_name.should equal(:expires)    
-    end
-    
-    it "should enable configuration option 'consecutive_login_retries_amount_allowed'" do
-      sorcery_model_property_set(:consecutive_login_retries_amount_limit, 34)
-      User.sorcery_config.consecutive_login_retries_amount_limit.should equal(34)    
-    end
-    
-    it "should enable configuration option 'login_lock_time_period'" do
-      sorcery_model_property_set(:login_lock_time_period, 2.hours)
-      User.sorcery_config.login_lock_time_period.should == 2.hours    
-    end
-  end
+  it_behaves_like "rails_3_brute_force_protection_model"
   
 end