From 7969a0e92084a05ced94441bdc2078db224a5e1d Mon Sep 17 00:00:00 2001
From: snogrammer <rails_template@snogram.com>
Date: Fri, 26 Mar 2021 16:13:00 -0600
Subject: [PATCH] update rails. update app config.

---
 .gitignore                             |   1 +
 Gemfile.lock                           | 139 +++++++++++++------------
 app/mailers/bulma_devise_mailer.rb     |   2 +-
 app/views/home/index.html.erb          |   2 +-
 app/views/layouts/application.html.erb |   2 +-
 app/views/shared/_footer.html.erb      |   2 +-
 app/views/shared/_navbar.html.erb      |   2 +-
 config/application.rb                  |  21 ++--
 config/database.yml                    |   2 +-
 config/initializers/active_admin.rb    |   2 +-
 config/redis.yml                       |  14 +++
 config/smtp_mailer.yml                 |  16 +++
 vendor/fontawesome-pro/.DS_Store       | Bin 6148 -> 0 bytes
 13 files changed, 117 insertions(+), 88 deletions(-)
 create mode 100644 config/redis.yml
 create mode 100644 config/smtp_mailer.yml
 delete mode 100644 vendor/fontawesome-pro/.DS_Store

diff --git a/.gitignore b/.gitignore
index 72ad520..69c8159 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ yarn-debug.log*
 coverage
 
 .env*
