devise_invitable 1.7.4 → 2.0.3

data/app/controllers/devise/invitations_controller.rb

@@ -1,8 +1,8 @@
 class Devise::InvitationsController < DeviseController
-  prepend_before_action :authenticate_inviter!, :only => [:new, :create]
-  prepend_before_action :has_invitations_left?, :only => [:create]
-  prepend_before_action :require_no_authentication, :only => [:edit, :update, :destroy]
-  prepend_before_action :resource_from_invitation_token, :only => [:edit, :destroy]
+  prepend_before_action :authenticate_inviter!, only: [:new, :create]
+  prepend_before_action :has_invitations_left?, only: [:create]
+  prepend_before_action :require_no_authentication, only: [:edit, :update, :destroy]
+  prepend_before_action :resource_from_invitation_token, only: [:edit, :destroy]
 
   if respond_to? :helper_method
     helper_method :after_sign_in_path_for
@@ -23,12 +23,12 @@ class Devise::InvitationsController < DeviseController
 
     if resource_invited
       if is_flashing_format? && self.resource.invitation_sent_at
-        set_flash_message :notice, :send_instructions, :email => self.resource.email
+        set_flash_message :notice, :send_instructions, email: self.resource.email
       end
       if self.method(:after_invite_path_for).arity == 1
-        respond_with resource, :location => after_invite_path_for(current_inviter)
+        respond_with resource, location: after_invite_path_for(current_inviter)
       else
-        respond_with resource, :location => after_invite_path_for(current_inviter, resource)
+        respond_with resource, location: after_invite_path_for(current_inviter, resource)
       end
     else
       respond_with_navigational(resource) { render :new }
@@ -37,7 +37,6 @@ class Devise::InvitationsController < DeviseController
 
   # GET /resource/invitation/accept?invitation_token=abcdef
   def edit
-    sign_out send("current_#{resource_name}") if send("#{resource_name}_signed_in?")
     set_minimum_password_length
     resource.invitation_token = params[:invitation_token]
     render :edit
@@ -52,18 +51,19 @@ class Devise::InvitationsController < DeviseController
     yield resource if block_given?
 
     if invitation_accepted
-      if Devise.allow_insecure_sign_in_after_accept
+      if resource.class.allow_insecure_sign_in_after_accept
         flash_message = resource.active_for_authentication? ? :updated : :updated_not_active
         set_flash_message :notice, flash_message if is_flashing_format?
+        resource.after_database_authentication
         sign_in(resource_name, resource)
-        respond_with resource, :location => after_accept_path_for(resource)
+        respond_with resource, location: after_accept_path_for(resource)
       else
         set_flash_message :notice, :updated_not_active if is_flashing_format?
-        respond_with resource, :location => new_session_path(resource_name)
+        respond_with resource, location: new_session_path(resource_name)
       end
     else
       resource.invitation_token = raw_invitation_token
-      respond_with_navigational(resource){ render :edit }
+      respond_with_navigational(resource) { render :edit }
     end
   end
 
@@ -76,42 +76,42 @@ class Devise::InvitationsController < DeviseController
 
   protected
 
-  def invite_resource(&block)
-    resource_class.invite!(invite_params, current_inviter, &block)
-  end
+    def invite_resource(&block)
+      resource_class.invite!(invite_params, current_inviter, &block)
+    end
 
-  def accept_resource
-    resource_class.accept_invitation!(update_resource_params)
-  end
+    def accept_resource
+      resource_class.accept_invitation!(update_resource_params)
+    end
 
-  def current_inviter
-    authenticate_inviter!
-  end
+    def current_inviter
+      authenticate_inviter!
+    end
 
-  def has_invitations_left?
-    unless current_inviter.nil? || current_inviter.has_invitations_left?
-      self.resource = resource_class.new
-      set_flash_message :alert, :no_invitations_remaining if is_flashing_format?
-      respond_with_navigational(resource) { render :new }
+    def has_invitations_left?
+      unless current_inviter.nil? || current_inviter.has_invitations_left?
+        self.resource = resource_class.new
+        set_flash_message :alert, :no_invitations_remaining if is_flashing_format?
+        respond_with_navigational(resource) { render :new }
+      end
     end
-  end
 
