devise_invitable 1.5.5 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: c73f548d678402b25124902905d122de26316161
-  data.tar.gz: 39b1f217bf6a01ab772a462f5488f75a519b15fb
-SHA512: 
-  metadata.gz: 6150c3a9debc6a2974662801bff49a4bc3ab5ef1c6c24ca9a31d355d5633f48b591c99d80349a3feb4319b6bddf33ad5ae6159e2131fcd03b17aeed52b593f15
-  data.tar.gz: a6e3025090643913f77bcbb4d20c8a31db17573eb62e26a13256d6ffc83bc4812f0b84182c2e75456575761192a22b8f637be0f0c859e5dc315641491dd00b5f
+---
+SHA1:
+  metadata.gz: babfb02e4177cd88fe44772401f61014f8b462ea
+  data.tar.gz: 1302cfd7ca394b79ed9f250fe49e9753c4ea0ac8
+SHA512:
+  metadata.gz: ec68260bfce3d59a7365e60e14d756815b85f8c65260cc5df7f74cdd5cc0cf443176a4ec8468e91c667150d88e7676bf5acbea6a5c7b30211e2dc76d5d6d9d56
+  data.tar.gz: d4213cdfc200c4ba8fd5fee2eb0251cf2b892b6663caa0a9a7e307d62f2819307fcb00f43193d92815e8196277208994471f2a329c95931766cb13e5ef6f2cdb

data/CHANGELOG

@@ -1,3 +1,24 @@
+= 1.6.1
+
+- Support 2 arguments on after_invite_path_for, inviter and invitee
+- Support mongoid 6.0 (use :optional on invited_by relation)
+- Support devise 4.1
+
+= 1.6.0
+
+- Support devise 4.0 and rails 5.0
+- Add before/after invitation_created callbacks
+- Fix invitation_due_at when invite_for is 0
+- Add plain text mailer template
+- Ruby 1.9 not supported anymore
+- Adds :require_password_on_accepting config option, and ensure invitation is not accepted if password is required and removed from form
+
+= 1.5.5
+
+- Add optional options hash to invite! methods, they will be used for send_devise_notification call
+
+= 1.5.4
+
 - Ensure that all invited user passwords conform to a format
 - Call set_minimum_password_length (if exists) on accept invitation as devise does
 - Controllers inheriting from Devise::InvitationsController will now use 'devise.invitations' translations

data/README.rdoc

@@ -1,11 +1,13 @@
 = DeviseInvitable
