sorcery 0.8.1 → 0.8.2

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

@@ -27,6 +27,7 @@ module Sorcery
             end
 
             module VkClient
+              include Base::BaseClient
               class << self
                 attr_accessor :key,
                               :secret,
@@ -47,16 +48,16 @@ module Sorcery
                   @user_info_mapping = {}
                 end
 
-                def get_user_hash
+                def get_user_hash(access_token)
                   user_hash = {}
 
                   params = {
-                    :access_token => @access_token.token,
-                    :uids         => @access_token.params["user_id"],
+                    :access_token => access_token.token,
+                    :uids         => access_token.params["user_id"],
                     :fields       => @user_info_mapping.values.join(",")
                   }
 
-                  response = @access_token.get(@user_info_url, :params => params)
+                  response = access_token.get(@user_info_url, :params => params)
                   if user_hash[:user_info] = JSON.parse(response.body)
                     user_hash[:user_info] = user_hash[:user_info]["response"][0]
                     # add full_name - useful if you do not store it in separate fields
@@ -84,7 +85,7 @@ module Sorcery
                     :token_url    => @token_path,
                     :token_method => :post
                   }
-                  @access_token = self.get_access_token(args, options)
+                  return self.get_access_token(args, options)
                 end
 
               end

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

@@ -0,0 +1,97 @@
+module Sorcery
+  module Controller
+    module Submodules
+      module External
+        module Providers
+          # This module adds support for OAuth with xing.com.
+          # When included in the 'config.providers' option, it adds a new option, 'config.xing'.
+          # Via this new option you can configure Xing specific settings like your app's key and secret.
+          #
+          #   config.xing.key = <key>
+          #   config.xing.secret = <secret>
+          #   ...
+          #
+          module Xing
+            def self.included(base)
+              base.module_eval do
+                class << self
+                  attr_reader :xing
+
+                  def merge_xing_defaults!
+                    @defaults.merge!(:@xing => XingClient)
+                  end
+                end
+                merge_xing_defaults!
+                update!
+              end
+            end
+
+            module XingClient
+              include Base::BaseClient
+              class << self
+                attr_accessor :key,
+                              :secret,
+                              :callback_url,
+                              :site,
+                              :authorize_path,
+                              :request_token_path,
+                              :access_token_path,
+                              :user_info_path,
+                              :user_info_mapping
+                attr_reader   :access_token
+
+                include Protocols::Oauth1
+
+                # Override included get_consumer method to provide authorize_path
+                def get_consumer
+                  ::OAuth::Consumer.new(@key, @secret, @configuration)
+                end
+
+                def init
+                  @configuration = {
+                      site: "https://api.xing.com/v1",
+                      authorize_path: '/authorize',
+                      request_token_path: '/request_token',
+                      access_token_path: '/access_token'
+                  }
+                  @user_info_path = "/users/me"
+                end
+
+                def get_user_hash(access_token)
+                  user_hash = {}
+                  response = access_token.get(@user_info_path)
+                  user_hash[:user_info] = JSON.parse(response.body)['users'].first
+                  user_hash[:uid] = user_hash[:user_info]['id'].to_s
+                  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]
+                  return self.get_access_token(args)
+                end
+
+              end
+              init
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ 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.
+      # 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)
@@ -29,57 +29,94 @@ module Sorcery
         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_name, args = {})
