devise 1.0.11 → 1.1.pre

data/lib/devise/models/recoverable.rb

@@ -14,11 +14,7 @@ module Devise
     #   # creates a new token and send it with instructions about how to reset the password
     #   User.find(1).send_reset_password_instructions
     module Recoverable
-      def self.included(base)
-        base.class_eval do
-          extend ClassMethods
-        end
-      end
+      extend ActiveSupport::Concern
 
       # Update password saving the record and clearing token. Returns true if
       # the passwords are valid and the record was saved, false otherwise.
@@ -32,7 +28,7 @@ module Devise
       # Resets reset password token and send reset password instructions by email
       def send_reset_password_instructions
         generate_reset_password_token!
-        ::DeviseMailer.deliver_reset_password_instructions(self)
+        ::Devise::Mailer.reset_password_instructions(self).deliver
       end
 
       protected
@@ -45,7 +41,7 @@ module Devise
         # Resets the reset password token with and save the record without
         # validating
         def generate_reset_password_token!
-          generate_reset_password_token && save(false)
+          generate_reset_password_token && save(:validate => false)
         end
 
         # Removes reset_password token
@@ -69,7 +65,7 @@ module Devise
         # try saving the record. If not user is found, returns a new user
         # containing an error in reset_password_token attribute.
         # Attributes must contain reset_password_token, password and confirmation
-        def reset_password_by_token(attributes={})
+        def reset_password!(attributes={})
           recoverable = find_or_initialize_with_error_by(:reset_password_token, attributes[:reset_password_token])
           recoverable.reset_password!(attributes[:password], attributes[:password_confirmation]) unless recoverable.new_record?
           recoverable

data/lib/devise/models/rememberable.rb

@@ -30,21 +30,18 @@ module Devise
     #   # lookup the user based on the incoming cookie information
     #   User.serialize_from_cookie(cookie_string)
     module Rememberable
+      extend ActiveSupport::Concern
 
-      def self.included(base)
-        base.class_eval do
-          extend ClassMethods
-
-          # Remember me option available in after_authentication hook.
-          attr_accessor :remember_me
-        end
+      included do
+        # Remember me option available in after_authentication hook.
+        attr_accessor :remember_me
       end
 
       # Generate a new remember token and save the record without validations.
       def remember_me!
         self.remember_token = Devise.friendly_token
         self.remember_created_at = Time.now.utc
-        save(false)
+        save(:validate => false)
       end
 
       # Removes the remember token only if it exists, and save the record
@@ -53,7 +50,7 @@ module Devise
         if remember_token
           self.remember_token = nil
           self.remember_created_at = nil
-          save(false)
+          save(:validate => false)
         end
       end
 

data/lib/devise/models/timeoutable.rb

@@ -11,9 +11,7 @@ module Devise
     #
     #   timeout_in: the time you want to timeout the user session without activity.
     module Timeoutable
-      def self.included(base)
-        base.extend ClassMethods
-      end
+      extend ActiveSupport::Concern
 
       # Checks whether the user session has expired based on configured time.
       def timedout?(last_access)

data/lib/devise/models/token_authenticatable.rb

@@ -18,11 +18,10 @@ module Devise
     #    User.find(1).valid_authentication_token?('rI1t6PKQ8yP7VetgwdybB')  # returns true/false
     #
     module TokenAuthenticatable
-      def self.included(base)
-        base.class_eval do
-          extend ClassMethods
-          before_save :ensure_authentication_token
-        end
+      extend ActiveSupport::Concern
+
+      included do
+        before_save :ensure_authentication_token
       end
 
       # Generate new authentication token (a.k.a. "single access token").

data/lib/devise/models/validatable.rb

@@ -15,7 +15,7 @@ module Devise
 
         base.class_eval do
           validates_presence_of   :email
-          validates_uniqueness_of :email, :scope => authentication_keys[1..-1], :case_sensitive => false, :allow_blank => true
+          validates_uniqueness_of :email, :scope => authentication_keys[1..-1], :allow_blank => true
           validates_format_of     :email, :with  => EMAIL_REGEX, :allow_blank => true
 
           with_options :if => :password_required? do |v|
@@ -34,6 +34,15 @@ module Devise
                 "to the following methods: #{unavailable_validations.to_sentence}."
         end
       end
+
+      protected
+
+        # Checks whether a password is needed or not. For validations only.
+        # Passwords are always required if it's a new record, or if the password
+        # or confirmation are being set somewhere.
+        def password_required?
+          new_record? || !password.nil? || !password_confirmation.nil?
+        end
     end
   end
 end

data/lib/devise/orm/mongo_mapper.rb

@@ -1,19 +1,8 @@
 module Devise
   module Orm
     module MongoMapper
