Extract settings for system email addresses

Author: rossta

app/mailers/application_mailer.rb

@@ -3,13 +3,18 @@
 class ApplicationMailer < ActionMailer::Base
   prepend_view_path "app/views/emails"
 
-  SUPPORT_EMAIL = "[email protected]"
+  FROM_ADDRESS = Rails.configuration.settings.emails.transactional_from_address
+  FROM_NAME = Rails.configuration.settings.emails.transactional_from_name
 
-  default from: email_address_with_name(SUPPORT_EMAIL, "Joy of Rails")
+  default from: email_address_with_name(FROM_ADDRESS, FROM_NAME)
   layout "emails/mailer"
 
+  def self.test_recipient_email
+    Rails.configuration.settings.emails.test_recipient
+  end
+
   def support_email
-    email_address_with_name(SUPPORT_EMAIL, "Joy of Rails")
+    email_address_with_name(FROM_ADDRESS, FROM_NAME)
   end
 
   helper_method :support_email

config/application.rb

@@ -54,5 +54,10 @@ class Application < Rails::Application
 
     # Set up solid cable options
     config.solid_cable = ActiveSupport::OrderedOptions.new
+
+    # Set up custom settings
+    config.settings = ActiveSupport::OrderedOptions.new
+
+    config.settings.postmark_api_token = Rails.application.credentials.postmark&.api_token || "POSTMARK_API_TEST"
   end
 end

config/credentials/production.yml.enc

