devise_invitable 1.5.5 → 1.6.0

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: 1c29d1de12fe88af51d1a7e23efd9829db040271
+  data.tar.gz: e4ea042b56eac21a082f284d66b2f0d129555a83
+SHA512:
+  metadata.gz: d11eadb4b2f24ca4500a85fbb7c0636c7cca291f2b43dd9af7321bce5a88942e286fe2412ad4a51ae1556cf4441f7244e8910ccac189751a8b073a54510a1335
+  data.tar.gz: a1e51d0f15d30630bbf44f04d1ef7fcabc279ea405f931a0ef390939bfd5ce71d3dc117a178f927d081634344aba03eb96904f04199bbf53558b05d3f6d18351

data/CHANGELOG

@@ -1,3 +1,18 @@
+= 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
 
@@ -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:
@@ -287,12 +293,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,7 +314,7 @@ 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
 
@@ -398,9 +409,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

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.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/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,10 +40,12 @@ 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
         end
         belongs_to :invited_by, belongs_to_options
 
         include ActiveSupport::Callbacks
+        define_callbacks :invitation_created
         define_callbacks :invitation_accepted
 
         scope :no_active_invitation, lambda { where(:invitation_token => nil) }
@@ -56,7 +58,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,6 +88,7 @@ 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!
+        @accepting_invitation = true
         if self.invited_to_sign_up? && self.valid?
           run_callbacks :invitation_accepted do
             self.accept_invitation
@@ -98,6 +108,11 @@ module Devise
         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)
       def invitation_accepted?
         invitation_accepted_at.present?
@@ -121,17 +136,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 +162,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 +203,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 +335,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 +358,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.0'
 end

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/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

data/test/models/invitable_test.rb

@@ -29,9 +29,9 @@ class InvitableTest < ActiveSupport::TestCase
     user = new_user
     user.invite!
 
-    assert_not_nil user.invitation_token
-    assert_not_nil user.raw_invitation_token
-    assert_not_nil user.invitation_created_at
+    refute_nil user.invitation_token
+    refute_nil user.raw_invitation_token
+    refute_nil user.invitation_created_at
 
     3.times do
       user = User.find(user.id)
@@ -40,7 +40,7 @@ class InvitableTest < ActiveSupport::TestCase
         user.invite!
         user.invitation_token
       }.call
-      assert_not_nil user.raw_invitation_token
+      refute_nil user.raw_invitation_token
     end
   end
 
@@ -49,8 +49,8 @@ class InvitableTest < ActiveSupport::TestCase
     user.skip_invitation = true
     user.invite!
 
-    assert_not_nil user.invitation_token
-    assert_not_nil user.invitation_created_at
+    refute_nil user.invitation_token
+    refute_nil user.invitation_created_at
 
     3.times do
       user = User.find(user.id)
@@ -60,8 +60,8 @@ class InvitableTest < ActiveSupport::TestCase
         user.invite!
         user.invitation_token
       }.call
-      assert_not_nil user.invitation_token
-      assert_not_nil user.raw_invitation_token
+      refute_nil user.invitation_token
+      refute_nil user.raw_invitation_token
     end
   end
 
@@ -88,8 +88,8 @@ class InvitableTest < ActiveSupport::TestCase
     user.update_attributes(:invitation_sent_at => old_invitation_sent_at, :invitation_created_at => old_invitation_created_at)
     3.times do
       user.invite!
-      assert_not_equal old_invitation_sent_at, user.invitation_sent_at
-      assert_not_equal old_invitation_created_at, user.invitation_created_at
+      refute_equal old_invitation_sent_at, user.invitation_sent_at
+      refute_equal old_invitation_created_at, user.invitation_created_at
       user.update_attributes(:invitation_sent_at => old_invitation_sent_at, :invitation_created_at => old_invitation_created_at)
     end
   end
@@ -99,31 +99,32 @@ class InvitableTest < ActiveSupport::TestCase
 
     User.stubs(:invite_for).returns(nil)
     user.invitation_created_at = Time.now.utc