-      module InstanceMethods
-        def save(options={})
-          if options == false
-            super(:validate => false)
-          else
-            super
-          end
-        end
-      end
-
       def self.included_modules_hook(klass)
-        klass.send :extend,  self
-        klass.send :include, InstanceMethods
+        klass.send :extend, self
         yield
 
         klass.devise_modules.each do |mod|
@@ -22,11 +11,14 @@ module Devise
       end
       
       def find(*args)
+        options = args.extract_options!
         case args.first
-        when :first, :all
-          send(args.shift, *args)
-        else
-          super
+          when :first
+            first(options)
+          when :all
+            all(options)
+          else
+            super
         end
       end
       
@@ -43,10 +35,5 @@ module Devise
   end
 end
 
-if MongoMapper::Version >= "0.8.0"
-  MongoMapper::Plugins::Document::ClassMethods.send(:include, Devise::Models)
-  MongoMapper::Plugins::EmbeddedDocument::ClassMethods.send(:include, Devise::Models)
-else
-  MongoMapper::Document::ClassMethods.send(:include, Devise::Models)
-  MongoMapper::EmbeddedDocument::ClassMethods.send(:include, Devise::Models)
-end
+MongoMapper::Document::ClassMethods.send(:include, Devise::Models)
+MongoMapper::EmbeddedDocument::ClassMethods.send(:include, Devise::Models)

data/lib/devise/rails.rb

@@ -1,14 +1,16 @@
 require 'devise/rails/routes'
 require 'devise/rails/warden_compat'
 
-Rails.configuration.after_initialize do
-  require "devise/orm/#{Devise.orm}"
+module Devise
+  class Engine < ::Rails::Engine
+    engine_name :devise
 
-  # Adds Warden Manager to Rails middleware stack, configuring default devise
-  # strategy and also the failure app.
-  Rails.configuration.middleware.use Warden::Manager do |config|
-    Devise.configure_warden(config)
-  end
+    config.middleware.use Warden::Manager do |config|
+      Devise.configure_warden(config)
+    end
 
-  I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), 'locales', 'en.yml'))
-end
+    config.after_initialize do
+      require "devise/orm/#{Devise.orm}"
+    end
+  end
+end

data/lib/devise/rails/routes.rb

@@ -1,11 +1,10 @@
-module ActionController::Routing
+module ActionDispatch::Routing
   class RouteSet #:nodoc:
-
     # Ensure Devise modules are included only after loading routes, because we
     # need devise_for mappings already declared to create magic filters and
     # helpers.
-    def load_routes_with_devise!
-      load_routes_without_devise!
+    def finalize_with_devise!
+      finalize_without_devise!
       return if Devise.mappings.empty?
 
       ActionController::Base.send :include, Devise::Controllers::Helpers
@@ -13,121 +12,128 @@ module ActionController::Routing
 
       ActionView::Base.send :include, Devise::Controllers::UrlHelpers
     end
-    alias_method_chain :load_routes!, :devise
+    alias_method_chain :finalize!, :devise
+  end
 
