sorcery 0.3.0 → 0.3.1

data/README.rdoc

@@ -6,7 +6,7 @@ Crypto code taken almost unchanged from Authlogic.
 OAuth code inspired by OmniAuth and Ryan Bates's railscasts about it.
 
 
-== Summary
+== Philosophy
 
 
 Sorcery is a stripped-down, bare-bones authentication library, with which you can write your own authentication flow.
@@ -28,7 +28,7 @@ Example Rails 3 app using sorcery: https://github.com/NoamB/sorcery-example-app
 
 Example Sinatra app using sorcery: https://github.com/NoamB/sorcery-example-app-sinatra
 
-Documentation: http://rubydoc.info/gems/sorcery/0.3.0/frames
+Documentation: http://rubydoc.info/gems/sorcery/0.3.1/frames
 
 Check out the tutorials in the github wiki!
 
@@ -88,10 +88,44 @@ To generate migrations for both the core AND 'remember_me' submodule:
 These migrations use the default fields. You can choose to use these migrations or make your own tables and fields. Sorcery tries not to impose a database structure and naming scheme on your application.
 
 
-== Usage
+== API Summary
 
+Below is a summary of the library methods. Most method names are self explaining and the rest are commented:
 
-Please see the tutorials in the github wiki.
+  # core
+  require_login # this is a before filter
+  login(username,password,remember_me = false)
+  logout
+  logged_in?
+  current_user
+  redirect_back_or_to # used when a user tries to access a page while logged out, is asked to login, and we want to return him back to the page he originally wanted.
+  @user.external? # external users, such as facebook/twitter etc.
+
+  # activity logging
+  current_users
+
+  # http basic auth
+  require_login_from_http_basic # this is a before filter
+
+  # external
+  login_at(provider) # sends the user to an external service (twitter etc.) to authenticate.
+  login_from(provider) # tries to login from the external provider's callback.
+  create_from(provider) # create the user in the local app db.
+
+  # remember me
+  remember_me!
+  forget_me!
+
+  # reset password
+  User.load_from_reset_password_token(token)
+  @user.deliver_reset_password_instructions!
+  @user.reset_password!(params)
+
+  # user activation
+  User.load_from_activation_token(token)
+  @user.activate!
+
+Please see the tutorials in the github wiki for detailed usage information.
 
 
 == Full Features List by module:
@@ -137,7 +171,7 @@ Activity Logging (see lib/sorcery/model/submodules/activity_logging.rb):
 * an easy method of collecting the list of currently logged in users.
 * configurable timeout by which to decide whether to include a user in the list of logged in users.
 
-Oauth (see lib/sorcery/controller/submodules/oauth.rb):
+External (see lib/sorcery/controller/submodules/external.rb):
 * OAuth1 and OAuth2 support (currently twitter & facebook)
 * configurable db field names and authentications table.
 
@@ -150,14 +184,18 @@ I've got many plans which include (by priority):
 * Simple auth (no user)
 * Switching authentication mode at runtime (Maintenance mode)
 * Mongoid support
-* Configurable Auto login on registration/activation
 * Other reset password strategies (security questions?)
 * Other brute force protection strategies (captcha)
 * Have an idea? Let me know, and it might get into the gem!
 
+Other stuff:
+* Improve documentation
+* Tty to reduce the number of library methods, and find better names to some
+
 
 == Contributing to sorcery
 
+
 Your feedback is very welcome and will make this gem much much better for you, me and everyone else.
 Besides feedback on code, features, suggestions and bug reports, you may want to actually make an impact on the code.
 For this:

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/generators/sorcery_migration/templates/{oauth.rb → external.rb}

@@ -1,4 +1,4 @@
-class SorceryOauth < ActiveRecord::Migration
+class SorceryExternal < ActiveRecord::Migration
   def self.up
     create_table :authentications do |t|
       t.integer :user_id, :null => false

data/lib/sorcery/controller/submodules/email.rb