-    assert user.valid_invitation?
+    assert_predicate user, :valid_invitation?
 
     User.stubs(:invite_for).returns(nil)
     user.invitation_created_at = 1.year.ago
-    assert user.valid_invitation?
+    assert_predicate user, :valid_invitation?
 
     User.stubs(:invite_for).returns(0)
     user.invitation_created_at = Time.now.utc
-    assert user.valid_invitation?
+    assert_predicate user, :valid_invitation?
 
     User.stubs(:invite_for).returns(0)
     user.invitation_created_at = 1.day.ago
-    assert user.valid_invitation?
+    assert_predicate user, :valid_invitation?
 
     User.stubs(:invite_for).returns(1.day)
     user.invitation_created_at = Time.now.utc
-    assert user.valid_invitation?
+    assert_predicate user, :valid_invitation?
 
     User.stubs(:invite_for).returns(1.day)
     user.invitation_created_at = 2.days.ago
-    assert !user.valid_invitation?
+    refute_predicate user, :valid_invitation?
   end
 
   test 'should return token validity when there is invite_for' do
     User.stubs(:invite_for).returns(1.day)
+
     user = User.invite!(:email => "valid@email.com")
     sent_at = user.invitation_created_at || user.invitation_sent_at
     valid_until = sent_at + User.invite_for
@@ -131,20 +132,27 @@ class InvitableTest < ActiveSupport::TestCase
     assert_equal user.invitation_due_at, valid_until
   end
 
-  test 'should return nil as token validity when there is not invite_for' do
+  test 'should return nil for invitation due date when invite_for is nil' do
     User.stubs(:invite_for).returns(nil)
     user = User.invite!(:email => "valid@email.com")
 
     assert_equal user.invitation_due_at, nil
   end
 
+  test 'should return nil for invitation due date when invite_for is 0' do
+    User.stubs(:invite_for).returns(0)
+    user = User.invite!(email: 'valid@email.com')
+
+    assert_equal user.invitation_due_at, nil
+  end
+
   test 'should never generate the same invitation token for different users' do
     invitation_tokens = []
     3.times do
       user = new_user
       user.invite!
       token = user.invitation_token
-      assert !invitation_tokens.include?(token)
+      refute_includes invitation_tokens, token
       invitation_tokens << token
     end
   end
@@ -152,36 +160,49 @@ class InvitableTest < ActiveSupport::TestCase
   test 'should invite with multiple columns for invite key' do
     User.stubs(:invite_key).returns(:email => Devise.email_regexp, :username => /\A.+\z/)
     user = User.invite!(:email => "valid@email.com", :username => "name")
-    assert user.persisted?
-    assert user.errors.empty?
+    assert_predicate user, :persisted?
+    assert_empty user.errors
   end
 
   test 'should allow non-string columns for invite key' do
     User.stubs(:invite_key).returns(:email => Devise.email_regexp, :profile_id => :present?.to_proc, :active => true)
     user = User.invite!(:email => "valid@email.com", :profile_id => 1, :active => true)
-    assert user.persisted?
-    assert user.errors.empty?
+    assert_predicate user, :persisted?
+    assert_empty user.errors
   end
 
   test 'should not invite with some missing columns when invite key is an array' do
     User.stubs(:invite_key).returns(:email => Devise.email_regexp, :username => /\A.+\z/, :profile_id => :present?.to_proc, :active => true)
     user = User.invite!(:email => "valid@email.com")
-    assert user.new_record?
-    assert user.errors.present?
+    assert_predicate user, :new_record?
+    refute_empty user.errors
     assert user.errors[:username]
     assert user.errors[:profile_id]
     assert user.errors[:active]
-    assert user.errors[:email].empty?
+    assert_empty user.errors[:email]
   end
 
   test 'should return mail object' do
     mail = User.invite_mail!(:email => 'valid@email.com')
-    assert mail.class.name == 'Mail::Message'
+    assert_instance_of Mail::Message, mail
   end
 
   test 'should disallow login when invited' do
     invited_user = User.invite!(:email => "valid@email.com")