-    class Mapper #:doc:
-      # Includes devise_for method for routes. This method is responsible to
-      # generate all needed routes for devise, based on what modules you have
-      # defined in your model.
-      # Examples: Let's say you have an User model configured to use
-      # authenticatable, confirmable and recoverable modules. After creating this
-      # inside your routes:
-      #
-      #   map.devise_for :users
-      #
-      # this method is going to look inside your User model and create the
-      # needed routes:
-      #
-      #  # Session routes for Authenticatable (default)
-      #       new_user_session GET  /users/sign_in                    {:controller=>"sessions", :action=>"new"}
-      #           user_session POST /users/sign_in                    {:controller=>"sessions", :action=>"create"}
-      #   destroy_user_session GET  /users/sign_out                   {:controller=>"sessions", :action=>"destroy"}
-      #
-      #  # Password routes for Recoverable, if User model has :recoverable configured
-      #      new_user_password GET  /users/password/new(.:format)     {:controller=>"passwords", :action=>"new"}
-      #     edit_user_password GET  /users/password/edit(.:format)    {:controller=>"passwords", :action=>"edit"}
-      #          user_password PUT  /users/password(.:format)         {:controller=>"passwords", :action=>"update"}
-      #                        POST /users/password(.:format)         {:controller=>"passwords", :action=>"create"}
-      #
-      #  # Confirmation routes for Confirmable, if User model has :confirmable configured
-      #  new_user_confirmation GET  /users/confirmation/new(.:format) {:controller=>"confirmations", :action=>"new"}
-      #      user_confirmation GET  /users/confirmation(.:format)     {:controller=>"confirmations", :action=>"show"}
-      #                        POST /users/confirmation(.:format)     {:controller=>"confirmations", :action=>"create"}
-      #
-      # You can configure your routes with some options:
-      #
-      #  * :class_name => setup a different class to be looked up by devise, if it cannot be correctly find by the route name.
-      #
-      #    map.devise_for :users, :class_name => 'Account'
-      #
-      #  * :as => allows you to setup path name that will be used, as rails routes does. The following route configuration would setup your route as /accounts instead of /users:
-      #
-      #    map.devise_for :users, :as => 'accounts'
-      #
-      #  * :scope => setup the scope name. This is used as the instance variable name in controller, as the name in routes and the scope given to warden. Defaults to the singular of the given name:
-      #
-      #    map.devise_for :users, :scope => :account
-      #
-      #  * :path_names => configure different path names to overwrite defaults :sign_in, :sign_out, :password and :confirmation.
-      #
-      #    map.devise_for :users, :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification' }
-      #
-      #  * :path_prefix => the path prefix to be used in all routes.
-      #
-      #    map.devise_for :users, :path_prefix => "/:locale"
-      #
-      #  * :sign_out_via => restirct the HTTP method(s) accepted for the :sign_out action (default: :get), possible values are :post, :get, :put, :delete and :any, e.g. if you wish to restrict this to accept only :delete requests you should do:
-      #
-      #    map.devise_for :users, :sign_out_via => :delete
-      #
-      #    You need to make sure that your sign_out controls trigger a request with a matching HTTP method.
-      #
-      #  Any other options will be passed to route definition. If you need conditions for your routes, just map:
-      #
-      #    map.devise_for :users, :conditions => { :subdomain => /.+/ }
-      #
-      #  If you are using a dynamic prefix, like :locale above, you need to configure default_url_options through Devise. You can do that in config/initializers/devise.rb or setting a Devise.default_url_options:
-      #
-      #    Devise.default_url_options do
-      #      { :locale => I18n.locale }
-      #    end
-      #
-      def devise_for(*resources)
-        options = resources.extract_options!
+  class Mapper
+    # Includes devise_for method for routes. This method is responsible to
+    # generate all needed routes for devise, based on what modules you have
+    # defined in your model.
+    # Examples: Let's say you have an User model configured to use
+    # authenticatable, confirmable and recoverable modules. After creating this
+    # inside your routes:
+    #
+    #   devise_for :users
+    #
+    # this method is going to look inside your User model and create the
+    # needed routes:
+    #
+    #  # Session routes for Authenticatable (default)
+    #       new_user_session GET  /users/sign_in                    {:controller=>"sessions", :action=>"new"}
+    #           user_session POST /users/sign_in                    {:controller=>"sessions", :action=>"create"}
+    #   destroy_user_session GET  /users/sign_out                   {:controller=>"sessions", :action=>"destroy"}
+    #
+    #  # Password routes for Recoverable, if User model has :recoverable configured
+    #      new_user_password GET  /users/password/new(.:format)     {:controller=>"passwords", :action=>"new"}
+    #     edit_user_password GET  /users/password/edit(.:format)    {:controller=>"passwords", :action=>"edit"}
+    #          user_password PUT  /users/password(.:format)         {:controller=>"passwords", :action=>"update"}
+    #                        POST /users/password(.:format)         {:controller=>"passwords", :action=>"create"}
+    #
+    #  # Confirmation routes for Confirmable, if User model has :confirmable configured
+    #  new_user_confirmation GET  /users/confirmation/new(.:format) {:controller=>"confirmations", :action=>"new"}
+    #      user_confirmation GET  /users/confirmation(.:format)     {:controller=>"confirmations", :action=>"show"}
+    #                        POST /users/confirmation(.:format)     {:controller=>"confirmations", :action=>"create"}
+    #
+    # You can configure your routes with some options:
+    #
+    #  * :class_name => setup a different class to be looked up by devise,
+    #                   if it cannot be correctly find by the route name.
+    #
+    #    devise_for :users, :class_name => 'Account'
+    #
+    #  * :as => allows you to setup path name that will be used, as rails routes does.
+    #           The following route configuration would setup your route as /accounts instead of /users:
+    #
+    #    devise_for :users, :as => 'accounts'
+    #
+    #  * :scope => setup the scope name. This is used as the instance variable name in controller,
+    #              as the name in routes and the scope given to warden. Defaults to the singular of the given name:
+    #
+    #    devise_for :users, :scope => :account
+    #
+    #  * :path_names => configure different path names to overwrite defaults :sign_in, :sign_out, :sign_up,
+    #                   :password, :confirmation, :unlock.
+    #
+    #    devise_for :users, :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification' }
+    #
+    #  * :path_prefix => the path prefix to be used in all routes.
+    #
+    #    devise_for :users, :path_prefix => "/:locale"
+    #
+    #  If you are using a dynamic prefix, like :locale above, you need to configure default_url_options through Devise.
+    #  You can do that in config/initializers/devise.rb or setting a Devise.default_url_options:
+    #
+    #    Devise.default_url_options do
+    #      { :locale => I18n.locale }
+    #    end
+    #
+    #  * :controllers => the controller which should be used. All routes by default points to Devise controllers.
+    #    However, if you want them to point to custom controller, you should do:
+    #
+    #    devise_for :users, :controllers => { :sessions => "users/sessions" }
+    #
+    def devise_for(*resources)
+      options = resources.extract_options!
+      resources.map!(&:to_sym)
 