@@ -0,0 +1,44 @@
+# module Sorcery
+#   module Controller
+#     module Submodules
+#       # This module allows you to authenticate to the site using a mail server.
+#       # Let's say your organization is called blup, and everyone has someklutz@blup.com,
+#       # Instead of registering a new username and password for an internal web application,
+#       # why not simply reuse your email credentials?
+#       # Of course this means that if the mail server is down, nobody can authenticate to your app.
+#       # I might add a fallback for that in the future.
+#       module Email
+#         def self.included(base)
+#           base.send(:include, InstanceMethods)
+#           Config.module_eval do
+#             class << self
+#               attr_reader :email_protocols                           # email protocols like pop3, IMAP etc.
+#                                           
+#               def merge_mail_defaults!
+#                 @defaults.merge!(:@email_protocols => [])
+#               end
+#               
+#               def email_protocols=(protocols)
+#                 protocols.each do |protocol|
+#                   include Protocols.const_get(protocol.to_s.split("_").map {|p| p.capitalize}.join(""))
+#                 end
+#               end
+#             end
+#             merge_mail_defaults!
+#           end
+#         end
+# 
+#         module InstanceMethods
+#           protected
+#           
+#           # sends user to authenticate at the provider's website.
+#           # after authentication the user is redirected to the callback defined in the provider config
+#           def login_at(protocol)
+# 
+#           end
+# 
+#         end
+#       end
+#     end
+#   end
+# end

data/lib/sorcery/controller/submodules/external/protocols/oauth1.rb

@@ -0,0 +1,35 @@
+require 'oauth'
+module Sorcery
+  module Controller
+    module Submodules
+      module External
+        module Protocols
+          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
+end

data/lib/sorcery/controller/submodules/external/protocols/oauth2.rb

@@ -0,0 +1,26 @@
+require 'oauth2'
+module Sorcery
+  module Controller
+    module Submodules
+      module External
+        module Protocols
+          module Oauth2
+            def oauth_version
+              "2.0"
+            end
+          
+            def authorize_url(*args)
+              client = ::OAuth2::Client.new(@key, @secret, :site => @site)
+              client.web_server.authorize_url(:redirect_uri => @callback_url, :scope => @scope)
+            end
+          
+            def get_access_token(args)
+              client = ::OAuth2::Client.new(@key, @secret, :site => @site)
+              client.web_server.get_access_token(args[:code], :redirect_uri => @callback_url)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sorcery/controller/submodules/{oauth → external}/providers/facebook.rb

@@ -1,7 +1,7 @@
 module Sorcery
   module Controller
     module Submodules
-      module Oauth
+      module External
         module Providers
           # This module adds support for OAuth with facebook.com.
           # When included in the 'config.providers' option, it adds a new option, 'config.facebook'.
@@ -16,7 +16,7 @@ module Sorcery
               base.module_eval do
                 class << self
                   attr_reader :facebook                           # access to facebook_client.
-          
+                  
                   def merge_facebook_defaults!
                     @defaults.merge!(:@facebook => FacebookClient)
                   end
@@ -36,7 +36,7 @@ module Sorcery
                               :scope,
                               :user_info_mapping
                             
-                include Oauth2
+                include Protocols::Oauth2
             
                 def init
                   @site           = "https://graph.facebook.com"
@@ -45,13 +45,31 @@ module Sorcery
                   @user_info_mapping = {}
                 end
                 
-                def get_user_hash(access_token)
+                def get_user_hash
                   user_hash = {}
-                  response = access_token.get(@user_info_path)
+                  response = @access_token.get(@user_info_path)
                   user_hash[:user_info] = JSON.parse(response)
-                  user_hash[:uid] = user_hash[:user_info]['id'].to_i
+                  user_hash[:uid] = user_hash[:user_info]['id']
                   user_hash
                 end
