devise_invitable 2.0.0 → 2.0.8

data/lib/devise_invitable.rb

@@ -22,7 +22,8 @@ module Devise
   mattr_accessor :invite_for
   @@invite_for = 0
 
-  # Public: Flag that force a record to be valid before being actually invited
+  # Public: Ensure that invited record is valid.
+  # The invitation won't be sent if this check fails.
   # (default: false).
   #
   # Examples (in config/initializers/devise.rb)

data/lib/generators/active_record/templates/migration.rb

@@ -8,7 +8,6 @@ class DeviseInvitableAddTo<%= table_name.camelize %> < ActiveRecord::Migration<%
       t.integer    :invitation_limit
       t.references :invited_by, polymorphic: true
       t.integer    :invitations_count, default: 0
-      t.index      :invitations_count
       t.index      :invitation_token, unique: true # for invitable
       t.index      :invited_by_id
     end

data/lib/generators/devise_invitable/devise_invitable_generator.rb

@@ -7,7 +7,7 @@ module DeviseInvitable
 
       def inject_devise_invitable_content
         path = File.join('app', 'models', "#{file_path}.rb")
-        inject_into_file(path, 'invitable, :', after: 'devise :') if File.exists?(path)
+        inject_into_file(path, 'invitable, :', after: 'devise :') if File.exist?(path)
       end
 
       hook_for :orm

data/lib/generators/devise_invitable/install_generator.rb

@@ -15,8 +15,8 @@ module DeviseInvitable
             inject_into_file(devise_initializer_path, before: "  # ==> Configuration for :confirmable\n") do
 <<-CONTENT
   # ==> Configuration for :invitable
-  # The period the generated invitation token is valid, after
-  # this period, the invited resource won't be able to accept the invitation.
+  # The period the generated invitation token is valid.
+  # After this period, the invited resource won't be able to accept the invitation.
   # When invite_for is 0 (the default), the invitation won't expire.
   # config.invite_for = 2.weeks
 
@@ -35,7 +35,8 @@ module DeviseInvitable
   # config.invite_key = { email: /\\A[^@]+@[^@]+\\z/ }
   # config.invite_key = { email: /\\A[^@]+@[^@]+\\z/, username: nil }
 
-  # Flag that force a record to be valid before being actually invited
+  # Ensure that invited record is valid.
+  # The invitation won't be sent if this check fails.
   # Default: false
   # config.validate_on_invite = true
 

data/test/functional/controller_helpers_test.rb

@@ -41,4 +41,14 @@ class ControllerHelpersTest < ActionController::TestCase
     assert Devise::InvitationsController.method_defined? :after_accept_path_for
     assert !Devise::InvitationsController.instance_methods(false).include?(:after_accept_path_for)
   end
+
+  test 'invalid token path defaults to after sign out path' do
+    assert_equal @controller.send(:after_sign_out_path_for, :user), @controller.invalid_token_path_for(:user)
+  end
+
+  test 'invalid token path is customizable from application controller' do
+    custom_path = 'customized/invalid/token/path'
+    @controller.instance_eval "def invalid_token_path_for(resource_name) '#{custom_path}' end"
+    assert_equal @controller.invalid_token_path_for(:user), custom_path
+  end
 end

data/test/generators/views_generator_test.rb

@@ -28,13 +28,14 @@ class ViewsGeneratorTest < ::Rails::Generators::TestCase
   end
 
   private
-  def assert_files
-    assert views = { @invitations_path => %w/edit.html.erb new.html.erb/, @mailer_path => %w/invitation_instructions.html.erb/ }
 
-    views.each do |path, files|
-      files.each do |file|
-        assert_file File.join path, file
+    def assert_files
+      assert views = { @invitations_path => %w/edit.html.erb new.html.erb/, @mailer_path => %w/invitation_instructions.html.erb/ }
+
+      views.each do |path, files|
+        files.each do |file|
+          assert_file File.join path, file
+        end
       end
     end
-  end
 end

