changing to v0.3.1 API

Gemfile

@@ -2,4 +2,4 @@ source 'http://rubygems.org'
 
 gem 'sinatra', '>= 1.2.0'
 gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "sorcery", '0.2.1'
+gem "sorcery", '0.3.1'

Gemfile.lock

@@ -75,7 +75,7 @@ GEM
     sinatra (1.2.1)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
-    sorcery (0.2.1)
+    sorcery (0.3.1)
       bcrypt-ruby (~> 2.1.4)
       json (>= 1.5.1)
       oauth (>= 0.4.4)

myapp.rb

@@ -32,7 +32,7 @@
 
 # models
 require 'sorcery'
-Sorcery::Controller::Config.submodules = [:user_activation, :http_basic_auth, :remember_me, :reset_password, :session_timeout, :brute_force_protection, :activity_logging, :oauth]
+Sorcery::Controller::Config.submodules = [:user_activation, :http_basic_auth, :remember_me, :reset_password, :session_timeout, :brute_force_protection, :activity_logging, :external]
 include Sorcery::Controller::Adapters::Sinatra
 include Sorcery::Controller
 
@@ -42,7 +42,7 @@
 
   config.controller_to_realm_map = {"application" => "Application", "users" => "Users"}
 
-  config.oauth_providers = [:twitter, :facebook]
+  config.external_providers = [:twitter, :facebook]
 
   config.twitter.key = "eYVNBjBDi33aa9GkA3w"
   config.twitter.secret = "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8"
@@ -177,19 +177,19 @@ def not_authenticated
   erb "HTTP Basic Auth"
 end
 
-# OAuth
+# External
 get '/auth_at_provider' do
-  auth_at_provider(params[:provider])
+  login_at(params[:provider])
 end
 
 get '/oauth/callback' do
   provider = params[:provider]
-  @user = login_from_access_token(provider)
+  @user = login_from(provider)
   if @user
     session[:notice] = "Success!"
     redirect '/'
   else
-    if @user = create_from_provider!(provider)
+    if @user = create_from(provider)
       @user.activate!
       session.clear # protect from session fixation attack
       login_user(@user)