sorcery 0.2.1 → 0.3.1

data/sorcery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sorcery}
-  s.version = "0.2.1"
+  s.version = "0.3.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-03-15}
+  s.date = %q{2011-04-17}
   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 = [
@@ -25,16 +25,27 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "lib/generators/sorcery_migration/sorcery_migration_generator.rb",
+    "lib/generators/sorcery_migration/templates/activity_logging.rb",
+    "lib/generators/sorcery_migration/templates/brute_force_protection.rb",
+    "lib/generators/sorcery_migration/templates/core.rb",
+    "lib/generators/sorcery_migration/templates/external.rb",
+    "lib/generators/sorcery_migration/templates/remember_me.rb",
+    "lib/generators/sorcery_migration/templates/reset_password.rb",
+    "lib/generators/sorcery_migration/templates/user_activation.rb",
     "lib/sorcery.rb",
     "lib/sorcery/controller.rb",
+    "lib/sorcery/controller/adapters/sinatra.rb",
     "lib/sorcery/controller/submodules/activity_logging.rb",
     "lib/sorcery/controller/submodules/brute_force_protection.rb",
+    "lib/sorcery/controller/submodules/email.rb",
+    "lib/sorcery/controller/submodules/external.rb",
+    "lib/sorcery/controller/submodules/external/protocols/oauth1.rb",
+    "lib/sorcery/controller/submodules/external/protocols/oauth2.rb",
+    "lib/sorcery/controller/submodules/external/providers/facebook.rb",
+    "lib/sorcery/controller/submodules/external/providers/twitter.rb",
     "lib/sorcery/controller/submodules/http_basic_auth.rb",
     "lib/sorcery/controller/submodules/oauth.rb",
-    "lib/sorcery/controller/submodules/oauth/oauth1.rb",
-    "lib/sorcery/controller/submodules/oauth/oauth2.rb",
-    "lib/sorcery/controller/submodules/oauth/providers/facebook.rb",
-    "lib/sorcery/controller/submodules/oauth/providers/twitter.rb",
     "lib/sorcery/controller/submodules/remember_me.rb",
     "lib/sorcery/controller/submodules/session_timeout.rb",
     "lib/sorcery/crypto_providers/aes256.rb",
@@ -47,12 +58,15 @@ Gem::Specification.new do |s|
     "lib/sorcery/model.rb",
     "lib/sorcery/model/submodules/activity_logging.rb",
     "lib/sorcery/model/submodules/brute_force_protection.rb",
-    "lib/sorcery/model/submodules/oauth.rb",
+    "lib/sorcery/model/submodules/external.rb",
     "lib/sorcery/model/submodules/remember_me.rb",
     "lib/sorcery/model/submodules/reset_password.rb",
     "lib/sorcery/model/submodules/user_activation.rb",
     "lib/sorcery/model/temporary_token.rb",
+    "lib/sorcery/sinatra.rb",
     "lib/sorcery/test_helpers.rb",
+    "lib/sorcery/test_helpers/rails.rb",
+    "lib/sorcery/test_helpers/sinatra.rb",
     "sorcery.gemspec",
     "spec/Gemfile",
     "spec/Gemfile.lock",
@@ -97,7 +111,7 @@ Gem::Specification.new do |s|
     "spec/rails3/app_root/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
     "spec/rails3/app_root/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
     "spec/rails3/app_root/db/migrate/core/20101224223620_create_users.rb",
-    "spec/rails3/app_root/db/migrate/oauth/20101224223628_create_authentications.rb",
+    "spec/rails3/app_root/db/migrate/external/20101224223628_create_authentications.rb",
     "spec/rails3/app_root/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
     "spec/rails3/app_root/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
     "spec/rails3/app_root/db/schema.rb",
@@ -136,8 +150,42 @@ Gem::Specification.new do |s|
     "spec/rails3/app_root/spec/user_reset_password_spec.rb",
     "spec/rails3/app_root/spec/user_spec.rb",
     "spec/rails3/app_root/vendor/plugins/.gitkeep",
+    "spec/sinatra/Gemfile",
+    "spec/sinatra/Gemfile.lock",
+    "spec/sinatra/Rakefile",
+    "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",
+    "spec/sinatra/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
+    "spec/sinatra/db/migrate/core/20101224223620_create_users.rb",
+    "spec/sinatra/db/migrate/external/20101224223628_create_authentications.rb",
+    "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/myapp.rb",
+    "spec/sinatra/sorcery_mailer.rb",
+    "spec/sinatra/spec/controller_activity_logging_spec.rb",
+    "spec/sinatra/spec/controller_brute_force_protection_spec.rb",
+    "spec/sinatra/spec/controller_http_basic_auth_spec.rb",
+    "spec/sinatra/spec/controller_oauth2_spec.rb",
+    "spec/sinatra/spec/controller_oauth_spec.rb",
+    "spec/sinatra/spec/controller_remember_me_spec.rb",
+    "spec/sinatra/spec/controller_session_timeout_spec.rb",
+    "spec/sinatra/spec/controller_spec.rb",
+    "spec/sinatra/spec/spec.opts",
+    "spec/sinatra/spec/spec_helper.rb",
+    "spec/sinatra/spec/user_activation_spec.rb",
+    "spec/sinatra/spec/user_activity_logging_spec.rb",
+    "spec/sinatra/spec/user_brute_force_protection_spec.rb",
+    "spec/sinatra/spec/user_oauth_spec.rb",
+    "spec/sinatra/spec/user_remember_me_spec.rb",
+    "spec/sinatra/spec/user_reset_password_spec.rb",
+    "spec/sinatra/spec/user_spec.rb",
+    "spec/sinatra/user.rb",
+    "spec/sinatra/views/test_login.erb",
     "spec/sorcery_crypto_providers_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/untitled folder"
   ]
   s.homepage = %q{http://github.com/NoamB/sorcery}
   s.licenses = ["MIT"]
@@ -167,7 +215,7 @@ Gem::Specification.new do |s|
     "spec/rails3/app_root/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
     "spec/rails3/app_root/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
     "spec/rails3/app_root/db/migrate/core/20101224223620_create_users.rb",
-    "spec/rails3/app_root/db/migrate/oauth/20101224223628_create_authentications.rb",
+    "spec/rails3/app_root/db/migrate/external/20101224223628_create_authentications.rb",
     "spec/rails3/app_root/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
     "spec/rails3/app_root/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
     "spec/rails3/app_root/db/schema.rb",
@@ -189,6 +237,34 @@ Gem::Specification.new do |s|
     "spec/rails3/app_root/spec/user_remember_me_spec.rb",
     "spec/rails3/app_root/spec/user_reset_password_spec.rb",
     "spec/rails3/app_root/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",
+    "spec/sinatra/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
+    "spec/sinatra/db/migrate/core/20101224223620_create_users.rb",
+    "spec/sinatra/db/migrate/external/20101224223628_create_authentications.rb",
+    "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/myapp.rb",
+    "spec/sinatra/sorcery_mailer.rb",
+    "spec/sinatra/spec/controller_activity_logging_spec.rb",
+    "spec/sinatra/spec/controller_brute_force_protection_spec.rb",
+    "spec/sinatra/spec/controller_http_basic_auth_spec.rb",
+    "spec/sinatra/spec/controller_oauth2_spec.rb",
+    "spec/sinatra/spec/controller_oauth_spec.rb",
+    "spec/sinatra/spec/controller_remember_me_spec.rb",
+    "spec/sinatra/spec/controller_session_timeout_spec.rb",
+    "spec/sinatra/spec/controller_spec.rb",
+    "spec/sinatra/spec/spec_helper.rb",
+    "spec/sinatra/spec/user_activation_spec.rb",
+    "spec/sinatra/spec/user_activity_logging_spec.rb",
+    "spec/sinatra/spec/user_brute_force_protection_spec.rb",
+    "spec/sinatra/spec/user_oauth_spec.rb",
+    "spec/sinatra/spec/user_remember_me_spec.rb",
+    "spec/sinatra/spec/user_reset_password_spec.rb",
+    "spec/sinatra/spec/user_spec.rb",
+    "spec/sinatra/user.rb",
     "spec/sorcery_crypto_providers_spec.rb",
     "spec/spec_helper.rb"
   ]

