credible 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 534ceaffb085783354fb29b8e30cd25fc4bca42282b7c729798cda1e35eb4809
-  data.tar.gz: 7a30018164a97fef54c90deb80e92f607039cf1c9604ca740872859c9554bc89
+  metadata.gz: d4c5ed3ddcad0d273dd3637387e2dbc0707cdb0d6f798220ff7dbe5837771e47
+  data.tar.gz: a130e2ef99889ed2811fdea510f939771e8472f31beb5aafb5908db517ce73a3
 SHA512:
-  metadata.gz: 1ef0e645f4f52194c7244ae550ca50c17e073e27b6c420b3a8f57ab92e284be098959f6af2fa926a05530c351d7c59206bbcfb5f9825c6f9212a4fe7f7fe128a
-  data.tar.gz: 7f7f48f126f381505c8c73c1122a249f47421d2feef5a84a726de35a8bb09a1f7e0650a64bcdcbcc7009d0895e4b7e04ec912838d4e0fb49f0b1f0cb6d257ca9
+  metadata.gz: aee55582756b905e423934dacc61fbe8871debd89b0605ac0acfdd0a71929326a4dbdd9afc3fd939cdd59a05c997fd6897f8b1be1ca529f5628b60762f06e7a5
+  data.tar.gz: dd2897f009bec2bb23dc41308ca0808f62138064d1f1b8ec866801ee303c93a3d2e66dc6607dc8ade859f0714be380a2a7ca23f3aa4dd4ab8372a7332736c940

data/app/controllers/credible/authentication/users_controller.rb

@@ -21,7 +21,7 @@ class Credible::Authentication::UsersController < Credible::AuthenticationContro
     authorize @user
 
     if @user.save
-      Credible::UserMailer.with(user: @user).confirmation_email.deliver_later
+      Credible::ConfirmationMailer.with(user: @user).confirmation_email.deliver_later
       @session = ::Session.create(user: @user)
       render :show, status: :created, location: @user
     else
@@ -54,7 +54,7 @@ class Credible::Authentication::UsersController < Credible::AuthenticationContro
     @user.reset_password
 
     if @user.save
-      Credible::UserMailer.with(user: @user).confirmation_email.deliver_later
+      Credible::ResetPasswordMailer.with(user: @user).reset_password_email.deliver_later
       render :show, status: :ok, location: @user
     else
       render json: @user.errors, status: :unprocessable_entity

data/app/mailers/credible/{user_mailer.rb → confirmation_mailer.rb}

@@ -1,6 +1,4 @@
-class Credible::UserMailer < ApplicationMailer
-  include Rails.application.routes.url_helpers
-
+class Credible::ConfirmationMailer < CredibleMailer
   def confirmation_email
     @app_name = Rails.application.class.module_parent_name
     @user = params[:user]
@@ -8,11 +6,4 @@ class Credible::UserMailer < ApplicationMailer
     @confirmation_url = @url + 'confirm/' + @user.confirmation_token + '?email=' + @user.email
     mail(to: @user.email, subject: "Welcome to #{@app_name} | Please confirm your account")
   end
-
-  def invitation_email
-    @app_name = Rails.application.class.module_parent_name
-    @user = params[:user]
-    @url  = root_url
-    mail(to: @user.email, subject: "You have been invited to #{@app_name}")
-  end
 end

data/app/mailers/credible/invitation_mailer.rb

@@ -0,0 +1,9 @@
+class Credible::InvitationMailer < CredibleMailer
+  def invitation_email
+    @app_name = Rails.application.class.module_parent_name
+    @user = params[:user]
+    @url  = root_url
+    @invitation_url = @url + 'confirm/' + @user.confirmation_token + '?email=' + @user.email
+    mail(to: @user.email, subject: "You have been invited to #{@app_name}")
+  end
+end

data/app/mailers/credible/reset_password_mailer.rb

