devise 2.0.0 → 2.0.1

data/Rakefile

@@ -0,0 +1,34 @@
+# encoding: UTF-8
+
+require 'rake/testtask'
+require 'rdoc/task'
+
+desc 'Default: run tests for all ORMs.'
+task :default => :test
+
+desc 'Run Devise tests for all ORMs.'
+task :pre_commit do
+  Dir[File.join(File.dirname(__FILE__), 'test', 'orm', '*.rb')].each do |file|
+    orm = File.basename(file).split(".").first
+    # "Some day, my son, rake's inner wisdom will reveal itself.  Until then,
+    # take this `system` -- may its brute force protect you well."
+    exit 1 unless system "rake test DEVISE_ORM=#{orm}"
+  end
+end
+
+desc 'Run Devise unit tests.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for Devise.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Devise'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/app/controllers/devise/sessions_controller.rb

@@ -6,12 +6,12 @@ class Devise::SessionsController < DeviseController
   def new
     resource = build_resource
     clean_up_passwords(resource)
-    respond_with(resource, stub_options(resource))
+    respond_with(resource, serialize_options(resource))
   end
 
   # POST /resource/sign_in
   def create
-    resource = warden.authenticate!(:scope => resource_name, :recall => "#{controller_path}#new")
+    resource = warden.authenticate!(auth_options)
     set_flash_message(:notice, :signed_in) if is_navigational_format?
     sign_in(resource_name, resource)
     respond_with resource, :location => after_sign_in_path_for(resource)
@@ -38,11 +38,15 @@ class Devise::SessionsController < DeviseController
 
   protected
 
-  def stub_options(resource)
+  def serialize_options(resource)
     methods = resource_class.authentication_keys.dup
     methods = methods.keys if methods.is_a?(Hash)
     methods << :password if resource.respond_to?(:password)
     { :methods => methods, :only => [:password] }
   end
+
+  def auth_options
+    { :scope => resource_name, :recall => "#{controller_path}#new" }
+  end
 end
 

