sorcery 0.7.0 → 0.7.4

data/lib/sorcery/model.rb

@@ -3,8 +3,8 @@ module Sorcery
   # It should be included into the ORM base class.
   # In the case of Rails this is usually ActiveRecord (actually, in that case, the plugin does this automatically).
   #
-  # When included it defines a single method: 'activate_sorcery!' which when called adds the other capabilities 
-  # to the class.
+  # When included it defines a single method: 'authenticates_with_sorcery!'
+  # which when called adds the other capabilities to the class.
   # This method is also the place to configure the plugin in the Model layer.
   module Model
     def self.included(klass)
@@ -24,6 +24,7 @@ module Sorcery
             ::Sorcery::Controller::Config.user_config.tap{|blk| blk.call(@sorcery_config) if blk}
             
             init_mongoid_support! if defined?(Mongoid) and self.ancestors.include?(Mongoid::Document)
+            init_mongo_mapper_support! if defined?(MongoMapper) and self.ancestors.include?(MongoMapper::Document)
 
             init_orm_hooks!
             
@@ -62,13 +63,29 @@ module Sorcery
             end
           end
           
+          # defines mongo_mapper fields on the model class,
+          def init_mongo_mapper_support!
+            self.class_eval do
+              sorcery_config.username_attribute_names.each do |username|
+                key username, String
+              end
+              key sorcery_config.email_attribute_name, String unless sorcery_config.username_attribute_names.include?(sorcery_config.email_attribute_name)
+              key sorcery_config.crypted_password_attribute_name, String
+              key sorcery_config.salt_attribute_name, String
+            end
+          end
+
           # add virtual password accessor and ORM callbacks.
           def init_orm_hooks!
             self.class_eval do
               attr_accessor @sorcery_config.password_attribute_name
               attr_protected @sorcery_config.crypted_password_attribute_name, @sorcery_config.salt_attribute_name
-              before_save :encrypt_password, :if => Proc.new { |record| record.send(sorcery_config.password_attribute_name).present? }
-              after_save :clear_virtual_password, :if => Proc.new { |record| record.send(sorcery_config.password_attribute_name).present? }
+              before_save :encrypt_password, :if => Proc.new { |record|
+                record.send(sorcery_config.password_attribute_name).present?
+              }
+              after_save :clear_virtual_password, :if => Proc.new { |record|
+                record.send(sorcery_config.password_attribute_name).present?
+              }
             end
           end
         end

data/lib/sorcery.rb

@@ -5,6 +5,7 @@ module Sorcery
     module Adapters
       autoload :ActiveRecord, 'sorcery/model/adapters/active_record'
       autoload :Mongoid, 'sorcery/model/adapters/mongoid'
+      autoload :MongoMapper, 'sorcery/model/adapters/mongo_mapper'
     end
     module Submodules
       autoload :UserActivation, 'sorcery/model/submodules/user_activation'
@@ -36,9 +37,6 @@ module Sorcery
         end
       end
     end
-    module Adapters
-      autoload :Sinatra, 'sorcery/controller/adapters/sinatra'
-    end
   end
   module CryptoProviders
     autoload :Common, 'sorcery/crypto_providers/common'
@@ -52,12 +50,9 @@ module Sorcery
   autoload :TestHelpers, 'sorcery/test_helpers'
   module TestHelpers
     autoload :Rails, 'sorcery/test_helpers/rails'
-    autoload :Sinatra, 'sorcery/test_helpers/sinatra'
     autoload :Internal, 'sorcery/test_helpers/internal'
     module Internal
       autoload :Rails, 'sorcery/test_helpers/internal/rails'
-      autoload :Sinatra, 'sorcery/test_helpers/internal/sinatra'
-      autoload :SinatraModular, 'sorcery/test_helpers/internal/sinatra_modular'
     end
 
   end
@@ -77,6 +72,9 @@ module Sorcery
     end
   end
 