-            provider = Config.send(provider_name)
-            if provider.callback_url.present? && provider.callback_url[0] == '/'
+          # save the singleton ProviderClient instance into @provider
+          def sorcery_get_provider(provider_name)
+            Config.send(provider_name.to_sym)
+          end
+
+          # get the login URL from the provider, if applicable.  Returns nil if the provider
+          # does not provide a login URL.  (as of v0.8.1 all providers provide a login URL)
+          def sorcery_login_url(provider_name)
+            @provider = sorcery_get_provider provider_name
+            sorcery_fixup_callback_url @provider
+            if @provider.respond_to?(:login_url) && @provider.has_callback?
+              return @provider.login_url(params, session)
+            else
+              return nil
+            end
+          end
+
+          # get the user hash from a provider using information from the params and session.
+          def sorcery_fetch_user_hash(provider_name)
+            # the application should never ask for user hashes from two different providers
+            # on the same request.  But if they do, we should be ready: on the second request,
+            # clear out the instance variables if the provider is different
+            provider = sorcery_get_provider provider_name
+            if @provider.nil? || @provider != provider
+              @provider = provider
+              @access_token = nil
+              @user_hash = nil
+            end
+
+            # delegate to the provider for the access token and the user hash.
+            # cache them in instance variables.
+            @access_token ||= @provider.process_callback(params, session) # sends request to oauth agent to get the token
+            @user_hash ||= @provider.get_user_hash(@access_token) # uses the token to send another request to the oauth agent requesting user info
+          end
+
+          # for backwards compatibility
+          def access_token(*args)
+            @access_token
+          end
+
+
+          # this method should be somewhere else.  It only does something once per application per provider.
+          def sorcery_fixup_callback_url(provider)
+            provider.original_callback_url ||= provider.callback_url
+            if provider.original_callback_url.present? && provider.original_callback_url[0] == '/'
               uri = URI.parse(request.url.gsub(/\?.*$/,''))
               uri.path = ''
               uri.query = nil
               uri.scheme = 'https' if(request.env['HTTP_X_FORWARDED_PROTO'] == 'https')
               host = uri.to_s
-              provider.callback_url = "#{host}#{provider.callback_url}"
-            end
-            if provider.has_callback?
-              redirect_to provider.login_url(params,session)
-            else
-              #provider.login(args)
+              provider.callback_url = "#{host}#{@provider.original_callback_url}"
             end
           end
 
+          # 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_name, args = {})
+            redirect_to sorcery_login_url(provider_name)
+          end
+
           # tries to login the user from provider's callback
           def login_from(provider_name)
-            provider = Config.send(provider_name)
-            provider.process_callback(params,session)
-            user_hash = provider.get_user_hash
-            if user = user_class.load_from_provider(provider_name,user_hash[:uid].to_s)
+            sorcery_fetch_user_hash provider_name
+            
+            if user = user_class.load_from_provider(provider_name, @user_hash[:uid].to_s)
+              # we found the user.
+              # clear the session
               return_to_url = session[:return_to_url]
               reset_session
               session[:return_to_url] = return_to_url
+
+              # sign in the user
               auto_login(user)
               after_login!(user)
+
+              # return the user
               user
             end
           end
 
-          # get provider access account
-          def access_token(provider_name)
-            provider = Config.send(provider_name)
-            provider.access_token
-          end
-
           # If user is logged, he can add all available providers into his account
           def add_provider_to_user(provider_name)
-            provider_name = provider_name.to_sym
-            provider = Config.send(provider_name)
-            provider.process_callback(params,session)
-            user_hash = provider.get_user_hash
+            sorcery_fetch_user_hash provider_name
             config = user_class.sorcery_config
 
             # first check to see if user has a particular authentication already
-            unless (current_user.send(config.authentications_class.to_s.downcase.pluralize).send("find_by_#{config.provider_attribute_name}_and_#{config.provider_uid_attribute_name}", provider_name, user_hash[:uid].to_s))
-              user = current_user.send(config.authentications_class.to_s.downcase.pluralize).build(config.provider_uid_attribute_name => user_hash[:uid], config.provider_attribute_name => provider_name.to_s)
+            unless (current_user.send(config.authentications_class.to_s.downcase.pluralize).send("find_by_#{config.provider_attribute_name}_and_#{config.provider_uid_attribute_name}", provider_name, @user_hash[:uid].to_s))
+              user = current_user.send(config.authentications_class.to_s.downcase.pluralize).build(config.provider_uid_attribute_name => @user_hash[:uid], config.provider_attribute_name => provider_name.to_s)
               user.save(:validate => false)
             else
               user = false
