devise_invitable 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 853e0a1f85a22c77e6caa07a56e90cde6f0b54ad39651a756f73d213f2d8a085
-  data.tar.gz: a824c95001fb09a4b9c2b11809c46bf7a4cc1ca667166889a1d8d0f8a3f842d0
+  metadata.gz: 0517f954240bfc3c1fd255df0d502d5fdbd461d4e695cd0c5ec725854af50dcf
+  data.tar.gz: 239b887a32e66dbc38fbf1e04625def2f1dea325fcc6d20af0e1befd066dd000
 SHA512:
-  metadata.gz: 48e4376634d9c32e9703a635b9676c7aa6859ad5c9abaa7a301538d7b918871340304c0897fbf8b7c950398065a7254c88ecbc951f747bc4e3edb91a59a0baaf
-  data.tar.gz: b5a98b61c21f14585205679a0577194df7c542214552970e9fa9eb0b6c81f93f35a7fd4fbf443904e1d25f4c817dd32dfca69f160b93d71c26bcc67e992c1f4a
+  metadata.gz: 957006ebe6e94715459f941b52004a1002e72005e9344baca46679398bc34e360604e3a8a205d9099a4ff5015be597c1c02a89055137db6c12f10ecf03949db7
+  data.tar.gz: 17200aa6cf76d5abf07de1e4c0987f197140087a7a3210df0bf948a6098602eeeab05d65983cc69ef2185f2de741813ebc778a28d476a86bc5b1527bbd918f4c

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.0.5
+- Fix NoMethodError in random_password when validatable is not used ([#850](https://github.com/scambra/devise_invitable/pull/850))
+
+## 2.0.4
+- Fix devise deprecations ([#842](https://github.com/scambra/devise_invitable/pull/842))
+- Update translations ([#844](https://github.com/scambra/devise_invitable/pull/844), [#845](https://github.com/scambra/devise_invitable/pull/845))
+- Fix/enforce initial password length to follow devise ([#848](https://github.com/scambra/devise_invitable/pull/848))
+
 ## 2.0.3
 - Add locales ([#834](https://github.com/scambra/devise_invitable/pull/834), [#835](https://github.com/scambra/devise_invitable/pull/835))
 - Remove index on invitations_count column ([#830](https://github.com/scambra/devise_invitable/pull/830))

data/README.rdoc

@@ -181,15 +181,15 @@ To change behaviour of inviting or accepting users, you can simply override two
   class Users::InvitationsController < Devise::InvitationsController
     private
 
-      # this is called when creating invitation
-      # should return an instance of resource class
+      # This is called when creating invitation.
+      # It should return an instance of resource class.
       def invite_resource
         # skip sending emails on invite
         super { |user| user.skip_invitation = true }
       end
 
-      # this is called when accepting invitation
-      # should return an instance of resource class
+      # This is called when accepting invitation.
+      # It should return an instance of resource class.
       def accept_resource
         resource = resource_class.accept_invitation!(update_resource_params)
         # Report accepting invitation to analytics

data/config/locales/es.yml

@@ -18,7 +18,7 @@ es:
     mailer:
       invitation_instructions:
         subject: "Instruciones de la invitación"
-        hello: "Estimada/o %{nombre}"
+        hello: "Hola %{email}"
         someone_invited_you: "Has sido invitado a %{url}, puedes aceptarlo siguiendo el siguiente enlace"
         accept: "Aceptar la invitación"
         accept_until: "Esta invitación expirará en %{due_date}."
@@ -28,4 +28,4 @@ es:
       devise:
         mailer:
           invitation_instructions:
-            accept_until_format: "%d de %B de %Y, %H:%M"
+            accept_until_format: "%d de %B de %Y, %H:%M"

data/config/locales/ja.yml

@@ -20,7 +20,6 @@ ja:
         subject: '招待を承認するには'
         hello: 'こんにちは、%{email}さん'
         someone_invited_you: '%{url}に招待されました。以下のリンクから承認できます。'
-        accept: 'Accept invitation'
         accept: '招待を承認する'
         accept_until: 'この招待は%{due_date}まで有効です。'
         ignore: '招待を承認しない場合は、このメールを無視してください。<br />あなたのアカウントは上記のリンク先にアクセスしパスワードを設定するまでは作成されません。'

data/lib/devise_invitable/models.rb

@@ -397,7 +397,10 @@ module Devise
           # lower + upper case, a digit and a symbol.
           # For more unusual rules, this method can be overridden.
           def random_password
-            'aA1!' + Devise.friendly_token[0, 20]
+            length = respond_to?(:password_length) ? password_length : Devise.password_length
+
+            prefix = 'aA1!'
+            prefix + Devise.friendly_token(length.last - prefix.length)
           end
       end
     end

data/lib/devise_invitable/models/authenticatable.rb

@@ -1,11 +1,17 @@
 module Devise
   module Models
     module Authenticatable
-      BLACKLIST_FOR_SERIALIZATION.concat %i[
+      list = %i[
         invitation_token invitation_created_at invitation_sent_at
         invitation_accepted_at invitation_limit invited_by_type
         invited_by_id invitations_count
       ]
+      
+      if defined?(UNSAFE_ATTRIBUTES_FOR_SERIALIZATION)
+        UNSAFE_ATTRIBUTES_FOR_SERIALIZATION.concat(list)
+      else
+        BLACKLIST_FOR_SERIALIZATION.concat(list)
+      end
     end
   end
 end

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.0.5'.freeze
 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
@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Sergio Cambra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -186,8 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: An invitation strategy for Devise