sorcery 0.3.1 → 0.4.0

data/spec/sinatra/spec/controller_session_timeout_spec.rb

@@ -10,6 +10,10 @@ describe Sinatra::Application do
       create_new_user
     end
     
+    after(:each) do
+      Timecop.return
+    end
+    
     it "should not reset session before session timeout" do
       session[:user_id] = User.first.id
       get "/test_should_be_logged_in"
@@ -19,7 +23,7 @@ describe Sinatra::Application do
     it "should reset session after session timeout" do
       get "/test_login", :username => 'gizmo', :password => 'secret'
       session[:user_id].should_not be_nil
-      sleep 0.6
+      Timecop.travel(Time.now+0.6)
       get "/test_should_be_logged_in"
       last_response.should be_a_redirect
     end
@@ -29,10 +33,10 @@ describe Sinatra::Application do
       sorcery_controller_property_set(:session_timeout,2)
       sorcery_controller_property_set(:session_timeout_from_last_action, true)
       get "/test_login", :username => 'gizmo', :password => 'secret'
-      sleep 1
+      Timecop.travel(Time.now+1)
       get "/test_should_be_logged_in"
       session[:user_id].should_not be_nil
-      sleep 1
+      Timecop.travel(Time.now+1)
       get "/test_should_be_logged_in"
       session[:user_id].should_not be_nil
       last_response.should be_ok
@@ -42,7 +46,7 @@ describe Sinatra::Application do
       sorcery_controller_property_set(:session_timeout,0.5)
       sorcery_controller_property_set(:session_timeout_from_last_action, true)
       get "/test_login", :username => 'gizmo', :password => 'secret'
-      sleep 0.6
+      Timecop.travel(Time.now+0.6)
       get "/test_should_be_logged_in"
       session[:user_id].should be_nil
       last_response.should be_a_redirect

data/spec/sinatra/spec/spec.opts

@@ -1,4 +1,2 @@
---colour
---format progress
---loadby mtime
---reverse
+--color
+--format documentation

data/spec/sinatra/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $: << APP_ROOT # for model reloading
 
 require 'rack/test'
 require 'rspec'
+require 'timecop'
 
 # set test environment
 set :environment, :test
@@ -36,7 +37,7 @@ require File.join(File.dirname(__FILE__), '..','user')
 require File.join(File.dirname(__FILE__), '..','authentication')
 
 class TestUser < ActiveRecord::Base
-  activate_sorcery!
+  authenticates_with_sorcery!
 end
 
 class TestMailer < ActionMailer::Base

data/spec/sorcery_crypto_providers_spec.rb

@@ -31,7 +31,7 @@ describe "Crypto Providers wrappers" do
     
     before(:all) do
       @digest = 'Noam Ben-Ari'
-      10.times {@digest = Digest::SHA1.hexdigest(@digest)}
+      Sorcery::CryptoProviders::SHA1.stretches.times {@digest = Digest::SHA1.hexdigest(@digest)}
     end
     
     after(:each) do
@@ -61,7 +61,7 @@ describe "Crypto Providers wrappers" do
     
     before(:all) do
       @digest = 'Noam Ben-Ari'
-      20.times {@digest = Digest::SHA256.hexdigest(@digest)}
+      Sorcery::CryptoProviders::SHA256.stretches.times {@digest = Digest::SHA256.hexdigest(@digest)}
     end
     
     after(:each) do
@@ -91,7 +91,7 @@ describe "Crypto Providers wrappers" do
     
     before(:all) do
       @digest = 'Noam Ben-Ari'
-      20.times {@digest = Digest::SHA512.hexdigest(@digest)}
+      Sorcery::CryptoProviders::SHA512.stretches.times {@digest = Digest::SHA512.hexdigest(@digest)}
     end
     
     after(:each) do
@@ -153,7 +153,8 @@ describe "Crypto Providers wrappers" do
   describe Sorcery::CryptoProviders::BCrypt do
     
     before(:all) do
-      @digest = BCrypt::Password.create('Noam Ben-Ari', :cost => 10)
+      Sorcery::CryptoProviders::BCrypt.cost = 1
+      @digest = BCrypt::Password.create('Noam Ben-Ari', :cost => Sorcery::CryptoProviders::BCrypt.cost)
     end
     
     after(:each) do

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/spec/spec_helper.rb