-        resources.map!(&:to_sym)
-        resources.each do |resource|
-          mapping = Devise::Mapping.new(resource, options.dup)
-          Devise.default_scope ||= mapping.name
-          Devise.mappings[mapping.name] = mapping
+      controllers = Hash.new { |h,k| h[k] = "devise/#{k}" }
+      controllers.merge!(options.delete(:controllers) || {})
 
-          route_options = mapping.route_options.merge(:path_prefix => mapping.raw_path, :name_prefix => "#{mapping.name}_")
+      resources.each do |resource|
+        mapping = Devise::Mapping.new(resource, options.dup)
 
-          with_options(route_options) do |routes|
-            mapping.for.each do |mod|
-              send(mod, routes, mapping) if self.respond_to?(mod, true)
-            end
-          end
+        Devise.default_scope ||= mapping.name
+        Devise.mappings[mapping.name] = mapping
+
+        mapping.for.each do |mod|
+          send(mod, mapping, controllers) if self.respond_to?(mod, true)
         end
       end
+    end
 
-      protected
+    protected
 
-        def database_authenticatable(routes, mapping)
-          routes.with_options(:controller => 'sessions', :name_prefix => nil) do |session|
-            session.send(:"new_#{mapping.name}_session",     mapping.path_names[:sign_in],  :action => 'new',     :conditions => { :method => :get })
-            session.send(:"#{mapping.name}_session",         mapping.path_names[:sign_in],  :action => 'create',  :conditions => { :method => :post })
-            destroy_options = { :action => 'destroy' }
-            destroy_options.merge! :conditions => { :method => mapping.sign_out_via } unless mapping.sign_out_via == :any
-            session.send(:"destroy_#{mapping.name}_session", mapping.path_names[:sign_out], destroy_options)
-          end
+      def authenticatable(mapping, controllers)
+        scope mapping.raw_path do
+          get  mapping.path_names[:sign_in],  :to => "#{controllers[:sessions]}#new",     :as => :"new_#{mapping.name}_session"
+          post mapping.path_names[:sign_in],  :to => "#{controllers[:sessions]}#create",  :as => :"#{mapping.name}_session"
+          get  mapping.path_names[:sign_out], :to => "#{controllers[:sessions]}#destroy", :as => :"destroy_#{mapping.name}_session"
         end
-
-        def confirmable(routes, mapping)
-          routes.resource :confirmation, :only => [:new, :create, :show], :as => mapping.path_names[:confirmation]
+      end
+ 
+      def recoverable(mapping, controllers)
+        scope mapping.raw_path, :name_prefix => mapping.name do
+          resource :password, :only => [:new, :create, :edit, :update], :as => mapping.path_names[:password], :controller => controllers[:passwords]
         end
-
-        def lockable(routes, mapping)
-          routes.resource :unlock, :only => [:new, :create, :show], :as => mapping.path_names[:unlock]
+      end
+ 
+      def confirmable(mapping, controllers)
+        scope mapping.raw_path, :name_prefix => mapping.name do
+          resource :confirmation, :only => [:new, :create, :show], :as => mapping.path_names[:confirmation], :controller => controllers[:confirmations]
         end
-
-        def recoverable(routes, mapping)
-          routes.resource :password, :only => [:new, :create, :edit, :update], :as => mapping.path_names[:password]
+      end
+ 
+      def lockable(mapping, controllers)
+        scope mapping.raw_path, :name_prefix => mapping.name do
+          resource :unlock, :only => [:new, :create, :show], :as => mapping.path_names[:unlock], :controller => controllers[:unlocks]
         end
+      end
 
-        def registerable(routes, mapping)
-          routes.resource :registration, :only => [:new, :create, :edit, :update, :destroy], :as => mapping.raw_path[1..-1], :path_prefix => nil, :path_names => { :new => mapping.path_names[:sign_up] }
+      def registerable(mapping, controllers)
+        scope :name_prefix => mapping.name do
+          resource :registration, :only => [:new, :create, :edit, :update, :destroy], :as => mapping.raw_path[1..-1],
+                   :path_names => { :new => mapping.path_names[:sign_up] }, :controller => controllers[:registrations]
         end
-    end
+      end
   end
-end
+end