+.DS_STORE
diff --git a/Gemfile.lock b/Gemfile.lock
index 1609ecf..19703bf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,40 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.0)
-      actionpack (= 6.1.0)
-      activesupport (= 6.1.0)
+    actioncable (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.0)
-      actionpack (= 6.1.0)
-      activejob (= 6.1.0)
-      activerecord (= 6.1.0)
-      activestorage (= 6.1.0)
-      activesupport (= 6.1.0)
+    actionmailbox (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.0)
-      actionpack (= 6.1.0)
-      actionview (= 6.1.0)
-      activejob (= 6.1.0)
-      activesupport (= 6.1.0)
+    actionmailer (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      actionview (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.0)
-      actionview (= 6.1.0)
-      activesupport (= 6.1.0)
+    actionpack (6.1.3.1)
+      actionview (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.0)
-      actionpack (= 6.1.0)
-      activerecord (= 6.1.0)
-      activestorage (= 6.1.0)
-      activesupport (= 6.1.0)
+    actiontext (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.0)
-      activesupport (= 6.1.0)
+    actionview (6.1.3.1)
+      activesupport (= 6.1.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -48,22 +48,22 @@ GEM
       kaminari (~> 1.0, >= 1.2.1)
       railties (>= 5.2, < 6.2)
       ransack (~> 2.1, >= 2.1.1)
-    activejob (6.1.0)
-      activesupport (= 6.1.0)
+    activejob (6.1.3.1)
+      activesupport (= 6.1.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.0)
-      activesupport (= 6.1.0)
-    activerecord (6.1.0)
-      activemodel (= 6.1.0)
-      activesupport (= 6.1.0)
-    activestorage (6.1.0)
-      actionpack (= 6.1.0)
-      activejob (= 6.1.0)
-      activerecord (= 6.1.0)
-      activesupport (= 6.1.0)
-      marcel (~> 0.3.1)
-      mimemagic (~> 0.3.2)
-    activesupport (6.1.0)
+    activemodel (6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activerecord (6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+    activestorage (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
+      marcel (~> 1.0.0)
+      mini_mime (~> 1.0.2)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -86,7 +86,7 @@ GEM
     bulma-rails (0.9.1)
       sassc (~> 2.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     connection_pool (2.2.3)
     crass (1.0.6)
     css_parser (1.7.1)
@@ -122,7 +122,7 @@ GEM
       actionpack (>= 4.1)
       activesupport (>= 4.1)
     htmlentities (4.3.4)
-    i18n (1.8.5)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     inherited_resources (1.12.0)
       actionpack (>= 5.2, < 6.2)
@@ -158,24 +158,23 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.8.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.0)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mini_mime (1.0.3)
+    minitest (5.14.4)
     mock_redis (0.26.0)
     msgpack (1.3.3)
     multi_json (1.15.0)
-    nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nio4r (2.5.7)
+    nokogiri (1.11.2-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.11.2-x86_64-linux)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
     parallel (1.20.1)
     paranoia (2.4.3)
@@ -198,39 +197,40 @@ GEM
     public_suffix (4.0.6)
     puma (5.1.1)
       nio4r (~> 2.0)
+    racc (1.5.2)
     rack (2.2.3)
     rack-proxy (0.6.5)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.0)
-      actioncable (= 6.1.0)
-      actionmailbox (= 6.1.0)
-      actionmailer (= 6.1.0)
-      actionpack (= 6.1.0)
-      actiontext (= 6.1.0)
-      actionview (= 6.1.0)
-      activejob (= 6.1.0)
-      activemodel (= 6.1.0)
-      activerecord (= 6.1.0)
-      activestorage (= 6.1.0)
-      activesupport (= 6.1.0)
+    rails (6.1.3.1)
+      actioncable (= 6.1.3.1)
+      actionmailbox (= 6.1.3.1)
+      actionmailer (= 6.1.3.1)
+      actionpack (= 6.1.3.1)
+      actiontext (= 6.1.3.1)
+      actionview (= 6.1.3.1)
+      activejob (= 6.1.3.1)
+      activemodel (= 6.1.3.1)
+      activerecord (= 6.1.3.1)
+      activestorage (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.0)
+      railties (= 6.1.3.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.1.0)
-      actionpack (= 6.1.0)
-      activesupport (= 6.1.0)
+    railties (6.1.3.1)
+      actionpack (= 6.1.3.1)
+      activesupport (= 6.1.3.1)
       method_source
       rake (>= 0.8.7)
       thor (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.2)
+    rake (13.0.3)
     ransack (2.4.0)
       activerecord (>= 5.2.4)
       activesupport (>= 5.2.4)
@@ -340,7 +340,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (1.0.1)
+    thor (1.1.0)
     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -361,6 +361,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-18
+  x86_64-darwin-20
   x86_64-linux-musl
 
 DEPENDENCIES
diff --git a/app/mailers/bulma_devise_mailer.rb b/app/mailers/bulma_devise_mailer.rb
index 3d72fe6..1a9995d 100644
--- a/app/mailers/bulma_devise_mailer.rb
+++ b/app/mailers/bulma_devise_mailer.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 class BulmaDeviseMailer < Devise::Mailer
-  default from: App::Config::DEFAULT_EMAIL
+  default from: Rails.configuration.x.smtp_mailer.primary_sender_email
   layout 'mailer'
 end
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 2a2eb7d..094ee3d 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -3,7 +3,7 @@
     <div class="hero-body">
       <div class="container">
         <h1 class="title">
-          <%= App::Config::APP_TITLE %>
+          <%= App::TITLE %>
         </h1>
         <h2 class="subtitle">
           My first website with <strong>Bulma</strong>!
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index aa86c9a..61ad19c 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= App::Config::APP_TITLE %></title>
+    <title><%= App::TITLE %></title>
 
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
index 546e719..1fb4bee 100644
--- a/app/views/shared/_footer.html.erb
+++ b/app/views/shared/_footer.html.erb
@@ -26,7 +26,7 @@
       </p>
 
       <p>
-        By using <%= App::Config::APP_TITLE %>, you acknowledge and agree to the terms of cookie use and other first-party analytics;<br/>
+        By using <%= App::TITLE %>, you acknowledge and agree to the terms of cookie use and other first-party analytics;<br/>
         which are used for site performance, development debugging, and other non-nefarious technology improvements.
       </p>
     </div>
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index 37cb633..d863688 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -2,7 +2,7 @@
   <div class="navbar-brand">
     <%= link_to(root_path, class: "navbar-item") do %>
       <%= fa_stacked_icon("cubes", base: "shield", base_type: :fal) %>
-      <%= App::Config::APP_TITLE %>
+      <%= App::TITLE %>
     <% end %>
 
     <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false">
diff --git a/config/application.rb b/config/application.rb
index 93b1179..fceb52a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -22,16 +22,13 @@ require 'sprockets/railtie'
 Bundler.require(*Rails.groups)
 
 module App
-  module Config
-    APP_NAME = 'app' # TODO: Update name
-    APP_TITLE = 'TODO: Update in config/application.rb'
-    DATABASE_URL = ENV.fetch('DATABASE_URL') { "postgres://localhost:5432/#{APP_NAME}_#{Rails.env}" }
-    REDIS_URL = ENV.fetch('REDIS_URL') { 'redis://localhost:6379/0' }
-    SMTP_HOST = ENV.fetch('SMTP_HOST') { 'localhost' }
-    SMTP_PORT = ENV.fetch('SMTP_PORT') { 1025 }
-  end
+  SHORT_NAME = 'app' # TODO: Update name
+  TITLE = 'TODO: Update in config/application.rb'
 
   class Application < Rails::Application
+    config.x.redis = config_for(:redis)
+    config.x.smtp_mailer = config_for(:smtp_mailer)
+
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 6.0
 
@@ -45,19 +42,19 @@ module App
 
     # System-wide settings
     # mail settings
-    config.action_mailer.default_url_options = { host: App::Config::SMTP_HOST }
+    config.action_mailer.default_url_options = { host: config.x.smtp_mailer.host }
     config.action_mailer.delivery_method = :smtp
-    config.action_mailer.smtp_settings = { address: App::Config::SMTP_HOST, port: App::Config::SMTP_PORT }
+    config.action_mailer.smtp_settings = { address: config.x.smtp_mailer.host, port: config.x.smtp_mailer.port }
 
     # https://github.com/redis-store/redis-rails#rails-fragment-cache
-    config.cache_store = :redis_store, App::Config::REDIS_URL, { expires_in: 90.minutes }
+    config.cache_store = :redis_store, config.x.redis.url, { expires_in: 90.minutes }
 
     # https://github.com/mperham/sidekiq/wiki/Active-Job#active-job-setup
     config.active_job.queue_adapter = :sidekiq
 
     # In order for logs to function properly,
     # Docker expects your application or process to log to STDOUT
-    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger           = ActiveSupport::Logger.new($stdout)
     logger.formatter = config.log_formatter
     config.log_tags  = %i[subdomain uuid]
     config.logger    = ActiveSupport::TaggedLogging.new(logger)
diff --git a/config/database.yml b/config/database.yml
index 2eb0ff7..7381e3f 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -4,7 +4,7 @@ default: &default
   encoding: unicode
   pool: <%= ENV.fetch('DATABASE_CONNECTION_POOL') { 20 } %>
   url: <%= ENV.fetch('DATABASE_URL') { 'postgres://localhost:5432' } %>
-  database: <%= ENV.fetch('DATABASE_NAME') { "#{App::Config::APP_NAME}_#{Rails.env}" } %>
+  database: <%= ENV.fetch('DATABASE_NAME') { "#{App::SHORT_NAME}_#{Rails.env}" } %>
 
 development:
   <<: *default
diff --git a/config/initializers/active_admin.rb b/config/initializers/active_admin.rb
index a28ffc6..fec480b 100644
--- a/config/initializers/active_admin.rb
+++ b/config/initializers/active_admin.rb
@@ -6,7 +6,7 @@ ActiveAdmin.setup do |config|
   # Set the title that is displayed on the main layout
   # for each of the active admin pages.
   #
-  config.site_title = App::Config::APP_TITLE
+  config.site_title = App::TITLE
 
   ##
   # Arctic Admin
diff --git a/config/redis.yml b/config/redis.yml
new file mode 100644
index 0000000..f518b32
--- /dev/null
+++ b/config/redis.yml
@@ -0,0 +1,14 @@
+default: &default
+  url: <%= ENV.fetch('REDIS_URL', 'redis://localhost:6379/0') %>
+
+development:
+  <<: *default
+
+test:
+  <<: *default
+
+staging:
+  <<: *default
+
+production:
+  <<: *default
diff --git a/config/smtp_mailer.yml b/config/smtp_mailer.yml
new file mode 100644
index 0000000..bf89eae
--- /dev/null
+++ b/config/smtp_mailer.yml
@@ -0,0 +1,16 @@
+default: &default
+  primary_sender_email: 'no-reply@app.com' # TODO: Change email
+  host: <%= ENV.fetch('SMTP_HOST', 'localhost') %>
+  port: <%= ENV.fetch('SMTP_PORT', 1025) %>
+
+development:
+  <<: *default
+
+test:
+  <<: *default
+
+staging:
+  <<: *default
+
+production:
+  <<: *default
diff --git a/vendor/fontawesome-pro/.DS_Store b/vendor/fontawesome-pro/.DS_Store
deleted file mode 100644
index f4636617fb7770a57452b94eb231413725f2f010..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~JqiLr422WjLa^D=avBfd4F=H@cmYu>S+EfMIl3=Dh_2Qm@&d`rWF{>86+0Ud
z(e>@L66r-`1~-+Zg^?-N6FJNEbUhA-%Vl`lpJZ-l;Ju9YpN=vm0TLhq5+DH*_z?nj
zZ^LHuP(~6U0TOr+u<t{Go7U78>Yok-9|52p%5KPgmVg#3Kx=9XMFpnO3XN9vF~sWL
z4lQ}Ernb;%7tP^A^T}#c3{0b4v|s_#>cT(*BrqZ{jdgGL{}%pf{vWk)NdhGBX9Tp{
z>^5t>RNk#`uV?jrRxNLEs2@jo`3b<nuHpsU4g19sXiaUQsKEFm;20Q4;Hw1gSlbXd