sorcery 0.1.4 → 0.3.0

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 :Oauth, 'sorcery/model/submodules/oauth'
     end
   end
   autoload :Controller, 'sorcery/controller'
@@ -17,6 +19,18 @@ module Sorcery
       autoload :BruteForceProtection, 'sorcery/controller/submodules/brute_force_protection'
       autoload :HttpBasicAuth, 'sorcery/controller/submodules/http_basic_auth'
       autoload :ActivityLogging, 'sorcery/controller/submodules/activity_logging'
+      autoload :Oauth, 'sorcery/controller/submodules/oauth'
+      module Oauth
+        autoload :Oauth1, 'sorcery/controller/submodules/oauth/oauth1'
+        autoload :Oauth2, 'sorcery/controller/submodules/oauth/oauth2'
+        module Providers
+          autoload :Twitter, 'sorcery/controller/submodules/oauth/providers/twitter'
+          autoload :Facebook, 'sorcery/controller/submodules/oauth/providers/facebook'
+        end
+      end
+    end
+    module Adapters
+      autoload :Sinatra, 'sorcery/controller/adapters/sinatra'
     end
   end
   module CryptoProviders
@@ -27,6 +41,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.0"
 
   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-04}
   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,25 @@ 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/oauth.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/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",
@@ -42,23 +56,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/oauth.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 +109,7 @@ Gem::Specification.new do |s|
     "spec/rails3/app_root/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
     "spec/rails3/app_root/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
     "spec/rails3/app_root/db/migrate/core/20101224223620_create_users.rb",
+    "spec/rails3/app_root/db/migrate/oauth/20101224223628_create_authentications.rb",
     "spec/rails3/app_root/db/migrate/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 +130,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/oauth/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 +213,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/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/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/oauth/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 +271,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 +284,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 +300,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 +317,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.0', :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.0)
 
 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.0)!

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.0', :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

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

@@ -1,7 +1,14 @@
 PATH
   remote: ../../../
   specs:
-    sorcery (0.1.3)
+    sorcery (0.3.0)
+      bcrypt-ruby (~> 2.1.4)
+      json (>= 1.5.1)
+      oauth (>= 0.4.4)
+      oauth (>= 0.4.4)
+      oauth2 (>= 0.1.1)
+      oauth2 (>= 0.1.1)
+      rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -33,6 +40,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.4)
@@ -41,7 +49,12 @@ 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)
+    json (1.5.1)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
     mail (2.2.13)
@@ -50,6 +63,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)
@@ -96,6 +115,7 @@ GEM
     simplecov (0.3.9)
       simplecov-html (>= 0.3.7)
     simplecov-html (0.3.9)
+    spork (0.9.0.rc3)
     sqlite3-ruby (1.3.2)
     thor (0.14.6)
     treetop (1.4.9)
@@ -106,11 +126,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bcrypt-ruby (~> 2.1.4)
   rails (= 3.0.3)
   rspec
   rspec-rails
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.1.3)!
+  sorcery (= 0.3.0)!
+  spork (~> 0.9.0.rc)
   sqlite3-ruby

data/spec/rails3/app_root/app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+require 'oauth'
+
 class ApplicationController < ActionController::Base
   protect_from_forgery
   
@@ -18,6 +20,11 @@ class ApplicationController < ActionController::Base
     render :text => ""
   end
   
+  def test_return_to
+    @user = login(params[:username], params[:password])
+    return_or_redirect_to(:index, :notice => 'haha!')
+  end
+  
   def test_logout
     logout
     render :text => ""
@@ -43,7 +50,7 @@ class ApplicationController < ActionController::Base
   end
   
   def test_login_from_cookie
-    @user = logged_in_user
+    @user = current_user
     render :text => ""
   end
   
@@ -59,6 +66,40 @@ class ApplicationController < ActionController::Base
     render :text => "HTTP Basic Auth"
   end
   
+  def auth_at_provider_test
+    auth_at_provider(:twitter)
+  end
+  
+  def auth_at_provider_test2
+    auth_at_provider(:facebook)
+  end
+  
+  def test_login_from_access_token
+    if @user = login_from_access_token(:twitter)
+      redirect_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+  
+  def test_login_from_access_token2
+    if @user = login_from_access_token(:facebook)
+      redirect_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+  
+  def test_create_from_provider
+    provider = params[:provider]
+    login_from_access_token(provider)
+    if @user = create_from_provider!(provider)
+      redirect_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+  
   protected
   
   

data/spec/rails3/app_root/app/models/authentication.rb

@@ -0,0 +1,3 @@
+class Authentication < ActiveRecord::Base
+  belongs_to :user
+end

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

@@ -1,3 +1,6 @@
 class User < ActiveRecord::Base
-  #activate_sorcery!
+  attr_accessible :email, :password, :password_confirmation, :authentications_attributes
+  
+  has_many :authentications, :dependent => :destroy
+  accepts_nested_attributes_for :authentications
 end

data/spec/rails3/app_root/config/application.rb

@@ -38,9 +38,7 @@ module AppRoot
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
-    
-    config.root = File.expand_path('../..', __FILE__)
-    
+        
     config.action_mailer.delivery_method = :test
     
     config.active_support.deprecation = :stderr

data/spec/rails3/app_root/config/routes.rb

@@ -1,14 +1,5 @@
 AppRoot::Application.routes.draw do
   root :to => "application#index" 
-  match '/test_login', :to => "application#test_login"
-  match '/test_logout', :to => "application#test_logout"
-  match '/some_action', :to => "application#some_action"
-  match '/test_logout_with_remember', :to => "application#test_logout_with_remember"
-  match '/test_login_with_remember', :to => 'application#test_login_with_remember'
-  match '/test_login_with_remember_in_login', :to => 'application#test_login_with_remember_in_login'
-  match '/test_login_from_cookie', :to => 'application#test_login_from_cookie'
-  match '/test_should_be_logged_in', :to => 'application#test_should_be_logged_in'
-  match '/test_http_basic_auth', :to => 'application#test_http_basic_auth'
   # The priority is based upon order of creation:
   # first created -> highest priority.
 
@@ -64,5 +55,5 @@ AppRoot::Application.routes.draw do
 
   # This is a legacy wild controller route that's not recommended for RESTful applications.
   # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id(.:format)))'
+  match ':controller(/:action(/:id(.:format)))'
 end

data/spec/rails3/app_root/db/migrate/activation/20101224223622_add_activation_to_users.rb

@@ -1,15 +1,17 @@
 class AddActivationToUsers < ActiveRecord::Migration
   def self.up
     add_column :users, :activation_state, :string, :default => nil
-    add_column :users, :activation_code, :string, :default => nil
+    add_column :users, :activation_token, :string, :default => nil
+    add_column :users, :activation_token_expires_at, :datetime, :default => nil
     
-    add_index :users, :activation_code
+    add_index :users, :activation_token
   end
 
   def self.down
-    remove_index :users, :activation_code
+    remove_index :users, :activation_token
     
-    remove_column :users, :activation_code
+    remove_column :users, :activation_token_expires_at
+    remove_column :users, :activation_token
     remove_column :users, :activation_state
   end
 end

data/spec/rails3/app_root/db/migrate/core/20101224223620_create_users.rb

@@ -1,10 +1,10 @@
 class CreateUsers < ActiveRecord::Migration
   def self.up
     create_table :users do |t|
-      t.string :username
-      t.string :email, :null => false
-      t.string :crypted_password
-      t.string :salt
+      t.string :username,         :null => false
+      t.string :email,            :default => nil
+      t.string :crypted_password, :default => nil
+      t.string :salt,             :default => nil
 
       t.timestamps
     end