devise_invitable 2.0.8 → 2.0.10

data/config/locales/fr.yml

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

data/config/locales/id.yml

@@ -0,0 +1,31 @@
+id:
+  devise:
+    failure:
+      invited: "Anda memiliki undangan yang tertunda, harap terima undangan tersebut untuk menyelesaikan pembuatan akun Anda."
+    invitations:
+      send_instructions: "Email undangan telah dikirim ke %{email}."
+      invitation_token_invalid: "Token undangan yang diberikan tidak valid!"
+      updated: "Kata sandi Anda telah berhasil diatur. Anda sudah masuk."
+      updated_not_active: "Kata sandi Anda telah berhasil diatur."
+      no_invitations_remaining: "Tidak ada undangan tersisa."
+      invitation_removed: "Undangan Anda telah dihapus."
+      new:
+        header: "Kirim Undangan"
+        submit_button: "Kirim undangan"
+      edit:
+        header: "Atur kata sandi Anda"
+        submit_button: "Atur kata sandi"
+    mailer:
+      invitation_instructions:
+        subject: "Instruksi Undangan"
+        hello: "Halo %{email}"
+        someone_invited_you: "Seseorang telah mengundang Anda ke %{url}. Anda dapat menerima undangan ini melalui tautan di bawah ini."
+        accept: "Terima Undangan"
+        accept_until: "Undangan ini akan berakhir pada %{due_date}."
+        ignore: "Jika Anda tidak ingin menerima undangan ini, silakan abaikan email ini. Akun Anda tidak akan dibuat sampai Anda mengakses tautan di atas dan mengatur kata sandi Anda."
+  time:
+    formats:
+      devise:
+        mailer:
+          invitation_instructions:
+            accept_until_format: "%d %B %Y %H:%M:%S"

data/config/locales/zh-CN.yml

@@ -0,0 +1,31 @@
+zh-CN:
+  devise:
+    failure:
+      invited: "您有一封待处理的帐号邀请，请接受邀请完成创建您的帐号。"
+    invitations:
+      send_instructions: "邀请电子邮件已发送至 %{email}。"
+      invitation_token_invalid: "所提供的邀请验证无效！"
+      updated: "您的密码已设置成功，。现在您已经登入了。"
+      updated_not_active: "您的密码已设置成功。"
+      no_invitations_remaining: "没有待处理的邀请"
+      invitation_removed: "您的邀请被删除了。"
+      new:
+        header: "发送邀请"
+        submit_button: "发送邀请"
+      edit:
+        header: "设置您的密码"
+        submit_button: "设置密码"
+    mailer:
+      invitation_instructions:
+        subject: "邀请"
+        hello: "%{email} 您好"
+        someone_invited_you: "邀请您加入 %{url}，您可以通过以下的网页链接接受邀请，并创设帐号："
+        accept: "接受邀请"
+        accept_until: "这封邀请将于 %{due_date} 到期。"
+        ignore: "如果您不想接受邀请，请忽略这封电子邮件。只要未选取上述“接受邀请”的链接并且设置密码，您的帐号就不会成立。"
+  time:
+    formats:
+      devise:
+        mailer:
+          invitation_instructions:
+            accept_until_format: "%B %d, %Y %I:%M %p"

data/config/locales/zh-TW.yml

@@ -1,14 +1,14 @@
 zh-TW:
   devise:
     failure:
-      invited: "你有已經有一個建立帳號的邀請，請接受邀請來建立帳號"
+      invited: "你有一封設立帳號的邀請，請接受邀請來創建你的帳號。"
     invitations:
-      send_instructions: "邀請已發送至%{email)。"
-      invitation_token_invalid: "提供認證已無效!"
-      updated: "你的密碼已設置成功，你現在已經登入了。"
-      updated_not_active: "密碼設置成功。"
-      no_invitations_remaining: "沒有名額可以給您邀請其他人"
-      invitation_removed: "你的邀請已被刪除。"
+      send_instructions: "邀請已發送至%{email)"
+      invitation_token_invalid: "所提供的邀請驗證無效！"
+      updated: "你的密碼已設置成功，現在你已經登入了。"
+      updated_not_active: "密碼設置成功"
+      no_invitations_remaining: "邀請名額已用盡"
+      invitation_removed: "你的邀請被刪除了"
       new:
         header: "發送邀請"
         submit_button: "發送邀請"
