sorcery 0.3.0 → 0.3.1

data/spec/rails3/app_root/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../../
   specs:
-    sorcery (0.3.0)
+    sorcery (0.3.1)
       bcrypt-ruby (~> 2.1.4)
       json (>= 1.5.1)
       oauth (>= 0.4.4)
@@ -131,6 +131,6 @@ DEPENDENCIES
   rspec-rails
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.3.0)!
+  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
@@ -35,29 +35,29 @@ describe ApplicationController do
       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
@@ -86,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

@@ -19,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!
@@ -42,9 +42,9 @@ describe ApplicationController do
       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
@@ -52,19 +52,19 @@ 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
@@ -93,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

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

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'sinatra', '>= 1.2.0'
 gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "sorcery", '0.3.0', :path => '../../'
+gem "sorcery", '0.3.1', :path => '../../'
 
 group :development, :test do
   gem 'rspec'

data/spec/sinatra/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.3.0)
+    sorcery (0.3.1)
       bcrypt-ruby (~> 2.1.4)
       json (>= 1.5.1)
       oauth (>= 0.4.4)
@@ -129,6 +129,6 @@ DEPENDENCIES
   ruby-debug19
   simplecov (>= 0.3.8)
   sinatra (>= 1.2.0)
-  sorcery (= 0.3.0)!
+  sorcery (= 0.3.1)!
   spork (~> 0.9.0.rc)
   sqlite3-ruby

data/spec/sinatra/myapp.rb

@@ -53,7 +53,7 @@ end
 post '/test_return_to' do
   session[:return_to_url] = params[:return_to_url] if params[:return_to_url]
   @user = login(params[:username], params[:password])
-  return_or_redirect_to(:some_action)
+  redirect_back_or_to(:some_action)
 end
 
 get '/test_should_be_logged_in' do
@@ -96,12 +96,12 @@ end
 
 # oauth
 
-get '/auth_at_provider_test' do
-  auth_at_provider(:twitter)
+get '/login_at_test' do
+  login_at(:twitter)
 end
 
-get '/test_login_from_access_token' do
-  if @user = login_from_access_token(:twitter)
+get '/test_login_from' do
+  if @user = login_from(:twitter)
     erb "Success!"
   else
     erb "Failed!"
@@ -110,12 +110,12 @@ end
 
 # oauth2
 
-get '/auth_at_provider_test2' do
-  auth_at_provider(:facebook)
+get '/login_at_test2' do
+  login_at(:facebook)
 end
 
-get '/test_login_from_access_token2' do
-  if @user = login_from_access_token(:facebook)
+get '/test_login_from2' do
+  if @user = login_from(:facebook)
     erb "Success!"
   else
     erb "Failed!"
@@ -124,8 +124,8 @@ end
 
 get '/test_create_from_provider' do
   provider = params[:provider]
-  login_from_access_token(provider)
-  if @user = create_from_provider!(provider)
+  login_from(provider)
+  if @user = create_from(provider)
     erb "Success!"
   else
     erb "Failed!"

data/spec/sinatra/spec/controller_oauth2_spec.rb

@@ -12,16 +12,16 @@ end
 
 describe 'MyApp' do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/oauth")
