sorcery 0.1.4 → 0.3.1

data/lib/sorcery/test_helpers/rails.rb

@@ -0,0 +1,57 @@
+module Sorcery
+  module TestHelpers
+    module Rails
+      SUBMODUELS_AUTO_ADDED_CONTROLLER_FILTERS = [:register_last_activity_time_to_db, :deny_banned_user, :validate_session]
+      
+      def sorcery_reload!(submodules = [], options = {})
+        reload_user_class
+
+        # return to no-module configuration
+        ::Sorcery::Controller::Config.init!
+        ::Sorcery::Controller::Config.reset!
+
+        # remove all plugin before_filters so they won't fail other tests.
+        # I don't like this way, but I didn't find another.
+        # hopefully it won't break until Rails 4.
+        ApplicationController._process_action_callbacks.delete_if {|c| SUBMODUELS_AUTO_ADDED_CONTROLLER_FILTERS.include?(c.filter) }
+
+        # configure
+        ::Sorcery::Controller::Config.submodules = submodules
+        ::Sorcery::Controller::Config.user_class = nil
+        ActionController::Base.send(:include,::Sorcery::Controller)
+
+        User.activate_sorcery! do |config|
+          options.each do |property,value|
+            config.send(:"#{property}=", value)
+          end
+        end
+      end
+      
+      def sorcery_controller_property_set(property, value)
+        ApplicationController.activate_sorcery! do |config|
+          config.send(:"#{property}=", value)
+        end
+      end
+
+      def sorcery_controller_oauth_property_set(provider, property, value)
+        ApplicationController.activate_sorcery! do |config|
+          config.send(provider).send(:"#{property}=", value)
+        end
+      end
+      
+      def login_user(user = nil)
+        user ||= @user
+        subject.send(:login_user,user)
+        subject.send(:after_login!,user,[user.username,'secret'])
+      end
+
+      def logout_user
+        subject.send(:logout)
+      end
+
+      def clear_user_without_logout
+        subject.instance_variable_set(:@current_user,nil)
+      end
+    end
+  end
+end

data/lib/sorcery/test_helpers/sinatra.rb

@@ -0,0 +1,131 @@
+module Sorcery
+  module TestHelpers
+    module Sinatra
+      
+      class MyApp
+        class << self
+          def new
+            return this
+          end
+        end
+      end
+      
+      class ::Sinatra::Application
+        class << self
+          attr_accessor :sorcery_vars
+        end
+        @sorcery_vars = {}
+
+        # NOTE: see before and after test filters in filters.rb
+        
+        def save_instance_vars
+          instance_variables.each do |var|
+            self.class.sorcery_vars[:"#{var.to_s.delete("@")}"] = instance_variable_get(var)
+          end
+        end
+      end
+                    
+      ::RSpec::Matchers.define :redirect_to do |expected|
+        match do |actual|
+          actual.status == 302 && actual.location == expected
+        end
+      end
+      
+      def get_sinatra_app(app)
+        while app.class != ::Sinatra::Application do
+          app = app.instance_variable_get(:@app)
+        end
+        app
+      end
+      
+      def login_user(user=nil)
+        user ||= @user
+        get_sinatra_app(subject).send(:login_user,user)
+        get_sinatra_app(subject).send(:after_login!,user,[user.username,'secret'])
+      end
+      
+      def logout_user
+        get_sinatra_app(subject).send(:logout)
+      end
+
+      def clear_user_without_logout
+        get_sinatra_app(subject).instance_variable_set(:@current_user,nil)
+      end
+        
+      def assigns
+        ::Sinatra::Application.sorcery_vars
+      end
+      
+      class SessionData
+        def initialize(cookies)
+          @cookies = cookies
+          @data = cookies['rack.session']
+          if @data
+            @data = @data.unpack("m*").first
+            @data = Marshal.load(@data)
+          else
+            @data = {}
+          end
+        end
+
+        def [](key)
+          @data[key]
+        end
+
+        def []=(key, value)
+          @data[key] = value
+          session_data = Marshal.dump(@data)
+          session_data = [session_data].pack("m*")
+          @cookies.merge("rack.session=#{Rack::Utils.escape(session_data)}", URI.parse("//example.org//"))
+          raise "session variable not set" unless @cookies['rack.session'] == session_data
+        end
+      end
+
+      def session
+        SessionData.new(rack_test_session.instance_variable_get(:@rack_mock_session).cookie_jar)
+      end
+      
+      def cookies
+        rack_test_session.instance_variable_get(:@rack_mock_session).cookie_jar
+      end
+      
+      def sorcery_reload!(submodules = [], options = {})
+        reload_user_class
+
+        # return to no-module configuration
+        ::Sorcery::Controller::Config.init!
+        ::Sorcery::Controller::Config.reset!
+
+        # clear all filters
+        ::Sinatra::Application.instance_variable_set(:@filters,{:before => [],:after => []})
+        ::Sinatra::Application.class_eval do
+          load File.join(File.dirname(__FILE__),'..','..','..','spec','sinatra','filters.rb')
+        end
+        
+        # configure
+        ::Sorcery::Controller::Config.submodules = submodules
+        ::Sorcery::Controller::Config.user_class = nil
+        ::Sinatra::Application.send(:include, Sorcery::Controller::Adapters::Sinatra)
+        ::Sinatra::Application.send(:include, Sorcery::Controller)
+        
+        User.activate_sorcery! do |config|
+          options.each do |property,value|
+            config.send(:"#{property}=", value)
+          end
+        end
+      end
+      
+      def sorcery_controller_property_set(property, value)
+        ::Sinatra::Application.activate_sorcery! do |config|
+          config.send(:"#{property}=", value)
+        end
+      end
+
+      def sorcery_controller_oauth_property_set(provider, property, value)
+        ::Sinatra::Application.activate_sorcery! do |config|
+          config.send(provider).send(:"#{property}=", value)
+        end
+      end
+    end
+  end
+end