+  if defined?(MongoMapper)
+    MongoMapper::Document.send(:plugin, Sorcery::Model::Adapters::MongoMapper)
+  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 = "sorcery"
-  s.version = "0.7.0"
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Noam Ben Ari"]
-  s.date = "2011-09-30"
+  s.date = "2011-10-29"
   s.description = "Provides common authentication needs such as signing in/out, activating by email and resetting password."
   s.email = "nbenari@gmail.com"
   s.extra_rdoc_files = [
@@ -25,17 +25,18 @@ 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/generators/sorcery/USAGE",
+    "lib/generators/sorcery/install_generator.rb",
+    "lib/generators/sorcery/templates/initializer.rb",
+    "lib/generators/sorcery/templates/migration/activity_logging.rb",
+    "lib/generators/sorcery/templates/migration/brute_force_protection.rb",
+    "lib/generators/sorcery/templates/migration/core.rb",
+    "lib/generators/sorcery/templates/migration/external.rb",
+    "lib/generators/sorcery/templates/migration/remember_me.rb",
+    "lib/generators/sorcery/templates/migration/reset_password.rb",
+    "lib/generators/sorcery/templates/migration/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",
@@ -56,9 +57,9 @@ Gem::Specification.new do |s|
     "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/adapters/active_record.rb",
+    "lib/sorcery/model/adapters/mongo_mapper.rb",
     "lib/sorcery/model/adapters/mongoid.rb",
     "lib/sorcery/model/submodules/activity_logging.rb",
     "lib/sorcery/model/submodules/brute_force_protection.rb",
@@ -68,14 +69,10 @@ Gem::Specification.new do |s|
     "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/internal/sinatra_modular.rb",
     "lib/sorcery/test_helpers/rails.rb",
-    "lib/sorcery/test_helpers/sinatra.rb",
     "sorcery.gemspec",
     "spec/Gemfile",
     "spec/Gemfile.lock",
@@ -87,7 +84,6 @@ Gem::Specification.new do |s|
     "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",
@@ -161,6 +157,68 @@ Gem::Specification.new do |s|
     "spec/rails3/spec/user_reset_password_spec.rb",
     "spec/rails3/spec/user_spec.rb",
     "spec/rails3/vendor/plugins/.gitkeep",
+    "spec/rails3_mongo_mapper/.gitignore",
+    "spec/rails3_mongo_mapper/.rspec",
+    "spec/rails3_mongo_mapper/Gemfile",
+    "spec/rails3_mongo_mapper/Gemfile.lock",
+    "spec/rails3_mongo_mapper/Rakefile",
+    "spec/rails3_mongo_mapper/app/controllers/application_controller.rb",
+    "spec/rails3_mongo_mapper/app/helpers/application_helper.rb",
+    "spec/rails3_mongo_mapper/app/mailers/sorcery_mailer.rb",
+    "spec/rails3_mongo_mapper/app/models/authentication.rb",
+    "spec/rails3_mongo_mapper/app/models/user.rb",
+    "spec/rails3_mongo_mapper/app/views/layouts/application.html.erb",
+    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_email.html.erb",
+    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_email.text.erb",
+    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_success_email.html.erb",
+    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_success_email.text.erb",
+    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/reset_password_email.html.erb",
+    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/reset_password_email.text.erb",
+    "spec/rails3_mongo_mapper/config.ru",
+    "spec/rails3_mongo_mapper/config/application.rb",
+    "spec/rails3_mongo_mapper/config/boot.rb",
+    "spec/rails3_mongo_mapper/config/environment.rb",
+    "spec/rails3_mongo_mapper/config/environments/development.rb",
+    "spec/rails3_mongo_mapper/config/environments/in_memory.rb",
+    "spec/rails3_mongo_mapper/config/environments/production.rb",
+    "spec/rails3_mongo_mapper/config/environments/test.rb",
+    "spec/rails3_mongo_mapper/config/initializers/backtrace_silencers.rb",
+    "spec/rails3_mongo_mapper/config/initializers/inflections.rb",
+    "spec/rails3_mongo_mapper/config/initializers/mime_types.rb",
+    "spec/rails3_mongo_mapper/config/initializers/mongo.rb",
+    "spec/rails3_mongo_mapper/config/initializers/secret_token.rb",
+    "spec/rails3_mongo_mapper/config/initializers/session_store.rb",
+    "spec/rails3_mongo_mapper/config/locales/en.yml",
+    "spec/rails3_mongo_mapper/config/routes.rb",
+    "spec/rails3_mongo_mapper/db/schema.rb",
+    "spec/rails3_mongo_mapper/db/seeds.rb",
+    "spec/rails3_mongo_mapper/lib/tasks/.gitkeep",
+    "spec/rails3_mongo_mapper/public/404.html",
+    "spec/rails3_mongo_mapper/public/422.html",
+    "spec/rails3_mongo_mapper/public/500.html",
+    "spec/rails3_mongo_mapper/public/favicon.ico",
+    "spec/rails3_mongo_mapper/public/images/rails.png",
+    "spec/rails3_mongo_mapper/public/javascripts/application.js",
+    "spec/rails3_mongo_mapper/public/javascripts/controls.js",
+    "spec/rails3_mongo_mapper/public/javascripts/dragdrop.js",
+    "spec/rails3_mongo_mapper/public/javascripts/effects.js",
+    "spec/rails3_mongo_mapper/public/javascripts/prototype.js",
+    "spec/rails3_mongo_mapper/public/javascripts/rails.js",
+    "spec/rails3_mongo_mapper/public/robots.txt",
+    "spec/rails3_mongo_mapper/public/stylesheets/.gitkeep",
+    "spec/rails3_mongo_mapper/script/rails",
+    "spec/rails3_mongo_mapper/spec/controller_spec.rb",
+    "spec/rails3_mongo_mapper/spec/spec.opts",
+    "spec/rails3_mongo_mapper/spec/spec_helper.orig.rb",
+    "spec/rails3_mongo_mapper/spec/spec_helper.rb",
+    "spec/rails3_mongo_mapper/spec/user_activation_spec.rb",
+    "spec/rails3_mongo_mapper/spec/user_activity_logging_spec.rb",
+    "spec/rails3_mongo_mapper/spec/user_brute_force_protection_spec.rb",
+    "spec/rails3_mongo_mapper/spec/user_oauth_spec.rb",
+    "spec/rails3_mongo_mapper/spec/user_remember_me_spec.rb",
+    "spec/rails3_mongo_mapper/spec/user_reset_password_spec.rb",
+    "spec/rails3_mongo_mapper/spec/user_spec.rb",
+    "spec/rails3_mongo_mapper/vendor/plugins/.gitkeep",
     "spec/rails3_mongoid/.gitignore",
     "spec/rails3_mongoid/.rspec",
     "spec/rails3_mongoid/Gemfile",
@@ -211,6 +269,7 @@ Gem::Specification.new do |s|
     "spec/rails3_mongoid/public/robots.txt",
     "spec/rails3_mongoid/public/stylesheets/.gitkeep",
     "spec/rails3_mongoid/script/rails",
+    "spec/rails3_mongoid/spec/controller_activity_logging_spec.rb",
     "spec/rails3_mongoid/spec/controller_spec.rb",
     "spec/rails3_mongoid/spec/spec.opts",
     "spec/rails3_mongoid/spec/spec_helper.orig.rb",
@@ -232,60 +291,6 @@ Gem::Specification.new do |s|
     "spec/shared_examples/user_remember_me_shared_examples.rb",
     "spec/shared_examples/user_reset_password_shared_examples.rb",
     "spec/shared_examples/user_shared_examples.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/modular.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/sinatra_modular/Gemfile",
-    "spec/sinatra_modular/Gemfile.lock",
-    "spec/sinatra_modular/Rakefile",
-    "spec/sinatra_modular/authentication.rb",
-    "spec/sinatra_modular/db/migrate/activation/20101224223622_add_activation_to_users.rb",
-    "spec/sinatra_modular/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
-    "spec/sinatra_modular/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
-    "spec/sinatra_modular/db/migrate/core/20101224223620_create_users.rb",
-    "spec/sinatra_modular/db/migrate/external/20101224223628_create_authentications.rb",
-    "spec/sinatra_modular/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
-    "spec/sinatra_modular/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
-    "spec/sinatra_modular/filters.rb",
-    "spec/sinatra_modular/modular.rb",
-    "spec/sinatra_modular/myapp.rb",
-    "spec/sinatra_modular/sorcery_mailer.rb",
-    "spec/sinatra_modular/spec_modular/controller_activity_logging_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_brute_force_protection_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_http_basic_auth_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_oauth2_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_oauth_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_remember_me_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_session_timeout_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_spec.rb",
-    "spec/sinatra_modular/spec_modular/spec.opts",
-    "spec/sinatra_modular/spec_modular/spec_helper.rb",
-    "spec/sinatra_modular/user.rb",
-    "spec/sinatra_modular/views/test_login.erb",
     "spec/sorcery_crypto_providers_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb"
@@ -293,151 +298,17 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/NoamB/sorcery"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "Magical authentication for Rails 3 applications"
-  s.test_files = [
-    "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/integration_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/rails3_mongoid/app/controllers/application_controller.rb",
-    "spec/rails3_mongoid/app/helpers/application_helper.rb",
-    "spec/rails3_mongoid/app/mailers/sorcery_mailer.rb",
-    "spec/rails3_mongoid/app/models/authentication.rb",
-    "spec/rails3_mongoid/app/models/user.rb",
-    "spec/rails3_mongoid/config/application.rb",
-    "spec/rails3_mongoid/config/boot.rb",
-    "spec/rails3_mongoid/config/environment.rb",
-    "spec/rails3_mongoid/config/environments/development.rb",
-    "spec/rails3_mongoid/config/environments/in_memory.rb",
-    "spec/rails3_mongoid/config/environments/production.rb",
-    "spec/rails3_mongoid/config/environments/test.rb",
-    "spec/rails3_mongoid/config/initializers/backtrace_silencers.rb",
-    "spec/rails3_mongoid/config/initializers/inflections.rb",
-    "spec/rails3_mongoid/config/initializers/mime_types.rb",
-    "spec/rails3_mongoid/config/initializers/secret_token.rb",
-    "spec/rails3_mongoid/config/initializers/session_store.rb",
-    "spec/rails3_mongoid/config/routes.rb",
-    "spec/rails3_mongoid/db/schema.rb",
-    "spec/rails3_mongoid/db/seeds.rb",
-    "spec/rails3_mongoid/spec/controller_spec.rb",
-    "spec/rails3_mongoid/spec/spec_helper.orig.rb",
-    "spec/rails3_mongoid/spec/spec_helper.rb",
-    "spec/rails3_mongoid/spec/user_activation_spec.rb",
-    "spec/rails3_mongoid/spec/user_activity_logging_spec.rb",
-    "spec/rails3_mongoid/spec/user_brute_force_protection_spec.rb",
-    "spec/rails3_mongoid/spec/user_oauth_spec.rb",
-    "spec/rails3_mongoid/spec/user_remember_me_spec.rb",
-    "spec/rails3_mongoid/spec/user_reset_password_spec.rb",
-    "spec/rails3_mongoid/spec/user_spec.rb",
-    "spec/shared_examples/controller_oauth2_shared_examples.rb",
-    "spec/shared_examples/controller_oauth_shared_examples.rb",
-    "spec/shared_examples/user_activation_shared_examples.rb",
-    "spec/shared_examples/user_activity_logging_shared_examples.rb",
-    "spec/shared_examples/user_brute_force_protection_shared_examples.rb",
-    "spec/shared_examples/user_oauth_shared_examples.rb",
-    "spec/shared_examples/user_remember_me_shared_examples.rb",
-    "spec/shared_examples/user_reset_password_shared_examples.rb",
-    "spec/shared_examples/user_shared_examples.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/modular.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/sinatra_modular/authentication.rb",
-    "spec/sinatra_modular/db/migrate/activation/20101224223622_add_activation_to_users.rb",
-    "spec/sinatra_modular/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
-    "spec/sinatra_modular/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
-    "spec/sinatra_modular/db/migrate/core/20101224223620_create_users.rb",
-    "spec/sinatra_modular/db/migrate/external/20101224223628_create_authentications.rb",
-    "spec/sinatra_modular/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
-    "spec/sinatra_modular/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
-    "spec/sinatra_modular/filters.rb",
-    "spec/sinatra_modular/modular.rb",
-    "spec/sinatra_modular/myapp.rb",
-    "spec/sinatra_modular/sorcery_mailer.rb",
-    "spec/sinatra_modular/spec_modular/controller_activity_logging_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_brute_force_protection_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_http_basic_auth_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_oauth2_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_oauth_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_remember_me_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_session_timeout_spec.rb",
-    "spec/sinatra_modular/spec_modular/controller_spec.rb",
-    "spec/sinatra_modular/spec_modular/spec_helper.rb",
-    "spec/sinatra_modular/user.rb",
-    "spec/sorcery_crypto_providers_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_runtime_dependency(%q<oauth2>, ["~> 0.5.1"])
+      s.add_runtime_dependency(%q<oauth2>, ["~> 0.4.1"])
       s.add_development_dependency(%q<rails>, [">= 3.0.0"])
       s.add_development_dependency(%q<json>, [">= 1.5.1"])
-      s.add_development_dependency(%q<mongoid>, ["~> 2.0"])
-      s.add_development_dependency(%q<bson_ext>, ["~> 1.3"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.5.0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
@@ -449,14 +320,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<timecop>, [">= 0"])
       s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_runtime_dependency(%q<oauth2>, ["~> 0.5.1"])
+      s.add_runtime_dependency(%q<oauth2>, ["~> 0.4.1"])
     else
       s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
+      s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<json>, [">= 1.5.1"])
-      s.add_dependency(%q<mongoid>, ["~> 2.0"])
-      s.add_dependency(%q<bson_ext>, ["~> 1.3"])
       s.add_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
@@ -468,15 +337,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<timecop>, [">= 0"])
       s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
       s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
+      s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
     end
   else
     s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-    s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
+    s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
     s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<json>, [">= 1.5.1"])
