devise_ennder 1.0.1.0.9

data/app/views/passwords/edit.html.erb

@@ -0,0 +1,16 @@
+<h2>Change your password</h2>
+
+<% form_for resource_name, resource, :url => password_path(resource_name), :html => { :method => :put } do |f| %>
+  <%= f.error_messages %>
+  <%= f.hidden_field :reset_password_token %>
+
+  <p><%= f.label :password %></p>
+  <p><%= f.password_field :password %></p>
+
+  <p><%= f.label :password_confirmation %></p>
+  <p><%= f.password_field :password_confirmation %></p>
+
+  <p><%= f.submit "Change my password" %></p>
+<% end %>
+
+<%= render :partial => "shared/devise_links" %>

data/app/views/passwords/new.html.erb

@@ -0,0 +1,12 @@
+<h2><%= t('devise.passwords.link') %></h2>
+
+<% form_for resource_name, resource, :url => password_path(resource_name) do |f| %>
+  <%= f.error_messages %>
+
+  <p><%= f.label :email %></p>
+  <p><%= f.text_field :email %></p>
+
+  <p><%= f.submit t('devise.passwords.send_me_instructions') %></p>
+<% end %>
+
+<%= render :partial => "shared/devise_links" %>

data/app/views/registrations/edit.html.erb

@@ -0,0 +1,25 @@
+<h2>Edit <%= resource_name.to_s.humanize %></h2>
+
+<% form_for resource_name, resource, :url => registration_path(resource_name), :html => { :method => :put } do |f| -%>
+  <%= f.error_messages %>
+
+  <p><%= f.label :email %></p>
+  <p><%= f.text_field :email %></p>
+
+  <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i></p>
+  <p><%= f.password_field :password %></p>
+
+  <p><%= f.label :password_confirmation %></p>
+  <p><%= f.password_field :password_confirmation %></p>
+
+  <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i></p>
+  <p><%= f.password_field :current_password %></p>
+
+  <p><%= f.submit "Update" %></p>
+<% end -%>
+
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
+
+<%= render :partial => "shared/devise_links" %>

data/app/views/registrations/new.html.erb

@@ -0,0 +1,17 @@
+<h2><%= t('devise.registrations.link') %></h2>
+
+<% form_for resource_name, resource, :url => registration_path(resource_name) do |f| -%>
+  <%= f.error_messages %>
+  <p><%= f.label :email %></p>
+  <p><%= f.text_field :email %></p>
+
+  <p><%= f.label :password %></p>
+  <p><%= f.password_field :password %></p>
+
+  <p><%= f.label :password_confirmation %></p>
+  <p><%= f.password_field :password_confirmation %></p>
+
+  <p><%= f.submit t('devise.registrations.self_link') %></p>
+<% end -%>
+
+<%= render :partial => "shared/devise_links" %>

data/app/views/sessions/new.html.erb

@@ -0,0 +1,17 @@
+<h2><%= t('devise.sessions.link') %></h2>
+
+<% form_for resource_name, resource, :url => session_path(resource_name) do |f| -%>
+  <p><%= f.label :email %></p>
+  <p><%= f.text_field :email %></p>
+
+  <p><%= f.label :password %></p>
+  <p><%= f.password_field :password %></p>
+
+  <% if devise_mapping.rememberable? -%>
+    <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
+  <% end -%>
+
+  <p><%= f.submit t('devise.sessions.self_link') %></p>
+<% end -%>
+
+<%= render :partial => "shared/devise_links" %>

data/app/views/shared/_devise_links.erb

@@ -0,0 +1,19 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to t('devise.sessions.link'), new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to t('devise.registrations.link'), new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+  <%= link_to t('devise.passwords.link'), new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to t('devise.confirmations.link'), new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && controller_name != 'unlocks' %>
+  <%= link_to t('devise.unlocks.link'), new_unlock_path(resource_name) %><br />
+<% end -%>

data/app/views/shared/_user_nav.html.erb