+                
+                def has_callback?
+                  true
+                end
+                
+                # calculates and returns the url to which the user should be redirected,
+                # to get authenticated at the external provider's site.
+                def login_url(params,session)
+                  self.authorize_url
+                end
+                
+                # tries to login the user from access token
+                def process_callback(params,session)
+                  args = {}
+                  args.merge!({:code => params[:code]}) if params[:code]
+                  @access_token = self.get_access_token(args)
+                end
+                
               end
               init
             end

data/lib/sorcery/controller/submodules/{oauth → external}/providers/twitter.rb

@@ -1,7 +1,7 @@
 module Sorcery
   module Controller
     module Submodules
-      module Oauth
+      module External
         module Providers
           # This module adds support for OAuth with Twitter.com.
           # When included in the 'config.providers' option, it adds a new option, 'config.twitter'.
@@ -15,7 +15,10 @@ module Sorcery
             def self.included(base)
               base.module_eval do
                 class << self
-                  attr_reader :twitter                           # access to twitter_client.
+                  attr_reader :twitter
+                  # def twitter(&blk) # allows block syntax.
+                  #   yield @twitter
+                  # end                           
 
                   def merge_twitter_defaults!
                     @defaults.merge!(:@twitter => TwitterClient)
@@ -25,7 +28,7 @@ module Sorcery
                 update!
               end
             end
-
+            
             module TwitterClient
               class << self
                 attr_accessor :key,
@@ -35,7 +38,7 @@ module Sorcery
                               :user_info_path,
                               :user_info_mapping
                 
-                include Oauth1
+                include Protocols::Oauth1
                 
                 def init
                   @site           = "https://api.twitter.com"
@@ -43,13 +46,35 @@ module Sorcery
                   @user_info_mapping = {}
                 end
                 
-                def get_user_hash(access_token)
+                def get_user_hash
                   user_hash = {}
-                  response = access_token.get(@user_info_path)
+                  response = @access_token.get(@user_info_path)
                   user_hash[:user_info] = JSON.parse(response.body)
                   user_hash[:uid] = user_hash[:user_info]['id']
                   user_hash
                 end
+                
+                def has_callback?
+                  true
+                end
+                
+                # calculates and returns the url to which the user should be redirected,
+                # to get authenticated at the external provider's site.
+                def login_url(params,session)
+                  req_token = self.get_request_token
+                  session[:request_token]         = req_token.token
+                  session[:request_token_secret]  = req_token.secret
+                  self.authorize_url({:request_token => req_token.token, :request_token_secret => req_token.secret})
+                end
+                
+                # tries to login the user from access token
+                def process_callback(params,session)
+                  args = {}
+                  args.merge!({:oauth_verifier => params[:oauth_verifier], :request_token => session[:request_token], :request_token_secret => session[:request_token_secret]})
+                  args.merge!({:code => params[:code]}) if params[:code]
+                  @access_token = self.get_access_token(args)
+                end
+
               end  
               init
             end

data/lib/sorcery/controller/submodules/external.rb