data/lib/sorcery/test_helpers.rb

@@ -0,0 +1,40 @@
+module Sorcery
+  module TestHelpers
+    # a patch to fix a bug in testing that happens when you 'destroy' a session twice.
+    # After the first destroy, the session is an ordinary hash, and then when destroy is called again there's an exception.
+    class ::Hash
+      def destroy
+        clear
+      end
+    end
+    
+    def create_new_user(attributes_hash = nil)
+      user_attributes_hash = attributes_hash || {:username => 'gizmo', :email => "bla@bla.com", :password => 'secret'}
+      @user = User.new(user_attributes_hash)
+      @user.save!
+      @user
+    end
+
+    def create_new_external_user(provider, attributes_hash = nil)
+      user_attributes_hash = attributes_hash || {:username => 'gizmo', :authentications_attributes => [{:provider => provider, :uid => 123}]}
+      @user = User.new(user_attributes_hash)
+      @user.save!
+      @user
+    end
+    
+    def sorcery_model_property_set(property, *values)
+      User.class_eval do
+        sorcery_config.send(:"#{property}=", *values)
+      end
+    end
+    
+    private
+
+    # reload user class between specs
+    # so it will be possible to test the different submodules in isolation
+    def reload_user_class
+      Object.send(:remove_const,:User)
+      load 'user.rb'
+    end
+  end
+end

data/lib/sorcery.rb

@@ -1,12 +1,14 @@
 module Sorcery
   autoload :Model, 'sorcery/model'
   module Model
+    autoload :TemporaryToken, 'sorcery/model/temporary_token'
     module Submodules
       autoload :UserActivation, 'sorcery/model/submodules/user_activation'
       autoload :ResetPassword, 'sorcery/model/submodules/reset_password'
       autoload :RememberMe, 'sorcery/model/submodules/remember_me'
       autoload :ActivityLogging, 'sorcery/model/submodules/activity_logging'
       autoload :BruteForceProtection, 'sorcery/model/submodules/brute_force_protection'
+      autoload :External, 'sorcery/model/submodules/external'
     end
   end
   autoload :Controller, 'sorcery/controller'
@@ -17,6 +19,20 @@ 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 :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/external/providers/twitter'
+          autoload :Facebook, 'sorcery/controller/submodules/external/providers/facebook'
+        end
+      end
+    end
+    module Adapters
+      autoload :Sinatra, 'sorcery/controller/adapters/sinatra'
     end
   end
   module CryptoProviders
@@ -27,6 +43,12 @@ module Sorcery
     autoload :SHA256, 'sorcery/crypto_providers/sha256'
     autoload :SHA512, 'sorcery/crypto_providers/sha512'
   end
+  autoload :TestHelpers, 'sorcery/test_helpers'
+  module TestHelpers
+    autoload :Rails, 'sorcery/test_helpers/rails'
+    autoload :Sinatra, 'sorcery/test_helpers/sinatra'
+  end
   
   require 'sorcery/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  require 'sorcery/sinatra' if defined?(Sinatra)
 end

data/sorcery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sorcery}
-  s.version = "0.1.4"
+  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-02-19}
+  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,11 +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/remember_me.rb",
     "lib/sorcery/controller/submodules/session_timeout.rb",
     "lib/sorcery/crypto_providers/aes256.rb",