@@ -0,0 +1,15 @@
+			<div id="user_nav" align="right">
+<%
+	if user_signed_in?
+%>				<%= t('devise.sessions.signed_in_as') %> <b><%= current_user.email %></b>.&nbsp;&nbsp;&nbsp;<%= link_to t('devise.sessions.Logout'), destroy_user_session_path %>&nbsp;&nbsp;&nbsp;<%= link_to t('devise.registrations.edit'), edit_user_registration_path %><%
+	else
+%>				<%= link_to( t('devise.registrations.link'), new_user_registration_path ) %> <%= t('devise.sessions.or') %> <%= link_to( t('devise.sessions.link'), new_user_session_path ) %><%
+	end
+
+	if I18n.locale == :en
+%> [&nbsp;en&nbsp;|&nbsp;<%= link_to 'fr', url_for(:locale => 'fr') %>&nbsp;]<%
+	else
+%> [&nbsp;<%= link_to 'en', url_for(:locale => 'en') %>&nbsp;|&nbsp;fr&nbsp;]<%
+	end
+%>
+			</div>

data/app/views/unlocks/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Resend unlock instructions</h2>
+
+<% form_for resource_name, resource, :url => unlock_path(resource_name) do |f| %>
+  <%= f.error_messages %>
+
+  <p><%= f.label :email %></p>
+  <p><%= f.text_field :email %></p>
+
+  <p><%= f.submit "Resend unlock instructions" %></p>
+<% end %>
+
+<%= render :partial => "shared/devise_links" %>

data/config/locales/devise.en.yml

@@ -0,0 +1,62 @@
+en:
+  devise:
+    sessions:
+      link: 'Sign in'
+      #Ennder
+      self_link: 'Sign in'
+      #Ennder
+      or: 'or'
+      signed_in: 'Signed in successfully.'
+      #Ennder
+      signed_in_as: 'Signed in as'
+      signed_out: 'Signed out successfully.'
+      unauthenticated: 'You need to sign in or sign up before continuing.'
+      unconfirmed: 'You have to confirm your account before continuing.'
+      locked: 'Your account is locked.'
+      invalid: 'Invalid email or password.'
+      invalid_token: 'Invalid authentication token.'
+      timeout: 'Your session expired, please sign in again to continue.'
+      inactive: 'Your account was not activated yet.'
+      #Ennder
+      Logout: 'Logout'
+      #Ennder
+      Could_not_destroy_resource: 'Could not destroy User!'
+
+    passwords:
+      link: 'Forgot password?'
+      #Ennder
+      send_me_instructions: 'Send me reset password instructions'
+      send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
+      updated: 'Your password was changed successfully. You are now signed in.'
+    confirmations:
+      link: "Didn't receive confirmation instructions?"
+      send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
+      confirmed: 'Your account was successfully confirmed. You are now signed in.'
+    registrations:
+      link: 'Sign up'
+      #Ennder
+      self_link: "Sign up"
+      #Ennder
+      edit: 'Edit my profile'
+      signed_up: 'You have signed up successfully. If enabled, a confirmation was sent to your e-mail.'
+      updated: 'You updated your account successfully.'
+      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+      #Ennder
+      confirm_link: 'You can confirm your account through the link below:'
+    unlocks:
+      link: "Didn't receive unlock instructions?"
+      send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
+      unlocked: 'Your account was successfully unlocked. You are now signed in.'
+    mailer:
+      confirmation_instructions: 'Confirmation instructions'
+      reset_password_instructions: 'Reset password instructions'
+      #Ennder
+      Change_my_password: 'Change my password'
+      #Ennder
+      Someone_requested_change_password: 'Someone has requested a link to change your password, and you can do this through the link below.'
+      #Ennder
+      If_you_didnt_request_this: "If you didn't request this, please ignore this email."
+      #Ennder
+      Your_password_wont_change_until: "Your password won't change until you access the link above and create a new one."
+      unlock_instructions: 'Unlock Instructions'
+

data/config/locales/devise.fr.yml

