sorcery 0.5.21 → 0.6.1

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,7 +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_class = "User"
 
           ::Sorcery::Controller::Config.user_config do |user|
             options.each do |property,value|

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

@@ -51,7 +51,7 @@ module Sorcery
           ::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_class = "User"
 
           ::Sorcery::Controller::Config.user_config do |user|
             options.each do |property, value|

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

@@ -51,7 +51,7 @@ module Sorcery
           ::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_class = "User"
 
           ::Sorcery::Controller::Config.user_config do |user|
             options.each do |property, value|

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/sorcery.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{sorcery}
-  s.version = "0.5.21"
+  s.name = "sorcery"
+  s.version = "0.6.1"
 
   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-20}
-  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.date = "2011-09-02"
+  s.description = "Provides common authentication needs such as signing in/out, activating by email and resetting password."
+  s.email = "nbenari@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -218,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",
@@ -276,11 +285,11 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/NoamB/sorcery}
+  s.homepage = "http://github.com/NoamB/sorcery"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Magical authentication for Rails 3 applications}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Magical authentication for Rails 3 applications"
   s.test_files = [
     "spec/rails3/app/controllers/application_controller.rb",
     "spec/rails3/app/helpers/application_helper.rb",
@@ -355,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",
@@ -407,8 +425,8 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
-      s.add_runtime_dependency(%q<oauth2>, [">= 0.1.1"])
+      s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
+      s.add_runtime_dependency(%q<oauth2>, ["~> 0.4.1"])
       s.add_development_dependency(%q<rails>, [">= 3.0.0"])
       s.add_development_dependency(%q<json>, [">= 1.5.1"])
       s.add_development_dependency(%q<mongoid>, ["~> 2.0"])
@@ -422,12 +440,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<simplecov>, [">= 0.3.8"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
-      s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.4"])
-      s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
-      s.add_runtime_dependency(%q<oauth2>, [">= 0.1.1"])
+      s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
+      s.add_runtime_dependency(%q<oauth2>, ["~> 0.4.1"])
     else
-      s.add_dependency(%q<oauth>, [">= 0.4.4"])
-      s.add_dependency(%q<oauth2>, [">= 0.1.1"])
+      s.add_dependency(%q<oauth>, ["~> 0.4.4"])
+      s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<json>, [">= 1.5.1"])
       s.add_dependency(%q<mongoid>, ["~> 2.0"])
@@ -441,13 +459,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<simplecov>, [">= 0.3.8"])
       s.add_dependency(%q<timecop>, [">= 0"])
-      s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.4"])
-      s.add_dependency(%q<oauth>, [">= 0.4.4"])
-      s.add_dependency(%q<oauth2>, [">= 0.1.1"])
+      s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
+      s.add_dependency(%q<oauth>, ["~> 0.4.4"])
+      s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
     end
   else
-    s.add_dependency(%q<oauth>, [">= 0.4.4"])
-    s.add_dependency(%q<oauth2>, [">= 0.1.1"])
+    s.add_dependency(%q<oauth>, ["~> 0.4.4"])
+    s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
     s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<json>, [">= 1.5.1"])
     s.add_dependency(%q<mongoid>, ["~> 2.0"])
@@ -461,9 +479,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<simplecov>, [">= 0.3.8"])
     s.add_dependency(%q<timecop>, [">= 0"])
-    s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.4"])
-    s.add_dependency(%q<oauth>, [">= 0.4.4"])
-    s.add_dependency(%q<oauth2>, [">= 0.1.1"])
+    s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
+    s.add_dependency(%q<oauth>, ["~> 0.4.4"])
+    s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
   end
 end
 

data/spec/Gemfile

@@ -3,8 +3,8 @@ source 'http://rubygems.org'
 gem "rails", '3.0.3'
 gem 'bcrypt-ruby', :require => 'bcrypt'
 gem "sorcery", '>= 0.1.0', :path => '../'
-gem 'oauth', ">= 0.4.4"
-gem 'oauth2', ">= 0.1.1"
+gem 'oauth', "~> 0.4.4"
+gem 'oauth2', "~> 0.4.1"
 group :development do
   gem "rspec", "~> 2.5.0"
   gem 'ruby-debug19'

data/spec/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../
   specs:
-    sorcery (0.5.2)
-      bcrypt-ruby (~> 2.1.4)
+    sorcery (0.6.0)
+      bcrypt-ruby (~> 3.0.0)
       oauth (>= 0.4.4)
       oauth (>= 0.4.4)
       oauth2 (>= 0.1.1)
@@ -38,39 +38,39 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.4)
+    addressable (2.2.6)
     archive-tar-minitar (0.5.2)
-    arel (2.0.6)
-    bcrypt-ruby (2.1.4)
+    arel (2.0.10)
+    bcrypt-ruby (3.0.0)
     builder (2.1.2)
-    columnize (0.3.2)
-    diff-lcs (1.1.2)
+    columnize (0.3.4)
+    diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.5.5)
+    faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
-    i18n (0.5.0)
-    linecache19 (0.5.11)
+    i18n (0.6.0)
+    linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    mail (2.2.13)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    multi_json (0.0.5)
-    multipart-post (1.1.0)
-    oauth (0.4.4)
-    oauth2 (0.1.1)
-      faraday (~> 0.5.0)
-      multi_json (~> 0.0.4)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    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.3)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
     rails (3.0.3)
       actionmailer (= 3.0.3)
@@ -85,16 +85,16 @@ GEM
       activesupport (= 3.0.3)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.8.7)
+    rake (0.9.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
       rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
+    rspec-core (2.5.2)
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    ruby-debug-base19 (0.11.24)
+    ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby_core_source (>= 0.1.4)
@@ -102,23 +102,24 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
+    ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    simplecov (0.3.9)
-      simplecov-html (>= 0.3.7)
-    simplecov-html (0.3.9)
+    simplecov (0.4.2)
+      simplecov-html (~> 0.4.4)
+    simplecov-html (0.4.5)
     thor (0.14.6)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.29)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bcrypt-ruby
-  oauth (>= 0.4.4)
-  oauth2 (>= 0.1.1)
+  oauth (~> 0.4.4)
+  oauth2 (~> 0.4.1)
   rails (= 3.0.3)
   rspec (~> 2.5.0)
   ruby-debug19

data/spec/rails3/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ../../../
   specs:
-    oauth (0.4.4)
-    sorcery (0.5.2)
-      bcrypt-ruby (~> 2.1.4)
+    sorcery (0.6.0)
+      bcrypt-ruby (~> 3.0.0)
       oauth (>= 0.4.4)
       oauth (>= 0.4.4)
       oauth2 (>= 0.1.1)
@@ -39,10 +38,10 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.5)
+    addressable (2.2.6)
     archive-tar-minitar (0.5.2)
     arel (2.0.6)
-    bcrypt-ruby (2.1.4)
+    bcrypt-ruby (3.0.0)
     builder (2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
@@ -61,8 +60,9 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    multi_json (1.0.1)
-    multipart-post (1.1.0)
+    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)

data/spec/rails3/spec/controller_oauth2_spec.rb

@@ -1,9 +1,10 @@
 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")
   OAuth2::Client.stub!(:new).and_return(@client)
-  @acc_token = OAuth2::AccessToken.new(@client, "", "asd", nil, {})
+  @acc_token = OAuth2::AccessToken.new(@client, "asd", {})
   @webby = @client.web_server
   OAuth2::Strategy::WebServer.stub!(:new).and_return(@webby)
   @webby.stub!(:get_access_token).and_return(@acc_token)
@@ -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