-  def resource_from_invitation_token
-    unless params[:invitation_token] && self.resource = resource_class.find_by_invitation_token(params[:invitation_token], true)
-      set_flash_message(:alert, :invitation_token_invalid) if is_flashing_format?
-      redirect_to after_sign_out_path_for(resource_name)
+    def resource_from_invitation_token
+      unless params[:invitation_token] && self.resource = resource_class.find_by_invitation_token(params[:invitation_token], true)
+        set_flash_message(:alert, :invitation_token_invalid) if is_flashing_format?
+        redirect_to after_sign_out_path_for(resource_name)
+      end
     end
-  end
 
-  def invite_params
-    devise_parameter_sanitizer.sanitize(:invite)
-  end
+    def invite_params
+      devise_parameter_sanitizer.sanitize(:invite)
+    end
 
-  def update_resource_params
-    devise_parameter_sanitizer.sanitize(:accept_invitation)
-  end
+    def update_resource_params
+      devise_parameter_sanitizer.sanitize(:accept_invitation)
+    end
 
-  def translation_scope
-    'devise.invitations'
-  end
+    def translation_scope
+      'devise.invitations'
+    end
 end

data/app/controllers/devise_invitable/registrations_controller.rb

@@ -1,17 +1,17 @@
 class DeviseInvitable::RegistrationsController < Devise::RegistrationsController
   protected
 
-  def build_resource(hash = {})
-    if hash[:email]
-      self.resource = resource_class.where(:email => hash[:email]).first
-      if self.resource && self.resource.respond_to?(:invited_to_sign_up?) && self.resource.invited_to_sign_up?
-        self.resource.attributes = hash
-        self.resource.send_confirmation_instructions if self.resource.confirmation_required_for_invited?
-        self.resource.accept_invitation
-      else
-        self.resource = nil
+    def build_resource(hash = {})
+      if hash[:email]
+        self.resource = resource_class.where(email: hash[:email]).first
+        if self.resource && self.resource.respond_to?(:invited_to_sign_up?) && self.resource.invited_to_sign_up?
+          self.resource.attributes = hash
+          self.resource.send_confirmation_instructions if self.resource.confirmation_required_for_invited?
+          self.resource.accept_invitation
+        else
+          self.resource = nil
+        end
       end
+      self.resource ||= super
     end
-    self.resource ||= super
-  end
 end

data/app/views/devise/invitations/edit.html.erb

@@ -1,16 +1,22 @@
-<h2><%= t 'devise.invitations.edit.header' %></h2>
+<h2><%= t "devise.invitations.edit.header" %></h2>
 
-<%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %>
-  <%= devise_error_messages! %>
+<%= form_for(resource, as: resource_name, url: invitation_path(resource_name), html: { method: :put }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
   <%= f.hidden_field :invitation_token, readonly: true %>
 
   <% if f.object.class.require_password_on_accepting %>
-  <p><%= f.label :password %><br />
-  <%= f.password_field :password %></p>
+    <div class="field">
+      <%= f.label :password %><br />
+      <%= f.password_field :password %>
+    </div>
 
-  <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
+    <div class="field">
+      <%= f.label :password_confirmation %><br />
+      <%= f.password_field :password_confirmation %>
+    </div>
   <% end %>
 
-  <p><%= f.submit t("devise.invitations.edit.submit_button") %></p>
+  <div class="actions">
+    <%= f.submit t("devise.invitations.edit.submit_button") %>
+  </div>
 <% end %>

data/app/views/devise/invitations/new.html.erb

@@ -1,12 +1,16 @@
 <h2><%= t "devise.invitations.new.header" %></h2>
 
-<%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f| %>
-  <%= devise_error_messages! %>
+<%= form_for(resource, as: resource_name, url: invitation_path(resource_name), html: { method: :post }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
-<% resource.class.invite_key_fields.each do |field| -%>
-  <p><%= f.label field %><br />
-  <%= f.text_field field %></p>
-<% end -%>
+  <% resource.class.invite_key_fields.each do |field| -%>
+    <div class="field">
+      <%= f.label field %><br />
+      <%= f.text_field field %>
+    </div>
+  <% end -%>
 
-  <p><%= f.submit t("devise.invitations.new.submit_button") %></p>
+  <div class="actions">
+    <%= f.submit t("devise.invitations.new.submit_button") %>
+  </div>
 <% end %>

data/app/views/devise/mailer/invitation_instructions.html.erb

@@ -2,10 +2,10 @@
 
 <p><%= t("devise.mailer.invitation_instructions.someone_invited_you", url: root_url) %></p>
 
-<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, :invitation_token => @token) %></p>
+<p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token) %></p>
 
 <% if @resource.invitation_due_at %>
   <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %></p>
 <% end %>
 