data/spec/Gemfile

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

data/spec/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../../
   specs:
-    sorcery (0.2.1)
+    sorcery (0.3.1)
 
 GEM
   remote: http://rubygems.org/
@@ -118,4 +118,4 @@ DEPENDENCIES
   rspec
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.2.1)!
+  sorcery (= 0.3.1)!

data/spec/rails3/app_root/Gemfile

@@ -2,10 +2,8 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.3'
 gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "sorcery", '0.2.1', :path => '../../../'
-gem 'bcrypt-ruby', '~> 2.1.4', :require => 'bcrypt'
-gem 'oauth', ">= 0.4.4"
-gem 'oauth2', ">= 0.1.1"
+gem "sorcery", '0.3.1', :path => '../../../'
+
 group :development, :test do
   gem 'rspec'
   gem 'rspec-rails'

data/spec/rails3/app_root/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../../
   specs:
-    sorcery (0.2.1)
+    sorcery (0.3.1)
       bcrypt-ruby (~> 2.1.4)
       json (>= 1.5.1)
       oauth (>= 0.4.4)
@@ -126,14 +126,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bcrypt-ruby (~> 2.1.4)
-  oauth (>= 0.4.4)
-  oauth2 (>= 0.1.1)
   rails (= 3.0.3)
   rspec
   rspec-rails
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.2.1)!
+  sorcery (= 0.3.1)!
   spork (~> 0.9.0.rc)
   sqlite3-ruby