@@ -1,10 +1,9 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'simplecov'
-SimpleCov.root File.join(File.dirname(__FILE__), '..', 'lib')
-SimpleCov.start
-
+# require 'simplecov'
+# SimpleCov.root File.join(File.dirname(__FILE__), '..', 'lib')
+# SimpleCov.start
 
 require 'rspec'
 require 'sorcery'

metadata

@@ -2,7 +2,7 @@
 name: sorcery
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-17 00:00:00 +03:00
+date: 2011-04-21 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.3.0
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: *id005
@@ -73,9 +73,9 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: *id006
@@ -146,8 +146,19 @@ dependencies:
   prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
+  name: timecop
   requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: bcrypt-ruby
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -155,10 +166,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: oauth
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -166,10 +177,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: oauth2
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -177,7 +188,7 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *id015
+  version_requirements: *id016
 description: Provides common authentication needs such as signing in/out, activating by email and resetting password.
 email: nbenari@gmail.com
 executables: []
@@ -209,23 +220,23 @@ 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/remember_me.rb
 - lib/sorcery/controller/submodules/session_timeout.rb
 - lib/sorcery/crypto_providers/aes256.rb
 - lib/sorcery/crypto_providers/bcrypt.rb
+- lib/sorcery/crypto_providers/common.rb
 - lib/sorcery/crypto_providers/md5.rb
 - lib/sorcery/crypto_providers/sha1.rb
 - lib/sorcery/crypto_providers/sha256.rb
 - lib/sorcery/crypto_providers/sha512.rb
 - lib/sorcery/engine.rb
+- lib/sorcery/initializers/initializer.rb
 - lib/sorcery/model.rb
 - lib/sorcery/model/submodules/activity_logging.rb
 - lib/sorcery/model/submodules/brute_force_protection.rb
@@ -234,6 +245,7 @@ files:
 - lib/sorcery/model/submodules/reset_password.rb
 - lib/sorcery/model/submodules/user_activation.rb
 - lib/sorcery/model/temporary_token.rb
+- lib/sorcery/railties/tasks.rake
 - lib/sorcery/sinatra.rb
 - lib/sorcery/test_helpers.rb
 - lib/sorcery/test_helpers/rails.rb
@@ -242,85 +254,85 @@ files:
 - spec/Gemfile
 - spec/Gemfile.lock
 - spec/Rakefile
+- spec/rails3/.gitignore
 - spec/rails3/.rspec