data/devise.gemspec

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "devise/version"
+
+Gem::Specification.new do |s|
+  s.name        = "devise"
+  s.version     = Devise::VERSION.dup
+  s.platform    = Gem::Platform::RUBY
+  s.summary     = "Flexible authentication solution for Rails with Warden"
+  s.email       = "contact@plataformatec.com.br"
+  s.homepage    = "http://github.com/plataformatec/devise"
+  s.description = "Flexible authentication solution for Rails with Warden"
+  s.authors     = ['José Valim', 'Carlos Antônio']
+
+  s.rubyforge_project = "devise"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- test/*`.split("\n")
+  s.require_paths = ["lib"]
+
+  s.add_dependency("warden", "~> 1.1")
+  s.add_dependency("orm_adapter", "~> 0.0.3")
+  s.add_dependency("bcrypt-ruby", "~> 3.0")
+  s.add_dependency("railties", "~> 3.1")
+end

data/gemfiles/Gemfile.rails-3.1.x

@@ -0,0 +1,35 @@
+source "http://rubygems.org"
+
+gem "devise", :path => ".."
+
+gem "rails", "~> 3.1.0"
+gem "omniauth", "~> 1.0.0"
+gem "omniauth-oauth2", "~> 1.0.0"
+gem "rdoc"
+
+group :test do
+  gem "omniauth-facebook"
+  gem "omniauth-openid", "~> 1.0.1"
+  gem "webrat", "0.7.2", :require => false
+  gem "mocha", :require => false
+
+  platforms :mri_18 do
+    gem "ruby-debug", ">= 0.10.3"
+  end
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "jruby-openssl"
+end
+
+platforms :ruby do
+  gem "sqlite3-ruby"
+
+  group :mongoid do
+    gem "mongo", "~> 1.3.0"
+    gem "mongoid", "~> 2.0"
+    gem "bson_ext", "~> 1.3.0"
+  end
+end

data/lib/devise.rb

@@ -221,7 +221,7 @@ module Devise
   # to :main_app. Should be overriden by engines in order
   # to provide custom routes.
   mattr_accessor :router_name
-  @@router_name = :main_app
+  @@router_name = nil
 
   # DEPRECATED CONFIG
 

data/lib/devise/models/confirmable.rb

@@ -31,7 +31,7 @@ module Devise
 
       included do
         before_create :generate_confirmation_token, :if => :confirmation_required?
-        after_create  :send_confirmation_instructions, :if => :confirmation_required?
+        after_create  :send_on_create_confirmation_instructions, :if => :confirmation_required?
         before_update :postpone_email_change_until_confirmation, :if => :postpone_email_change?
         after_update :send_confirmation_instructions, :if => :reconfirmation_required?
       end
@@ -109,6 +109,13 @@ module Devise
 
       protected
 
+        # A callback method used to deliver confirmation
+        # instructions on creation. This can be overriden
+        # in models to map to a nice sign up e-mail.
+        def send_on_create_confirmation_instructions
+          self.devise_mailer.confirmation_instructions(self).deliver
+        end
+
         # Callback to overwrite if confirmation is required or not.
         def confirmation_required?
           !confirmed?

data/lib/devise/rails.rb

@@ -55,9 +55,14 @@ module Devise
       unless defined?(Rails::Generators)
         if Devise.case_insensitive_keys == false
           warn "\n[DEVISE] Devise.case_insensitive_keys is false which is no longer " \
-            "supported. If you want to continue running on this mode, please ensure " \
-            "you are not using validatable (you can copy the validations directly to your model) " \
-            "and set case_insensitive_keys to an empty array.\n"
+            "supported. Recent Devise versions automatically downcase the e-mail before " \
+            "saving it to the database but your app isn't using this feature. You can solve " \
+            "this issue by either:\n\n" \
+            "1) Setting config.case_insensitive_keys = [:email] in your Devise initializer and " \
+            "running a migration that will downcase all emails already in the database;\n\n" \
+            "2) Setting config.case_insensitive_keys = [] (so nothing will be downcased) and " \
+            "making sure you are not using Devise :validatable (since validatable assumes case" \
+            "insensitivity)\n"
         end
 
         if Devise.apply_schema && defined?(Mongoid)

data/lib/devise/rails/routes.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/object/try"
+
 module ActionDispatch::Routing
   class RouteSet #:nodoc:
     # Ensure Devise modules are included only after loading routes, because we
@@ -6,6 +8,14 @@ module ActionDispatch::Routing
       finalize_without_devise!
 
       @devise_finalized ||= begin
+        if Devise.router_name.nil? && self != Rails.application.try(:routes)
+          warn "[Devise] We have detected that you are using devise_for inside engine routes. " \
+            "In this case, you probably want to set Devise.router_name = MOUNT_POINT, where "   \
+            "MOUNT_POINT is a symbol representing where this engine will be mounted at. For "   \
+            "now, Devise will default the mount point to :main_app."
+        end
+
+        Devise.router_name ||= :main_app
         Devise.configure_warden!
         Devise.regenerate_helpers!
         true
@@ -210,7 +220,9 @@ module ActionDispatch::Routing
         devise_scope mapping.name do
           if block_given?
             ActiveSupport::Deprecation.warn "Passing a block to devise_for is deprecated. " \
-              "Please call devise_scope :#{mapping.name} do ... end with the block instead", caller
+              "Please remove the block from devise_for (only the block, the call to " \
+              "devise_for must still exist) and call devise_scope :#{mapping.name} do ... end " \
+              "with the block instead", caller
             yield
           end
 
@@ -363,7 +375,10 @@ module ActionDispatch::Routing
         path_prefix = "/#{mapping.path}/auth".squeeze("/")
 
         if ::OmniAuth.config.path_prefix && ::OmniAuth.config.path_prefix != path_prefix
-          raise "You can only add :omniauthable behavior to one Devise model"
+          raise "Wrong OmniAuth configuration. If you are getting this exception, it means that either:\n\n" \
+            "1) You are manually setting OmniAuth.config.path_prefix and it doesn't match the Devise one\n" \
+            "2) You are setting :omniauthable in more than one model\n" \
+            "3) You changed your Devise routes/OmniAuth setting and haven't restarted your server"
         else
           ::OmniAuth.config.path_prefix = path_prefix
         end

data/lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "2.0.0".freeze
+  VERSION = "2.0.1".freeze
 end

data/lib/generators/devise/views_generator.rb

@@ -13,6 +13,13 @@ module Devise
         public_task :copy_views
       end
 
+      # TODO: Add this to Rails itslef
+      module ClassMethods
+        def hide!
+          Rails::Generators.hide_namespace self.namespace
+        end
+      end
+
       def copy_views
         view_directory :confirmations
         view_directory :passwords
@@ -36,18 +43,21 @@ module Devise
       include ViewPathTemplates
       source_root File.expand_path("../../../../app/views/devise", __FILE__)
       desc "Copies default Devise views to your application."
+      hide!
     end
 
     class SimpleFormForGenerator < Rails::Generators::Base #:nodoc:
       include ViewPathTemplates
       source_root File.expand_path("../../templates/simple_form_for", __FILE__)
       desc "Copies simple form enabled views to your application."
+      hide!
     end
 
     class ErbGenerator < Rails::Generators::Base #:nodoc:
       include ViewPathTemplates
       source_root File.expand_path("../../../../app/views/devise", __FILE__)
       desc "Copies Devise mail erb views to your application."
+      hide!
 
       def copy_views
         view_directory :mailer
@@ -58,6 +68,7 @@ module Devise
       include ViewPathTemplates
       source_root File.expand_path("../../templates", __FILE__)
       desc "Copies Devise mail markerb views to your application."
+      hide!
 
       def copy_views
         view_directory :markerb, target_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
+date: 2012-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
-  requirement: &2152505840 !ruby/object:Gem::Requirement
+  requirement: &2152591440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2152505840
+  version_requirements: *2152591440
 - !ruby/object:Gem::Dependency
   name: orm_adapter
-  requirement: &2152501920 !ruby/object:Gem::Requirement
+  requirement: &2152588140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152501920
+  version_requirements: *2152588140
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &2152525080 !ruby/object:Gem::Requirement
+  requirement: &2152586020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152525080
+  version_requirements: *2152586020
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &2152523660 !ruby/object:Gem::Requirement
+  requirement: &2152584880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,16 +55,21 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2152523660
+  version_requirements: *2152584880
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .travis.yml
 - CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
-- README.rdoc
+- README.md
+- Rakefile
 - app/controllers/devise/confirmations_controller.rb
 - app/controllers/devise/omniauth_callbacks_controller.rb
 - app/controllers/devise/passwords_controller.rb
@@ -87,6 +92,9 @@ files:
 - app/views/devise/shared/_links.erb
 - app/views/devise/unlocks/new.html.erb
 - config/locales/en.yml
+- devise.gemspec
+- gemfiles/Gemfile.rails-3.1.x
+- lib/devise.rb
 - lib/devise/controllers/helpers.rb
 - lib/devise/controllers/rememberable.rb
 - lib/devise/controllers/scoped_views.rb
@@ -106,6 +114,7 @@ files:
 - lib/devise/hooks/trackable.rb
 - lib/devise/mailers/helpers.rb
 - lib/devise/mapping.rb
+- lib/devise/models.rb
 - lib/devise/models/authenticatable.rb
 - lib/devise/models/confirmable.rb
 - lib/devise/models/database_authenticatable.rb
@@ -120,18 +129,17 @@ files:
 - lib/devise/models/token_authenticatable.rb
 - lib/devise/models/trackable.rb
 - lib/devise/models/validatable.rb
-- lib/devise/models.rb
 - lib/devise/modules.rb
+- lib/devise/omniauth.rb
 - lib/devise/omniauth/config.rb
 - lib/devise/omniauth/url_helpers.rb
-- lib/devise/omniauth.rb
 - lib/devise/orm/active_record.rb
 - lib/devise/orm/mongoid.rb
 - lib/devise/param_filter.rb
 - lib/devise/path_checker.rb
+- lib/devise/rails.rb
 - lib/devise/rails/routes.rb
 - lib/devise/rails/warden_compat.rb
-- lib/devise/rails.rb
 - lib/devise/schema.rb
 - lib/devise/strategies/authenticatable.rb
 - lib/devise/strategies/base.rb
@@ -140,7 +148,6 @@ files:
 - lib/devise/strategies/token_authenticatable.rb
 - lib/devise/test_helpers.rb
 - lib/devise/version.rb
-- lib/devise.rb
 - lib/generators/active_record/devise_generator.rb
 - lib/generators/active_record/templates/migration.rb
 - lib/generators/active_record/templates/migration_existing.rb
@@ -149,11 +156,11 @@ files:
 - lib/generators/devise/orm_helpers.rb
 - lib/generators/devise/views_generator.rb
 - lib/generators/mongoid/devise_generator.rb
+- lib/generators/templates/README
 - lib/generators/templates/devise.rb
 - lib/generators/templates/markerb/confirmation_instructions.markerb
 - lib/generators/templates/markerb/reset_password_instructions.markerb
 - lib/generators/templates/markerb/unlock_instructions.markerb
-- lib/generators/templates/README
 - lib/generators/templates/simple_form_for/confirmations/new.html.erb
 - lib/generators/templates/simple_form_for/passwords/edit.html.erb
 - lib/generators/templates/simple_form_for/passwords/new.html.erb
@@ -209,6 +216,7 @@ files:
 - test/orm/active_record.rb
 - test/orm/mongoid.rb
 - test/path_checker_test.rb
+- test/rails_app/Rakefile
 - test/rails_app/app/active_record/admin.rb
 - test/rails_app/app/active_record/shim.rb
 - test/rails_app/app/active_record/user.rb
@@ -236,6 +244,7 @@ files:
 - test/rails_app/app/views/users/index.html.erb
 - test/rails_app/app/views/users/mailer/confirmation_instructions.erb
 - test/rails_app/app/views/users/sessions/new.html.erb
+- test/rails_app/config.ru
 - test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb
 - test/rails_app/config/database.yml
@@ -248,18 +257,14 @@ files:
 - test/rails_app/config/initializers/inflections.rb
 - test/rails_app/config/initializers/secret_token.rb
 - test/rails_app/config/routes.rb
-- test/rails_app/config.ru
 - test/rails_app/db/migrate/20100401102949_create_tables.rb
 - test/rails_app/db/schema.rb
 - test/rails_app/lib/shared_admin.rb
 - test/rails_app/lib/shared_user.rb
-- test/rails_app/log/development.log
-- test/rails_app/log/test.log
 - test/rails_app/public/404.html
 - test/rails_app/public/422.html
 - test/rails_app/public/500.html
 - test/rails_app/public/favicon.ico
-- test/rails_app/Rakefile
 - test/rails_app/script/rails
 - test/routes_test.rb
 - test/support/assertions.rb
@@ -269,28 +274,6 @@ files:
 - test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb
-- test/tmp/app/views/devise/_links.erb
-- test/tmp/app/views/devise/confirmations/new.html.erb
-- test/tmp/app/views/devise/mailer/confirmation_instructions.html.erb
-- test/tmp/app/views/devise/mailer/reset_password_instructions.html.erb
-- test/tmp/app/views/devise/mailer/unlock_instructions.html.erb
-- test/tmp/app/views/devise/passwords/edit.html.erb
-- test/tmp/app/views/devise/passwords/new.html.erb
-- test/tmp/app/views/devise/registrations/edit.html.erb
-- test/tmp/app/views/devise/registrations/new.html.erb
-- test/tmp/app/views/devise/sessions/new.html.erb
-- test/tmp/app/views/devise/unlocks/new.html.erb
-- test/tmp/app/views/users/_links.erb
-- test/tmp/app/views/users/confirmations/new.html.erb
-- test/tmp/app/views/users/mailer/confirmation_instructions.html.erb
-- test/tmp/app/views/users/mailer/reset_password_instructions.html.erb
-- test/tmp/app/views/users/mailer/unlock_instructions.html.erb
-- test/tmp/app/views/users/passwords/edit.html.erb
-- test/tmp/app/views/users/passwords/new.html.erb
-- test/tmp/app/views/users/registrations/edit.html.erb
-- test/tmp/app/views/users/registrations/new.html.erb
-- test/tmp/app/views/users/sessions/new.html.erb
-- test/tmp/app/views/users/unlocks/new.html.erb
 homepage: http://github.com/plataformatec/devise
 licenses: []
 post_install_message: 
@@ -311,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: devise
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
@@ -364,6 +347,7 @@ test_files:
 - test/orm/active_record.rb
 - test/orm/mongoid.rb
 - test/path_checker_test.rb
+- test/rails_app/Rakefile
 - test/rails_app/app/active_record/admin.rb
 - test/rails_app/app/active_record/shim.rb
 - test/rails_app/app/active_record/user.rb
@@ -391,6 +375,7 @@ test_files:
 - test/rails_app/app/views/users/index.html.erb
 - test/rails_app/app/views/users/mailer/confirmation_instructions.erb
 - test/rails_app/app/views/users/sessions/new.html.erb
+- test/rails_app/config.ru
 - test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb
 - test/rails_app/config/database.yml
@@ -403,18 +388,14 @@ test_files:
 - test/rails_app/config/initializers/inflections.rb
 - test/rails_app/config/initializers/secret_token.rb
 - test/rails_app/config/routes.rb
-- test/rails_app/config.ru
 - test/rails_app/db/migrate/20100401102949_create_tables.rb
 - test/rails_app/db/schema.rb
 - test/rails_app/lib/shared_admin.rb
 - test/rails_app/lib/shared_user.rb
-- test/rails_app/log/development.log
-- test/rails_app/log/test.log
 - test/rails_app/public/404.html
 - test/rails_app/public/422.html
 - test/rails_app/public/500.html
 - test/rails_app/public/favicon.ico
-- test/rails_app/Rakefile
 - test/rails_app/script/rails
 - test/routes_test.rb
 - test/support/assertions.rb
@@ -424,25 +405,3 @@ test_files:
 - test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb
-- test/tmp/app/views/devise/_links.erb
-- test/tmp/app/views/devise/confirmations/new.html.erb
-- test/tmp/app/views/devise/mailer/confirmation_instructions.html.erb
-- test/tmp/app/views/devise/mailer/reset_password_instructions.html.erb
-- test/tmp/app/views/devise/mailer/unlock_instructions.html.erb
-- test/tmp/app/views/devise/passwords/edit.html.erb
-- test/tmp/app/views/devise/passwords/new.html.erb
-- test/tmp/app/views/devise/registrations/edit.html.erb
-- test/tmp/app/views/devise/registrations/new.html.erb
-- test/tmp/app/views/devise/sessions/new.html.erb
-- test/tmp/app/views/devise/unlocks/new.html.erb
-- test/tmp/app/views/users/_links.erb
-- test/tmp/app/views/users/confirmations/new.html.erb
-- test/tmp/app/views/users/mailer/confirmation_instructions.html.erb
-- test/tmp/app/views/users/mailer/reset_password_instructions.html.erb
-- test/tmp/app/views/users/mailer/unlock_instructions.html.erb
-- test/tmp/app/views/users/passwords/edit.html.erb
-- test/tmp/app/views/users/passwords/new.html.erb
-- test/tmp/app/views/users/registrations/edit.html.erb
-- test/tmp/app/views/users/registrations/new.html.erb
-- test/tmp/app/views/users/sessions/new.html.erb
-- test/tmp/app/views/users/unlocks/new.html.erb