@@ -0,0 +1,9 @@
+class Credible::ResetPasswordMailer < CredibleMailer
+  def reset_password_email
+    @app_name = Rails.application.class.module_parent_name
+    @user = params[:user]
+    @url  = root_url
+    @reset_password_url = @url + 'confirm/' + @user.confirmation_token + '?email=' + @user.email
+    mail(to: @user.email, subject: "Please reset your #{@app_name} password")
+  end
+end

data/app/mailers/credible_mailer.rb

@@ -0,0 +1,3 @@
+class CredibleMailer < ApplicationMailer
+  include Rails.application.routes.url_helpers
+end

data/app/views/credible/invitation_mailer/invitation_email.html.haml

@@ -0,0 +1,7 @@
+%h1= "You have been invited to #{@app_name}"
+
+%p
+  To confirm your account, please follow this link:
+  = link_to @invitation_url, @invitation_url
+
+%p We look forward to having you!

data/app/views/credible/invitation_mailer/invitation_email.text.haml

@@ -0,0 +1,6 @@
+= "You have been invited to #{@app_name}"
+
+To confirm your account, please follow this link:
+= link_to @invitation_url, @invitation_url
+
+We look forward to having you!

data/app/views/credible/reset_password_mailer/reset_password_email.html.haml

@@ -0,0 +1,7 @@
+%h1 You have requested a password reset
+
+%p
+  To sign in and reset your password, please follow this link:
+  = link_to @reset_password_url, @reset_password_url
+
+%p It's good to have you back!

data/app/views/credible/reset_password_mailer/reset_password_email.text.haml

@@ -0,0 +1,6 @@
+You have requested a password reset
+
+To sign in and reset your password, please follow this link:
+= link_to @reset_password_url, @reset_password_url
+
+It's good to have you back!

data/lib/credible/version.rb

@@ -1,3 +1,3 @@
 module Credible
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: credible
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Thom Bruce
@@ -100,7 +100,10 @@ files:
 - app/controllers/credible/authentication_controller.rb
 - app/helpers/credible/application_helper.rb
 - app/jobs/credible/application_job.rb
-- app/mailers/credible/user_mailer.rb
+- app/mailers/credible/confirmation_mailer.rb
+- app/mailers/credible/invitation_mailer.rb
+- app/mailers/credible/reset_password_mailer.rb
+- app/mailers/credible_mailer.rb
 - app/models/credible/application_record.rb
 - app/policies/credible/application_policy.rb
 - app/policies/credible/authentication/session_policy.rb
@@ -110,10 +113,12 @@ files:
 - app/views/credible/authentication/sessions/show.json.jbuilder
 - app/views/credible/authentication/users/_user.json.jbuilder
 - app/views/credible/authentication/users/show.json.jbuilder
-- app/views/credible/user_mailer/confirmation_email.html.haml
-- app/views/credible/user_mailer/confirmation_email.text.haml
-- app/views/credible/user_mailer/invitation_email.html.haml
-- app/views/credible/user_mailer/invitation_email.text.haml
+- app/views/credible/confirmation_mailer/confirmation_email.html.haml
+- app/views/credible/confirmation_mailer/confirmation_email.text.haml
+- app/views/credible/invitation_mailer/invitation_email.html.haml
+- app/views/credible/invitation_mailer/invitation_email.text.haml
+- app/views/credible/reset_password_mailer/reset_password_email.html.haml
+- app/views/credible/reset_password_mailer/reset_password_email.text.haml
 - config/initializers/warden.rb
 - config/routes.rb
 - lib/credible.rb

data/app/views/credible/user_mailer/invitation_email.html.haml

@@ -1,3 +0,0 @@
-%h1= "You have been invited to #{@app_name}"
-%p= "To login to the site, just follow this link: #{@url}."
-%p Thanks for joining and have a great day!

data/app/views/credible/user_mailer/invitation_email.text.haml

@@ -1,6 +0,0 @@
-= "You have been invited to #{@app_name}"
-\===============================================
- 
-= "To login to the site, just follow this link: #{@url}."
- 
-Thanks for joining and have a great day!