-<p><%= t("devise.mailer.invitation_instructions.ignore").html_safe %></p>
+<p><%= t("devise.mailer.invitation_instructions.ignore") %></p>

data/app/views/devise/mailer/invitation_instructions.text.erb

@@ -2,10 +2,10 @@
 
 <%= t("devise.mailer.invitation_instructions.someone_invited_you", url: root_url) %>
 
-<%= accept_invitation_url(@resource, :invitation_token => @token) %>
+<%= accept_invitation_url(@resource, invitation_token: @token) %>
 
 <% if @resource.invitation_due_at %>
   <%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %>
 <% end %>
 
-<%= strip_tags t("devise.mailer.invitation_instructions.ignore") %>
+<%= t("devise.mailer.invitation_instructions.ignore") %>

data/config/locales/ar.yml

@@ -0,0 +1,23 @@
+ar:
+  devise:
+    failure:
+      invited: 'لديك دعوة معلّقة، يجب عليك قبولها للإنتهاء من إنشاء حسابك.'
+    invitations:
+      send_instructions: 'تم إرسال الدعوة إلى البريد الإلكتروني %{email}.'
+      invitation_token_invalid: 'كود الدعوة غير صحيح'
+      updated: 'تم تحديد كلمة المرور الخاص بك، انت الآن مسجل دخول.'
+      no_invitations_remaining: "لم يبق لديك دعوات"
+      invitation_removed: 'تم حذف دعوتك.'
+      new:
+        header: "ارسال الدعوة"
+        submit_button: "ارسل الدعوة"
+      edit:
+        header: "تحديد كلمة المرور"
+        submit_button: "حدد كلمة المرور"
+    mailer:
+      invitation_instructions:
+        subject: 'تعليمات الدعوة'
+        hello: 'مرحبا %{email}'
+        someone_invited_you: 'تم إرسال دعوة لك إلى %{url}, يمكنك الموافقة من خلال الرابط في الأسفل'
+        accept: 'قبول الدعوة'
+        ignore: "إذا كنت لا تريد قبول الدعوة، الرجاء تجاهل هذا البريد.<br />لن يتم إنشاء حساب خاص بك إلا إذا دخلت على الرابط أعلاه وحددت كلمة مرور خاص بك."

data/config/locales/da.yml

@@ -0,0 +1,41 @@
+da:
+  activerecord:
+    attributes:
+      user:
+        invitation_token: Invitationsnøgle
+        invitation_created_at: Invitation oprettet
+        invitation_sent_at: Invitation sendt
+        invitation_accepted_at: Invitation accepteret
+        invitation_limit: Invitationsbegrænsning
+        invited_by: Inviteret af
+        invitations_count: Antal invitationer
+  devise:
+    failure:
+      invited: "Du har allerede en ventende invitation, som du bedes acceptere for at oprette en konto."
+    invitations:
+      send_instructions: "Der er sendt en invitationsmail til %{email}."
+      invitation_token_invalid: "Den angivne invitationsnøgle er ikke gyldig."
+      updated: "Din adgangskode er gemt, og du er nu logget ind."
+      updated_not_active: "Din adgangskode er gemt, og du kan nu logge ind på din konto."
+      no_invitations_remaining: "Ikke flere invitationer tilbage"
+      invitation_removed: "Din invitation er blevet fjernet."
+      new:
+        header: "Send en invitation"
+        submit_button: "Send mail"
+      edit:
+        header: "Vælg din adgangskode"
+        submit_button: "Gem adgangskode"
+    mailer:
+      invitation_instructions:
+        subject: "Invitation til at oprette en konto"
+        hello: "Hej %{email}"
+        someone_invited_you: "Du er blevet inviteret til at oprette en konto på %{url}, og du kan gøre det via linket herunder."
+        accept: "Accepter invitation"
+        accept_until: "Invitation gælder indtil %{due_date}."
+        ignore: "Hvis du ikke vil tage imod invitationen om at oprette en konto, kan du blot ignorere denne mail.<br />\nDer vil ikke blive oprettet nogen konto, medmindre du følger linket herover og derefter opretter en adgangskode."
+  time:
+    formats:
+      devise:
+        mailer:
+          invitation_instructions:
+            accept_until_format: "%e. %B %Y kl. %H.%M"

data/config/locales/de.yml

