sorcery 0.4.1 → 0.5.2

data/lib/sorcery.rb

@@ -2,6 +2,10 @@ module Sorcery
   autoload :Model, 'sorcery/model'
   module Model
     autoload :TemporaryToken, 'sorcery/model/temporary_token'
+    module Adapters
+      autoload :ActiveRecord, 'sorcery/model/adapters/active_record'
+      autoload :Mongoid, 'sorcery/model/adapters/mongoid'
+    end
     module Submodules
       autoload :UserActivation, 'sorcery/model/submodules/user_activation'
       autoload :ResetPassword, 'sorcery/model/submodules/reset_password'
@@ -48,8 +52,30 @@ module Sorcery
   module TestHelpers
     autoload :Rails, 'sorcery/test_helpers/rails'
     autoload :Sinatra, 'sorcery/test_helpers/sinatra'
+    autoload :Internal, 'sorcery/test_helpers/internal'
+    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)
+  end
+
+  if defined?(Mongoid)
+    Mongoid::Document.module_eval do
+      included do
+        attr_reader :new_record
+        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.4.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Noam Ben Ari"]
-  s.date = %q{2011-04-21}
+  s.date = %q{2011-05-19}
   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 = [
@@ -56,6 +56,8 @@ Gem::Specification.new do |s|
     "lib/sorcery/engine.rb",
     "lib/sorcery/initializers/initializer.rb",
     "lib/sorcery/model.rb",
+    "lib/sorcery/model/adapters/active_record.rb",
+    "lib/sorcery/model/adapters/mongoid.rb",
     "lib/sorcery/model/submodules/activity_logging.rb",
     "lib/sorcery/model/submodules/brute_force_protection.rb",
     "lib/sorcery/model/submodules/external.rb",
@@ -66,6 +68,10 @@ Gem::Specification.new do |s|
     "lib/sorcery/railties/tasks.rake",
     "lib/sorcery/sinatra.rb",
     "lib/sorcery/test_helpers.rb",
+    "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",
@@ -151,6 +157,67 @@ Gem::Specification.new do |s|
     "spec/rails3/spec/user_reset_password_spec.rb",
     "spec/rails3/spec/user_spec.rb",
     "spec/rails3/vendor/plugins/.gitkeep",
+    "spec/rails3_mongoid/.gitignore",
+    "spec/rails3_mongoid/.rspec",
+    "spec/rails3_mongoid/Gemfile",
+    "spec/rails3_mongoid/Gemfile.lock",
+    "spec/rails3_mongoid/Rakefile",
+    "spec/rails3_mongoid/app/controllers/application_controller.rb",
+    "spec/rails3_mongoid/app/helpers/application_helper.rb",
+    "spec/rails3_mongoid/app/mailers/sorcery_mailer.rb",
+    "spec/rails3_mongoid/app/models/authentication.rb",
+    "spec/rails3_mongoid/app/models/user.rb",
+    "spec/rails3_mongoid/app/views/layouts/application.html.erb",
+    "spec/rails3_mongoid/app/views/sorcery_mailer/activation_email.html.erb",
+    "spec/rails3_mongoid/app/views/sorcery_mailer/activation_email.text.erb",
+    "spec/rails3_mongoid/app/views/sorcery_mailer/activation_success_email.html.erb",
+    "spec/rails3_mongoid/app/views/sorcery_mailer/activation_success_email.text.erb",
+    "spec/rails3_mongoid/app/views/sorcery_mailer/reset_password_email.html.erb",
+    "spec/rails3_mongoid/app/views/sorcery_mailer/reset_password_email.text.erb",
+    "spec/rails3_mongoid/config.ru",
+    "spec/rails3_mongoid/config/application.rb",
+    "spec/rails3_mongoid/config/boot.rb",
+    "spec/rails3_mongoid/config/environment.rb",
+    "spec/rails3_mongoid/config/environments/development.rb",
+    "spec/rails3_mongoid/config/environments/in_memory.rb",
+    "spec/rails3_mongoid/config/environments/production.rb",
+    "spec/rails3_mongoid/config/environments/test.rb",
+    "spec/rails3_mongoid/config/initializers/backtrace_silencers.rb",
+    "spec/rails3_mongoid/config/initializers/inflections.rb",
+    "spec/rails3_mongoid/config/initializers/mime_types.rb",
+    "spec/rails3_mongoid/config/initializers/secret_token.rb",
+    "spec/rails3_mongoid/config/initializers/session_store.rb",
+    "spec/rails3_mongoid/config/locales/en.yml",
+    "spec/rails3_mongoid/config/mongoid.yml",
+    "spec/rails3_mongoid/config/routes.rb",
+    "spec/rails3_mongoid/db/schema.rb",
+    "spec/rails3_mongoid/db/seeds.rb",
+    "spec/rails3_mongoid/lib/tasks/.gitkeep",
+    "spec/rails3_mongoid/public/404.html",
+    "spec/rails3_mongoid/public/422.html",
+    "spec/rails3_mongoid/public/500.html",
+    "spec/rails3_mongoid/public/favicon.ico",
+    "spec/rails3_mongoid/public/images/rails.png",
+    "spec/rails3_mongoid/public/javascripts/application.js",
+    "spec/rails3_mongoid/public/javascripts/controls.js",
+    "spec/rails3_mongoid/public/javascripts/dragdrop.js",
+    "spec/rails3_mongoid/public/javascripts/effects.js",
+    "spec/rails3_mongoid/public/javascripts/prototype.js",
+    "spec/rails3_mongoid/public/javascripts/rails.js",
+    "spec/rails3_mongoid/public/robots.txt",
+    "spec/rails3_mongoid/public/stylesheets/.gitkeep",
+    "spec/rails3_mongoid/script/rails",
+    "spec/rails3_mongoid/spec/spec.opts",
+    "spec/rails3_mongoid/spec/spec_helper.orig.rb",
+    "spec/rails3_mongoid/spec/spec_helper.rb",
+    "spec/rails3_mongoid/spec/user_activation_spec.rb",
+    "spec/rails3_mongoid/spec/user_activity_logging_spec.rb",
+    "spec/rails3_mongoid/spec/user_brute_force_protection_spec.rb",
+    "spec/rails3_mongoid/spec/user_oauth_spec.rb",
+    "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/rails3_mongoid/vendor/plugins/.gitkeep",
     "spec/sinatra/Gemfile",
     "spec/sinatra/Gemfile.lock",
     "spec/sinatra/Rakefile",
@@ -163,6 +230,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",
@@ -177,10 +245,36 @@ 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",
-    "spec/untitled folder"
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/NoamB/sorcery}
   s.licenses = ["MIT"]
