sorcery 0.2.1 → 0.4.2

metadata

@@ -2,7 +2,7 @@
 name: sorcery
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 +02:00
+date: 2011-04-30 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: []
@@ -196,119 +207,165 @@ files:
 - 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/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
 - 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
-- 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
 - lib/sorcery/model/temporary_token.rb
+- lib/sorcery/railties/tasks.rake
+- lib/sorcery/sinatra.rb
 - lib/sorcery/test_helpers.rb
+- lib/sorcery/test_helpers/internal.rb
+- lib/sorcery/test_helpers/internal/rails.rb
+- lib/sorcery/test_helpers/internal/sinatra.rb
+- lib/sorcery/test_helpers/rails.rb
+- lib/sorcery/test_helpers/sinatra.rb
 - sorcery.gemspec
 - 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/oauth/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
+- 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/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
 homepage: http://github.com/NoamB/sorcery
 licenses: 
@@ -338,49 +395,70 @@ 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/oauth/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
+- 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/user.rb
 - spec/sorcery_crypto_providers_spec.rb
 - spec/spec_helper.rb

data/lib/sorcery/controller/submodules/oauth/oauth1.rb

@@ -1,26 +0,0 @@
-require 'oauth'
-module Sorcery
-  module Controller
-    module Submodules
-      module Oauth
-        module Oauth1
-          def oauth_version
-            "1.0"
-          end
-          
-          def get_request_token
-            ::OAuth::Consumer.new(@key, @secret, :site => @site).get_request_token(:oauth_callback => @callback_url)
-          end
-          
-          def authorize_url(args)
-            args[:request_token].authorize_url(:oauth_callback => @callback_url)
-          end
-          
-          def get_access_token(args)
-            args[:request_token].get_access_token(:oauth_verifier => args[:oauth_verifier])
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sorcery/controller/submodules/oauth/oauth2.rb

@@ -1,24 +0,0 @@
-require 'oauth2'
-module Sorcery
-  module Controller
-    module Submodules
-      module Oauth
-        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

data/spec/rails3/app_root/.rspec

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

data/spec/rails3/app_root/config/database.yml

@@ -1,27 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
-  
-in_memory:
-  adapter: sqlite3
-  database: ":memory:"
-  verbosity: quiet

data/spec/rails3/app_root/spec/controller_session_timeout_spec.rb

@@ -1,50 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe ApplicationController do
-  
-  # ----------------- SESSION TIMEOUT -----------------------
-  describe ApplicationController, "with session timeout features" do
-    before(:all) do
-      sorcery_reload!([:session_timeout])
-      sorcery_controller_property_set(:session_timeout,0.5)
-      create_new_user
-    end
-    
-    it "should not reset session before session timeout" do
-      login_user
-      get :test_should_be_logged_in
-      session[:user_id].should_not be_nil
-      response.should be_a_success
-    end
-    
-    it "should reset session after session timeout" do
-      login_user
-      sleep 0.6
-      get :test_should_be_logged_in
-      session[:user_id].should be_nil
-      response.should be_a_redirect
-    end
-    
-    it "with 'session_timeout_from_last_action' should not logout if there was activity" do
-      sorcery_controller_property_set(:session_timeout_from_last_action, true)
-      login_user
-      sleep 0.3
-      get :test_should_be_logged_in
-      session[:user_id].should_not be_nil
-      sleep 0.3
-      get :test_should_be_logged_in
-      session[:user_id].should_not be_nil
-      response.should be_a_success
-    end
-    
-    it "with 'session_timeout_from_last_action' should logout if there was no activity" do
-      sorcery_controller_property_set(:session_timeout_from_last_action, true)
-      login_user
-      sleep 0.6
-      get :test_should_be_logged_in
-      session[:user_id].should be_nil
-      response.should be_a_redirect
-    end
-    
-  end
-end