trusty-cms 3.9.1 → 3.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68b5d192b0eb704a3c5fa94908c6bb6afcf2e075e4fa35d3fdcc752edd3f0d40
-  data.tar.gz: 3e6def89678f029646758e77501309e3eb22d1fec354c06cba9c7e4d19c6285e
+  metadata.gz: 246d866f0a6aa60ac12d02ab96b5b63579cfd1d9e063a216a46599363ef9c509
+  data.tar.gz: baf4525e2d34937dc0166b1c4d718f44b103a3fbff8ae31aeb2a4604f9bf0c02
 SHA512:
-  metadata.gz: b8cca1a28477268d7acc711f99e41fb6a50fd45826536f5f62817cbab0a7104a3ca02c3936a6ae23d5980063faf8d278e420a9c7fa3ee62db8585d9e44d9d433
-  data.tar.gz: 803f000d78f14bf6a4c28148920476bf8a6662cf6474477fb5d1a9ea19c4c919a6945480832bfc8b432ea2c00e359ee9c6dbe600c74eb4306230b568830d6678
+  metadata.gz: f50cdce31139be21bf316c906f922a86e2fb6a51e8b4beb1ee3efc56db7b25ed8cef192fc056d1b72676f0af44125e2f23dd74f4e2c80d0610be9ed67ffc0934
+  data.tar.gz: 8c255a2a22bfcb9ecadba9c81390d7df1cf5a36d078873bd030d15449341ca7b0824764dc65620eec2a6581f7b43e4a344790a53a5a63c8f5895becad99649ee

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (3.9.1)
+    trusty-cms (3.9.2)
       RedCloth (= 4.3.2)
       acts_as_list (~> 0.9.5)
       acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -142,7 +142,7 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    httparty (0.17.3)
+    httparty (0.18.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     i18n (1.8.2)

data/app/mailers/devise_mailer.rb

@@ -0,0 +1,8 @@
+class DeviseMailer < Devise::Mailer
+
+  def reset_password_instructions(record, token, opts={})
+    mail = super
+    mail.subject = "Reset Password for TrustyCMS for ${record.first_name}"
+    mail
+  end  
+end

data/app/views/devise/sessions/new.html.haml

@@ -4,7 +4,7 @@
     = image_tag('/assets/admin/default_safe_login.svg', alt: 'web browser with padlock on top')
   .login
     %h1 Log in
-    = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+    = form_for(resource, as: resource_name, url: authenticate_path) do |f|
       .field
         = f.label :email
         %br/

data/app/views/devise_mailer/reset_password_instructions.html.haml

@@ -0,0 +1,5 @@
+%p
+  Hello #{@resource.email}!
+%p Someone has requested a link to change your TrustyCMS password. You can do this through the link below.
+%p= link_to 'Change my password', edit_user_password_url(@resource, reset_password_token: @token)
+%p Your password won't change until you access the link above and create a new one.

data/config/initializers/devise.rb

@@ -29,7 +29,7 @@ Devise.setup do |config|
   config.mailer_sender = ENV['ORG_FROM_EMAIL'] ||= 'admin@trustycms.org'
 
   # Configure the class responsible to send e-mails.
-  # config.mailer = 'Devise::Mailer'
+  config.mailer = 'DeviseMailer'
 
   # Configure the parent class responsible to send e-mails.
   # config.parent_mailer = 'ActionMailer::Base'

data/config/routes.rb

@@ -1,6 +1,9 @@
 TrustyCms::Application.routes.draw do
   root to: 'site#show_page'
   devise_for :users, module: :devise, :skip => :registration
+  as :user do
+    post 'authenticate', to: 'devise/sessions#create', as: :authenticate
+  end
   get '/rad_social/mail' => 'social_mailer#social_mail_form', as: :rad_social_mail_form
   post '/rad_social/mail' => 'social_mailer#create_social_mail', as: :rad_create_social_mail
   TrustyCms::Application.config.enabled_extensions.each { |ext|

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '3.9.1'
+    VERSION = '3.9.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 3.9.1
+  version: 3.9.2
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -662,6 +662,7 @@ files:
 - app/helpers/site_helper.rb
 - app/helpers/sites_helper.rb
 - app/mailers/application_mailer.rb
+- app/mailers/devise_mailer.rb
 - app/mailers/rad_social_mailer.rb
 - app/models/asset.rb
 - app/models/asset_type.rb
@@ -763,6 +764,7 @@ files:
 - app/views/devise/passwords/new.html.haml
 - app/views/devise/sessions/new.html.haml
 - app/views/devise/shared/_links.html.haml
+- app/views/devise_mailer/reset_password_instructions.html.haml
 - app/views/layouts/application.html.haml
 - app/views/layouts/mail.html.haml
 - app/views/layouts/mailer.text.haml