-    s.add_dependency(%q<mongoid>, ["~> 2.0"])
-    s.add_dependency(%q<bson_ext>, ["~> 1.3"])
     s.add_dependency(%q<rspec>, ["~> 2.5.0"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
@@ -488,7 +355,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<timecop>, [">= 0"])
     s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
     s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-    s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
+    s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
   end
 end
 

data/spec/Gemfile

@@ -4,7 +4,7 @@ gem "rails", '3.0.3'
 gem 'bcrypt-ruby', :require => 'bcrypt'
 gem "sorcery", '>= 0.1.0', :path => '../'
 gem 'oauth', "~> 0.4.4"
-gem 'oauth2', "~> 0.5.1"
+gem 'oauth2', "~> 0.4.1"
 group :development do
   gem "rspec", "~> 2.5.0"
   gem 'ruby-debug19'

data/spec/Gemfile.lock

@@ -1,10 +1,12 @@
 PATH
   remote: ../
   specs:
-    sorcery (0.6.1)
+    sorcery (0.7.2)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.5.0)
+      oauth (~> 0.4.4)
+      oauth2 (~> 0.4.1)
+      oauth2 (~> 0.4.1)
 
 GEM
   remote: http://rubygems.org/
@@ -39,16 +41,16 @@ GEM
     addressable (2.2.6)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
