credible 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61357e14d2d15acb05c8382cddc3d46da9cad63d3f64a1a30ea51855cd99111d
-  data.tar.gz: d785759b5a2a64fbdb99e747afef80af236417aa86885b63186980edd2045219
+  metadata.gz: 03a8b5244fc23f52c956c6588fba347bbf3f7846415c684cf8c28951d1459d81
+  data.tar.gz: 8db72b4303a461a57364359a0687582b8ed8c6b05b34f6adb9486b9624e3bfcc
 SHA512:
-  metadata.gz: caf407bff7ada8ade260aa0617cebc191bf5cd132d5962aeaba2e51770d5135ad36b5a04727852eb85c00689bea3523ba132e761f18d97b3804d349b5e717838
-  data.tar.gz: b3e114d34cddacee014020349326a2a42ac2ef22cf374b585f6de199180e1fdac455cf7684e7202b3d94f5f2b18aff92e59b0b9788763eb4e59682b0cc4b4c4b
+  metadata.gz: 49d993317e3f3b93aec22d76c11e70669be871d898aa7da6da0e7d599013e23cd7db54b3362b817f9f3971ad5f4351edcfaf9ce35a02bad7f4eeda8bd636223e
+  data.tar.gz: '09002b2259c179980ac39619f81ea1e15b2c8d67ee961b0b9dff3bd5299ed779c97f943efad01458fc205cb7d43b23e4d3b3b27811b29ab17aa4fc4eeac83a2b'

data/app/mailers/credible/confirmation_mailer.rb

@@ -1,9 +1,9 @@
-class Credible::ConfirmationMailer < CredibleMailer
+class Credible::ConfirmationMailer < Credible::MailerBase
   def confirmation_email
     @app_name = Rails.application.class.module_parent_name
     @user = params[:user]
-    @url  = root_url
-    @confirmation_url = @url + 'confirm/' + @user.confirmation_token + '?email=' + @user.email
+    # TODO: Provide a means to have URL set by user
+    @confirmation_url = main_app.root_url + 'confirm/' + @user.confirmation_token + '?email=' + @user.email
     mail(to: @user.email, subject: "Welcome to #{@app_name} | Please confirm your account")
   end
 end

data/app/mailers/credible/invitation_mailer.rb

@@ -1,9 +1,9 @@
-class Credible::InvitationMailer < CredibleMailer
+class Credible::InvitationMailer < Credible::MailerBase
   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
+    # TODO: Provide a means to have URL set by user
+    @invitation_url = main_app.root_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_mailer.rb → credible/mailer_base.rb}

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

data/app/mailers/credible/reset_password_mailer.rb

@@ -1,9 +1,9 @@
-class Credible::ResetPasswordMailer < CredibleMailer
+class Credible::ResetPasswordMailer < Credible::MailerBase
   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
+    # TODO: Provide a means to have URL set by user
+    @reset_password_url = main_app.root_url + 'confirm/' + @user.confirmation_token + '?email=' + @user.email
     mail(to: @user.email, subject: "Please reset your #{@app_name} password")
   end
 end

data/app/views/credible/confirmation_mailer/confirmation_email.html.erb

@@ -0,0 +1,11 @@
+<h1>
+  <%= "Welcome to #{@app_name}, #{@user.email}" %>
+</h1>
+<p>
+  <%= "You have successfully signed up to #{@app_name}, your username is: #{@user.email}." %>
+  <br/>
+</p>
+<p>
+  To confirm your account, please follow this link: <%= link_to @confirmation_url, @confirmation_url %>
+</p>
+<p>Thanks for joining and have a great day!</p>

data/app/views/credible/confirmation_mailer/confirmation_email.text.erb

@@ -0,0 +1,5 @@
+<%= "Welcome to #{@app_name}, #{@user.email}" %>
+\===============================================
+<%= "You have successfully signed up to #{@app_name}, your username is: #{@user.email}." %>
+To confirm your account, please follow this link: <%= @confirmation_url %>
+Thanks for joining and have a great day!

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

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

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

@@ -0,0 +1,4 @@
+<%= "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.erb

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

data/app/views/credible/reset_password_mailer/{reset_password_email.text.haml → reset_password_email.text.erb}

@@ -1,6 +1,4 @@
 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
-
+<%= link_to @reset_password_url, @reset_password_url %>
 It's good to have you back!

data/config/routes.rb

@@ -7,7 +7,7 @@ Credible::Engine.routes.draw do
     # /auth/signup.json
     post 'signup', to: 'users#create'
     # /auth/confirm.json
-    get 'confirm/:confirmation_token', to: 'users#confirm'
+    get 'confirm/:confirmation_token', to: 'users#confirm', as: :confirmation
     # /auth/signout.json
     delete 'signout', to: 'sessions#destroy'
 

data/lib/credible/version.rb

@@ -1,3 +1,3 @@
 module Credible
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: credible
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Thom Bruce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.2.2
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
   name: warden
   requirement: !ruby/object:Gem::Requirement
@@ -116,19 +130,19 @@ files:
 - app/jobs/credible/application_job.rb
 - app/mailers/credible/confirmation_mailer.rb
 - app/mailers/credible/invitation_mailer.rb
+- app/mailers/credible/mailer_base.rb
 - app/mailers/credible/reset_password_mailer.rb
-- app/mailers/credible_mailer.rb
 - app/models/credible/application_record.rb
 - app/views/credible/authentication/sessions/_session.json.jbuilder
 - 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/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
+- app/views/credible/confirmation_mailer/confirmation_email.html.erb
+- app/views/credible/confirmation_mailer/confirmation_email.text.erb
+- app/views/credible/invitation_mailer/invitation_email.html.erb
+- app/views/credible/invitation_mailer/invitation_email.text.erb
+- app/views/credible/reset_password_mailer/reset_password_email.html.erb
+- app/views/credible/reset_password_mailer/reset_password_email.text.erb
 - config/initializers/warden.rb
 - config/routes.rb
 - lib/credible.rb

data/app/views/credible/confirmation_mailer/confirmation_email.html.haml

@@ -1,11 +0,0 @@
-%h1= "Welcome to #{@app_name}, #{@user.email}"
-
-%p
-  = "You have successfully signed up to #{@app_name}, your username is: #{@user.email}."
-  %br/
-
-%p
-  To confirm your account, please follow this link:
-  = link_to @confirmation_url, @confirmation_url
-
-%p Thanks for joining and have a great day!

data/app/views/credible/confirmation_mailer/confirmation_email.text.haml

@@ -1,9 +0,0 @@
-= "Welcome to #{@app_name}, #{@user.email}"
-\===============================================
- 
-= "You have successfully signed up to #{@app_name}, your username is: #{@user.email}."
- 
-To confirm your account, please follow this link:
-= @confirmation_url
- 
-Thanks for joining and have a great day!

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

@@ -1,7 +0,0 @@
-%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

@@ -1,6 +0,0 @@
-= "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

@@ -1,7 +0,0 @@
-%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!