data/spec/rails3/app_root/app/controllers/application_controller.rb

@@ -22,7 +22,7 @@ class ApplicationController < ActionController::Base
   
   def test_return_to
     @user = login(params[:username], params[:password])
-    return_or_redirect_to(:index, :notice => 'haha!')
+    redirect_back_or_to(:index, :notice => 'haha!')
   end
   
   def test_logout
@@ -66,24 +66,24 @@ class ApplicationController < ActionController::Base
     render :text => "HTTP Basic Auth"
   end
   
-  def auth_at_provider_test
-    auth_at_provider(:twitter)
+  def login_at_test
+    login_at(:twitter)
   end
   
-  def auth_at_provider_test2
-    auth_at_provider(:facebook)
+  def login_at_test2
+    login_at(:facebook)
   end
   
-  def test_login_from_access_token
-    if @user = login_from_access_token(:twitter)
+  def test_login_from
+    if @user = login_from(:twitter)
       redirect_to "bla", :notice => "Success!"
     else
       redirect_to "blu", :alert => "Failed!"
     end
   end
   
-  def test_login_from_access_token2
-    if @user = login_from_access_token(:facebook)
+  def test_login_from2
+    if @user = login_from(:facebook)
       redirect_to "bla", :notice => "Success!"
     else
       redirect_to "blu", :alert => "Failed!"
@@ -92,8 +92,8 @@ class ApplicationController < ActionController::Base
   
   def test_create_from_provider
     provider = params[:provider]
-    login_from_access_token(provider)
-    if @user = create_from_provider!(provider)
+    login_from(provider)
+    if @user = create_from(provider)
       redirect_to "bla", :notice => "Success!"
     else
       redirect_to "blu", :alert => "Failed!"

data/spec/rails3/app_root/spec/controller_oauth2_spec.rb

@@ -12,16 +12,16 @@ end
 
 describe ApplicationController do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/oauth")
-    sorcery_reload!([:oauth])
-    sorcery_controller_property_set(:oauth_providers, [:facebook])
+    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
+    sorcery_reload!([:external])
+    sorcery_controller_property_set(:external_providers, [:facebook])
     sorcery_controller_oauth_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
     sorcery_controller_oauth_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
     sorcery_controller_oauth_property_set(:facebook, :callback_url, "http://blabla.com")
   end
   
   after(:all) do
-    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/oauth")
+    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
   end
   # ----------------- OAuth -----------------------
   describe ApplicationController, "with OAuth features" do
@@ -32,34 +32,36 @@ describe ApplicationController do
       
     after(:each) do
       User.delete_all
+      Authentication.delete_all
     end
     
-    it "auth_at_provider redirects correctly" do
+    it "login_at redirects correctly" do
       create_new_user
-      get :auth_at_provider_test2
+      get :login_at_test2
       response.should be_a_redirect
       response.should redirect_to("http://myapi.com/oauth/authorize?client_id=key&redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access&type=web_server")
     end
     
-    it "'login_from_access_token' logins if user exists" do
+    it "'login_from' logins if user exists" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_external_user(:facebook)
-      get :test_login_from_access_token2
+      get :test_login_from2
       flash[:notice].should == "Success!"
     end
     
-    it "'login_from_access_token' fails if user doesn't exist" do
+    it "'login_from' fails if user doesn't exist" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_user
-      get :test_login_from_access_token2
+      get :test_login_from2
       flash[:alert].should == "Failed!"
     end
   end
   