@@ -92,18 +129,16 @@ module Sorcery
           # If a provider doesn't give required informations or username/email is already taken,
           # we store provider/user infos into a session and can be rendered into registration form
           def create_and_validate_from(provider_name)
-            provider_name = provider_name.to_sym
-            provider = Config.send(provider_name)
-            user_hash = provider.get_user_hash
+            sorcery_fetch_user_hash provider_name
             config = user_class.sorcery_config
 
-            attrs = user_attrs(provider.user_info_mapping, user_hash)
+            attrs = user_attrs(@provider.user_info_mapping, @user_hash)
 
             user = user_class.new(attrs)
-            user.send(config.authentications_class.to_s.downcase.pluralize).build(config.provider_uid_attribute_name => user_hash[:uid], config.provider_attribute_name => provider_name)
+            user.send(config.authentications_class.to_s.downcase.pluralize).build(config.provider_uid_attribute_name => @user_hash[:uid], config.provider_attribute_name => provider_name)
 
             session[:incomplete_user] = {
-              :provider => {config.provider_uid_attribute_name => user_hash[:uid], config.provider_attribute_name => provider_name},
+              :provider => {config.provider_uid_attribute_name => @user_hash[:uid], config.provider_attribute_name => provider_name},
               :user_hash => attrs
             } unless user.save
 
@@ -127,12 +162,10 @@ module Sorcery
           #   create_from(provider) {|user| user.some_check }
           #
           def create_from(provider_name)
-            provider_name = provider_name.to_sym
-            provider = Config.send(provider_name)
-            user_hash = provider.get_user_hash
+            sorcery_fetch_user_hash provider_name
             config = user_class.sorcery_config
 
-            attrs = user_attrs(provider.user_info_mapping, user_hash)
+            attrs = user_attrs(@provider.user_info_mapping, @user_hash)
 
             user_class.transaction do
               @user = user_class.new()
@@ -145,7 +178,7 @@ module Sorcery
               end
 
               @user.save(:validate => false)
-              user_class.sorcery_config.authentications_class.create!({config.authentications_user_id_attribute_name => @user.id, config.provider_attribute_name => provider_name, config.provider_uid_attribute_name => user_hash[:uid]})
+              user_class.sorcery_config.authentications_class.create!({config.authentications_user_id_attribute_name => @user.id, config.provider_attribute_name => provider_name, config.provider_uid_attribute_name => @user_hash[:uid]})
             end
             @user
           end

data/lib/sorcery/controller.rb

@@ -28,7 +28,7 @@ module Sorcery
 
       # Takes credentials and returns a user on successful authentication.
       # Runs hooks after login or failed login.
-       def login(*credentials)
+      def login(*credentials)
         @current_user = nil
         user = user_class.authenticate(*credentials)
         if user
@@ -37,6 +37,8 @@ module Sorcery
           old_session.each_pair do |k,v|
             session[k.to_sym] = v
           end
+          form_authenticity_token
+
           auto_login(user)
           after_login!(user, credentials)
           current_user
@@ -49,7 +51,8 @@ module Sorcery
       # Resets the session and runs hooks before and after.
       def logout
         if logged_in?
-          before_logout!(current_user)
+          @current_user = current_user if @current_user.nil?
+          before_logout!(@current_user)
           reset_session
           after_logout!
           @current_user = nil

data/lib/sorcery/model/submodules/activity_logging.rb

@@ -14,6 +14,7 @@ module Sorcery
             attr_accessor :last_login_at_attribute_name,                  # last login attribute name.
                           :last_logout_at_attribute_name,                 # last logout attribute name.
                           :last_activity_at_attribute_name,               # last activity attribute name.
+                          :last_login_from_ip_address_name,               # last activity login source
                           :activity_timeout                               # how long since last activity is 
                                                                           #the user defined logged out?
           end