@@ -0,0 +1,31 @@
+de:                                                                                                                                                                       
+  devise:                                                                                                                                                                 
+    failure:                                                                                                                                                              
+      invited: "Du hast bereits eine Einladung erhalten. Nimm die Einladung an um dein Nutzerkonto zu erstellen."                                                         
+    invitations:                                                                                                                                                          
+      send_instructions: "Eine Einladung wurde an %{email} verschickt."                                                                                                   
+      invitation_token_invalid: "Der Einladungs-Code ist ungültig!"                                                                                                       
+      updated: "Dein Passwort wurde gesetzt. Du bist nun angemeldet."                                                                                                     
+      updated_not_active: "Dein Passwort wurde gesetzt."                                                                                                                  
+      no_invitations_remaining: "Es gibt keine weiteren Einladungen"                                                                                                      
+      invitation_removed: "Deine Einladung wurde gelöscht."                                                                                                               
+      new:                                                                                                                                                                
+        header: "Einladung schicken"                                                                                                                                      
+        submit_button: "Einladung schicken"                                                                                                                               
+      edit:                                                                                                                                                               
+        header: "Setze ein Passwort"                                                                                                                                      
+        submit_button: "Passwort setzen"                                                                                                                                  
+    mailer:                                                                                                                                                               
+      invitation_instructions:                                                                                                                                            
+        subject: "Einladung"                                                                                                                                              
+        hello: "Hallo %{email}"                                                                                                                                           
+        someone_invited_you: "Jemand hat dich zu %{url} eingeladen. Du kannst die Einladung mit dem Link unten annehmen."                                                 
+        accept: "Einladung annehmen"                                                                                                                                      
+        accept_until: "Diese Einladung ist gültig bis zum %{due_date}."                                                                                                   
+        ignore: "Wenn du die Einladung nicht annehmen willst, ignoriere diese E-Mail einfach.<br />\nEs wird kein Benutzerkonto erstellt solange du nicht die Einladung mi↪ttels des Links oben annimmst."                                                                                                                                          
+  time:                                                                                                                                                                   
+    formats:                                                                                                                                                              
+      devise:                                                                                                                                                             
+        mailer:                                                                                                                                                           
+          invitation_instructions:                                                                                                                                        
+            accept_until_format: "%d. %B %Y %H:%M"

data/config/locales/en.yml

@@ -22,7 +22,7 @@ en:
         someone_invited_you: "Someone has invited you to %{url}, you can accept it through the link below."
         accept: "Accept invitation"
         accept_until: "This invitation will be due in %{due_date}."
-        ignore: "If you don't want to accept the invitation, please ignore this email.<br />\nYour account won't be created until you access the link above and set your password."
+        ignore: "If you don't want to accept the invitation, please ignore this email. Your account won't be created until you access the link above and set your password."
   time:
     formats:
       devise:

data/config/locales/es.yml

@@ -0,0 +1,31 @@
+es:
+  devise:
+    failure:
+      invited: "Tienes una invitación pendiente, acéptala para acabar de crear tu cuenta."
+    invitations:
+      send_instructions: "Se ha enviado una invitación a %{email}."
+      invitation_token_invalid: "¡La invitación no es válida!"
+      updated: "Se ha configurado su contraseña y ha ingresado al sistema"
+      updated_not_active: "Su contraseña se ha configurado correctamente."
+      no_invitations_remaining: "No quedan invitaciones"
+      invitation_removed: "Se ha retirado su invitación"
+      new:
+        header: "Enviar Invitación"
+        submit_button: "Envía una invitación"
+      edit:
+        header: "Establecer contraseña"
+        submit_button: "Guardar mi contraseña"
+    mailer:
+      invitation_instructions:
+        subject: "Instruciones de la invitación"
+        hello: "Estimada/o %{nombre}"
+        someone_invited_you: "Has sido invitado a %{url}, puedes aceptarlo siguiendo el siguiente enlace"
+        accept: "Aceptar la invitación"
+        accept_until: "Esta invitación expirará en %{due_date}."
+        ignore: "Si no le interesa esta invitación, simplemente ignore este correo. No se creará tu cuenta hasta que accedas al enlace anterior y crees una contraseña."
+  time:
+    formats:
+      devise:
+        mailer:
+          invitation_instructions:
+            accept_until_format: "%d de %B de %Y, %H:%M"

data/config/locales/et.yml

