tb_core 1.4.6 → 1.4.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: df57df79c7de9d2b469be1b10dbf13768c0618fc
4
- data.tar.gz: dcfad21bb4faad94fa53f152d377fe8d894cb9a8
2
+ SHA256:
3
+ metadata.gz: 5dd467d0438cc596f8c289d040049e2e1d41d8d1c03cf2f643fca5bb8a2999ec
4
+ data.tar.gz: 374cea46337ada9623d5365024e4bf914f70a25b0c6e2f83997e319000ea342e
5
5
  SHA512:
6
- metadata.gz: 6c0b426a055515c34d662e6275dc4b24f09ee6caec1d8e12587fd54c51ca360c437b3277daf43eb1422c0f706c017270eeab6ed697579a6760ac4145dca97c40
7
- data.tar.gz: 334d22e9f1e97cf378d256b1fa34e28609589c311bba1b952d3aa526801060249830702582aa66a4610b1510418ee3f047203c047ed79c703b33c797e716ef40
6
+ metadata.gz: 94358f3622e59b5f638be9ed1ba51add44a014ddf1748dff548b8f717f9aee662d37b4a7cd9011fb8c46b9423e9b9b9b01bb621e316df41d6390be21650df119
7
+ data.tar.gz: ab751288247246638a04c5d779f166e3cb0c426551ec3eac4cbb59ba19ce1c489ea12f1a264c0f424f354e365a8b031e77b7c12ff7b0a367157fb0cc4558064c
@@ -0,0 +1,8 @@
1
+ module ForgotPasswordMailerHelper
2
+ def perishable_token_link_expiration_time_text(user)
3
+ return if user.class.perishable_token_valid_for.blank?
4
+ expiration_time = user.updated_at + user.class.perishable_token_valid_for
5
+
6
+ "This link will expire in #{distance_of_time_in_words(Time.current, expiration_time)}."
7
+ end
8
+ end
@@ -1,4 +1,6 @@
1
1
  class TbCoreMailer < ActionMailer::Base
2
+ helper ForgotPasswordMailerHelper
3
+
2
4
  default from: TbCore.from_address
3
5
  layout 'mailer'
4
6
 
@@ -1,6 +1,10 @@
1
1
  <h1>Hello <%= @user.full_name %>,</h1>
2
2
 
3
- <p>A password reset has recently been requested for your user account on <strong><%= TbCore.config.site_name %></strong>. Click the link below to set your new password.</p>
3
+ <p>
4
+ A password reset has recently been requested for your user account on <strong><%= TbCore.config.site_name %></strong>.
5
+ Click the link below to set your new password.
6
+ <%= perishable_token_link_expiration_time_text(@user) %>
7
+ </p>
4
8
 
5
9
  <p><%= link_to @url, @url %></p>
6
10
 
@@ -1,3 +1,3 @@
1
1
  module TbCore
2
- VERSION = '1.4.6'.freeze
2
+ VERSION = '1.4.7'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tb_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.6
4
+ version: 1.4.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Greg Woods
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-04-03 00:00:00.000000000 Z
11
+ date: 2018-12-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: authlogic
@@ -324,6 +324,7 @@ files:
324
324
  - app/controllers/user_sessions_controller.rb
325
325
  - app/helpers/admin/application_helper.rb
326
326
  - app/helpers/admin/roles_helper.rb
327
+ - app/helpers/forgot_password_mailer_helper.rb
327
328
  - app/helpers/tb_core/application_helper.rb
328
329
  - app/mailers/tb_core_mailer.rb
329
330
  - app/models/concerns/tb_core/user_model.rb
@@ -497,7 +498,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
497
498
  version: '0'
498
499
  requirements: []
499
500
  rubyforge_project:
500
- rubygems_version: 2.6.14
501
+ rubygems_version: 2.7.7
501
502
  signing_key:
502
503
  specification_version: 4
503
504
  summary: Twice Baked Core Engine