@@ -22,6 +23,7 @@ module Sorcery
             @defaults.merge!(:@last_login_at_attribute_name                => :last_login_at,
                              :@last_logout_at_attribute_name               => :last_logout_at,
                              :@last_activity_at_attribute_name             => :last_activity_at,
+                             :@last_login_from_ip_address_name             => :last_login_from_ip_address,
                              :@activity_timeout                            => 10 * 60)
             reset!
           end
@@ -42,6 +44,7 @@ module Sorcery
             field sorcery_config.last_login_at_attribute_name,    :type => Time
             field sorcery_config.last_logout_at_attribute_name,   :type => Time
             field sorcery_config.last_activity_at_attribute_name, :type => Time
+            field sorcery_config.last_login_from_ip_address_name, :type => String
           end
         end
       end

data/lib/sorcery/model/submodules/brute_force_protection.rb

@@ -1,18 +1,18 @@
 module Sorcery
   module Model
     module Submodules
-      # This module helps protect user accounts by locking them down after too many failed attemps 
+      # This module helps protect user accounts by locking them down after too many failed attemps
       # to login were detected.
-      # This is the model part of the submodule which provides configuration options and methods 
+      # This is the model part of the submodule which provides configuration options and methods
       # for locking and unlocking the user.
       module BruteForceProtection
         def self.included(base)
           base.sorcery_config.class_eval do
             attr_accessor :failed_logins_count_attribute_name,        # failed logins attribute name.
-                          :lock_expires_at_attribute_name,            # this field indicates whether user 
+                          :lock_expires_at_attribute_name,            # this field indicates whether user
                                                                       # is banned and when it will be active again.
                           :consecutive_login_retries_amount_limit,    # how many failed logins allowed.
-                          :login_lock_time_period,                    # how long the user should be banned. 
+                          :login_lock_time_period,                    # how long the user should be banned.
                                                                       # in seconds. 0 for permanent.
 
                           :unlock_token_attribute_name,               # Unlock token attribute name
@@ -20,7 +20,7 @@ module Sorcery
                           :unlock_token_mailer_disabled,              # When true, dont send unlock token via email
                           :unlock_token_mailer                        # Mailer class
           end
-          
+
           base.sorcery_config.instance_eval do
             @defaults.merge!(:@failed_logins_count_attribute_name              => :failed_logins_count,
                              :@lock_expires_at_attribute_name                  => :lock_expires_at,
@@ -33,7 +33,7 @@ module Sorcery
                              :@unlock_token_mailer                             => nil)
             reset!
           end
-          
+
           base.sorcery_config.before_authenticate << :prevent_locked_user_login
           base.sorcery_config.after_config << :define_brute_force_protection_mongoid_fields if defined?(Mongoid) and base.ancestors.include?(Mongoid::Document)
           if defined?(MongoMapper) and base.ancestors.include?(MongoMapper::Document)
@@ -42,7 +42,7 @@ module Sorcery
           base.extend(ClassMethods)
           base.send(:include, InstanceMethods)
         end
-        
+
         module ClassMethods
           def load_from_unlock_token(token)
             return nil if token.blank?
@@ -64,7 +64,7 @@ module Sorcery
             key sorcery_config.unlock_token_attribute_name, String
           end
         end
-        
+
         module InstanceMethods
           # Called by the controller to increment the failed logins counter.
           # Calls 'lock!' if login retries limit was reached.
@@ -75,7 +75,7 @@ module Sorcery
             self.update_many_attributes(config.failed_logins_count_attribute_name => self.send(config.failed_logins_count_attribute_name))
             self.lock! if self.send(config.failed_logins_count_attribute_name) >= config.consecutive_login_retries_amount_limit
           end
-          
+
           # /!\
           # Moved out of protected for use like activate! in controller
           # /!\
@@ -95,11 +95,13 @@ module Sorcery
 
             unless config.unlock_token_mailer_disabled || config.unlock_token_mailer.nil?
               attributes[config.unlock_token_attribute_name] = TemporaryToken.generate_random_token