@@ -232,6 +326,35 @@ Gem::Specification.new do |s|
     "spec/rails3/spec/user_remember_me_spec.rb",
     "spec/rails3/spec/user_reset_password_spec.rb",
     "spec/rails3/spec/user_spec.rb",
+    "spec/rails3_mongoid/app/controllers/application_controller.rb",
+    "spec/rails3_mongoid/app/helpers/application_helper.rb",
+    "spec/rails3_mongoid/app/mailers/sorcery_mailer.rb",
+    "spec/rails3_mongoid/app/models/authentication.rb",
+    "spec/rails3_mongoid/app/models/user.rb",
+    "spec/rails3_mongoid/config/application.rb",
+    "spec/rails3_mongoid/config/boot.rb",
+    "spec/rails3_mongoid/config/environment.rb",
+    "spec/rails3_mongoid/config/environments/development.rb",
+    "spec/rails3_mongoid/config/environments/in_memory.rb",
+    "spec/rails3_mongoid/config/environments/production.rb",
+    "spec/rails3_mongoid/config/environments/test.rb",
+    "spec/rails3_mongoid/config/initializers/backtrace_silencers.rb",
+    "spec/rails3_mongoid/config/initializers/inflections.rb",
+    "spec/rails3_mongoid/config/initializers/mime_types.rb",
+    "spec/rails3_mongoid/config/initializers/secret_token.rb",
+    "spec/rails3_mongoid/config/initializers/session_store.rb",
+    "spec/rails3_mongoid/config/routes.rb",
+    "spec/rails3_mongoid/db/schema.rb",
+    "spec/rails3_mongoid/db/seeds.rb",
+    "spec/rails3_mongoid/spec/spec_helper.orig.rb",
+    "spec/rails3_mongoid/spec/spec_helper.rb",
+    "spec/rails3_mongoid/spec/user_activation_spec.rb",
+    "spec/rails3_mongoid/spec/user_activity_logging_spec.rb",
+    "spec/rails3_mongoid/spec/user_brute_force_protection_spec.rb",
+    "spec/rails3_mongoid/spec/user_oauth_spec.rb",
+    "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/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",
@@ -241,6 +364,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",
@@ -253,6 +377,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"
   ]