@@ -0,0 +1,23 @@
+et:
+  devise:
+    failure:
+      invited: 'Sul on kutse ootel - aktsepteeri, et konto loomine lõpule viia.'
+    invitations:
+      send_instructions: 'Kutse on saadetud emailile %{email}.'
+      invitation_token_invalid: 'Antud kutse ei ole kehtiv!'
+      updated: 'Sinu salasõna on edukalt sätitud. Oled nüüd sisse logitud.'
+      no_invitations_remaining: "Kutseid pole rohkem järgi."
+      invitation_removed: 'Sinu kutse eemaldati.'
+      new:
+        header: "Kutse saatmine"
+        submit_button: "Saada kutse"
+      edit:
+        header: "Salasõna sättimine"
+        submit_button: "Säti mu salasõna"
+    mailer:
+      invitation_instructions:
+        subject: 'Kutse juhised'
+        hello: 'Tere, %{email}'
+        someone_invited_you: 'Keegi kutsus Sind aadressile %{url}. Kutse saad vastu võtta allolevalt lingilt.'
+        accept: 'Võta kutse vastu'
+        ignore: "Kui Sa ei soovi kutset vastu võtta, siis lihtsalt ignoreeri seda emaili.<br />Sinu kontot ei looda enne, kui oled ülalolevat linki külastanud ja oma salasõna määranud."

data/config/locales/fa.yml

@@ -0,0 +1,31 @@
+fa:
+  devise:
+    failure:
+      invited: "شما یک دعوت نامه در حال انتظار دارید، با قبول آن حساب خود را بسازید."
+    invitations:
+      send_instructions: "یک ایمیل دعوت نامه به %{email} ارسال شد."
+      invitation_token_invalid: "کد دعوت نامه معتبر نیست!"
+      updated: "رمز عبور شما ذخیره شد. شما وارد سایت شدید!"
+      updated_not_active: "رمز عبور شما ذخیره شد."
+      no_invitations_remaining: "دعوت نامه ای نمانده"
+      invitation_removed: "دعوت نامه شما حذف شده."
+      new:
+        header: "فرستادن دعوت نامه"
+        submit_button: "فرستادن دعوت نامه"
+      edit:
+        header: "رمز عبور انتخاب کنید"
+        submit_button: "رمز عبور ذخیره کن"
+    mailer:
+      invitation_instructions:
+        subject: "شما دعوت شدید!"
+        hello: "سلام %{email}"
+        someone_invited_you: "شما به %{url} دعوت شدید. لینک زیر را استفاده کنید تا حساب شما فعال شود."
+        accept: "قبول دعوت"
+        accept_until: "این دعوت نامه تا تاریخ %{due_date} اعتبار دارد."
+        ignore: "اگر نمی خواهید این دعوت را قبول کنید, لطفا این ایمیل را نادیده بگیرید.<br />تا وقتی که بر روی لینک بالا کلیک نکنید، حساب شما ساخته نخواهد شد."
+  time:
+    formats:
+      devise:
+        mailer:
+          invitation_instructions:
+            accept_until_format: "%B %d, %Y %I:%M %p"

data/config/locales/fr.yml

@@ -0,0 +1,34 @@
+fr:
+  devise:
+    failure:
+      invited: "Vous avez une invitation en attente, acceptez-la pour terminer la création de votre compte."
+    invitations:
+      send_instructions: "Un e-mail d'invitation a été envoyé à %{email}."
+      invitation_token_invalid: "Le jeton d'invitation fourni n'est pas valide!"
+      updated: 'Votre mot de passe a été défini avec succès. Vous êtes maintenant connecté.'
+      updated_not_active: "Votre mot de passe a été défini avec succès."
+      no_invitations_remaining: "Il n'y a plus d'invitations restantes"
+      invitation_removed: 'Votre invitation a été supprimée.'
+      new:
+        header: Nouvel utilisateur
+        legend: Envoyer l’invitation
+        submit_button: Envoyer
+      edit:
+        header: Confirmation
+        submit_button: Confirmer
+        new_password: Mot de passe
+        new_password_confirmation: Confirmation du mot de passe
+    mailer:
+      invitation_instructions:
+        subject: 'Vous avez reçu une invitation'
+        hello: 'Bonjour %{email}'
+        someone_invited_you: "Vous avez été invité à rejoindre %{url}, vous pouvez accepter cette invitation via le lien ci-dessous."
+        accept: "Accepter l'invitation"
+        accept_until: "Cette invitation sera valable jusqu'au %{due_date}."
+        ignore: "Si vous ne souhaitez pas accepter cette invitation, veuillez ignorer cet e-mail.<br />Votre compte ne sera pas créé tant que vous n'accéderez pas au lien ci-dessous et que vous ayez défini votre mot de passe."
+  time:
+    formats:
+      devise:
+        mailer:
+          invitation_instructions:
+            accept_until_format: "%B %d, %Y %I:%M %p"