+              self.update_many_attributes(attributes)
               send_unlock_token_email!
+            else
+              self.update_many_attributes(attributes)
             end
-            self.update_many_attributes(attributes)
           end
-          
+
           def unlocked?
             config = sorcery_config
             self.send(config.lock_expires_at_attribute_name).nil?
@@ -108,7 +110,7 @@ module Sorcery
           def send_unlock_token_email!
             generic_send_email(:unlock_token_email_method_name, :unlock_token_mailer) unless sorcery_config.unlock_token_email_method_name.nil? or sorcery_config.unlock_token_mailer_disabled == true
           end
-          
+
           # Prevents a locked user from logging in, and unlocks users that expired their lock time.
           # Runs as a hook before authenticate.
           def prevent_locked_user_login

data/lib/sorcery/model.rb

@@ -79,7 +79,7 @@ module Sorcery
           def init_orm_hooks!
             self.class_eval do
               attr_accessor @sorcery_config.password_attribute_name
-              attr_protected @sorcery_config.crypted_password_attribute_name, @sorcery_config.salt_attribute_name
+              #attr_protected @sorcery_config.crypted_password_attribute_name, @sorcery_config.salt_attribute_name
               before_save :encrypt_password, :if => Proc.new { |record|
                 record.send(sorcery_config.password_attribute_name).present?
               }

data/lib/sorcery/railties/tasks.rake

@@ -1,12 +1,6 @@
-require 'fileutils'
-
 namespace :sorcery do
   desc "Adds sorcery's initializer file"
   task :bootstrap do
     warn "This task is obsolete.\nUse \"rails g sorcery:install\" now.\nSee README for more information."
-
-    src = File.join(File.dirname(__FILE__), '..', 'initializers', 'initializer.rb')
-    target = File.join(Rails.root, "config", "initializers", "sorcery.rb")
-    FileUtils.cp(src, target)
   end
-end
+end

data/lib/sorcery.rb

@@ -31,6 +31,7 @@ module Sorcery
           autoload :Oauth2, 'sorcery/controller/submodules/external/protocols/oauth2'
         end
         module Providers
+          autoload :Base, 'sorcery/controller/submodules/external/providers/base'
           autoload :Twitter, 'sorcery/controller/submodules/external/providers/twitter'
           autoload :Facebook, 'sorcery/controller/submodules/external/providers/facebook'
           autoload :Github, 'sorcery/controller/submodules/external/providers/github'
@@ -38,6 +39,7 @@ module Sorcery
           autoload :Liveid, 'sorcery/controller/submodules/external/providers/liveid'
           autoload :Linkedin, 'sorcery/controller/submodules/external/providers/linkedin'
           autoload :Vk, 'sorcery/controller/submodules/external/providers/vk'
+          autoload :Xing, 'sorcery/controller/submodules/external/providers/xing'
         end
       end
     end
@@ -81,4 +83,4 @@ module Sorcery
   end
 
   require 'sorcery/engine' if defined?(Rails) && Rails::VERSION::MAJOR >= 3
-end
+end