-    assert !invited_user.valid_password?('1234')
+    refute invited_user.valid_password?('1234')
+  end
+
+  test 'should not accept invite without password' do
+    user = User.invite!(:email => "valid@email.com")
+    user = User.accept_invitation!(:invitation_token => Thread.current[:token])
+    refute_predicate user, :invitation_accepted?
+  end
+
+  test 'should accept invite without password if enforce is disabled' do
+    Devise.stubs(:require_password_on_accepting => false)
+    user = User.invite!(:email => "valid@email.com")
+    user = User.accept_invitation!(:invitation_token => Thread.current[:token])
+    assert_predicate user, :invitation_accepted?
   end
 
   test 'should set password and password confirmation from params' do
@@ -194,7 +215,7 @@ class InvitableTest < ActiveSupport::TestCase
     user = User.invite!(:email => "valid@email.com")
     old_encrypted_password = user.encrypted_password
     user = User.accept_invitation!(:invitation_token => Thread.current[:token], :password => '123456789', :password_confirmation => '123456789')
-    assert_not_equal old_encrypted_password, user.encrypted_password
+    refute_equal old_encrypted_password, user.encrypted_password
   end
 
   test 'should not override password on invite!' do
@@ -236,7 +257,7 @@ class InvitableTest < ActiveSupport::TestCase
     User.reset_password_by_token(:reset_password_token => token, :password => '123456789', :password_confirmation => '123456789')
     assert_nil user.reload.reset_password_token
     assert_nil user.reload.invitation_token
-    assert !user.invited_to_sign_up?
+    refute_predicate user, :invited_to_sign_up?
   end
 
   test 'should not accept invitation on failing to reset the password' do
@@ -256,7 +277,7 @@ class InvitableTest < ActiveSupport::TestCase
 
   test 'should not set invitation_accepted_at if just resetting password' do
     user = User.create!(:email => "valid@email.com", :password => "123456780")
-    assert !user.invited_to_sign_up?
+    refute_predicate user, :invited_to_sign_up?
     token, user.reset_password_token = Devise.token_generator.generate(User, :reset_password_token)
     user.reset_password_sent_at = Time.now.utc
     user.save
@@ -273,30 +294,30 @@ class InvitableTest < ActiveSupport::TestCase
     assert_difference('ActionMailer::Base.deliveries.size') do
       token = user.invitation_token
       user.invite!
-      assert_not_equal token, user.invitation_token
+      refute_equal token, user.invitation_token
     end
   end
 
   test 'should return a record with invitation token and no errors to send invitation by email' do
     invited_user = User.invite!(:email => "valid@email.com")
-    assert invited_user.errors.blank?
-    assert invited_user.invitation_token.present?
+    assert_empty invited_user.errors
+    assert_predicate invited_user.invitation_token, :present?
     assert_equal 'valid@email.com', invited_user.email
-    assert invited_user.persisted?
+    assert_predicate invited_user, :persisted?
   end
 
   test 'should set all attributes with no errors' do
     invited_user = User.invite!(:email => "valid@email.com", :username => 'first name')
-    assert invited_user.errors.blank?
+    assert_empty invited_user.errors
     assert_equal 'first name', invited_user.username
-    assert invited_user.persisted?
+    assert_predicate invited_user, :persisted?
   end
 
   test 'should not validate other attributes when validate_on_invite is disabled' do
     validate_on_invite = User.validate_on_invite
     User.validate_on_invite = false
     invited_user = User.invite!(:email => "valid@email.com", :username => "a"*50)
-    assert invited_user.errors.empty?
+    assert_empty invited_user.errors
     User.validate_on_invite = validate_on_invite
   end
 
@@ -304,7 +325,7 @@ class InvitableTest < ActiveSupport::TestCase
     validate_on_invite = User.validate_on_invite
     User.validate_on_invite = true
     invited_user = User.invite!(:email => "valid@email.com", :username => "a"*50)