-- 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
-- spec/rails3/app_root/app/views/sorcery_mailer/activation_email.text.erb
-- spec/rails3/app_root/app/views/sorcery_mailer/activation_success_email.html.erb
-- spec/rails3/app_root/app/views/sorcery_mailer/activation_success_email.text.erb
-- spec/rails3/app_root/app/views/sorcery_mailer/reset_password_email.html.erb
-- spec/rails3/app_root/app/views/sorcery_mailer/reset_password_email.text.erb
-- spec/rails3/app_root/config.ru
-- spec/rails3/app_root/config/application.rb
-- spec/rails3/app_root/config/boot.rb
-- spec/rails3/app_root/config/database.yml
-- spec/rails3/app_root/config/environment.rb
-- spec/rails3/app_root/config/environments/development.rb
-- spec/rails3/app_root/config/environments/in_memory.rb
-- spec/rails3/app_root/config/environments/production.rb
-- spec/rails3/app_root/config/environments/test.rb
-- spec/rails3/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails3/app_root/config/initializers/inflections.rb
-- spec/rails3/app_root/config/initializers/mime_types.rb
-- spec/rails3/app_root/config/initializers/secret_token.rb
-- spec/rails3/app_root/config/initializers/session_store.rb
-- spec/rails3/app_root/config/locales/en.yml
-- spec/rails3/app_root/config/routes.rb
-- spec/rails3/app_root/db/migrate/activation/20101224223622_add_activation_to_users.rb
-- 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/lib/tasks/.gitkeep
-- spec/rails3/app_root/public/404.html
-- spec/rails3/app_root/public/422.html
-- spec/rails3/app_root/public/500.html
-- spec/rails3/app_root/public/favicon.ico
-- spec/rails3/app_root/public/images/rails.png
-- spec/rails3/app_root/public/index.html
-- spec/rails3/app_root/public/javascripts/application.js
-- spec/rails3/app_root/public/javascripts/controls.js
-- spec/rails3/app_root/public/javascripts/dragdrop.js
-- spec/rails3/app_root/public/javascripts/effects.js
-- spec/rails3/app_root/public/javascripts/prototype.js
-- spec/rails3/app_root/public/javascripts/rails.js
-- spec/rails3/app_root/public/robots.txt
-- spec/rails3/app_root/public/stylesheets/.gitkeep
-- spec/rails3/app_root/script/rails
-- 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/Gemfile
+- spec/rails3/Gemfile.lock
+- spec/rails3/README
+- spec/rails3/Rakefile
+- spec/rails3/Rakefile.unused
+- spec/rails3/app/controllers/application_controller.rb
+- spec/rails3/app/helpers/application_helper.rb
+- spec/rails3/app/mailers/sorcery_mailer.rb
+- spec/rails3/app/models/authentication.rb
+- spec/rails3/app/models/user.rb
+- spec/rails3/app/views/layouts/application.html.erb
+- spec/rails3/app/views/sorcery_mailer/activation_email.html.erb
+- spec/rails3/app/views/sorcery_mailer/activation_email.text.erb
+- spec/rails3/app/views/sorcery_mailer/activation_success_email.html.erb
+- spec/rails3/app/views/sorcery_mailer/activation_success_email.text.erb
+- spec/rails3/app/views/sorcery_mailer/reset_password_email.html.erb
+- spec/rails3/app/views/sorcery_mailer/reset_password_email.text.erb
+- spec/rails3/config.ru
+- spec/rails3/config/application.rb
+- spec/rails3/config/boot.rb
+- spec/rails3/config/database.yml
+- spec/rails3/config/environment.rb
+- spec/rails3/config/environments/development.rb
+- spec/rails3/config/environments/in_memory.rb
+- spec/rails3/config/environments/production.rb
+- spec/rails3/config/environments/test.rb
+- spec/rails3/config/initializers/backtrace_silencers.rb
+- spec/rails3/config/initializers/inflections.rb
+- spec/rails3/config/initializers/mime_types.rb
+- spec/rails3/config/initializers/secret_token.rb
+- spec/rails3/config/initializers/session_store.rb
+- spec/rails3/config/locales/en.yml
+- spec/rails3/config/routes.rb
+- spec/rails3/db/migrate/activation/20101224223622_add_activation_to_users.rb
+- spec/rails3/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb
+- spec/rails3/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb
+- spec/rails3/db/migrate/core/20101224223620_create_users.rb
+- spec/rails3/db/migrate/external/20101224223628_create_authentications.rb
+- spec/rails3/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb
+- spec/rails3/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb
+- spec/rails3/db/schema.rb
+- spec/rails3/db/seeds.rb
+- spec/rails3/lib/tasks/.gitkeep
+- spec/rails3/public/404.html
+- spec/rails3/public/422.html
+- spec/rails3/public/500.html
+- spec/rails3/public/favicon.ico
+- spec/rails3/public/images/rails.png
+- spec/rails3/public/index.html
+- spec/rails3/public/javascripts/application.js
+- spec/rails3/public/javascripts/controls.js
+- spec/rails3/public/javascripts/dragdrop.js
+- spec/rails3/public/javascripts/effects.js
+- spec/rails3/public/javascripts/prototype.js
+- spec/rails3/public/javascripts/rails.js
+- spec/rails3/public/robots.txt
+- spec/rails3/public/stylesheets/.gitkeep
+- spec/rails3/script/rails
+- spec/rails3/spec/controller_activity_logging_spec.rb
+- spec/rails3/spec/controller_brute_force_protection_spec.rb
+- spec/rails3/spec/controller_http_basic_auth_spec.rb
+- spec/rails3/spec/controller_oauth2_spec.rb
+- spec/rails3/spec/controller_oauth_spec.rb
+- spec/rails3/spec/controller_remember_me_spec.rb
+- spec/rails3/spec/controller_session_timeout_spec.rb
+- spec/rails3/spec/controller_spec.rb
+- spec/rails3/spec/spec.opts
+- spec/rails3/spec/spec_helper.orig.rb
+- spec/rails3/spec/spec_helper.rb
+- spec/rails3/spec/user_activation_spec.rb
+- spec/rails3/spec/user_activity_logging_spec.rb
+- spec/rails3/spec/user_brute_force_protection_spec.rb
+- spec/rails3/spec/user_oauth_spec.rb
+- spec/rails3/spec/user_remember_me_spec.rb
+- spec/rails3/spec/user_reset_password_spec.rb
+- spec/rails3/spec/user_spec.rb
+- spec/rails3/vendor/plugins/.gitkeep
 - spec/sinatra/Gemfile
 - spec/sinatra/Gemfile.lock
 - spec/sinatra/Rakefile