@@ -1 +1 @@
-DWCnTuYrtpM13SLH4cdvHIU7k3/QoN+sSgNwU07E9WzX9eJCvR3DxQS5fjYMZ9ibKemWXTO2kElpMHm8xQaz6/lcBn80lKJHeEpKrqfsRDgoZ+6cgIPYn+nuDF1bpHRVk0BX1fTlOnQFrZQw8boXgh1+1C4GlXFwLUVL11ZR34vJbl2++p4EBxFeUE90WhWeLR9uDXwtLS70xPKQlVIyAWHCcw+aMdf41jLkHwRYENA8KuY6Zj6f0EXTH9ss51yUUilxXy4Vl9Trz0AHeWxr043aWfZ44CYX1e4pOvnAucj3NIY7P77e5uq5BSbBU80rNUR2pi0k4ZBzaL1RvEjV3Q26mYV8IaftMqXWYq++K57waAcqhz4Jl9IleeCygnGmxzcZpQaEZALsvR0t9tx+axsftdmAeIOptSbsnLVsJCOR0h40+c9dwRoJ8Cy12uZ/4cpQT5oL0NRGh2pG8+pU6x5NgbZGObP734azXWfTvfvbJHaaBwXr9CqQDD6zjO+LCjVJG2kbI9ait9uctdtZjWJQ8YXdqYwgqYsCyR6F8dTyTDp+s6TfubqA3y24hoAVyUK1+aLMUm5gAIHILj99pbGdv4pTfr+YZhM+TLjO6PZz/ts4iVnfryuXSgBniWGUSCIwkB3huEP2hij4RNndH2wbc/m5T9INIx1/PU94+8AzymX6Rwy9uEmZHsgGMendb0mE9a1Dn52ij/I8dBjSFbapCMv5vK0MzJTiadOKp/J+KobKTub/ntkMkSkuU3IM12PK2Y50AOCDD2A5awlFRflBD6uDYiRMjKtPBy5YQSbKt4f8OI3pL3xWyNA5gVshQpettwNPUcT+mrCbuoyCle/M1a2CA4Ffo4F55O1pG43CzKv4j1G7L0Wa9+txmVKWEzZZ4VHtVQGxSRLVtzNzCF38wiyskxaRFR4T0ISobO8Eg6/JS7/RXs+B4WfDUf0QePPyQ9XxgYXxsGlapbYhg8K09vyUbt2HUbwlXshlWQyhmosfR0hY6tmAeOjXc/Mk/z1b+MHCkhiJk3NcwzO/33tvlylII3S6X2BseGwaolFPRlHC4XZr/XX4Ln0PYu0nuz5jTYiTj2ZOwozcb5ttFd+nLjEzeYQPdZGbDSBc/io9ru/yWTTjyFq7RF0ZdbnpCodlMEKVVAjEUrpKD+xSeTO1EFsS26+tq+Y2Ccg1O39/Hn53j3/FUxgxZ3BmC/gZpWZq4YU8sPiQWUqSi8T/A08TrDG0UTUzxL2k6ZOiYr0/XOGS/GFUPbZ95wiHBomVVl2MNc5Zl0YTTd2h8pddemSWmHuQcLm0N5dpgbIxsdQKx9Dv6VnzkPxoGmQPJkpboYXTv9YE3nfQ7h+37Zkzxhh2LcwY9g5mVo57qmANYH/8U76cHXd/gZD73/FV4uJJ9CVliS2+khnmXSy5gTncoH/8fbu1L8Zzp2HKoKTrUlTP--ryA8l6Rzlf/P5OoZ--T42JGehlCbjNCCWS4DBkfw==
+aEa907hC5fqaG4dnkxjIOTic52nEidIQYhR2SmVU96LQ0Tw9blhUby1fCWQNe1TLe/vhHWWJLYrNro+a0lbcLxznJmrd4LupEXcqTpyqiRC1of6E9eFciz79JgvwaqOQoVQ5CaSPNf0K2qycIYk8w+iYli8j0SdFVtN6q8Tqdvsa7u148HGbtRlc/KClLpqa8P5rDaMCVVIiy97CsyjrOz82RioKnJiNwxwUm5VHqbJHTHvbnHjSOt7M9kBUWOKKdoYKJr/Pls/C0SdI/v3eeTFR+tUGdJCLlehy8l/KHD6zuMJL7oNCA9qgly6+KM5KXaE2sUQWzMhLFcj2c/m+4yzuzUvUc5VqwcYVbEHolJTvNuSrVu4hJoTopuK3rSnyC9yjENpRdeTovW/twxijdBac9yCtgskzyuMUiHHnFRxibol2wyzFQxbmtEkeAHBW/rd1lCky9rLRpvMkMmHhUaq1ql2MH7aQqs/jTfyPzPydpas0wc2QrJCiK+9HiiGhyehpMt5Gdd5BT1uis14K1MzmTfKxOjEyvUKTScz6gt9N0tOdRjjKUZHIk3wphYwDA/6hHDYFYd0B0ovFQx3FVAGwwpmmiddK/+ImP56CyZpJLQ957EMcezhuYSZK/F8ObJkqtCJTkEU7JZceLjc9MAdrtbxGK8EpXH19+49RnH1IwLzKzPPl8gHC+P9EqEsl9Z6UyoLGvPFeVRHTt3VxU2Zec3Fc+9rj4EzUtbKIAeal6qg4gk9kzk4Fr2yZv++qEcEifnhPK2XTuEiLxZLGUC5n+966XdgenFDeoD6Eli6mijigv72B5GGrnQvmokirXVu6jDX1Y6FgmTA4jJU/DJilAEwEA3IGkHjyC5faO6YTXvZ0dQ39je8YvcYQkL3mlSRr0PKznCuDZmmv5MB4S0krGj/58wMv7a2yeeWcHDtL2XvdFvvXP8d3QRHXJZBCdEs2W/RqIso1Is7owLczLpnWMsKVEBxgXdpLQIEGRGFZDKqEF9DUrYxI0Oi75ZV48Jt19pKYH9aDtDlVqUX1H0NgLgMERLNV3R+5aEq831x1xgnNsIcs0a9iGBycbSar+WDfax3L4yu02n423lA2ygS4JfP78Byl02NuyTJ5w4AXZNhYKXobWjhF69bUX0tq91oiEEvFhN28Z8zLar8ETCf7zlHRjbW+nr5x0v60a17BfTg5cp+UBpD5HJsn23PNdD4bjKtL39EW0PwQgDvhWiuMxz0Ato3W9jZ1QAhxHtpzhQ4ZZ6vDCtvc1v2Lh0JO0pXZMSTm5Th33Gd7/yDelftmzahCq84jKTn2qTJOrPFZHHBbrWC3nIv/GAtcnp44aeXLZWCVsJHXUXbhhXq1HxluBPmFovmRZmDByX0MdeQxyMo5k++b+lGsILeash2RmRAlfh3L9gS+S7Yq4lt83ebRqKPfowEmoPlobbqtcovHOz3mrQZah5tyzt76BFZgQBS8tlXTTKik0enT6jADTU0VkwXv53Lb9XC4elGIGh+UU8HmbLw2ugFzmVANKWRTOdx3CvF/WQrpcbn2Eko1cIAT1HmXDWvOp9bZDJLEpct6IoSko3W9bCghDM/cKhouF+vi0ZPJAR8K0w2mXTWdTe8sTZmk13cg4SstYg30Ze3qRWmN5L96GbemAv0Hm1PJDVlTUSYH9FC7LVX7eclqY/P7LN/r6C3T4nukcQ8fs9G9VEns3yVzm8ZrF+BSaMWrr2YX+FZu+u7467Rg5I+9a+VikquXu+djTAmIxfcS40+71TsgghFzgh4=--/VUcntmltCA2Muwe--N0iiWNQQiAHAxcq82fSbGw==