@@ -17,12 +17,15 @@ zh-TW:
         submit_button: "設置密碼"
     mailer:
       invitation_instructions:
-        subject: "邀請教學"
-        hello: "%{email} 你好"
-        someone_invited_you: "你已被邀請成為會員，你可以通過此連結接受邀請並創立帳號：%{url}"
+        subject: "邀請"
+        hello: "%{email} 你好，"
+        someone_invited_you: “邀請你加入%{url}。你可以通過以下的網頁連結接受邀請，並創設帳號："
         accept: "接受邀請"
-        accept_until: "此邀請將於 %{due_date} 後過期。"
-        ignore: "如果你不想接受邀請, 請忽略此電子郵件。在你透過上面的連結設置密碼前，都不會建立您的帳號。"
+        accept_until: "這封邀請將於 %{due_date} 到期。"
+        ignore:
+          "如果你不想接受邀請,
+          請忽略這封電子郵件。只要未選取上述“接受邀請”的連結並且設置密碼，你的帳號就不會成立。"
+
   time:
     formats:
       devise:

data/lib/devise_invitable/models.rb

@@ -30,12 +30,12 @@ module Devise
 
       included do
         include ::DeviseInvitable::Inviter
-        belongs_to_options = if Devise.invited_by_class_name
-          { class_name: Devise.invited_by_class_name }
+        belongs_to_options = if invited_by_class_name
+          { class_name: invited_by_class_name }
         else
           { polymorphic: true }
         end
-        if fk = Devise.invited_by_foreign_key
+        if fk = invited_by_foreign_key
           belongs_to_options[:foreign_key] = fk
         end
         if defined?(ActiveRecord) && defined?(ActiveRecord::Base) && self < ActiveRecord::Base
@@ -76,9 +76,9 @@ module Devise
 
       def self.required_fields(klass)
         fields = [:invitation_token, :invitation_created_at, :invitation_sent_at, :invitation_accepted_at,
-         :invitation_limit, Devise.invited_by_foreign_key || :invited_by_id, :invited_by_type]
+         :invitation_limit, klass.invited_by_foreign_key || :invited_by_id, :invited_by_type]
         fields << :invitations_count if defined?(ActiveRecord) && self < ActiveRecord::Base
-        fields -= [:invited_by_type] if Devise.invited_by_class_name
+        fields -= [:invited_by_type] if klass.invited_by_class_name
         fields
       end
 
@@ -195,7 +195,7 @@ module Devise
       def clear_reset_password_token
         reset_password_token_present = reset_password_token.present?
         super
-        accept_invitation! if reset_password_token_present && invited_to_sign_up?
+        accept_invitation! if reset_password_token_present && valid_invitation?
       end
 
       def clear_errors_on_valid_keys
@@ -231,7 +231,7 @@ module Devise
       def add_taken_error(key)
         errors.add(key, :taken)
       end
-    
+
       def invitation_taken?
         !invited_to_sign_up?
       end

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '2.0.8'.freeze
+  VERSION = '2.0.10'.freeze
 end

data/test/models/invitable_test.rb

@@ -279,6 +279,23 @@ class InvitableTest < ActiveSupport::TestCase
     refute_predicate user, :invited_to_sign_up?
   end
 
+  test 'should not accept expired invitation while resetting the password' do
+    User.stubs(:invite_for).returns(1.day)
+    user = User.invite!(email: 'valid@email.com')
+    assert user.invited_to_sign_up?
+    user.invitation_created_at = Time.now.utc - 2.days
+    token, user.reset_password_token = Devise.token_generator.generate(User, :reset_password_token)
+    user.reset_password_sent_at = Time.now.utc
+    user.save
+
+    assert user.reset_password_token.present?
+    assert user.invitation_token.present?
+    User.reset_password_by_token(reset_password_token: token, password: '123456789', password_confirmation: '123456789')
+    assert_nil user.reload.reset_password_token
+    assert user.reload.invitation_token.present?
+    assert user.reload.invited_to_sign_up?
+  end
+
   test 'should not accept invitation on failing to reset the password' do
     user = User.invite!(email: 'valid@email.com')
     assert user.invited_to_sign_up?