@@ -42,23 +58,31 @@ 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/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",
     "spec/Rakefile",
     "spec/rails3/.rspec",
-    "spec/rails3/Gemfile",
-    "spec/rails3/Gemfile.lock",
-    "spec/rails3/Rakefile",
     "spec/rails3/app_root/.gitignore",
+    "spec/rails3/app_root/.rspec",
+    "spec/rails3/app_root/Gemfile",
+    "spec/rails3/app_root/Gemfile.lock",
     "spec/rails3/app_root/README",
+    "spec/rails3/app_root/Rakefile",
     "spec/rails3/app_root/Rakefile.unused",
     "spec/rails3/app_root/app/controllers/application_controller.rb",
     "spec/rails3/app_root/app/helpers/application_helper.rb",
     "spec/rails3/app_root/app/mailers/sorcery_mailer.rb",
+    "spec/rails3/app_root/app/models/authentication.rb",
     "spec/rails3/app_root/app/models/user.rb",
     "spec/rails3/app_root/app/views/layouts/application.html.erb",
     "spec/rails3/app_root/app/views/sorcery_mailer/activation_email.html.erb",
@@ -87,6 +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/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",
@@ -107,36 +132,71 @@ Gem::Specification.new do |s|
     "spec/rails3/app_root/public/robots.txt",
     "spec/rails3/app_root/public/stylesheets/.gitkeep",
     "spec/rails3/app_root/script/rails",
-    "spec/rails3/app_root/test/fixtures/users.yml",
-    "spec/rails3/app_root/test/performance/browsing_test.rb",
-    "spec/rails3/app_root/test/test_helper.rb",
-    "spec/rails3/app_root/test/unit/user_test.rb",
+    "spec/rails3/app_root/spec/controller_activity_logging_spec.rb",
+    "spec/rails3/app_root/spec/controller_brute_force_protection_spec.rb",
+    "spec/rails3/app_root/spec/controller_http_basic_auth_spec.rb",
+    "spec/rails3/app_root/spec/controller_oauth2_spec.rb",
+    "spec/rails3/app_root/spec/controller_oauth_spec.rb",
+    "spec/rails3/app_root/spec/controller_remember_me_spec.rb",
+    "spec/rails3/app_root/spec/controller_session_timeout_spec.rb",
+    "spec/rails3/app_root/spec/controller_spec.rb",
+    "spec/rails3/app_root/spec/spec_helper.orig.rb",
+    "spec/rails3/app_root/spec/spec_helper.rb",
+    "spec/rails3/app_root/spec/user_activation_spec.rb",
+    "spec/rails3/app_root/spec/user_activity_logging_spec.rb",
+    "spec/rails3/app_root/spec/user_brute_force_protection_spec.rb",
+    "spec/rails3/app_root/spec/user_oauth_spec.rb",
+    "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/rails3/app_root/vendor/plugins/.gitkeep",
-    "spec/rails3/controller_activity_logging_spec.rb",
-    "spec/rails3/controller_brute_force_protection_spec.rb",
-    "spec/rails3/controller_http_basic_auth_spec.rb",
-    "spec/rails3/controller_remember_me_spec.rb",
-    "spec/rails3/controller_session_timeout_spec.rb",
-    "spec/rails3/controller_spec.rb",
-    "spec/rails3/spec_helper.rb",
-    "spec/rails3/user_activation_spec.rb",
-    "spec/rails3/user_activity_logging_spec.rb",
-    "spec/rails3/user_brute_force_protection_spec.rb",
-    "spec/rails3/user_remember_me_spec.rb",
-    "spec/rails3/user_reset_password_spec.rb",
-    "spec/rails3/user_spec.rb",
+    "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"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Magical authentication for Rails 3 applications}
   s.test_files = [
     "spec/rails3/app_root/app/controllers/application_controller.rb",
     "spec/rails3/app_root/app/helpers/application_helper.rb",
     "spec/rails3/app_root/app/mailers/sorcery_mailer.rb",
+    "spec/rails3/app_root/app/models/authentication.rb",
     "spec/rails3/app_root/app/models/user.rb",
     "spec/rails3/app_root/config/application.rb",
     "spec/rails3/app_root/config/boot.rb",
@@ -155,26 +215,56 @@ 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/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",
     "spec/rails3/app_root/db/seeds.rb",
-    "spec/rails3/app_root/test/performance/browsing_test.rb",
-    "spec/rails3/app_root/test/test_helper.rb",
-    "spec/rails3/app_root/test/unit/user_test.rb",
-    "spec/rails3/controller_activity_logging_spec.rb",
-    "spec/rails3/controller_brute_force_protection_spec.rb",
-    "spec/rails3/controller_http_basic_auth_spec.rb",
-    "spec/rails3/controller_remember_me_spec.rb",
-    "spec/rails3/controller_session_timeout_spec.rb",
-    "spec/rails3/controller_spec.rb",
-    "spec/rails3/spec_helper.rb",
-    "spec/rails3/user_activation_spec.rb",
-    "spec/rails3/user_activity_logging_spec.rb",
-    "spec/rails3/user_brute_force_protection_spec.rb",
-    "spec/rails3/user_remember_me_spec.rb",
-    "spec/rails3/user_reset_password_spec.rb",
-    "spec/rails3/user_spec.rb",
+    "spec/rails3/app_root/spec/controller_activity_logging_spec.rb",
+    "spec/rails3/app_root/spec/controller_brute_force_protection_spec.rb",
+    "spec/rails3/app_root/spec/controller_http_basic_auth_spec.rb",
+    "spec/rails3/app_root/spec/controller_oauth2_spec.rb",
+    "spec/rails3/app_root/spec/controller_oauth_spec.rb",
+    "spec/rails3/app_root/spec/controller_remember_me_spec.rb",
+    "spec/rails3/app_root/spec/controller_session_timeout_spec.rb",
+    "spec/rails3/app_root/spec/controller_spec.rb",
+    "spec/rails3/app_root/spec/spec_helper.orig.rb",
+    "spec/rails3/app_root/spec/spec_helper.rb",
+    "spec/rails3/app_root/spec/user_activation_spec.rb",
+    "spec/rails3/app_root/spec/user_activity_logging_spec.rb",
+    "spec/rails3/app_root/spec/user_brute_force_protection_spec.rb",
+    "spec/rails3/app_root/spec/user_oauth_spec.rb",
+    "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"
   ]