config/environments/production.rb

@@ -77,7 +77,7 @@
 
   # Configure Postmark
   config.action_mailer.delivery_method = :postmark
-  config.action_mailer.postmark_settings = {api_token: Rails.application.credentials.postmark&.api_token || "POSTMARK_API_TEST"}
+  config.action_mailer.postmark_settings = {api_token: config.settings.postmark_api_token}
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).

config/initializers/emails.rb

@@ -0,0 +1,11 @@
+Rails.application.configure do
+  config.settings.emails = ActiveSupport::OrderedOptions.new
+
+  emails = Rails.application.credentials.emails
+
+  config.settings.emails.transactional_from_address = emails&.transactional_from_address || "[email protected]"
+  config.settings.emails.transactional_from_name = emails&.transactional_from_name || "Joy of Rails"
+  config.settings.emails.broadcast_from_address = emails&.broadcast_from_address || "[email protected]"
+  config.settings.emails.broadcast_from_name = emails&.broadcast_from_name || "Joy of Rails"
+  config.settings.emails.test_recipient = emails&.test_recipient || "[email protected]"
+end

spec/mailers/emails/admin_user_mailer_spec.rb

@@ -9,7 +9,7 @@
     it "renders the headers" do
       expect(mail.subject).to eq("New Joy of Rails User")
       expect(mail.to).to eq(["[email protected]"])
-      expect(mail.from).to eq(["hello@joyofrails.com"])
+      expect(mail.from).to eq(["hello@example.com"])
     end
 
     it "renders the body" do

spec/mailers/emails/heartbeat_mailer_spec.rb

@@ -11,7 +11,7 @@
     end
 
     # Test the body of the sent email contains what we expect it to
-    expect(email.from).to eq ["hello@joyofrails.com"]
+    expect(email.from).to eq ["hello@example.com"]
     expect(email.to).to eq ["[email protected]"]
     expect(email.subject).to eq "It’s alive!"
     expect(email.body.encoded).to match("The Joy of Rails email integration is working!")

spec/mailers/emails/magic_session_mailer_spec.rb

@@ -8,7 +8,7 @@
     it "renders the headers" do
       expect(mail.subject).to eq("Your sign-in link")
       expect(mail.to).to eq(["[email protected]"])
-      expect(mail.from).to eq(["hello@joyofrails.com"])
+      expect(mail.from).to eq(["hello@example.com"])
     end
 
     it "renders the body" do
@@ -23,7 +23,7 @@
     it "renders the headers" do
       expect(mail.subject).to eq("No account found")
       expect(mail.to).to eq(["[email protected]"])
-      expect(mail.from).to eq(["hello@joyofrails.com"])
+      expect(mail.from).to eq(["hello@example.com"])
     end
 
     it "renders the body" do

spec/mailers/emails/user_mailer_spec.rb

@@ -8,7 +8,7 @@
     it "renders the headers" do
       expect(mail.subject).to eq("Confirm your email address")
       expect(mail.to).to eq(["[email protected]"])
-      expect(mail.from).to eq(["hello@joyofrails.com"])
+      expect(mail.from).to eq(["hello@example.com"])
     end
 
     it "renders the body" do
@@ -23,7 +23,7 @@
     it "renders the headers" do
       expect(mail.subject).to eq("Reset your password")
       expect(mail.to).to eq(["[email protected]"])
-      expect(mail.from).to eq(["hello@joyofrails.com"])
+      expect(mail.from).to eq(["hello@example.com"])
     end
 
     it "renders the body" do
@@ -38,7 +38,7 @@
     it "renders the headers" do
       expect(mail.subject).to eq("Welcome to Joy of Rails!")
       expect(mail.to).to eq(["[email protected]"])
-      expect(mail.from).to eq(["hello@joyofrails.com"])
+      expect(mail.from).to eq(["hello@example.com"])
     end
 
     it "renders the body" do