Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#460] Revisit and set the default value for some environment variables #511

Merged
merged 3 commits into from
Apr 29, 2024
Merged

[#460] Revisit and set the default value for some environment variables #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
caa4e11
Add default value for MAILER_DEFAULT_HOST
sanG-github Apr 12, 2024
85249fc
Add default value for MAILER_DEFAULT_PORT
sanG-github Apr 12, 2024
09f8639
Add default value for AVAILABLE_LOCALES
sanG-github Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .template/spec/base/config/environments/development_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
end

it 'configures the mailer asset host' do
expect(subject).to contain("config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST')")
expect(subject).to contain("config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST', 'localhost')")
end

it 'configures the mailer default url options' do
Expand All @@ -24,8 +24,8 @@
def mailer_default_url_config
<<~RUBY
config.action_mailer.default_url_options = {
host: ENV.fetch('MAILER_DEFAULT_HOST'),
port: ENV.fetch('MAILER_DEFAULT_PORT')
host: ENV.fetch('MAILER_DEFAULT_HOST', 'localhost'),
port: ENV.fetch('MAILER_DEFAULT_PORT', '3000')
}
RUBY
end
Expand Down
12 changes: 6 additions & 6 deletions .template/spec/base/config/environments/production_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
subject { file('config/environments/production.rb') }

it 'configures the mailer asset host' do
expect(subject).to contain("config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST')")
expect(subject).to contain("config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST', 'localhost')")
end

it 'configures the mailer default url options' do
Expand All @@ -24,22 +24,22 @@
def mailer_default_url_config
<<~RUBY
config.action_mailer.default_url_options = {
host: ENV.fetch('MAILER_DEFAULT_HOST'),
port: ENV.fetch('MAILER_DEFAULT_PORT')
host: ENV.fetch('MAILER_DEFAULT_HOST', 'localhost'),
port: ENV.fetch('MAILER_DEFAULT_PORT', '3000')
}
RUBY
end

def i18n_config
<<~RUBY
# eg: AVAILABLE_LOCALES = 'en,th'
config.i18n.available_locales = ENV.fetch('AVAILABLE_LOCALES').split(',')
config.i18n.available_locales = ENV.fetch('AVAILABLE_LOCALES', 'en').split(',')

# eg: DEFAULT_LOCALE = 'en'
config.i18n.default_locale = ENV.fetch('DEFAULT_LOCALE')
config.i18n.default_locale = ENV.fetch('DEFAULT_LOCALE', 'en')

# eg: FALLBACK_LOCALES = 'en,th'
config.i18n.fallbacks = ENV.fetch('FALLBACK_LOCALES').split(',')
config.i18n.fallbacks = ENV.fetch('FALLBACK_LOCALES', 'en').split(',')
RUBY
end
end
4 changes: 2 additions & 2 deletions .template/spec/base/config/environments/test_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
def mailer_default_url_config
<<~RUBY
config.action_mailer.default_url_options = {
host: ENV.fetch('MAILER_DEFAULT_HOST'),
port: ENV.fetch('MAILER_DEFAULT_PORT')
host: ENV.fetch('MAILER_DEFAULT_HOST', 'localhost'),
port: ENV.fetch('MAILER_DEFAULT_PORT', '3000')
}
RUBY
end
Expand Down
6 changes: 3 additions & 3 deletions config/environments/development.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

config.action_mailer.delivery_method = :letter_opener

config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST')
config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST', 'localhost')

config.action_mailer.default_url_options = {
host: ENV.fetch('MAILER_DEFAULT_HOST'),
port: ENV.fetch('MAILER_DEFAULT_PORT')
host: ENV.fetch('MAILER_DEFAULT_HOST', 'localhost'),
port: ENV.fetch('MAILER_DEFAULT_PORT', '3000')
}
RUBY
end
Expand Down
12 changes: 6 additions & 6 deletions config/environments/production.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
insert_into_file 'config/environments/production.rb', after: /config.action_mailer.perform_caching.+\n/ do
<<~RUBY.indent(2)

config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST')
config.action_mailer.asset_host = ENV.fetch('MAILER_DEFAULT_HOST', 'localhost')

config.action_mailer.default_url_options = {
host: ENV.fetch('MAILER_DEFAULT_HOST'),
port: ENV.fetch('MAILER_DEFAULT_PORT')
host: ENV.fetch('MAILER_DEFAULT_HOST', 'localhost'),
port: ENV.fetch('MAILER_DEFAULT_PORT', '3000')
}
RUBY
end
Expand All @@ -23,13 +23,13 @@
environment do
<<~RUBY
# eg: AVAILABLE_LOCALES = 'en,th'
config.i18n.available_locales = ENV.fetch('AVAILABLE_LOCALES').split(',')
config.i18n.available_locales = ENV.fetch('AVAILABLE_LOCALES', 'en').split(',')

# eg: DEFAULT_LOCALE = 'en'
config.i18n.default_locale = ENV.fetch('DEFAULT_LOCALE')
config.i18n.default_locale = ENV.fetch('DEFAULT_LOCALE', 'en')

# eg: FALLBACK_LOCALES = 'en,th'
config.i18n.fallbacks = ENV.fetch('FALLBACK_LOCALES').split(',')
config.i18n.fallbacks = ENV.fetch('FALLBACK_LOCALES', 'en').split(',')

RUBY
end
4 changes: 2 additions & 2 deletions config/environments/test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<<~RUBY.indent(2)

config.action_mailer.default_url_options = {
host: ENV.fetch('MAILER_DEFAULT_HOST'),
port: ENV.fetch('MAILER_DEFAULT_PORT')
host: ENV.fetch('MAILER_DEFAULT_HOST', 'localhost'),
port: ENV.fetch('MAILER_DEFAULT_PORT', '3000')
}
RUBY
end
Expand Down
Loading