data/sorcery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sorcery"
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Noam Ben Ari"]
-  s.date = "2013-01-25"
+  s.date = "2013-07-05"
   s.description = "Provides common authentication needs such as signing in/out, activating by email and resetting password."
   s.email = "nbenari@gmail.com"
   s.extra_rdoc_files = [
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
     "lib/sorcery/controller/submodules/external/protocols/certs/ca-bundle.crt",
     "lib/sorcery/controller/submodules/external/protocols/oauth1.rb",
     "lib/sorcery/controller/submodules/external/protocols/oauth2.rb",
+    "lib/sorcery/controller/submodules/external/providers/base.rb",
     "lib/sorcery/controller/submodules/external/providers/facebook.rb",
     "lib/sorcery/controller/submodules/external/providers/github.rb",
     "lib/sorcery/controller/submodules/external/providers/google.rb",
@@ -51,6 +52,7 @@ Gem::Specification.new do |s|
     "lib/sorcery/controller/submodules/external/providers/liveid.rb",
     "lib/sorcery/controller/submodules/external/providers/twitter.rb",
     "lib/sorcery/controller/submodules/external/providers/vk.rb",
+    "lib/sorcery/controller/submodules/external/providers/xing.rb",
     "lib/sorcery/controller/submodules/http_basic_auth.rb",
     "lib/sorcery/controller/submodules/remember_me.rb",
     "lib/sorcery/controller/submodules/session_timeout.rb",
@@ -304,7 +306,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/NoamB/sorcery"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.24"
   s.summary = "Magical authentication for Rails 3 applications"
 
   if s.respond_to? :specification_version then
@@ -316,11 +318,10 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
       s.add_development_dependency(%q<abstract>, [">= 1.0.0"])
       s.add_development_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_development_dependency(%q<json>, [">= 1.5.1"])
+      s.add_development_dependency(%q<json>, [">= 1.7.7"])
       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"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -335,11 +336,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
       s.add_dependency(%q<abstract>, [">= 1.0.0"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<json>, [">= 1.5.1"])
+      s.add_dependency(%q<json>, [">= 1.7.7"])
       s.add_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
-      s.add_dependency(%q<ruby-debug19>, [">= 0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, [">= 1.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -355,11 +355,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
     s.add_dependency(%q<abstract>, [">= 1.0.0"])
     s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<json>, [">= 1.5.1"])
+    s.add_dependency(%q<json>, [">= 1.7.7"])
     s.add_dependency(%q<rspec>, ["~> 2.5.0"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
-    s.add_dependency(%q<ruby-debug19>, [">= 0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, [">= 1.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])

data/spec/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem "rails", '3.0.3'
 gem 'bcrypt-ruby', :require => 'bcrypt'

data/spec/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    sorcery (0.7.13)
+    sorcery (0.8.1)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
       oauth2 (~> 0.8.0)

data/spec/rails3/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.13)
+    sorcery (0.8.1)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
       oauth2 (~> 0.8.0)
@@ -54,7 +54,7 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.8.4)
+    faraday (0.8.5)
       multipart-post (~> 1.1)
     ffi (1.0.11)
     httpauth (0.2.0)
@@ -75,7 +75,7 @@ GEM
     multipart-post (1.1.5)
     nokogiri (1.5.0)
     oauth (0.4.7)
-    oauth2 (0.8.0)
+    oauth2 (0.8.1)
       faraday (~> 0.8)
       httpauth (~> 0.1)
       jwt (~> 0.1.4)

data/spec/rails3/app/models/user.rb

@@ -1,5 +1,5 @@
 class User < ActiveRecord::Base
-  attr_accessible :email, :password, :password_confirmation, :authentications_attributes
+  attr_accessible :username, :email, :password, :password_confirmation, :authentications_attributes
   
   has_many :authentications, :dependent => :destroy
   accepts_nested_attributes_for :authentications

data/spec/rails3/app/views/sorcery_mailer/send_unlock_token_email.text.erb

@@ -1 +1 @@
-Please visit <% @url %> for unlock your account.
+Please visit <%= @url %> for unlock your account.

data/spec/rails3/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb

@@ -3,6 +3,7 @@ class AddActivityLoggingToUsers < ActiveRecord::Migration
     add_column :users, :last_login_at,     :datetime, :default => nil
     add_column :users, :last_logout_at,    :datetime, :default => nil
     add_column :users, :last_activity_at,  :datetime, :default => nil
+    add_column :users, :last_login_from_ip_address,  :string, :default => nil
     
     add_index :users, [:last_logout_at, :last_activity_at]
   end
@@ -13,5 +14,6 @@ class AddActivityLoggingToUsers < ActiveRecord::Migration
     remove_column :users, :last_activity_at
     remove_column :users, :last_logout_at
     remove_column :users, :last_login_at
+    remove_column :users, :last_login_from_ip_address
   end
 end