@@ -0,0 +1,60 @@
+fr:
+  devise:
+    sessions:
+      link: 'Connexion'
+      self_link: 'Se connecter'
+      or: 'ou'
+      signed_in: 'Vous êtes Connecté.'
+      signed_in_as: 'Connecté en tant que'
+      signed_out: 'Vous avez été déconnecté.'
+      unauthenticated: 'Vous devez vous connecter ou vous enregistrer avant de continuer.'
+      unconfirmed: 'Vous devez vous connecter avant de continuer.'
+      locked: 'Votre compte est vérrouillé.'
+      invalid: 'Email ou mot-de-passe invalide.'
+      invalid_token: "Jeton d'identification invalide."
+      timeout: 'Votre session a expiré, veuiller vous re-connecter pour continuer.'
+      inactive: "Votre compte n'as pas encore été activé."
+      Logout: 'Déconnexion'
+      Could_not_destroy_resource: "Suppression de l'Utilisateur impossible!"
+
+    passwords:
+      link: 'Mot de passe oublié ?'
+      send_me_instructions: 'Envoyez-moi les instructions de ré-initialisation de mot de passe'
+      send_instructions: 'Vous allez recevoir dans quelques minutes un email avec les instructions vous indiquant comment réinitiliser votre mot de passe.'
+      updated: 'Votre mot de passe a été changé avec succès. Vous êtes maintenant connecté.'
+    confirmations:
+      link: "Vous n'avez pas reçu les instructions de confirmation ?"
+      send_instructions: 'Vous allez recevoir dans quelques minutes un email, avec les instructions vous permettant de confirmer votre compte.'
+      confirmed: 'Votre compte a été confirmé avec succès. Vous êtes maintenant connecté.'
+    registrations:
+      link: 'Enregistrement'
+      self_link: "S'enregistrer"
+      edit: 'Éditer mon profil'
+      signed_up: 'Vous vous êtes enregistré avec succès. Si activé, une confirmation a été envoyée à votre adresse e-mail.'
+      updated: 'Vous avez mis à jour votre compte avec succès.'
+      destroyed: 'Au revoir! Votre compte a été supprimé avec succès. Nous espérons vous revoir bientôt.'
+      confirm_link: 'Vous pouvez confirmer votre compte avec le lien suivant :'
+    unlocks:
+      link: "Vous n'avez pas reçu les instructions de dé-verrouillage?"
+      send_instructions: 'Vous allez recevoir dans quelques minutes un email, avec les instructions vous permettant de dé-verrouiller votre compte.'
+      unlocked: 'Votre compte a été dé-verouillé avec succès. Vous êtes maintenant connecté.'
+    mailer:
+      confirmation_instructions: 'Instructions de confirmation'
+      reset_password_instructions: 'Instructiond de ré-initialisation de mot de passe'
+      #Ennder
+      Change_my_password: 'Changer mon mot de passe'
+      #Ennder
+      Someone_requested_change_password: "Quelqu'un a demandé un lien pour changer votre mot de passe, ce que vous pouvez faire avec le lien ci-dessous."
+      #Ennder
+      If_you_didnt_request_this: "Si vous n'avez pas demandé ce changement, veuillez ignorer cet email."
+      #Ennder
+      Your_password_wont_change_until: "Votre mot de passe ne changera pas avant que vous n'accédiez au lien ci-dessous pour en créer un nouveau."
+      unlock_instructions: 'Instructions de dé-verrouillage'
+
+  #marche que pour Rails 3 ?
+  helpers:
+    label:
+      user:
+        password: 'Mot de passe(helpers.label.user)'
+      users:
+        password: 'Mot de passe(helpers.label.users)'

data/config/locales/en.yml

@@ -0,0 +1,6 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  #Au moins une traduction sinon ça plante
+  hello: "Hello world"

data/config/locales/fr.yml

@@ -0,0 +1,18 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+# du plugin devise_ennder
+
+fr:
+  #Au moins une traduction sinon ça plante
+  hello: "Salut le monde"
+
+  activerecord:
+    models:
+      user: "Utilisateur"
+    attributes:
+      user:
+        password: 'Mot de passe'
+        email: 'Email'
+        remember_me: 'Garder ma session active'
+        password_confirmation: 'Confirmation du mot de passe'

data/config/routes.rb

@@ -0,0 +1,4 @@
+ActionController::Routing::Routes.draw do |map|
+  Rails.logger.debug 'Routes Devise_ennder apportés par le Gem'
+  map.devise_for :users
+end