@@ -183,7 +273,10 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<json>, [">= 1.5.1"])
+      s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
+      s.add_runtime_dependency(%q<oauth2>, [">= 0.1.1"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
@@ -193,8 +286,13 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<simplecov>, [">= 0.3.8"])
       s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.4"])
+      s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
+      s.add_runtime_dependency(%q<oauth2>, [">= 0.1.1"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<json>, [">= 1.5.1"])
+      s.add_dependency(%q<oauth>, [">= 0.4.4"])
+      s.add_dependency(%q<oauth2>, [">= 0.1.1"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
@@ -204,9 +302,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<simplecov>, [">= 0.3.8"])
       s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.4"])
+      s.add_dependency(%q<oauth>, [">= 0.4.4"])
+      s.add_dependency(%q<oauth2>, [">= 0.1.1"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<json>, [">= 1.5.1"])
+    s.add_dependency(%q<oauth>, [">= 0.4.4"])
+    s.add_dependency(%q<oauth2>, [">= 0.1.1"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
@@ -216,6 +319,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<simplecov>, [">= 0.3.8"])
     s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.4"])
+    s.add_dependency(%q<oauth>, [">= 0.4.4"])
+    s.add_dependency(%q<oauth2>, [">= 0.1.1"])
   end
 end
 

data/spec/Gemfile

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

data/spec/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../../
   specs:
-    sorcery (0.1.3)
+    sorcery (0.3.1)
 
 GEM
   remote: http://rubygems.org/
@@ -33,6 +33,7 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
+    addressable (2.2.4)
     archive-tar-minitar (0.5.2)
     arel (2.0.6)
     bcrypt-ruby (2.1.3)
@@ -41,6 +42,10 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    faraday (0.5.5)
+      addressable (~> 2.2.4)
+      multipart-post (~> 1.1.0)
+      rack (< 2, >= 1.1.0)
     i18n (0.5.0)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
@@ -50,6 +55,12 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    multi_json (0.0.5)
+    multipart-post (1.1.0)
+    oauth (0.4.4)
+    oauth2 (0.1.1)
+      faraday (~> 0.5.0)
+      multi_json (~> 0.0.4)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -101,8 +112,10 @@ PLATFORMS
 
 DEPENDENCIES
   bcrypt-ruby
+  oauth (>= 0.4.4)
+  oauth2 (>= 0.1.1)
   rails (= 3.0.3)
   rspec
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.1.3)!
+  sorcery (= 0.3.1)!

data/spec/rails3/app_root/.rspec

@@ -0,0 +1 @@
+--colour

data/spec/rails3/{Gemfile → app_root/Gemfile}

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