@@ -366,6 +383,42 @@ class InvitableTest < ActiveSupport::TestCase
     User.validate_on_invite = validate_on_invite
   end
 
+  test 'should not validate other attributes when validate_on_invite is disabled (for instance method)' do
+    validate_on_invite = User.validate_on_invite
+    User.validate_on_invite = false
+    user = new_user(email: 'valid@email.com', username: 'a' * 50)
+    user.invite!(nil, validate: false)
+    assert_empty user.errors
+    User.validate_on_invite = validate_on_invite
+  end
+
+  test 'should validate other attributes when validate_on_invite is disabled and validate option is enabled (for instance method)' do
+    validate_on_invite = User.validate_on_invite
+    User.validate_on_invite = false
+    user = new_user(email: 'valid@email.com', username: 'a' * 50)
+    user.invite!(nil, validate: true)
+    refute_empty user.errors[:username]
+    User.validate_on_invite = validate_on_invite
+  end
+
+  test 'should validate other attributes when validate_on_invite is enabled and validate option is disabled (for instance method)' do
+    validate_on_invite = User.validate_on_invite
+    User.validate_on_invite = true
+    user = new_user(email: 'valid@email.com', username: 'a' * 50)
+    user.invite!
+    refute_empty user.errors[:username]
+    User.validate_on_invite = validate_on_invite
+  end
+
+  test 'should validate other attributes when validate_on_invite is enabled and validate option is disabled explicitly (for instance method)' do
+    validate_on_invite = User.validate_on_invite
+    User.validate_on_invite = true
+    user = new_user(email: 'valid@email.com', username: 'a' * 50)
+    user.invite!(nil, validate: false)
+    assert_empty user.errors
+    User.validate_on_invite = validate_on_invite
+  end
+
   test 'should return a record with errors if user was found by e-mail' do
     existing_user = User.new(email: 'valid@email.com')
     existing_user.save(validate: false)

data/test/orm/active_record.rb

@@ -1,13 +1,13 @@
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
 
-if ActiveRecord::VERSION::MAJOR >= 6
+if ActiveRecord::VERSION::MAJOR >= 7
   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__))
-end
+    File.expand_path('../../rails_app/db/migrate/', __FILE__)
+  ).migrate
+else # rails 6
+  ActiveRecord::MigrationContext.new(
+    File.expand_path('../../rails_app/db/migrate/', __FILE__),
+    ActiveRecord::Base.connection.schema_migration
+  ).migrate
+end

data/test/test_helper.rb

@@ -13,7 +13,9 @@ ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.default_url_options[:host] = 'example.com'
 
-ActiveSupport::Deprecation.silenced = true
+if ActiveSupport::Deprecation.respond_to?(:silenced=)
+  ActiveSupport::Deprecation.silenced = true
+end
 $VERBOSE = false
 
 class ActionDispatch::IntegrationTest

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.10
 platform: ruby
 authors:
 - Sergio Cambra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2025-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -62,7 +62,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE
-- README.rdoc
+- README.md
 - app/controllers/devise/invitations_controller.rb
 - app/controllers/devise_invitable/registrations_controller.rb
 - app/views/devise/invitations/edit.html.erb
@@ -78,6 +78,7 @@ files:
 - config/locales/et.yml
 - config/locales/fa.yml
 - config/locales/fr.yml
+- config/locales/id.yml
 - config/locales/it.yml
 - config/locales/ja.yml
 - config/locales/ko.yml
@@ -90,6 +91,7 @@ files:
 - config/locales/tr.yml
 - config/locales/ua.yml
 - config/locales/vi.yml
+- config/locales/zh-CN.yml
 - config/locales/zh-HK.yml
 - config/locales/zh-TW.yml
 - lib/devise_invitable.rb
@@ -172,7 +174,7 @@ metadata: {}
 post_install_message:
 rdoc_options:
 - "--main"
-- README.rdoc
+- README.md
 - "--charset=UTF-8"
 require_paths:
 - lib
@@ -187,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: An invitation strategy for Devise