credible 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af0ef8a69bffbd53bfaf823fc29a107cb6e8ae2d8da42b7463367c6cf0443c3e
-  data.tar.gz: 2fa77fbeaa822062e66fd2fcfa4eeef4046dc27f16c620389a2a38cd6c156b20
+  metadata.gz: 2a7e831e22ec5681ca50fa757a380c8bfacca2110ea5198a8b1a1ad756bedef9
+  data.tar.gz: ec273ca2a4984cc04fcce5a9a335b034258d927c22e7f6c8afecf86ec56d53b6
 SHA512:
-  metadata.gz: bbbe6d188e62a58ea4029a209a4f63d0987f359f3370b50657c710887e3708cd6fc04e5213073bd689a2a63af5a1ffc0b6ef1dbea94dfd186e6023f4a98755e3
-  data.tar.gz: 7aef0eb8eaf40fc6f5dd8f53213cb993452c67f27cee3de7ba01b25206e8252f92a6385365fa85826b0e843dc17e3937fe2cb87cbe8d0d1e7cebe13256e93ade
+  metadata.gz: 9c13e39deeedff85915708af06b2dc90b1db47a7f6b47b8d214fc318f958403342e7270ec20bdf73c52679f65478fec51a63ec774b6cc6454300066daa9d9ed9
+  data.tar.gz: 486785ac185da55edd463932d4b537cb7037901cad30e0842e0c43e1643cd6726e871be790daa8bb6ec62f5cf81ab717dccaade94150300717f03517b2900cf8

data/README.md

@@ -70,6 +70,14 @@ class Session < ApplicationRecord
 end
 ```
 
+## Mailers
+
+To user Credible's in-built mailers, you must set a hostname for your application. A suitable setting for this in `config/environments/development.rb` might be:
+
+```ruby
+config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+```
+
 ## Contributing
 
 Credible is not yet accepting contributions. Watch this space.

data/app/mailers/credible/user_mailer.rb

@@ -1,21 +1,18 @@
-class Credible::UserMailer < Credible::ApplicationMailer
-  # TODO: Decouple from Settings in inheriting application.
-  # QUESTION: How then will we set the URL?
-
+class Credible::UserMailer < ApplicationMailer
   include Rails.application.routes.url_helpers
 
   def confirmation_email
-    @settings = Settings.instance
+    @app_name = Rails.application.class.module_parent_name
     @user = params[:user]
-    @url  = root_url(host: @settings.hostname)
+    @url  = root_url
     @confirmation_url = @url + 'confirm/' + @user.confirmation_token
-    mail(from: @settings.email, to: @user.email, subject: "Welcome to #{Rails.application.class.module_parent_name} | Please confirm your account")
+    mail(to: @user.email, subject: "Welcome to #{@app_name} | Please confirm your account")
   end
 
   def invitation_email
-    @settings = Settings.instance
+    @app_name = Rails.application.class.module_parent_name
     @user = params[:user]
-    @url  = root_url(host: @settings.hostname)
-    mail(from: @settings.email, to: @user.email, subject: "You have been invited to #{Rails.application.class.module_parent_name}")
+    @url  = root_url
+    mail(to: @user.email, subject: "You have been invited to #{@app_name}")
   end
 end

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

@@ -1,7 +1,7 @@
-%h1= "Welcome to #{@settings.name}, #{@user.name}"
+%h1= "Welcome to #{@app_name}, #{@user.name}"
 
 %p
-  = "You have successfully signed up to #{@settings.name}, your username is: #{@user.email}."
+  = "You have successfully signed up to #{@app_name}, your username is: #{@user.email}."
   %br/
 
 %p

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

@@ -1,7 +1,7 @@
-= "Welcome to #{@settings.name}, #{@user.name}"
+= "Welcome to #{@app_name}, #{@user.name}"
 \===============================================
  
-= "You have successfully signed up to #{@settings.name}, your username is: #{@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

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

@@ -1,3 +1,3 @@
-%h1= "You have been invited to #{@settings.name}"
+%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,4 +1,4 @@
-= "You have been invited to #{@settings.name}"
+= "You have been invited to #{@app_name}"
 \===============================================
  
 = "To login to the site, just follow this link: #{@url}."

data/lib/credible/version.rb

@@ -1,3 +1,3 @@
 module Credible
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: credible
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Thom Bruce
@@ -100,7 +100,6 @@ files:
 - app/controllers/credible/authentication_controller.rb
 - app/helpers/credible/application_helper.rb
 - app/jobs/credible/application_job.rb
-- app/mailers/credible/application_mailer.rb
 - app/mailers/credible/user_mailer.rb
 - app/models/credible/application_record.rb
 - app/policies/credible/application_policy.rb

data/app/mailers/credible/application_mailer.rb

@@ -1,6 +0,0 @@
-module Credible
-  class ApplicationMailer < ActionMailer::Base
-    default from: 'from@example.com'
-    layout 'mailer'
-  end
-end