-{<img src="https://travis-ci.org/scambra/devise_invitable.png"/>}[https://travis-ci.org/scambra/devise_invitable] {<img src="https://codeclimate.com/github/scambra/devise_invitable/badges/gpa.svg"/}[https://codeclimate.com/github/scambra/devise_invitable]
+{<img src="https://badge.fury.io/rb/devise_invitable.svg"/>}[http://badge.fury.io/rb/devise_invitable] {<img src="https://travis-ci.org/scambra/devise_invitable.png"/>}[https://travis-ci.org/scambra/devise_invitable] {<img src="https://codeclimate.com/github/scambra/devise_invitable/badges/gpa.svg"/}[https://codeclimate.com/github/scambra/devise_invitable] 
 
 It adds support to devise[https://github.com/plataformatec/devise] for sending invitations by email (it requires to be authenticated) and accept the invitation setting the password.
 
 DeviseInvitable currently supports Rails 3 and 4, if you want to use it with Rails 2.3 you must install version {0.2.3}[https://rubygems.org/gems/devise_invitable/versions/0.2.3]
 
-If you want to use devise 3.0.x, you must use 1.2.1, newer versions require devise >= 3.1.0
+It works with Devise >= 3.2
+If you want to use devise 3.0.x, you must use 1.2.1 or lower
+If you want to use devise 3.1.x, you must use 1.3.2 or lower
 
 == Installation
 
@@ -16,7 +18,7 @@ Install DeviseInvitable gem, it will also install dependencies (such as devise a
 Add DeviseInvitable to your Gemfile (and Devise if you weren't using them):
 
   gem 'devise',           '~> 3.5.2'
-  gem 'devise_invitable', '~> 1.5.2'
+  gem 'devise_invitable', '~> 1.6.0'
 
 === Automatic installation
 
@@ -130,12 +132,16 @@ or directly as parameters to the <tt>devise</tt> method:
 
 * resend_invitation: resend invitation if user with invited status is invited again. Enabled by default.
 
-* invited_by_class_name: The class name of the inviting model. If this is nil, polymorphic association is used.
+* invited_by_class_name: the class name of the inviting model. If this is nil, polymorphic association is used.
 
-* invited_by_foreign_key: The foreign key to the inviting model (only used if invited_by_class_name is set, otherwise :invited_by_id)
+* invited_by_foreign_key: the foreign key to the inviting model (only used if invited_by_class_name is set, otherwise :invited_by_id)
+
+* invited_by_counter_cache: the column name used for counter_cache column. If this is nil (default value), the invited_by association is declared without counter_cache.
 
 * allow_insecure_sign_in_after_accept: automatically sign in the user after they set a password. Enabled by default.
 
+* require_password_on_accepting: require password when user accepts the invitation. Enabled by default. Disable if you don't want to ask or enforce to set password while accepting, because is set when user is invited or it will be set later.
+
 For more details, see <tt>config/initializers/devise.rb</tt> (after you invoked the "devise_invitable:install" generator described above).
 
 == Configuring views
@@ -160,7 +166,7 @@ To change the controller's behavior, create a controller that inherits from <tt>
 
    class Users::InvitationsController < Devise::InvitationsController
      def update
-       if this
+       if some_condition
          redirect_to root_path
        else
          super
@@ -174,7 +180,7 @@ Now just tell Devise that you want to use your controller, the controller above
 
 be sure that you generate the views and put them into the controller that you generated, so for this example it would be:
 
-  rails generate devise_invitable:views users/invitations
+  rails generate devise_invitable:views users
 
 To change behaviour of inviting or accepting users, you can simply override two methods:
 
@@ -265,7 +271,7 @@ To check if a particular user is created by invitation, irrespective to state of
 
 **Warning**
 
-When using skip_invitation you must send the email with the user object instance that generated the tokens, as 
+When using skip_invitation you must send the email with the user object instance that generated the tokens, as
 user.raw_invitation_token is available only to the instance and is not persisted in the database.
 
 You can send an invitation to an existing user if your workflow creates them separately:
@@ -277,6 +283,11 @@ You can also set <tt>invited_by</tt> when using the <tt>invite!</tt> class metho
 
   User.invite!({:email => "new_user@example.com"}, current_user) # current_user will be set as invited_by
 
+=== Find by invitation token
+
+To find by invitation token use the <tt>find_by_invitation_token</tt> class method. 
+
+  user = User.find_by_invitation_token(params[:invitation_token], true)
 
 
 === Accept an invitation
@@ -287,12 +298,17 @@ To accept an invitation with a token use the <tt>accept_invitation!</tt> class m
 
 === Callbacks
 
-A callback event is fired before and after an invitation is accepted (User#accept_invitation!). For example, in your resource model you can add:
+A callback event is fired before and after an invitation is created (User#invite!) or accepted (User#accept_invitation!). For example, in your resource model you can add:
 
+  before_invitation_created :email_admins
   after_invitation_accepted :email_invited_by
 
+  def email_admins
+    # ...
+  end
+
   def email_invited_by
-     # ...
+    # ...
   end
 
 The callbacks support all options and arguments available to the standard callbacks provided by AR.
@@ -303,14 +319,14 @@ A pair of scopes to find those users that have accepted, and those that have not
 
   User.invitation_accepted     # => returns all Users for whom the invitation_accepted_at attribute is not nil
   User.invitation_not_accepted # => returns all Users for whom the invitation_accepted_at attribute is nil
-  User.created_by_invite       # => returns all Users who are created by invitations, irrespective to invitation status 
+  User.created_by_invite       # => returns all Users who are created by invitations, irrespective to invitation status
 
 == Integration in a Rails application
 
 Since the invitations controller take care of all the creation/acceptation of an invitation, in most cases you wouldn't call the <tt>invite!</tt> and <tt>accept_invitation!</tt> methods directly.
 Instead, in your views, put a link to <tt>new_user_invitation_path</tt> or <tt>new_invitation_path(:user)</tt> or even <tt>/users/invitation/new</tt> to prepare and send an invitation (to a user in this example).
 
-After an invitation is created and sent, the inviter will be redirected to after_invite_path_for(resource_name), which is stored path or the same path as after_sign_in_path_for by default.
+After an invitation is created and sent, the inviter will be redirected to after_invite_path_for(inviter, invitee), which is stored path or the same path as after_sign_in_path_for by default.
 
 After an invitation is accepted, the invitee will be redirected to after_accept_path_for(resource), which is the same path as after_sign_in_path_for by default. If you want to override the path, override invitations controller and define after_accept_path_for method. This is useful in the common case that a user is invited to a specific location in your application. More on {Devise's README}[https://github.com/plataformatec/devise], "Controller filters and helpers" section.
 
@@ -386,6 +402,8 @@ The DeviseInvitable mailer uses the same pattern as Devise to create mail subjec
 
 Take a look at the generated locale file (in <tt>config/locales/devise_invitable.en.yml</tt>) to check all available messages.
 
+Translations are not included in gem (and they won't), they are available at wiki[https://github.com/scambra/devise_invitable/wiki/I18n].
+
 == Other ORMs
 
 DeviseInvitable supports ActiveRecord and Mongoid, like Devise.
@@ -398,9 +416,9 @@ https://github.com/scambra/devise_invitable/wiki
 
 == Testing
 
-To test DeviseInvitable for the ActiveRecord ORM with RVM, Ruby 1.9.2, and Rubygems 1.8.17:
+To test DeviseInvitable for the ActiveRecord ORM with RVM, Ruby 2.0.0:
 
-  rvm use 1.9.2
+  rvm use 2.0.0
   rvm gemset create devise_invitable
   rvm gemset use devise_invitable
   gem install bundler

data/app/controllers/devise/invitations_controller.rb

@@ -1,10 +1,19 @@
 class Devise::InvitationsController < DeviseController
+  if Rails::VERSION::MAJOR >= 5
+    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]
+  else
+    prepend_before_filter :authenticate_inviter!, :only => [:new, :create]
+    prepend_before_filter :has_invitations_left?, :only => [:create]
+    prepend_before_filter :require_no_authentication, :only => [:edit, :update, :destroy]
+    prepend_before_filter :resource_from_invitation_token, :only => [:edit, :destroy]
+  end
 
-  prepend_before_filter :authenticate_inviter!, :only => [:new, :create]
-  prepend_before_filter :has_invitations_left?, :only => [:create]
-  prepend_before_filter :require_no_authentication, :only => [:edit, :update, :destroy]
-  prepend_before_filter :resource_from_invitation_token, :only => [:edit, :destroy]
-  helper_method :after_sign_in_path_for
+  if respond_to? :helper_method
+    helper_method :after_sign_in_path_for
+  end
 
   # GET /resource/invitation/new
   def new
@@ -23,7 +32,11 @@ class Devise::InvitationsController < DeviseController
       if is_flashing_format? && self.resource.invitation_sent_at
         set_flash_message :notice, :send_instructions, :email => self.resource.email
       end
-      respond_with resource, :location => after_invite_path_for(current_inviter)
+      if self.method(:after_invite_path_for).arity == 1
+        respond_with resource, :location => after_invite_path_for(current_inviter)
+      else
+        respond_with resource, :location => after_invite_path_for(current_inviter, resource)
+      end
     else
       respond_with_navigational(resource) { render :new }
     end
@@ -108,4 +121,3 @@ class Devise::InvitationsController < DeviseController
     'devise.invitations'
   end
 end
-

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

@@ -4,11 +4,13 @@
   <%= devise_error_messages! %>
   <%= f.hidden_field :invitation_token %>
 
+  <% if f.object.class.require_password_on_accepting %>
   <p><%= f.label :password %><br />
   <%= f.password_field :password %></p>
 
   <p><%= f.label :password_confirmation %><br />
   <%= f.password_field :password_confirmation %></p>
+  <% end %>
 
   <p><%= f.submit t("devise.invitations.edit.submit_button") %></p>
 <% end %>

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

@@ -0,0 +1,11 @@
+<%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %>
+
+<%= t("devise.mailer.invitation_instructions.someone_invited_you", url: root_url) %>
+
+<%= 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") %>

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 />Your 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.<br />\nYour account won't be created until you access the link above and set your password."
   time:
     formats:
       devise:

data/lib/devise_invitable/controllers/helpers.rb

@@ -4,8 +4,8 @@ module DeviseInvitable::Controllers::Helpers
   included do
   end
   
-  def after_invite_path_for(resource)
-    after_sign_in_path_for(resource)
+  def after_invite_path_for(inviter, invitee = nil)
+    after_sign_in_path_for(inviter)
   end
   
   def after_accept_path_for(resource)

data/lib/devise_invitable/mapping.rb

@@ -1,14 +1,10 @@
 module DeviseInvitable
   module Mapping
-    def self.included(base)
-      base.alias_method_chain :default_controllers, :invitable
-    end
-    
     private
-    def default_controllers_with_invitable(options)
+    def default_controllers(options)
       options[:controllers] ||= {}
       options[:controllers][:registrations] ||= "devise_invitable/registrations"
-      default_controllers_without_invitable(options)
+      super
     end
   end
-end
+end

data/lib/devise_invitable/model.rb

@@ -40,11 +40,15 @@ module Devise
         if defined?(ActiveRecord) && defined?(ActiveRecord::Base) && self < ActiveRecord::Base
           counter_cache = Devise.invited_by_counter_cache
           belongs_to_options.merge! :counter_cache => counter_cache if counter_cache
+          belongs_to_options.merge! :optional => true if ActiveRecord::VERSION::MAJOR >= 5
+        elsif defined?(Mongoid) && defined?(Mongoid::Document) && self < Mongoid::Document && Mongoid::VERSION >= '6.0.0'
+          belongs_to_options.merge! :optional => true
         end
         belongs_to :invited_by, belongs_to_options
 
-        include ActiveSupport::Callbacks
-        define_callbacks :invitation_accepted
+        extend ActiveModel::Callbacks
+        define_model_callbacks :invitation_created
+        define_model_callbacks :invitation_accepted
 
         scope :no_active_invitation, lambda { where(:invitation_token => nil) }
         if defined?(Mongoid) && defined?(Mongoid::Document) && self < Mongoid::Document
@@ -56,7 +60,14 @@ module Devise
           scope :invitation_not_accepted, lambda { where(arel_table[:invitation_token].not_eq(nil)).where(:invitation_accepted_at => nil) }
           scope :invitation_accepted, lambda { where(arel_table[:invitation_accepted_at].not_eq(nil)) }
 
-          [:before_invitation_accepted, :after_invitation_accepted].each do |callback_method|
+          callbacks = [
+            :before_invitation_created,
+            :after_invitation_created,
+            :before_invitation_accepted,
+            :after_invitation_accepted,
+          ]
+
+          callbacks.each do |callback_method|
             send callback_method
           end
         end
@@ -79,11 +90,12 @@ module Devise
       # Accept an invitation by clearing invitation token and and setting invitation_accepted_at
       # Saves the model and confirms it if model is confirmable, running invitation_accepted callbacks
       def accept_invitation!
-        if self.invited_to_sign_up? && self.valid?
+        if self.invited_to_sign_up?
+          @accepting_invitation = true
           run_callbacks :invitation_accepted do
             self.accept_invitation
             self.confirmed_at = self.invitation_accepted_at if self.respond_to?(:confirmed_at)
-            self.save(:validate => false)
+            self.save
           end
         end
       end
@@ -95,15 +107,20 @@ module Devise
 
       # Verifies whether a user has been invited or not
       def invited_to_sign_up?
-        persisted? && invitation_token.present?
+        accepting_invitation? || (persisted? && invitation_token.present?)
+      end
+
+      # Returns true if accept_invitation! was called
+      def accepting_invitation?
+        @accepting_invitation
       end
 
-      # Verifies whether a user accepted an invitation (or is accepting it)
+      # Verifies whether a user accepted an invitation (false when user is accepting it)
       def invitation_accepted?
-        invitation_accepted_at.present?
+        !accepting_invitation? && invitation_accepted_at.present?
       end
 
-      # Verifies whether a user has accepted an invitation (or is accepting it), or was never invited
+      # Verifies whether a user has accepted an invitation (false when user is accepting it), or was never invited
       def accepted_or_not_invited?
         invitation_accepted? || !invited_to_sign_up?
       end
@@ -121,17 +138,20 @@ module Devise
 
         yield self if block_given?
         generate_invitation_token if no_token_present_or_skip_invitation?
-        self.invitation_created_at = Time.now.utc
-        self.invitation_sent_at = self.invitation_created_at unless skip_invitation
-        self.invited_by = invited_by if invited_by
 
-        # Call these before_validate methods since we aren't validating on save
-        self.downcase_keys if new_record_and_responds_to?(:downcase_keys)
-        self.strip_whitespace if new_record_and_responds_to?(:strip_whitespace)
+        run_callbacks :invitation_created do
+          self.invitation_created_at = Time.now.utc
+          self.invitation_sent_at = self.invitation_created_at unless skip_invitation
+          self.invited_by = invited_by if invited_by
 
-        if save(:validate => false)
-          self.invited_by.decrement_invitation_limit! if !was_invited and self.invited_by.present?
-          deliver_invitation(options) unless skip_invitation
+          # Call these before_validate methods since we aren't validating on save
+          self.downcase_keys if new_record_and_responds_to?(:downcase_keys)
+          self.strip_whitespace if new_record_and_responds_to?(:strip_whitespace)
+
+          if save(:validate => false)
+            self.invited_by.decrement_invitation_limit! if !was_invited and self.invited_by.present?
+            deliver_invitation(options) unless skip_invitation
+          end
         end
       end
 
@@ -144,7 +164,12 @@ module Devise
 
       # Only verify password when is not invited
       def valid_password?(password)
-        super unless block_from_invitation?
+        super unless !accepting_invitation? && block_from_invitation?
+      end
+
+      # Enforce password when invitation is being accepted
+      def password_required?
+        (accepting_invitation? && self.class.require_password_on_accepting) || super
       end
 
       def unauthenticated_message
@@ -180,7 +205,8 @@ module Devise
       end
 
       def invitation_due_at
-        return nil unless self.class.invite_for
+        return nil if (self.class.invite_for == 0 || self.class.invite_for.nil?)
+        #return nil unless self.class.invite_for
 
         time = self.invitation_created_at || self.invitation_sent_at
         time + self.class.invite_for
@@ -311,6 +337,14 @@ module Devise
         end
 
         # Callback convenience methods
+        def before_invitation_created(*args, &blk)
+          set_callback(:invitation_created, :before, *args, &blk)
+        end
+
+        def after_invitation_created(*args, &blk)
+          set_callback(:invitation_created, :after, *args, &blk)
+        end
+
         def before_invitation_accepted(*args, &blk)
           set_callback(:invitation_accepted, :before, *args, &blk)
         end
@@ -326,6 +360,7 @@ module Devise
         Devise::Models.config(self, :invite_key)
         Devise::Models.config(self, :resend_invitation)
         Devise::Models.config(self, :allow_insecure_sign_in_after_accept)
+        Devise::Models.config(self, :require_password_on_accepting)
 
         private
 

data/lib/devise_invitable/parameter_sanitizer.rb

@@ -1,29 +1,37 @@
 module DeviseInvitable
   module ParameterSanitizer
-    def invite
-      permit self.for(:invite)
-    end
-
-    def accept_invitation
-      permit self.for(:accept_invitation)
-    end
+    if defined?(Devise::BaseSanitizer)
+      def invite
+        permit self.for(:invite)
+      end
 
-    def self.included(base)
-      base.alias_method_chain :attributes_for, :invitable
+      def accept_invitation
+        permit self.for(:accept_invitation)
+      end
     end
 
     private
-    def permit(keys)
-      default_params.permit(*Array(keys))
-    end
 
-    def attributes_for_with_invitable(kind)
-      case kind
-      when :invite
-        resource_class.respond_to?(:invite_key_fields) ? resource_class.invite_key_fields : []
-      when :accept_invitation
-        [:password, :password_confirmation, :invitation_token]
-      else attributes_for_without_invitable(kind)
+    if defined?(Devise::BaseSanitizer)
+      def permit(keys)
+        default_params.permit(*Array(keys))
+      end
+
+      def attributes_for(kind)
+        case kind
+        when :invite
+          resource_class.respond_to?(:invite_key_fields) ? resource_class.invite_key_fields : []
+        when :accept_invitation
+          [:password, :password_confirmation, :invitation_token]
+        else
+          super
+        end
+      end
+    else
+      def initialize(resource_class, resource_name, params)
+        super
+        permit(:invite, keys: (resource_class.respond_to?(:invite_key_fields) ? resource_class.invite_key_fields : []) )
+        permit(:accept_invitation, keys: [:password, :password_confirmation, :invitation_token] )
       end
     end
   end

data/lib/devise_invitable/rails.rb

@@ -16,8 +16,8 @@ module DeviseInvitable
     end
     # extend mapping with after_initialize because it's not reloaded
     config.after_initialize do
-      Devise::Mapping.send :include, DeviseInvitable::Mapping
-      Devise::ParameterSanitizer.send :include, DeviseInvitable::ParameterSanitizer
+      Devise::Mapping.send :prepend, DeviseInvitable::Mapping
+      Devise::ParameterSanitizer.send :prepend, DeviseInvitable::ParameterSanitizer
     end
   end
 end

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '1.5.5'
+  VERSION = '1.6.1'
 end

data/lib/devise_invitable.rb

@@ -72,10 +72,16 @@ module Devise
   mattr_accessor :invited_by_counter_cache
   @@invited_by_counter_cache = nil
 
-  # Public: Auto-login after the user accepts the invite. If this is false,
+  # Public: Auto-login after the user accepts the invitation. If this is false,
   # the user will need to manually log in after accepting the invite (default: true).
   mattr_accessor :allow_insecure_sign_in_after_accept
   @@allow_insecure_sign_in_after_accept = true
+
+  # Public: Require password when user accepts the invitation. Set to false if
+  # you don't want to ask or enforce to set password while accepting, because is
+  # set when user is invited or it will be set later (default: true).
+  mattr_accessor :require_password_on_accepting
+  @@require_password_on_accepting = true
 end
 
 Devise.add_module :invitable, :controller => :invitations, :model => 'devise_invitable/model', :route => {:invitation => [nil, :new, :accept]}

data/lib/generators/devise_invitable/install_generator.rb

@@ -63,8 +63,8 @@ module DeviseInvitable
 
   # Auto-login after the user accepts the invite. If this is false,
   # the user will need to manually log in after accepting the invite.
-  # Default: false
-  # config.allow_insecure_sign_in_after_accept = true
+  # Default: true
+  # config.allow_insecure_sign_in_after_accept = false
 
 CONTENT
             end

data/test/functional/controller_helpers_test.rb

@@ -6,32 +6,37 @@ class ControllerHelpersTest < ActionController::TestCase
   test "after invite path defaults to after sign in path" do
     assert_equal @controller.send(:after_sign_in_path_for, :user), @controller.after_invite_path_for(:user)
   end
-  
+
   test "after accept path defaults to after sign in path" do
     assert_equal @controller.send(:after_sign_in_path_for, :user), @controller.after_accept_path_for(:user)
   end
-  
+
   test 'after invite path is customizable from application controller' do
     custom_path = 'customized/after/invite/path'
     @controller.instance_eval "def after_invite_path_for(resource) '#{custom_path}' end"
     assert_equal @controller.after_invite_path_for(:user), custom_path
   end
-  
+
+  test 'after invite path is customizable from application controller with invited' do
+    custom_path = 'customized/after/invite/path'
+    @controller.instance_eval "def after_invite_path_for(resource, invited) '#{custom_path}' end"
+    assert_equal @controller.after_invite_path_for(:user, :invited), custom_path
+  end
   test 'after accept path is customizable from application controller' do
     custom_path = 'customized/after/accept/path'
     @controller.instance_eval "def after_accept_path_for(resource) '#{custom_path}' end"
     assert_equal @controller.after_accept_path_for(:user), custom_path
   end
-  
+
   test 'is not a devise controller' do
     assert !@controller.devise_controller?
   end
-  
+
   test 'invitations controller respects definition for after invite path in application controller' do
     assert Devise::InvitationsController.method_defined? :after_invite_path_for
     assert !Devise::InvitationsController.instance_methods(false).include?(:after_invite_path_for)
   end
-  
+
   test 'invitations controller respects definition for after accept path in application controller' do
     assert Devise::InvitationsController.method_defined? :after_accept_path_for
     assert !Devise::InvitationsController.instance_methods(false).include?(:after_accept_path_for)

data/test/mailers/invitation_mail_test.rb

@@ -23,8 +23,8 @@ class InvitationMailTest < ActionMailer::TestCase
     assert_not_nil mail
   end
 
-  test 'content type should be set to html' do
-    assert_equal 'text/html; charset=UTF-8', mail.content_type
+  test 'content type should be set to multipart' do
+    assert_match /^multipart\/alternative; boundary="[^"]+"; charset=UTF-8/, mail.content_type
   end
 
   test 'send invitation to the user email' do
@@ -48,30 +48,44 @@ class InvitationMailTest < ActionMailer::TestCase
   end
 
   test 'body should have user info' do
-    assert_match /#{user.email}/, mail.body.decoded
+    assert_match /#{user.email}/, mail.html_part.body.decoded
+    assert_match /#{user.email}/, mail.text_part.body.decoded
   end
 
   test 'body should have link to confirm the account' do
     host = ActionMailer::Base.default_url_options[:host]
-    body = mail.body.decoded
+    body = mail.html_part.body.decoded
     invitation_url_regexp = %r{<a href=\"http://#{host}/users/invitation/accept\?invitation_token=#{Thread.current[:token]}">}
     assert_match invitation_url_regexp, body
+
+    body = mail.text_part.body.decoded
+    invitation_url_regexp = %r{http://#{host}/users/invitation/accept\?invitation_token=#{Thread.current[:token]}}
+    assert_match invitation_url_regexp, body
   end
 
   test 'body should have link to confirm the account on resend' do
     host = ActionMailer::Base.default_url_options[:host]
     user
     @user = User.find(user.id).invite!
-    body = mail.body.decoded
+    body = mail.html_part.body.decoded
     invitation_url_regexp = %r{<a href=\"http://#{host}/users/invitation/accept\?invitation_token=#{Thread.current[:token]}">}
     assert_match invitation_url_regexp, body
+
+    body = mail.text_part.body.decoded
+    invitation_url_regexp = %r{http://#{host}/users/invitation/accept\?invitation_token=#{Thread.current[:token]}}
+    assert_match invitation_url_regexp, body
   end
 
   test 'body should have invitation due date when it exists' do
+    User.stubs(:invite_for => 5)
+
     host = ActionMailer::Base.default_url_options[:host]
     user
-    body = mail.body.decoded
+    body = mail.html_part.body.decoded
+    due_date_regexp = %r{#{I18n.l user.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format' }}
+    assert_match due_date_regexp, body
 
+    body = mail.text_part.body.decoded
     due_date_regexp = %r{#{I18n.l user.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format' }}
     assert_match due_date_regexp, body
   end