-  describe ApplicationController, "'create_from_provider!'" do
+  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
@@ -84,8 +86,8 @@ describe ApplicationController do
   describe ApplicationController, "OAuth with User Activation features" do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activation")
-      sorcery_reload!([:user_activation,:oauth], :user_activation_mailer => ::SorceryMailer)
-      sorcery_controller_property_set(:oauth_providers, [:facebook])
+      sorcery_reload!([:user_activation,:external], :user_activation_mailer => ::SorceryMailer)
+      sorcery_controller_property_set(:external_providers, [:facebook])
       sorcery_controller_oauth_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
       sorcery_controller_oauth_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
       sorcery_controller_oauth_property_set(:facebook, :callback_url, "http://blabla.com")

data/spec/rails3/app_root/spec/controller_oauth_spec.rb

@@ -9,7 +9,9 @@ def stub_all_oauth_requests!
   @consumer.stub!(:get_request_token).and_return(@req_token)
   @acc_token = OAuth::AccessToken.new(@consumer)
   @req_token.stub!(:get_access_token).and_return(@acc_token)
-  session[:request_token] = @req_token
+  session[:request_token] = @req_token.token
+  session[:request_token_secret] = @req_token.secret
+  OAuth::RequestToken.stub!(:new).and_return(@req_token)
   response = OpenStruct.new()
   response.body = {"following"=>false, "listed_count"=>0, "profile_link_color"=>"0084B4", "profile_image_url"=>"http://a1.twimg.com/profile_images/536178575/noamb_normal.jpg", "description"=>"Programmer/Heavy Metal Fan/New Father", "status"=>{"text"=>"coming soon to sorcery gem: twitter and facebook authentication support.", "truncated"=>false, "favorited"=>false, "source"=>"web", "geo"=>nil, "in_reply_to_screen_name"=>nil, "in_reply_to_user_id"=>nil, "in_reply_to_status_id_str"=>nil, "created_at"=>"Sun Mar 06 23:01:12 +0000 2011", "contributors"=>nil, "place"=>nil, "retweeted"=>false, "in_reply_to_status_id"=>nil, "in_reply_to_user_id_str"=>nil, "coordinates"=>nil, "retweet_count"=>0, "id"=>44533012284706816, "id_str"=>"44533012284706816"}, "show_all_inline_media"=>false, "geo_enabled"=>true, "profile_sidebar_border_color"=>"a8c7f7", "url"=>nil, "followers_count"=>10, "screen_name"=>"nbenari", "profile_use_background_image"=>true, "location"=>"Israel", "statuses_count"=>25, "profile_background_color"=>"022330", "lang"=>"en", "verified"=>false, "notifications"=>false, "profile_background_image_url"=>"http://a3.twimg.com/profile_background_images/104087198/04042010339.jpg", "favourites_count"=>5, "created_at"=>"Fri Nov 20 21:58:19 +0000 2009", "is_translator"=>false, "contributors_enabled"=>false, "protected"=>false, "follow_request_sent"=>false, "time_zone"=>"Greenland", "profile_text_color"=>"333333", "name"=>"Noam Ben Ari", "friends_count"=>10, "profile_sidebar_fill_color"=>"C0DFEC", "id"=>123, "id_str"=>"91434812", "profile_background_tile"=>false, "utc_offset"=>-10800}.to_json
   @acc_token.stub!(:get).and_return(response)
@@ -17,19 +19,19 @@ end
 
 describe ApplicationController do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/oauth")