-    sorcery_reload!([:oauth])
-    sorcery_controller_property_set(:oauth_providers, [:facebook])
+    ActiveRecord::Migrator.migrate("#{APP_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("#{APP_ROOT}/db/migrate/oauth")
+    ActiveRecord::Migrator.rollback("#{APP_ROOT}/db/migrate/external")
   end
   # ----------------- OAuth -----------------------
   describe Sinatra::Application, "with OAuth features" do
@@ -35,29 +35,29 @@ describe 'MyApp' do
       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"
       last_response.should be_a_redirect
       last_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"
       last_response.body.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"
       last_response.body.should == "Failed!"
     end
   end
   
-  describe Sinatra::Application, "'create_from_provider!'" do
+  describe Sinatra::Application, "'create_from'" do
     before(:each) do
       stub_all_oauth2_requests!
       User.delete_all
@@ -86,8 +86,8 @@ describe 'MyApp' do
   describe Sinatra::Application, "OAuth with User Activation features" do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{APP_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/sinatra/spec/controller_oauth_spec.rb

@@ -18,19 +18,19 @@ end
 
 describe Sinatra::Application do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/oauth")
-    sorcery_reload!([:oauth])
-    sorcery_controller_property_set(:oauth_providers, [:twitter])
+    ActiveRecord::Migrator.migrate("#{APP_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("#{APP_ROOT}/db/migrate/oauth")
+    ActiveRecord::Migrator.rollback("#{APP_ROOT}/db/migrate/external")
   end
   # ----------------- OAuth -----------------------
-  describe Sinatra::Application, "'login_from_access_token'" do
+  describe Sinatra::Application, "'login_from'" do
   
     before(:each) do
       stub_all_oauth_requests!
@@ -41,9 +41,9 @@ describe Sinatra::Application do
       Authentication.delete_all
     end
     
-    it "auth_at_provider redirects correctly" do
+    it "login_at_test redirects correctly" do
       create_new_user
-      get "/auth_at_provider_test"
+      get "/login_at_test"
       last_response.should be_a_redirect
       last_response.should redirect_to("http://myapi.com/oauth/authorize?oauth_callback=http%3A%2F%2Fblabla.com&oauth_token=")
     end
@@ -51,19 +51,19 @@ describe Sinatra::Application 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"
       last_response.body.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"
       last_response.body.should == "Failed!"
     end
   end
   
-  describe Sinatra::Application, "'create_from_provider!'" do
+  describe Sinatra::Application, "'create_from'" do
     before(:each) do
       stub_all_oauth_requests!
       User.delete_all
@@ -92,7 +92,7 @@ describe Sinatra::Application do
   describe Sinatra::Application, "OAuth with User Activation features" do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{APP_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

data/spec/sinatra/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("#{APP_ROOT}/db/migrate/oauth")
+    ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/external")
   end
   
   after(:all) do
-    ActiveRecord::Migrator.rollback("#{APP_ROOT}/db/migrate/oauth")
+    ActiveRecord::Migrator.rollback("#{APP_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/sinatra/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("#{APP_ROOT}/db/migrate/oauth")
+      ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/external")
       sorcery_reload!()
     end
   
     after(:all) do
-      ActiveRecord::Migrator.rollback("#{APP_ROOT}/db/migrate/oauth")
+      ActiveRecord::Migrator.rollback("#{APP_ROOT}/db/migrate/external")
     end
     
     before(:each) do

metadata

@@ -2,7 +2,7 @@
 name: sorcery
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +03:00
+date: 2011-04-17 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -200,7 +200,7 @@ files:
 - 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/oauth.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
@@ -209,12 +209,14 @@ files:
 - 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
@@ -227,7 +229,7 @@ files:
 - 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
@@ -280,7 +282,7 @@ files:
 - 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
@@ -327,7 +329,7 @@ files:
 - 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/oauth/20101224223628_create_authentications.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
@@ -406,7 +408,7 @@ test_files:
 - 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
@@ -433,7 +435,7 @@ test_files:
 - 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/oauth/20101224223628_create_authentications.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

data/lib/sorcery/controller/submodules/oauth/oauth1.rb

@@ -1,33 +0,0 @@
-require 'oauth'
-module Sorcery
-  module Controller
-    module Submodules
-      module Oauth
-        module Oauth1
-          def oauth_version
-            "1.0"
-          end
-          
-          def get_request_token(token=nil,secret=nil)
-            return ::OAuth::RequestToken.new(get_consumer,token,secret) if token && secret
-            get_consumer.get_request_token(:oauth_callback => @callback_url)
-          end
-          
-          def authorize_url(args)
-            get_request_token(args[:request_token],args[:request_token_secret]).authorize_url(:oauth_callback => @callback_url)
-          end
-          
-          def get_access_token(args)
-            get_request_token(args[:request_token],args[:request_token_secret]).get_access_token(:oauth_verifier => args[:oauth_verifier])
-          end
-          
-          protected
-          
-          def get_consumer
-            ::OAuth::Consumer.new(@key, @secret, :site => @site)
-          end
-        end
-      end
-    end
-  end
-end