@@ -0,0 +1,83 @@
+module Sorcery
+  module Controller
+    module Submodules
+      # This submodule helps you login users from external auth providers such as Twitter.
+      # This is the controller part which handles the http requests and tokens passed between the app and the provider.
+      module External
+        def self.included(base)
+          base.send(:include, InstanceMethods)
+          Config.module_eval do
+            class << self
+              attr_reader :external_providers                           # external providers like twitter.
+                                          
+              def merge_external_defaults!
+                @defaults.merge!(:@external_providers => [])
+              end
+              
+              def external_providers=(providers)
+                providers.each do |provider|
+                  include Providers.const_get(provider.to_s.split("_").map {|p| p.capitalize}.join(""))
+                end
+              end
+            end
+            merge_external_defaults!
+          end
+        end
+
+        module InstanceMethods
+          protected
+          
+          # sends user to authenticate at the provider's website.
+          # after authentication the user is redirected to the callback defined in the provider config
+          def login_at(provider, args = {})
+            @provider = Config.send(provider)
+            if @provider.has_callback?
+              redirect_to @provider.login_url(params,session)
+            else
+              #@provider.login(args)
+            end
+          end
+          
+          # tries to login the user from provider's callback
+          def login_from(provider)
+            @provider = Config.send(provider)
+            @provider.process_callback(params,session)
+            @user_hash = @provider.get_user_hash
+            if user = Config.user_class.load_from_provider(provider,@user_hash[:uid])
+              reset_session
+              login_user(user)
+              user
+            end
+          end
+          
+          # this method automatically creates a new user from the data in the external user hash.
+          # The mappings from user hash fields to user db fields are set at controller config.
+          # If the hash field you would like to map is nested, use slashes. For example, Given a hash like:
+          #
+          #   "user" => {"name"=>"moishe"}
+          #
+          # You will set the mapping:
+          #
+          #   {:username => "user/name"}
+          #
+          # And this will cause 'moishe' to be set as the value of :username field.
+          def create_from(provider)
+            provider = provider.to_sym
+            @provider = Config.send(provider)
+            @user_hash = @provider.get_user_hash
+            config = Config.user_class.sorcery_config
+            attrs = {}
+            @provider.user_info_mapping.each do |k,v|
+              (varr = v.split("/")).size > 1 ? attrs.merge!(k => varr.inject(@user_hash[:user_info]) {|hsh,v| hsh[v] }) : attrs.merge!(k => @user_hash[:user_info][v])
+            end
+            Config.user_class.transaction do
+              @user = Config.user_class.create!(attrs)
+              Config.user_class.sorcery_config.authentications_class.create!({config.authentications_user_id_attribute_name => @user.id, config.provider_attribute_name => provider, config.provider_uid_attribute_name => @user_hash[:uid]})
+            end
+            @user
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sorcery/controller.rb

@@ -5,7 +5,7 @@ module Sorcery
         extend ClassMethods
         include InstanceMethods
         Config.submodules.each do |mod|
-          begin # FIXME: is this protection needed?
+          begin
             include Submodules.const_get(mod.to_s.split("_").map {|p| p.capitalize}.join("")) 
           rescue NameError
             # don't stop on a missing submodule.
@@ -73,12 +73,14 @@ module Sorcery
         @current_user ||= login_from_session || login_from_other_sources unless @current_user == false
       end
       
-      def return_or_redirect_to(url, flash_hash = {})
+      # used when a user tries to access a page while logged out, is asked to login, and we want to return him back to the page he originally wanted.
+      def redirect_back_or_to(url, flash_hash = {})
         redirect_to(session[:return_to_url] || url, :flash => flash_hash)
       end
       
       # The default action for denying non-authenticated users.
-      # You can override this method in your controllers.
+      # You can override this method in your controllers,
+      # or provide a different method in the configuration.
       def not_authenticated
         redirect_to root_path
       end

data/lib/sorcery/model/submodules/{oauth.rb → external.rb}

@@ -1,9 +1,9 @@
 module Sorcery
   module Model
     module Submodules
-      # This submodule helps you login users from OAuth providers such as Twitter.
+      # This submodule helps you login users from external providers such as Twitter.
       # This is the model part which handles finding the user using access tokens.
-      # For the controller options see Sorcery::Controller::Oauth.
+      # For the controller options see Sorcery::Controller::External.
       #
       # Socery assumes (read: requires) you will create external users in the same table where you keep your regular users,
       # but that you will have a separate table for keeping their external authentication data,
@@ -11,7 +11,7 @@ module Sorcery
       #
       # External users will have a null crypted_password field, since we do not hold their password.
       # They will not be sent activation emails on creation.
-      module Oauth
+      module External
         def self.included(base)
           base.sorcery_config.class_eval do
             attr_accessor :authentications_class,

data/lib/sorcery/model.rb

@@ -56,12 +56,6 @@ module Sorcery
         user if user && @sorcery_config.before_authenticate.all? {|c| user.send(c)} && credentials_match?(user.send(@sorcery_config.crypted_password_attribute_name),credentials[1],_salt)
       end
       