@@ -345,16 +357,10 @@ files:
 - 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.opts
 - spec/spec_helper.rb
 - spec/untitled folder
 has_rdoc: true
@@ -386,50 +392,50 @@ signing_key:
 specification_version: 3
 summary: Magical authentication for Rails 3 applications
 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
-- spec/rails3/app_root/config/environment.rb
-- spec/rails3/app_root/config/environments/development.rb
-- spec/rails3/app_root/config/environments/in_memory.rb
-- spec/rails3/app_root/config/environments/production.rb
-- spec/rails3/app_root/config/environments/test.rb
-- spec/rails3/app_root/config/initializers/backtrace_silencers.rb
-- spec/rails3/app_root/config/initializers/inflections.rb
-- spec/rails3/app_root/config/initializers/mime_types.rb
-- spec/rails3/app_root/config/initializers/secret_token.rb
-- spec/rails3/app_root/config/initializers/session_store.rb
-- spec/rails3/app_root/config/routes.rb
-- spec/rails3/app_root/db/migrate/activation/20101224223622_add_activation_to_users.rb
-- 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/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/controllers/application_controller.rb
+- spec/rails3/app/helpers/application_helper.rb
+- spec/rails3/app/mailers/sorcery_mailer.rb
+- spec/rails3/app/models/authentication.rb
+- spec/rails3/app/models/user.rb
+- spec/rails3/config/application.rb
+- spec/rails3/config/boot.rb
+- spec/rails3/config/environment.rb
+- spec/rails3/config/environments/development.rb
+- spec/rails3/config/environments/in_memory.rb
+- spec/rails3/config/environments/production.rb
+- spec/rails3/config/environments/test.rb
+- spec/rails3/config/initializers/backtrace_silencers.rb
+- spec/rails3/config/initializers/inflections.rb
+- spec/rails3/config/initializers/mime_types.rb
+- spec/rails3/config/initializers/secret_token.rb
+- spec/rails3/config/initializers/session_store.rb
+- spec/rails3/config/routes.rb
+- spec/rails3/db/migrate/activation/20101224223622_add_activation_to_users.rb
+- spec/rails3/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb
+- spec/rails3/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb
+- spec/rails3/db/migrate/core/20101224223620_create_users.rb
+- spec/rails3/db/migrate/external/20101224223628_create_authentications.rb
+- spec/rails3/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb
+- spec/rails3/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb
+- spec/rails3/db/schema.rb
+- spec/rails3/db/seeds.rb
+- spec/rails3/spec/controller_activity_logging_spec.rb
+- spec/rails3/spec/controller_brute_force_protection_spec.rb
+- spec/rails3/spec/controller_http_basic_auth_spec.rb
+- spec/rails3/spec/controller_oauth2_spec.rb
+- spec/rails3/spec/controller_oauth_spec.rb
+- spec/rails3/spec/controller_remember_me_spec.rb
+- spec/rails3/spec/controller_session_timeout_spec.rb
+- spec/rails3/spec/controller_spec.rb
+- spec/rails3/spec/spec_helper.orig.rb
+- spec/rails3/spec/spec_helper.rb
+- spec/rails3/spec/user_activation_spec.rb
+- spec/rails3/spec/user_activity_logging_spec.rb
+- spec/rails3/spec/user_brute_force_protection_spec.rb
+- spec/rails3/spec/user_oauth_spec.rb
+- spec/rails3/spec/user_remember_me_spec.rb
+- spec/rails3/spec/user_reset_password_spec.rb
+- spec/rails3/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
@@ -450,13 +456,6 @@ test_files:
 - 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