-    assert invited_user.errors[:username].present?
+    refute_empty invited_user.errors[:username]
     User.validate_on_invite = validate_on_invite
   end
 
@@ -312,8 +333,8 @@ class InvitableTest < ActiveSupport::TestCase
     validate_on_invite = User.validate_on_invite
     User.validate_on_invite = true
     invited_user = User.invite!(:email => "valid@email.com", :username => "a"*50)
-    assert invited_user.errors.present?
-    assert invited_user.errors[:password].empty?
+    refute_empty invited_user.errors
+    assert_empty invited_user.errors[:password]
     User.validate_on_invite = validate_on_invite
   end
 
@@ -321,8 +342,8 @@ class InvitableTest < ActiveSupport::TestCase
     validate_on_invite = User.validate_on_invite
     User.validate_on_invite = true
     invited_user = User.invite!(:email => "", :username => "a"*50)
-    assert invited_user.errors[:email].present?
-    assert invited_user.errors[:username].present?
+    refute_empty invited_user.errors[:email]
+    refute_empty invited_user.errors[:username]
     User.validate_on_invite = validate_on_invite
   end
 
@@ -363,7 +384,7 @@ class InvitableTest < ActiveSupport::TestCase
       user = User.invite!(:email => "valid@email.com", :username => "a"*50)
       assert_equal user, existing_user
       assert_equal ['has already been taken'], user.errors[:email]
-      assert user.errors[:username].present?
+      refute_empty user.errors[:username]
     ensure
       User.validate_on_invite = validate_on_invite
     end
@@ -385,7 +406,7 @@ class InvitableTest < ActiveSupport::TestCase
     invited_user = User.invite!(:email => "invalid_email.com", :username => 'first name')
     assert invited_user.new_record?
     assert_equal 'first name', invited_user.username
-    assert invited_user.errors.present?
+    refute_empty invited_user.errors
   end
 
   test 'should find a user to set his password based on invitation_token' do
@@ -449,10 +470,10 @@ class InvitableTest < ActiveSupport::TestCase
       :password_confirmation => 'new_password',
       :username => 'a'*50
     )
-    assert invited_user.errors[:username].present?
+    refute_empty invited_user.errors[:username]
 
     user.reload
-    assert !user.valid_password?('new_password')
+    refute user.valid_password?('new_password')
   end
 
   test 'should check if created by invitation' do
@@ -492,7 +513,7 @@ class InvitableTest < ActiveSupport::TestCase
 
     user.invite!
 
-    assert !user.confirmed?
+    refute_predicate user, :confirmed?
   end
 
   test 'user.has_invitations_left? test' do
@@ -508,7 +529,7 @@ class InvitableTest < ActiveSupport::TestCase
     # With an individual invitation_limit of 0, a user shouldn't be able to send an invitation
     user.invitation_limit = 0
     assert user.save
-    assert !user.has_invitations_left?
+    refute_predicate user, :has_invitations_left?
 
     # With in invitation_limit of 2, a user should be able to send two invitations
     user.invitation_limit = 2
@@ -536,7 +557,7 @@ class InvitableTest < ActiveSupport::TestCase
     assert_no_difference('ActionMailer::Base.deliveries.size') do
       user.invite!
     end
-    assert user.invitation_created_at.present?
+    assert_predicate user, :invitation_created_at
     assert_nil user.invitation_sent_at
   end
 
@@ -547,7 +568,7 @@ class InvitableTest < ActiveSupport::TestCase
         u.skip_invitation = true
       end
     end
-    assert user.invitation_created_at.present?
+    assert_predicate user, :invitation_created_at
     assert_nil user.invitation_sent_at
   end
 
@@ -568,17 +589,17 @@ class InvitableTest < ActiveSupport::TestCase
 
   test 'user.accept_invitation! should trigger callbacks' do
     user = User.invite!(:email => "valid@email.com")
-    assert_callbacks_not_fired user
+    assert_callbacks_not_fired :after_invitation_accepted, user
     user.accept_invitation!