data/test/generators_test.rb

@@ -17,13 +17,14 @@ class GeneratorsTest < ActiveSupport::TestCase
 
   test "rails g devise_invitable:install" do
     @output = `cd #{RAILS_APP_PATH} && rails g devise_invitable:install -p`
-    assert @output.match(%r{(inject|insert).*  config/initializers/devise\.rb\n})
+    puts @output
+    assert @output.match(%r{(inject|insert|File unchanged! The supplied flag value not found!).*  config/initializers/devise\.rb\n})
     assert @output.match(%r|create.*  config/locales/devise_invitable\.en\.yml\n|)
   end
 
   test "rails g devise_invitable Octopussy" do
     @output = `cd #{RAILS_APP_PATH} && rails g devise_invitable Octopussy -p`
-    assert @output.match(%r{(inject|insert).*  app/models/octopussy\.rb\n})
+    assert @output.match(%r{(inject|insert|File unchanged! The supplied flag value not found!).*  app/models/octopussy\.rb\n})
     assert @output.match(%r|invoke.*  #{DEVISE_ORM}\n|)
     if DEVISE_ORM == :active_record
       assert @output.match(%r|create.*  db/migrate/\d{14}_devise_invitable_add_to_octopussies\.rb\n|)

data/test/integration/invitation_test.rb

@@ -98,7 +98,7 @@ class InvitationTest < ActionDispatch::IntegrationTest
       fill_in 'Password confirmation', with: 'other_password'
     end
     assert_equal user_invitation_path, current_path
-    assert page.has_css?('#error_explanation li', text: /Password .*doesn\'t match/)
+    assert page.has_css?('#error_explanation li', text: /Password .*doesn['’]t match/)
     assert !user.confirmed?
   end
 

data/test/integration_tests_helper.rb

@@ -29,7 +29,6 @@ class ActionDispatch::IntegrationTest
 
   # Fix assert_redirect_to in integration sessions because they don't take into
   # account Middleware redirects.
-  #
   def assert_redirected_to(url)
     assert [301, 302].include?(@integration_session.status),
            "Expected status to be 301 or 302, got #{@integration_session.status}"

data/test/mailers/invitation_mail_test.rb

@@ -102,7 +102,7 @@ class InvitationMailTest < ActionMailer::TestCase
       def initialize(*args); end
       def deliver; end
     end
-    Devise.mailer = CustomMailer
+    Devise.mailer = 'InvitationMailTest::CustomMailer'
 
     User.invite!({ email: 'valid@email.com' }, nil, { invited_at: Time.now })
   end

data/test/model_tests_helper.rb

@@ -1,6 +1,6 @@
 class ActiveSupport::TestCase
   def setup_mailer
-    Devise.mailer = Devise::Mailer
+    Devise.mailer = 'Devise::Mailer'
     ActionMailer::Base.deliveries = []
   end
 

data/test/models/invitable_test.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 require 'model_tests_helper'
 
+class Validatable < User
+  devise :validatable, password_length: 10..20
+end
+
 class InvitableTest < ActiveSupport::TestCase
 
   def setup
@@ -85,12 +89,12 @@ class InvitableTest < ActiveSupport::TestCase
     user.invite!
     old_invitation_created_at = 3.days.ago
     old_invitation_sent_at = 3.days.ago
-    user.update_attributes(invitation_sent_at: old_invitation_sent_at, invitation_created_at: old_invitation_created_at)
+    user.update(invitation_sent_at: old_invitation_sent_at, invitation_created_at: old_invitation_created_at)
     3.times do
       user.invite!
       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)
+      user.update(invitation_sent_at: old_invitation_sent_at, invitation_created_at: old_invitation_created_at)
     end
   end
 
@@ -367,10 +371,10 @@ class InvitableTest < ActiveSupport::TestCase
     existing_user.save(validate: false)
     user = User.invite!(email: 'valid@email.com')
     assert_equal user, existing_user
-    assert_equal ['has already been taken'], user.errors[:email]
+    assert_equal [{error: :taken}], user.errors.details[:email]
     same_user = User.invite!(email: 'valid@email.com')
     assert_equal same_user, existing_user
-    assert_equal ['has already been taken'], same_user.errors[:email]
+    assert_equal [{error: :taken}], same_user.errors.details[:email]
   end
 
   test 'should return a record with errors if user with pending invitation was found by e-mail' do
@@ -384,7 +388,7 @@ class InvitableTest < ActiveSupport::TestCase
 
       user = User.invite!(email: 'valid@email.com')
       assert_equal user, existing_user
-      assert_equal ['has already been taken'], user.errors[:email]
+      assert_equal [{error: :taken}], user.errors.details[:email]
     ensure
       User.resend_invitation = resend_invitation
     end
@@ -398,7 +402,7 @@ class InvitableTest < ActiveSupport::TestCase
       existing_user.save(validate: false)
       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_equal [{error: :taken}], user.errors.details[:email]
       refute_empty user.errors[:username]
     ensure
       User.validate_on_invite = validate_on_invite
@@ -408,13 +412,13 @@ class InvitableTest < ActiveSupport::TestCase
   test 'should return a new record with errors if e-mail is blank' do
     invited_user = User.invite!(email: '')
     assert invited_user.new_record?
-    assert_equal ["can't be blank"], invited_user.errors[:email]
+    assert_equal [{error: :blank}], invited_user.errors.details[:email]
   end
 
   test 'should return a new record with errors if e-mail is invalid' do
     invited_user = User.invite!(email: 'invalid_email')
     assert invited_user.new_record?
-    assert_equal ['is invalid'], invited_user.errors[:email]
+    assert_equal [{error: :invalid}], invited_user.errors.details[:email]
   end
 
   test 'should set all attributes with errors if e-mail is invalid' do
@@ -434,13 +438,13 @@ class InvitableTest < ActiveSupport::TestCase
   test 'should return a new record with errors if no invitation_token is found' do
     invited_user = User.accept_invitation!(invitation_token: 'invalid_token')
     assert invited_user.new_record?
-    assert_equal ['is invalid'], invited_user.errors[:invitation_token]
+    assert_equal [{error: :invalid}], invited_user.errors.details[:invitation_token]
   end
 
   test 'should return a new record with errors if invitation_token is blank' do
     invited_user = User.accept_invitation!(invitation_token: '')
     assert invited_user.new_record?
-    assert_equal ["can't be blank"], invited_user.errors[:invitation_token]
+    assert_equal [{error: :blank}], invited_user.errors.details[:invitation_token]
   end
 
   test 'should return record with errors if invitation_token has expired' do
@@ -450,7 +454,7 @@ class InvitableTest < ActiveSupport::TestCase
     invited_user.save(validate: false)
     user = User.accept_invitation!(invitation_token: Thread.current[:token])
     assert_equal user, invited_user
-    assert_equal ['is invalid'], user.errors[:invitation_token]
+    assert_equal [{error: :invalid}], user.errors.details[:invitation_token]
   end
 
   test 'should allow record modification using block' do
@@ -760,4 +764,16 @@ class InvitableTest < ActiveSupport::TestCase
     assert user.persisted?
     assert user.errors.empty?
   end
+
+  test 'should set initial password following Devise.password_length' do
+    user = User.invite!(email: 'valid@email.com')
+    assert_empty user.errors
+    assert_equal Devise.password_length.last, user.password.length
+  end
+
+  test 'should set initial passsword using :validatable with custom password_length' do
+    user = Validatable.invite!(email: 'valid@email.com')
+    assert_empty user.errors
+    assert_equal Validatable.password_length.last, user.password.length
+  end
 end

data/test/orm/active_record.rb

@@ -1,7 +1,12 @@
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
 
-if defined? ActiveRecord::MigrationContext # rails >= 5.2
+if ActiveRecord::VERSION::MAJOR >= 6
+  ActiveRecord::MigrationContext.new(
+        File.expand_path('../../rails_app/db/migrate/', __FILE__),
+        ActiveRecord::Base.connection.schema_migration
+      ).migrate
+elsif defined? ActiveRecord::MigrationContext # rails >= 5.2
   ActiveRecord::MigrationContext.new(File.expand_path('../../rails_app/db/migrate/', __FILE__)).migrate
 else
   ActiveRecord::Migrator.migrate(File.expand_path('../../rails_app/db/migrate/', __FILE__))

data/test/rails_app/app/controllers/admins_controller.rb

@@ -1,6 +1,7 @@
 class AdminsController < Devise::InvitationsController
   protected
-  def authenticate_inviter!
-    authenticate_admin!(force: true)
-  end
+
+    def authenticate_inviter!
+      authenticate_admin!(force: true)
+    end
 end

data/test/rails_app/app/controllers/application_controller.rb

@@ -3,15 +3,16 @@ class ApplicationController < ActionController::Base
   before_action :configure_permitted_parameters, if: :devise_controller?
 
   protected
-  def after_sign_in_path_for(resource)
-    if resource.is_a? Admin
-      edit_admin_registration_path(resource)
-    else
-      super
+
+    def after_sign_in_path_for(resource)
+      if resource.is_a? Admin
+        edit_admin_registration_path(resource)
+      else
+        super
+      end
     end
-  end
 
-  def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:sign_up, keys: [:email, :password, :bio])
-  end
+    def configure_permitted_parameters
+      devise_parameter_sanitizer.permit(:sign_up, keys: [:email, :password, :bio])
+    end
 end

data/test/rails_app/app/controllers/free_invitations_controller.rb

@@ -1,12 +1,15 @@
 class FreeInvitationsController < Devise::InvitationsController
   protected
-  def authenticate_inviter!
-  # everyone can invite
-  end
-  def current_inviter
-    current_admin || current_user
-  end
-  def after_invite_path_for(resource)
-    resource ? super : root_path
-  end
+
+    def authenticate_inviter!
+    # everyone can invite
+    end
+
+    def current_inviter
+      current_admin || current_user
+    end
+
+    def after_invite_path_for(resource)
+      resource ? super : root_path
+    end
 end

data/test/rails_app/config/initializers/devise.rb

@@ -91,8 +91,8 @@ Devise.setup do |config|
   # config.pepper = "e31589192aeea8807cb7d8686b0f8484d6cbfaaa65443d45144519ed1d4ffbc6ccb73b21a69ece276d94f2cac95d83990d824f36f301d6f585ededd1bf90d67d"
 
   # ==> Configuration for :invitable
-  # The period the generated invitation token is valid, after
-  # this period, the invited resource won't be able to accept the invitation.
+  # The period the generated invitation token is valid.
+  # After this period, the invited resource won't be able to accept the invitation.
   # When invite_for is 0 (the default), the invitation won't expire.
   # config.invite_for = 2.weeks
 
@@ -111,7 +111,8 @@ Devise.setup do |config|
   # config.invite_key = {:email => /\\A[^@]+@[^@]+\\z/}
   # config.invite_key = {:email => /\\A[^@]+@[^@]+\\z/, :username => nil}
 
-  # Flag that force a record to be valid before being actually invited
+  # Ensure that invited record is valid.
+  # The invitation won't be sent if this check fails.
   # Default: false
   # config.validate_on_invite = true
 

data/test/rails_app/config/initializers/secret_token.rb

@@ -0,0 +1,9 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+if Rails.version < '5.2.0'
+  RailsApp::Application.config.secret_token = 'e997edf9d7eba5cf89a76a046fa53f5d66261d22cfcf29e3f538c75ad2d175b106bd5d099f44f6ce34ad3b3162d71cfaa37d2d4f4b38645288331427b4c2a607'
+end

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

@@ -32,7 +32,6 @@ class CreateTables < (Rails.version < '5.1' ? ActiveRecord::Migration : ActiveRe
       t.timestamps :null => false
     end
     add_index :users, :invitation_token, :unique => true
-    add_index :users, :invitations_count
 
     create_table :admins do |t|
       ## Database authenticatable
@@ -41,6 +40,5 @@ class CreateTables < (Rails.version < '5.1' ? ActiveRecord::Migration : ActiveRe
 
       t.integer :invitations_count, :default => 0
     end
-    add_index :admins, :invitations_count
   end
 end

data/test/test_helper.rb

@@ -7,11 +7,11 @@ require "rails_app/config/environment"
 require 'rails/test_help'
 require "orm/#{DEVISE_ORM}"
 require 'capybara/rails'
-require 'mocha/setup'
+require 'mocha/minitest'
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
-ActionMailer::Base.default_url_options[:host] = 'test.com'
+ActionMailer::Base.default_url_options[:host] = 'example.com'
 
 ActiveSupport::Deprecation.silenced = true
 $VERBOSE = false
@@ -19,28 +19,15 @@ $VERBOSE = false
 class ActionDispatch::IntegrationTest
   include Capybara::DSL
 end
+
 class ActionController::TestCase
   if defined? Devise::Test
     include Devise::Test::ControllerHelpers
   else
     include Devise::TestHelpers
   end
+
   if defined? ActiveRecord
-    if Rails.version >= '5.0.0'
-      self.use_transactional_tests = true
-    else
-      begin
-        require 'test_after_commit' 
-        self.use_transactional_fixtures = true
-      rescue LoadError
-      end
-    end
-  end
-      
-  if Rails.version < '5.0.0'
-    def post(action, *args)
-      hash = args[0] || {}
-      super action, hash[:params], hash[:session], hash[:flash]
-    end
+    self.use_transactional_tests = true
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.8
 platform: ruby
 authors:
 - Sergio Cambra
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
 description: It adds support for send invitations by email (it requires to be authenticated)
   and accept the invitation by setting a password.
 email:
@@ -69,7 +69,29 @@ files:
 - 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/ar.yml
+- config/locales/ca.yml
+- config/locales/da.yml
+- config/locales/de.yml
 - config/locales/en.yml
+- config/locales/es.yml
+- config/locales/et.yml
+- config/locales/fa.yml
+- config/locales/fr.yml
+- config/locales/it.yml
+- config/locales/ja.yml
+- config/locales/ko.yml
+- config/locales/nl.yml
+- config/locales/no.yml
+- config/locales/pl.yml
+- config/locales/pt-BR.yml
+- config/locales/pt.yml
+- config/locales/ru.yml
+- config/locales/tr.yml
+- config/locales/ua.yml
+- config/locales/vi.yml
+- config/locales/zh-HK.yml
+- config/locales/zh-TW.yml
 - lib/devise_invitable.rb
 - lib/devise_invitable/controllers/helpers.rb
 - lib/devise_invitable/inviter.rb
@@ -131,6 +153,7 @@ files:
 - test/rails_app/config/initializers/devise.rb
 - test/rails_app/config/initializers/inflections.rb
 - test/rails_app/config/initializers/mime_types.rb
+- test/rails_app/config/initializers/secret_token.rb
 - test/rails_app/config/initializers/session_store.rb
 - test/rails_app/config/initializers/wrap_parameters.rb
 - test/rails_app/config/locales/devise.en.yml
@@ -146,7 +169,7 @@ homepage: https://github.com/scambra/devise_invitable
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -164,9 +187,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: An invitation strategy for Devise
 test_files:
@@ -212,6 +234,7 @@ test_files:
 - test/rails_app/config/initializers/devise.rb
 - test/rails_app/config/initializers/inflections.rb
 - test/rails_app/config/initializers/mime_types.rb
+- test/rails_app/config/initializers/secret_token.rb
 - test/rails_app/config/initializers/session_store.rb
 - test/rails_app/config/initializers/wrap_parameters.rb
 - test/rails_app/config/locales/devise.en.yml