@@ -261,10 +407,12 @@ 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<rails>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<json>, [">= 1.5.1"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
       s.add_runtime_dependency(%q<oauth2>, [">= 0.1.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"])
+      s.add_development_dependency(%q<bson_ext>, ["~> 1.3"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.5.0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
@@ -278,10 +426,12 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
       s.add_runtime_dependency(%q<oauth2>, [">= 0.1.1"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<json>, [">= 1.5.1"])
       s.add_dependency(%q<oauth>, [">= 0.4.4"])
       s.add_dependency(%q<oauth2>, [">= 0.1.1"])
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<json>, [">= 1.5.1"])
+      s.add_dependency(%q<mongoid>, ["~> 2.0"])
+      s.add_dependency(%q<bson_ext>, ["~> 1.3"])
       s.add_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
@@ -296,10 +446,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<oauth2>, [">= 0.1.1"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<json>, [">= 1.5.1"])
     s.add_dependency(%q<oauth>, [">= 0.4.4"])
     s.add_dependency(%q<oauth2>, [">= 0.1.1"])
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<json>, [">= 1.5.1"])
+    s.add_dependency(%q<mongoid>, ["~> 2.0"])
+    s.add_dependency(%q<bson_ext>, ["~> 1.3"])
     s.add_dependency(%q<rspec>, ["~> 2.5.0"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])

data/spec/Gemfile

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

data/spec/Gemfile.lock

@@ -1,7 +1,12 @@
 PATH
-  remote: ../../../
+  remote: ../
   specs:
-    sorcery (0.4.1)
+    sorcery (0.5.2)
+      bcrypt-ruby (~> 2.1.4)
+      oauth (>= 0.4.4)
+      oauth (>= 0.4.4)
+      oauth2 (>= 0.1.1)
+      oauth2 (>= 0.1.1)
 
 GEM
   remote: http://rubygems.org/
@@ -36,7 +41,7 @@ GEM
     addressable (2.2.4)
     archive-tar-minitar (0.5.2)
     arel (2.0.6)
-    bcrypt-ruby (2.1.3)
+    bcrypt-ruby (2.1.4)
     builder (2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
@@ -118,4 +123,4 @@ DEPENDENCIES
   rspec (~> 2.5.0)
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.4.1)!
+  sorcery (>= 0.1.0)!

data/spec/rails3/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.3'
 gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "sorcery", '0.4.1', :path => '../../../'
+gem "sorcery", '>= 0.1.0', :path => '../../../'
 
 group :development, :test do
   gem "rspec", "~> 2.5.0"

data/spec/rails3/Gemfile.lock

@@ -2,14 +2,12 @@ PATH
   remote: ../../../
   specs:
     oauth (0.4.4)
-    sorcery (0.4.1)
+    sorcery (0.5.2)
       bcrypt-ruby (~> 2.1.4)
-      json (>= 1.5.1)
       oauth (>= 0.4.4)
       oauth (>= 0.4.4)
       oauth2 (>= 0.1.1)
       oauth2 (>= 0.1.1)
-      rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -55,7 +53,6 @@ GEM
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
     i18n (0.5.0)
-    json (1.5.1)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
     mail (2.2.13)
@@ -64,11 +61,11 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    multi_json (0.0.5)
+    multi_json (1.0.1)
     multipart-post (1.1.0)
-    oauth2 (0.4.0)
-      faraday (~> 0.6.0)
-      multi_json (~> 0.0.4)
+    oauth2 (0.4.1)
+      faraday (~> 0.6.1)
+      multi_json (>= 0.0.5)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -131,6 +128,6 @@ DEPENDENCIES
   rspec-rails (~> 2.5.0)
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.4.1)!
+  sorcery (>= 0.1.0)!
   sqlite3-ruby
   timecop

data/spec/rails3/spec/controller_activity_logging_spec.rb

@@ -22,10 +22,8 @@ describe ApplicationController do
     after(:each) do
       User.delete_all
     end
-
-    it "should respond to 'current_users'" do
-      subject.should respond_to(:current_users)
-    end
+    
+    specify { subject.should respond_to(:current_users) }
 
     it "'current_users' should be empty when no users are logged in" do
       subject.current_users.size.should == 0

data/spec/rails3/spec/controller_oauth_spec.rb

@@ -31,7 +31,7 @@ describe ApplicationController do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
   end
   # ----------------- OAuth -----------------------
-  describe ApplicationController, "'login_from'" do
+  describe ApplicationController, "'using external API to login'" do
   
     before(:each) do
       stub_all_oauth_requests!
@@ -64,7 +64,7 @@ describe ApplicationController do
     end
   end
   
-  describe ApplicationController, "'create_from'" do
+  describe ApplicationController, "using 'create_from'" do
     before(:each) do
       stub_all_oauth_requests!
       User.delete_all
@@ -90,7 +90,7 @@ describe ApplicationController do
     end
   end
   
-  describe ApplicationController, "OAuth with User Activation features" do
+  describe ApplicationController, "using OAuth with User Activation features" do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activation")
       sorcery_reload!([:user_activation,:external], :user_activation_mailer => ::SorceryMailer)

data/spec/rails3/spec/controller_session_timeout_spec.rb

@@ -29,26 +29,27 @@ describe ApplicationController do
       response.should be_a_redirect
     end
     
-    it "with 'session_timeout_from_last_action' should not logout if there was activity" do
-      sorcery_controller_property_set(:session_timeout_from_last_action, true)
-      get :test_login, :username => 'gizmo', :password => 'secret'
-      Timecop.travel(Time.now+0.3)
-      get :test_should_be_logged_in
-      session[:user_id].should_not be_nil
-      Timecop.travel(Time.now+0.3)
-      get :test_should_be_logged_in
-      session[:user_id].should_not be_nil
-      response.should be_a_success
-    end
+    context "with 'session_timeout_from_last_action'" do
+      it "should not logout if there was activity" do
+        sorcery_controller_property_set(:session_timeout_from_last_action, true)
+        get :test_login, :username => 'gizmo', :password => 'secret'
+        Timecop.travel(Time.now+0.3)
+        get :test_should_be_logged_in
+        session[:user_id].should_not be_nil
+        Timecop.travel(Time.now+0.3)
+        get :test_should_be_logged_in
+        session[:user_id].should_not be_nil
+        response.should be_a_success
+      end
     
-    it "with 'session_timeout_from_last_action' should logout if there was no activity" do
-      sorcery_controller_property_set(:session_timeout_from_last_action, true)
-      get :test_login, :username => 'gizmo', :password => 'secret'
-      Timecop.travel(Time.now+0.6)
-      get :test_should_be_logged_in
-      session[:user_id].should be_nil
-      response.should be_a_redirect
+      it "with 'session_timeout_from_last_action' should logout if there was no activity" do
+        sorcery_controller_property_set(:session_timeout_from_last_action, true)
+        get :test_login, :username => 'gizmo', :password => 'secret'
+        Timecop.travel(Time.now+0.6)
+        get :test_should_be_logged_in
+        session[:user_id].should be_nil
+        response.should be_a_redirect
+      end
     end
-    
   end
 end

data/spec/rails3/spec/controller_spec.rb

@@ -37,21 +37,13 @@ describe ApplicationController do
       sorcery_controller_property_set(:user_class, User)
     end
     
-    it "should respond to the instance method login" do
-      should respond_to(:login)
-    end
-  
-    it "should respond to the instance method logout" do
-      should respond_to(:logout)
-    end
+    specify { should respond_to(:login) }
+
+    specify { should respond_to(:logout) }
   
-    it "should respond to the instance method logged_in?" do
-      should respond_to(:logged_in?)
-    end
+    specify { should respond_to(:logged_in?) }
     
-    it "should respond to the instance method current_user" do
-      should respond_to(:current_user)
-    end
+    specify { should respond_to(:current_user) }
   
     it "login(username,password) should return the user when success and set the session with user.id" do
       get :test_login, :username => 'gizmo', :password => 'secret'
@@ -93,9 +85,7 @@ describe ApplicationController do
       subject.current_user.should == false
     end
     
-    it "should respond to 'require_login'" do
-      should respond_to(:require_login)
-    end
+    specify { should respond_to(:require_login) }
     
     it "should call the configured 'not_authenticated_action' when authenticate before_filter fails" do
       session[:user_id] = nil

data/spec/rails3/spec/spec_helper.rb

@@ -65,6 +65,6 @@ class TestMailer < ActionMailer::Base
 
 end
 
-include ::Sorcery::TestHelpers
-include ::Sorcery::TestHelpers::Rails
+include ::Sorcery::TestHelpers::Internal
+include ::Sorcery::TestHelpers::Internal::Rails
 

data/spec/rails3/spec/user_activation_spec.rb

@@ -57,23 +57,17 @@ describe "User with activation submodule" do
       sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
     
-    it "should generate an activation code on registration" do
+    before(:each) do
       create_new_user
-      @user.activation_token.should_not be_nil
     end
     
     it "should initialize user state to 'pending'" do
-      create_new_user
       @user.activation_state.should == "pending"
     end
     
-    it "should respond to 'activate!'" do
-      create_new_user
-      @user.should respond_to(:activate!)
-    end
+    specify { @user.should respond_to(:activate!) }
     
     it "should clear activation code and change state to 'active' on activation" do
-      create_new_user
       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
@@ -89,7 +83,6 @@ describe "User with activation submodule" do
     end
     
     it "subsequent saves do not send activation email" do
-      create_new_user
       old_size = ActionMailer::Base.deliveries.size
       @user.username = "Shauli"
       @user.save!
@@ -97,14 +90,12 @@ describe "User with activation submodule" do
     end
     
     it "should send the user an activation success email on successful activation" do
-      create_new_user
       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
-      create_new_user
       @user.activate!
       old_size = ActionMailer::Base.deliveries.size
       @user.username = "Shauli"
@@ -121,7 +112,6 @@ describe "User with activation submodule" do
     
     it "activation success email is optional" do
       sorcery_model_property_set(:activation_success_email_method_name, nil)
-      create_new_user
       old_size = ActionMailer::Base.deliveries.size
       @user.activate!
       ActionMailer::Base.deliveries.size.should == old_size

data/spec/rails3/spec/user_brute_force_protection_spec.rb

@@ -21,13 +21,8 @@ describe "User with brute_force_protection submodule" do
       User.sorcery_config.reset!
     end
     
-    it "should respond to 'failed_logins_count'" do
-      @user.should respond_to(:failed_logins_count)
-    end
-    
-    it "should respond to 'lock_expires_at'" do
-      @user.should respond_to(:failed_logins_count)
-    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)
@@ -49,28 +44,5 @@ describe "User with brute_force_protection submodule" do
       User.sorcery_config.login_lock_time_period.should == 2.hours    
     end
   end
-
-  # ----------------- PLUGIN ACTIVATED -----------------------
-  describe User, "when activated with sorcery" do
-  
-    before(:all) do
-      sorcery_reload!([:brute_force_protection])
-    end
-  
-    before(:each) do
-      User.delete_all
-    end
-
-    # it "should increment failed_logins_count on a failed login" do
-    #   create_new_user
-    #   
-    # end
-    # 
-    # it "should set lock expiry (effectively lock user) when failed_logins_count reaches max within max period" do
-    #   create_new_user
-    #   @user.lock_expires_at.should == Time.now.utc + 30
-    # end
- 
-  end
   
 end