-    assert_callbacks_fired user
+    assert_callbacks_fired :after_invitation_accepted, user
   end
 
   test 'user.accept_invitation! should not trigger callbacks if validation fails' do
     user = User.invite!(:email => "valid@email.com")
-    assert_callbacks_not_fired user
+    assert_callbacks_not_fired :after_invitation_accepted, user
     user.username='a'*50
     user.accept_invitation!
-    assert_callbacks_not_fired user
+    assert_callbacks_not_fired :after_invitation_accepted, user
   end
 
   test 'user.accept_invitation! should confirm user if confirmable' do
@@ -593,19 +614,19 @@ class InvitableTest < ActiveSupport::TestCase
     user.username='a'*50
     user.accept_invitation!
 
-    assert !user.confirmed?
+    refute_predicate user, :confirmed?
   end
 
-  def assert_callbacks_fired(user)
-    assert_callbacks_status user, true
+  def assert_callbacks_fired(callback, user)
+    assert_callbacks_status callback, user, true
   end
 
-  def assert_callbacks_not_fired(user)
-    assert_callbacks_status user, nil
+  def assert_callbacks_not_fired(callback, user)
+    assert_callbacks_status callback, user, nil
   end
 
-  def assert_callbacks_status(user, fired)
-    assert_equal fired, user.callback_works
+  def assert_callbacks_status(callback, user, fired)
+    assert_equal fired, user.send("#{callback}_callback_works".to_sym)
   end
 
   test "user.invite! should downcase the class's case_insensitive_keys" do
@@ -621,6 +642,13 @@ class InvitableTest < ActiveSupport::TestCase
     assert user.active == true
   end
 
+  test "user.invite! should trigger callbacks" do
+    user = User.new(email: "valid@email.com")
+    assert_callbacks_not_fired :after_invitation_created, user
+    user.invite!
+    assert_callbacks_fired :after_invitation_created, user
+  end
+
   test 'should pass validation before accept if field is required in post-invited instance' do
     user = User.invite!(:email => "valid@email.com")
     user.testing_accepted_or_not_invited = true
@@ -646,7 +674,7 @@ class InvitableTest < ActiveSupport::TestCase
   test 'should return instance with errors if invitation_token is nil' do
     User.create(:email => 'admin@test.com', :password => '123456', :password_confirmation => '123456')
     user = User.accept_invitation!
-    assert !user.errors.empty?
+    refute_empty user.errors
   end
 
   test "should count invited, created_by_invite, accepted and not accepted invitations" do

data/test/rails_app/app/models/user.rb

@@ -36,10 +36,11 @@ class User < PARENT_MODEL_CLASS
 
   devise :database_authenticatable, :registerable, :validatable, :confirmable, :invitable, :recoverable
 
-  attr_accessor :callback_works, :bio, :token
+  attr_accessor :after_invitation_created_callback_works, :after_invitation_accepted_callback_works, :bio, :token
   validates :username, :length => { :maximum => 20 }
-  
+
   attr_accessor :testing_accepted_or_not_invited
+
   validates :username, :presence => true, :if => :testing_accepted_or_not_invited_validator?
   validates :bio, :presence => true, :if => :invitation_accepted?
 
@@ -47,8 +48,12 @@ class User < PARENT_MODEL_CLASS
     testing_accepted_or_not_invited && accepted_or_not_invited?
   end
 
+  after_invitation_created do |object|
+    object.after_invitation_created_callback_works = true
+  end
+
   after_invitation_accepted do |object|
-    object.callback_works = true
+    object.after_invitation_accepted_callback_works = true
   end
 
   def send_devise_notification(method, raw, *args)

data/test/rails_app/config/application.rb

@@ -7,7 +7,8 @@ require "rails/test_unit/railtie"
 Bundler.require(:default, DEVISE_ORM) if defined?(Bundler)
 
 begin