-    bcrypt-ruby (3.0.0)
+    bcrypt-ruby (3.0.1)
     builder (2.1.2)
     columnize (0.3.4)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.7.4)
-      addressable (~> 2.2.6)
+    faraday (0.6.1)
+      addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
-      rack (< 2, >= 1.1.0)
+      rack (>= 1.1.0, < 2)
     i18n (0.6.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
@@ -57,15 +59,15 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
+    mime-types (1.17.2)
     multi_json (1.0.3)
     multipart-post (1.1.3)
     oauth (0.4.5)
-    oauth2 (0.5.1)
-      faraday (~> 0.7.4)
-      multi_json (~> 1.0.3)
+    oauth2 (0.4.1)
+      faraday (~> 0.6.1)
+      multi_json (>= 0.0.5)
     polyglot (0.3.2)
-    rack (1.2.3)
+    rack (1.2.4)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
@@ -83,7 +85,7 @@ GEM
       activesupport (= 3.0.3)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -102,14 +104,15 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    simplecov (0.4.2)
-      simplecov-html (~> 0.4.4)
-    simplecov-html (0.4.5)
+    simplecov (0.5.4)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
     thor (0.14.6)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby
@@ -117,7 +120,7 @@ PLATFORMS
 DEPENDENCIES
   bcrypt-ruby
   oauth (~> 0.4.4)
-  oauth2 (~> 0.5.1)
+  oauth2 (~> 0.4.1)
   rails (= 3.0.3)
   rspec (~> 2.5.0)
   ruby-debug19

data/spec/README.md

@@ -18,9 +18,14 @@ To run framework specs, cd into each directory, bundle, and run the specs. For e
     bundle install
     rake spec
 
-**Note:** the rails3_mongoid sample app does require, well, MongoDB. Installing MongoDB on mac osx is easy with homebrew. Seeing as you're reading the readme for running specs, I'll assume you can install MongoDB on your machine. For the purpose of running these tests, I put mongod in verbose mode and in the background so I can see it log to stdout. 
+**Note:** the rails3_mongoid and rails3_mongo_mapper sample apps do require, well, MongoDB. Installing MongoDB on mac osx is easy with homebrew. Seeing as you're reading the readme for running specs, I'll assume you can install MongoDB on your machine. For the purpose of running these tests, I put mongod in verbose mode and in the background so I can see it log to stdout. 
 
     cd spec/rails3_mongoid
     bundle install
     mongod -v &
+    rake spec
+    
+    cd spec/rails3_mongo_mapper
+    bundle install
+    mongod -v &
     rake spec

data/spec/rails3/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.3'
 gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "sorcery", '>= 0.1.0', :path => '../../../'
+gem "sorcery", '>= 0.1.0', :path => '../../'
 
 group :development, :test do
   gem "rspec", "~> 2.5.0"
@@ -10,6 +10,6 @@ group :development, :test do
   gem 'ruby-debug19'
   gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
   gem 'timecop'
-  gem 'capybara', '~> 1.1.1'
+  # gem 'capybara', '~> 1.1.1'
   gem 'launchy', '~> 2.0.5'
 end