-    sorcery_reload!([:oauth])
-    sorcery_controller_property_set(:oauth_providers, [:twitter])
+    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
+    sorcery_reload!([:external])
+    sorcery_controller_property_set(:external_providers, [:twitter])
     sorcery_controller_oauth_property_set(:twitter, :key, "eYVNBjBDi33aa9GkA3w")
     sorcery_controller_oauth_property_set(:twitter, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
     sorcery_controller_oauth_property_set(:twitter, :callback_url, "http://blabla.com")
   end
   
   after(:all) do
-    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/oauth")
+    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
   end
   # ----------------- OAuth -----------------------
-  describe ApplicationController, "'login_from_access_token'" do
+  describe ApplicationController, "'login_from'" do
   
     before(:each) do
       stub_all_oauth_requests!
@@ -37,11 +39,12 @@ describe ApplicationController do
       
     after(:each) do
       User.delete_all
+      Authentication.delete_all
     end
     
-    it "auth_at_provider redirects correctly" do
+    it "login_at redirects correctly" do
       create_new_user
-      get :auth_at_provider_test
+      get :login_at_test
       response.should be_a_redirect
       response.should redirect_to("http://myapi.com/oauth/authorize?oauth_callback=http%3A%2F%2Fblabla.com&oauth_token=")
     end
@@ -49,22 +52,23 @@ describe ApplicationController do
     it "logins if user exists" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_external_user(:twitter)
-      get :test_login_from_access_token, :oauth_verifier => "blablaRERASDFcxvSDFA"
+      get :test_login_from, :oauth_verifier => "blablaRERASDFcxvSDFA"
       flash[:notice].should == "Success!"
     end
     
-    it "'login_from_access_token' fails if user doesn't exist" do
+    it "'login_from' fails if user doesn't exist" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_user
-      get :test_login_from_access_token, :oauth_verifier => "blablaRERASDFcxvSDFA"
+      get :test_login_from, :oauth_verifier => "blablaRERASDFcxvSDFA"
       flash[:alert].should == "Failed!"
     end
   end
   
-  describe ApplicationController, "'create_from_provider!'" do
+  describe ApplicationController, "'create_from'" do
     before(:each) do
       stub_all_oauth_requests!
       User.delete_all
+      Authentication.delete_all
     end
       
     it "should create a new user" do
@@ -89,7 +93,7 @@ describe ApplicationController do
   describe ApplicationController, "OAuth with User Activation features" do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activation")
-      sorcery_reload!([:user_activation,:oauth], :user_activation_mailer => ::SorceryMailer)
+      sorcery_reload!([:user_activation,:external], :user_activation_mailer => ::SorceryMailer)
     end
     
     after(:all) do
@@ -98,6 +102,7 @@ describe ApplicationController do
     
     after(:each) do
       User.delete_all
+      Authentication.delete_all
     end
     
     it "should not send activation email to external users" do

data/spec/rails3/app_root/spec/controller_session_timeout_spec.rb

@@ -27,7 +27,7 @@ describe ApplicationController do
     
     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)
-      login_user
+      get :test_login, :username => 'gizmo', :password => 'secret'
       sleep 0.3
       get :test_should_be_logged_in
       session[:user_id].should_not be_nil
@@ -39,7 +39,7 @@ describe ApplicationController do
     
     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)
-      login_user
+      get :test_login, :username => 'gizmo', :password => 'secret'
       sleep 0.6
       get :test_should_be_logged_in
       session[:user_id].should be_nil

data/spec/rails3/app_root/spec/spec_helper.rb

@@ -53,6 +53,7 @@ Spork.prefork do
   end
   
   include ::Sorcery::TestHelpers
+  include ::Sorcery::TestHelpers::Rails
   
 end
 

data/spec/rails3/app_root/spec/user_oauth_spec.rb

@@ -2,19 +2,19 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "User with oauth submodule" do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/oauth")
+    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
   end
   
   after(:all) do
-    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/oauth")
+    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
   end
 
   # ----------------- PLUGIN CONFIGURATION -----------------------
   describe User, "loaded plugin configuration" do
   
     before(:all) do
-      sorcery_reload!([:oauth])
-      sorcery_controller_property_set(:oauth_providers, [:twitter])
+      sorcery_reload!([:external])
+      sorcery_controller_property_set(:external_providers, [:twitter])
       sorcery_model_property_set(:authentications_class, Authentication)
       sorcery_controller_oauth_property_set(:twitter, :key, "eYVNBjBDi33aa9GkA3w")
       sorcery_controller_oauth_property_set(:twitter, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")

data/spec/rails3/app_root/spec/user_spec.rb

@@ -286,12 +286,12 @@ describe "User with no submodules (core)" do
   
   describe User, "external users" do
     before(:all) do
-      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/oauth")
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
       sorcery_reload!()
     end
   
     after(:all) do
-      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/oauth")
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
     end
     
     before(:each) do

data/spec/sinatra/Gemfile

@@ -0,0 +1,12 @@
+source 'http://rubygems.org'
+
+gem 'sinatra', '>= 1.2.0'
+gem 'sqlite3-ruby', :require => 'sqlite3'
+gem "sorcery", '0.3.1', :path => '../../'
+
+group :development, :test do
+  gem 'rspec'
+  gem 'ruby-debug19'
+  gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
+  gem 'spork', '~> 0.9.0.rc'
+end