-  require "#{DEVISE_ORM}/railtie"
+  require "#{DEVISE_ORM}" if DEVISE_ORM == :mongoid
+  require "#{DEVISE_ORM}/railtie" unless DEVISE_ORM == :mongoid && Mongoid::VERSION >= '5.0.0'
 rescue LoadError
 end
 PARENT_MODEL_CLASS = DEVISE_ORM == :active_record ? ActiveRecord::Base : Object
@@ -20,5 +21,8 @@ module RailsApp
   class Application < Rails::Application
     config.filter_parameters << :password
     config.action_mailer.default_url_options = { :host => "localhost:3000" }
+    if DEVISE_ORM == :active_record && Rails.version.start_with?('5')
+      config.active_record.maintain_test_schema = false
+    end
   end
 end

data/test/rails_app/config/database.yml

@@ -11,7 +11,8 @@ development:
 # Do not set this db to the same as development or production.
 test:
   adapter: sqlite3
-  database: ":memory:"
+  #database: ":memory:"
+  database: db/test.sqlite3
   pool: 5
   timeout: 5000
 

data/test/rails_app/config/environments/test.rb

@@ -30,4 +30,6 @@ RailsApp::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.active_support.test_order = :sorted
 end

data/test/rails_app/db/migrate/20100401102949_create_tables.rb

@@ -29,7 +29,7 @@ class CreateTables < ActiveRecord::Migration
       t.string   :invited_by_type
       t.integer :invitations_count, :default => 0
 
-      t.timestamps
+      t.timestamps :null => false
     end
     add_index :users, :invitation_token, :unique => true
     add_index :users, :invitations_count

data/test/test_helper.rb

@@ -4,9 +4,8 @@ DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
 $:.unshift File.dirname(__FILE__)
 puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}"
 require "rails_app/config/environment"
-include Devise::TestHelpers
-require "orm/#{DEVISE_ORM}"
 require 'rails/test_help'
+require "orm/#{DEVISE_ORM}"
 require 'capybara/rails'
 require 'mocha/setup'
 
@@ -15,10 +14,11 @@ ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.default_url_options[:host] = 'test.com'
 
 ActiveSupport::Deprecation.silenced = true
+$VERBOSE = false
 
 class ActionDispatch::IntegrationTest
   include Capybara::DSL
 end
-class ActionController::TestCase 
-  include Devise::TestHelpers 
+class ActionController::TestCase
+  include Devise::TestHelpers
 end

metadata

@@ -1,59 +1,65 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: devise_invitable
-version: !ruby/object:Gem::Version 
-  version: 1.5.5
+version: !ruby/object:Gem::Version
+  version: 1.6.0
 platform: ruby
-authors: 
+authors:
 - Sergio Cambra
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-12-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-04-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.1.0
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.6
   type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.2.6
-    - - <
-      - !ruby/object:Gem::Version 
-        version: "5"
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.2.0
-  version_requirements: *id003
-description: It adds support for send invitations by email (it requires to be authenticated) and accept the invitation by setting a password.
-email: 
+description: It adds support for send invitations by email (it requires to be authenticated)
+  and accept the invitation by setting a password.
+email:
 - sergio@entrecables.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CHANGELOG
 - LICENSE
 - README.rdoc
@@ -62,6 +68,7 @@ files:
 - app/views/devise/invitations/edit.html.erb
 - app/views/devise/invitations/new.html.erb
 - app/views/devise/mailer/invitation_instructions.html.erb
+- app/views/devise/mailer/invitation_instructions.text.erb
 - config/locales/en.yml
 - lib/devise_invitable.rb
 - lib/devise_invitable/controllers/helpers.rb
@@ -134,35 +141,33 @@ files:
 - test/routes_test.rb
 - test/test_helper.rb
 homepage: https://github.com/scambra/devise_invitable
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
-rdoc_options: 
-- --main
+rdoc_options:
+- "--main"
 - README.rdoc
-- --charset=UTF-8
-require_paths: 
+- "--charset=UTF-8"
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: An invitation strategy for Devise
-test_files: 
+test_files:
 - test/functional/controller_helpers_test.rb
 - test/functional/registrations_controller_test.rb
 - test/generators/views_generator_test.rb