data/db/migrate/20100506013336_devise_create_users.rb

@@ -0,0 +1,23 @@
+class DeviseCreateUsers < ActiveRecord::Migration
+  def self.up
+    create_table(:users) do |t|
+      t.database_authenticatable :null => false
+      t.confirmable
+      t.recoverable
+      t.rememberable
+      t.trackable
+      # t.lockable
+
+      t.timestamps
+    end
+
+    add_index :users, :email,                :unique => true
+    add_index :users, :confirmation_token,   :unique => true
+    add_index :users, :reset_password_token, :unique => true
+    # add_index :users, :unlock_token,         :unique => true
+  end
+
+  def self.down
+    drop_table :users
+  end
+end

data/lib/devise/controllers/helpers.rb

@@ -0,0 +1,212 @@
+module Devise
+  module Controllers
+    # Those helpers are convenience methods added to ApplicationController.
+    module Helpers
+
+      def self.included(base)
+        base.class_eval do
+          helper_method :warden, :signed_in?, :devise_controller?, :anybody_signed_in?,
+                        *Devise.mappings.keys.map { |m| [:"current_#{m}", :"#{m}_signed_in?", :"#{m}_session"] }.flatten
+
+          # Use devise default_url_options. We have to declare it here to overwrite
+          # default definitions.
+          def default_url_options(options=nil)
+            Devise::Mapping.default_url_options
+          end
+        end
+      end
+
+      # The main accessor for the warden proxy instance
+      def warden
+        request.env['warden']
+      end
+
+      # Return true if it's a devise_controller. false to all controllers unless
+      # the controllers defined inside devise. Useful if you want to apply a before
+      # filter to all controller, except the ones in devise:
+      #
+      #   before_filter :my_filter, :unless => { |c| c.devise_controller? }
+      def devise_controller?
+        false
+      end
+
+      # Attempts to authenticate the given scope by running authentication hooks,
+      # but does not redirect in case of failures.
+      def authenticate(scope)
+        warden.authenticate(:scope => scope)
+      end
+
+      # Attempts to authenticate the given scope by running authentication hooks,
+      # redirecting in case of failures.
+      def authenticate!(scope)
+        warden.authenticate!(:scope => scope)
+      end
+
+      # Check if the given scope is signed in session, without running
+      # authentication hooks.
+      def signed_in?(scope)
+        warden.authenticate?(:scope => scope)
+      end
+
+      # Check if the any scope is signed in session, without running
+      # authentication hooks.
+      def anybody_signed_in?
+        Devise.mappings.keys.any? { |scope| signed_in?(scope) }
+      end
+
+      # Sign in an user that already was authenticated. This helper is useful for logging
+      # users in after sign up.
+      #
+      # Examples:
+      #
+      #   sign_in :user, @user    # sign_in(scope, resource)
+      #   sign_in @user           # sign_in(resource)
+      #
+      def sign_in(resource_or_scope, resource=nil)
+        scope      = Devise::Mapping.find_scope!(resource_or_scope)
+        resource ||= resource_or_scope
+        warden.set_user(resource, :scope => scope)
+        @_session = request.session # Recalculate session
+      end
+
+      # Sign out a given user or scope. This helper is useful for signing out an user
+      # after deleting accounts.
+      #
+      # Examples:
+      #
+      #   sign_out :user     # sign_out(scope)
+      #   sign_out @user     # sign_out(resource)
+      #
+      def sign_out(resource_or_scope)
+        scope = Devise::Mapping.find_scope!(resource_or_scope)
+        warden.user(scope) # Without loading user here, before_logout hook is not called
+        warden.raw_session.inspect # Without this inspect here. The session does not clear.
+        warden.logout(scope)
+      end
+
+      # Returns and delete the url stored in the session for the given scope. Useful
+      # for giving redirect backs after sign up:
+      #
+      # Example:
+      #
+      #   redirect_to stored_location_for(:user) || root_path
+      #
+      def stored_location_for(resource_or_scope)
+        scope = Devise::Mapping.find_scope!(resource_or_scope)
+        key = "#{scope}.return_to"
+        session.delete(key) || session.delete(key.to_sym)
+      end
+
+      # The default url to be used after signing in. This is used by all Devise
+      # controllers and you can overwrite it in your ApplicationController to
+      # provide a custom hook for a custom resource.
+      #
+      # By default, it first tries to find a resource_root_path, otherwise it
+      # uses the root path. For a user scope, you can define the default url in
+      # the following way:
+      #
+      #   map.user_root '/users', :controller => 'users' # creates user_root_path
+      #
+      #   map.namespace :user do |user|
+      #     user.root :controller => 'users' # creates user_root_path
+      #   end
+      #
+      #
+      # If the resource root path is not defined, root_path is used. However,
+      # if this default is not enough, you can customize it, for example:
+      #
+      #   def after_sign_in_path_for(resource)
+      #     if resource.is_a?(User) && resource.can_publish?
+      #       publisher_url
+      #     else
+      #       super
+      #     end
+      #   end
+      #
+      def after_sign_in_path_for(resource_or_scope)
+        scope = Devise::Mapping.find_scope!(resource_or_scope)
+        home_path = "#{scope}_root_path"
+        respond_to?(home_path, true) ? send(home_path) : root_path
+      end
+
+      # Method used by sessions controller to sign out an user. You can overwrite
+      # it in your ApplicationController to provide a custom hook for a custom
+      # scope. Notice that differently from +after_sign_in_path_for+ this method
+      # receives a symbol with the scope, and not the resource.
+      #
+      # By default is the root_path.
+      def after_sign_out_path_for(resource_or_scope)
+        root_path
+      end
+
+      # Sign in an user and tries to redirect first to the stored location and
+      # then to the url specified by after_sign_in_path_for.
+      #
+      # If just a symbol is given, consider that the user was already signed in
+      # through other means and just perform the redirection.
+      def sign_in_and_redirect(resource_or_scope, resource=nil, skip=false)
+        scope      = Devise::Mapping.find_scope!(resource_or_scope)
+        resource ||= resource_or_scope
+        if skip
+          @_session = request.session # Recalculate session
+        else
+          sign_in(scope, resource)
+        end
+        redirect_to stored_location_for(scope) || after_sign_in_path_for(resource)
+      end
+
+      # Sign out an user and tries to redirect to the url specified by
+      # after_sign_out_path_for.
+      def sign_out_and_redirect(resource_or_scope)
+        scope = Devise::Mapping.find_scope!(resource_or_scope)
+        sign_out(scope)
+        redirect_to after_sign_out_path_for(scope)
+      end
+
+      # Define authentication filters and accessor helpers based on mappings.
+      # These filters should be used inside the controllers as before_filters,
+      # so you can control the scope of the user who should be signed in to
+      # access that specific controller/action.
+      # Example:
+      #
+      #   Maps:
+      #     User => :authenticatable
+      #     Admin => :authenticatable
+      #
+      #   Generated methods:
+      #     authenticate_user!  # Signs user in or redirect
+      #     authenticate_admin! # Signs admin in or redirect
+      #     user_signed_in?     # Checks whether there is an user signed in or not
+      #     admin_signed_in?    # Checks whether there is an admin signed in or not
+      #     current_user        # Current signed in user
+      #     current_admin       # Current signed in admin
+      #     user_session        # Session data available only to the user scope
+      #     admin_session       # Session data available only to the admin scope
+      #
+      #   Use:
+      #     before_filter :authenticate_user!  # Tell devise to use :user map
+      #     before_filter :authenticate_admin! # Tell devise to use :admin map
+      #
+      Devise.mappings.each_key do |mapping|
+        class_eval <<-METHODS, __FILE__, __LINE__ + 1
+          def authenticate_#{mapping}!
+            warden.authenticate!(:scope => :#{mapping})
+          end
+
+          def #{mapping}_signed_in?
+            warden.authenticate?(:scope => :#{mapping})
+          end
+
+          def current_#{mapping}
+            @current_#{mapping} ||= warden.authenticate(:scope => :#{mapping})
+          end
+
+          def #{mapping}_session
+            current_#{mapping} && warden.session(:#{mapping})
+          end
+        METHODS
+      end
+
+    end
+  end
+end

data/lib/devise/controllers/internal_helpers.rb

@@ -0,0 +1,129 @@
+module Devise
+  module Controllers
+    # Those helpers are used only inside Devise controllers and should not be
+    # included in ApplicationController since they all depend on the url being
+    # accessed.
+    module InternalHelpers #:nodoc:
+
+      def self.included(base)
+        base.class_eval do
+          extend ScopedViews
+          unloadable
+
+          helper_method :resource, :scope_name, :resource_name, :resource_class, :devise_mapping, :devise_controller?
+          hide_action   :resource, :scope_name, :resource_name, :resource_class, :devise_mapping, :devise_controller?
+
+          skip_before_filter *Devise.mappings.keys.map { |m| :"authenticate_#{m}!" }
+          prepend_before_filter :is_devise_resource?
+        end
+      end
+
+      module ScopedViews
+        def scoped_views
+          defined?(@scoped_views) ? @scoped_views : Devise.scoped_views
+        end
+
+        def scoped_views=(value)
+          @scoped_views = value
+        end
+      end
+
+      # Gets the actual resource stored in the instance variable
+      def resource
+        instance_variable_get(:"@#{resource_name}")
+      end
+
+      # Proxy to devise map name
+      def resource_name
+        devise_mapping.name
+      end
+      alias :scope_name :resource_name
+
+      # Proxy to devise map class
+      def resource_class
+        devise_mapping.to
+      end
+
+      # Attempt to find the mapped route for devise based on request path
+      def devise_mapping
+        @devise_mapping ||= begin
+          mapping   = Devise::Mapping.find_by_path(request.path)
+          mapping ||= Devise.mappings[Devise.default_scope] if Devise.use_default_scope
+          mapping
+        end
+      end
+
+      # Overwrites devise_controller? to return true
+      def devise_controller?
+        true
+      end
+
+    protected
+
+      # Checks whether it's a devise mapped resource or not.
+      def is_devise_resource? #:nodoc:
+        raise ActionController::UnknownAction unless devise_mapping && devise_mapping.allows?(controller_name)
+      end
+
+      # Sets the resource creating an instance variable
+      def resource=(new_resource)
+        instance_variable_set(:"@#{resource_name}", new_resource)
+      end
+
+      # Build a devise resource.
+      def build_resource
+        self.resource ||= resource_class.new(params[resource_name] || {})
+      end
+
+      # Helper for use in before_filters where no authentication is required.
+      #
+      # Example:
+      #   before_filter :require_no_authentication, :only => :new
+      def require_no_authentication
+        redirect_to after_sign_in_path_for(resource_name) if warden.authenticated?(resource_name)
+      end
+
+      # Sets the flash message with :key, using I18n. By default you are able
+      # to setup your messages using specific resource scope, and if no one is
+      # found we look to default scope.
+      # Example (i18n locale file):
+      #
+      #   en:
+      #     devise:
+      #       passwords:
+      #         #default_scope_messages - only if resource_scope is not found
+      #         user:
+      #           #resource_scope_messages
+      #
+      # Please refer to README or en.yml locale file to check what messages are
+      # available.
+      def set_flash_message(key, kind, now=false)
+        flash_hash = now ? flash.now : flash
+        flash_hash[key] = I18n.t(:"#{resource_name}.#{kind}",
+                            :scope => [:devise, controller_name.to_sym], :default => kind)
+      end
+
+      # Shortcut to set flash.now message. Same rules applied from set_flash_message
+      def set_now_flash_message(key, kind)
+        set_flash_message(key, kind, true)
+      end
+
+      # Render a view for the specified scope. Turned off by default.
+      # Accepts just :controller as option.
+      def render_with_scope(action, options={})
+        controller_name = options.delete(:controller) || self.controller_name
+
+        if self.class.scoped_views
+          begin
+            render :template => "#{controller_name}/#{devise_mapping.as}/#{action}"
+          rescue ActionView::MissingTemplate
+            render action, :controller => controller_name
+          end
+        else
+          render action, :controller => controller_name
+        end
+      end
+
+    end
+  end
+end