-      # Calls the configured encryption provider to compare the supplied password with the encrypted one.
-      def credentials_match?(crypted, *tokens)
-        return crypted == tokens.join if @sorcery_config.encryption_provider.nil?
-        @sorcery_config.encryption_provider.matches?(crypted, *tokens)
-      end
-      
       # encrypt tokens using current encryption_provider.
       def encrypt(*tokens)
         return tokens.first if @sorcery_config.encryption_provider.nil?
@@ -71,6 +65,15 @@ module Sorcery
         CryptoProviders::AES256.key = @sorcery_config.encryption_key if @sorcery_config.encryption_algorithm == :aes256
         @sorcery_config.encryption_provider.encrypt(*tokens)
       end
+      
+      protected
+      
+      # Calls the configured encryption provider to compare the supplied password with the encrypted one.
+      def credentials_match?(crypted, *tokens)
+        return crypted == tokens.join if @sorcery_config.encryption_provider.nil?
+        @sorcery_config.encryption_provider.matches?(crypted, *tokens)
+      end
+      
     end
     
     module InstanceMethods

data/lib/sorcery.rb

@@ -8,7 +8,7 @@ module Sorcery
       autoload :RememberMe, 'sorcery/model/submodules/remember_me'
       autoload :ActivityLogging, 'sorcery/model/submodules/activity_logging'
       autoload :BruteForceProtection, 'sorcery/model/submodules/brute_force_protection'
-      autoload :Oauth, 'sorcery/model/submodules/oauth'
+      autoload :External, 'sorcery/model/submodules/external'
     end
   end
   autoload :Controller, 'sorcery/controller'
@@ -19,13 +19,15 @@ module Sorcery
       autoload :BruteForceProtection, 'sorcery/controller/submodules/brute_force_protection'
       autoload :HttpBasicAuth, 'sorcery/controller/submodules/http_basic_auth'
       autoload :ActivityLogging, 'sorcery/controller/submodules/activity_logging'
-      autoload :Oauth, 'sorcery/controller/submodules/oauth'
-      module Oauth
-        autoload :Oauth1, 'sorcery/controller/submodules/oauth/oauth1'
-        autoload :Oauth2, 'sorcery/controller/submodules/oauth/oauth2'
+      autoload :External, 'sorcery/controller/submodules/external'
+      module External
+        module Protocols
+          autoload :Oauth1, 'sorcery/controller/submodules/external/protocols/oauth1'
+          autoload :Oauth2, 'sorcery/controller/submodules/external/protocols/oauth2'
+        end
         module Providers
-          autoload :Twitter, 'sorcery/controller/submodules/oauth/providers/twitter'
-          autoload :Facebook, 'sorcery/controller/submodules/oauth/providers/facebook'
+          autoload :Twitter, 'sorcery/controller/submodules/external/providers/twitter'
+          autoload :Facebook, 'sorcery/controller/submodules/external/providers/facebook'
         end
       end
     end

data/sorcery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sorcery}
-  s.version = "0.3.0"
+  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-04-04}
+  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 = [
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     "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",
@@ -38,12 +38,14 @@ Gem::Specification.new do |s|
     "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",
@@ -56,7 +58,7 @@ 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",
@@ -109,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",
@@ -156,7 +158,7 @@ Gem::Specification.new do |s|
     "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",
@@ -213,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",
@@ -240,7 +242,7 @@ Gem::Specification.new do |s|
     "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/spec/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem "rails", '3.0.3'
 gem 'bcrypt-ruby', :require => 'bcrypt'
-gem "sorcery", '0.3.0', :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.3.0)
+    sorcery (0.3.1)
 
 GEM
   remote: http://rubygems.org/
@@ -118,4 +118,4 @@ DEPENDENCIES
   rspec
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.3.0)!
+  sorcery (= 0.3.1)!

data/spec/rails3/app_root/Gemfile

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