From 36299b46e60a1639393fd8b8fbdb60b38aea94f6 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Wed, 25 May 2022 09:40:20 +0100 Subject: [PATCH 1/2] Bumping rails versions to fix build issues locally --- Appraisals | 6 +++--- gemfiles/rails_5.2.gemfile | 2 +- gemfiles/rails_6.0.gemfile | 2 +- gemfiles/rails_6.1.gemfile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Appraisals b/Appraisals index 5cc3a0e8..697def6f 100644 --- a/Appraisals +++ b/Appraisals @@ -3,7 +3,7 @@ if RUBY_ENGINE == 'ruby' && RUBY_VERSION <= '3.0' appraise 'rails-5.2' do gem 'activerecord-jdbcsqlite3-adapter', '~> 52.5', platform: :jruby gem 'bootsnap', '~> 1.4' - gem 'rails', '5.2.4.3' + gem 'rails', '5.2.8' gem 'rspec-rails', '~> 3.7' gem 'sqlite3', '< 1.4.0', platform: :ruby end @@ -11,7 +11,7 @@ if RUBY_ENGINE == 'ruby' && RUBY_VERSION <= '3.0' appraise 'rails-6.0' do gem 'activerecord-jdbcsqlite3-adapter', '~> 60.1', platform: :jruby gem 'bootsnap', '~> 1.4' - gem 'rails', '6.0.3.1' + gem 'rails', '6.0.5' gem 'rspec-rails', '~> 3.7' gem 'sqlite3', '~> 1.4.0', platform: :ruby end @@ -21,7 +21,7 @@ end appraise 'rails-6.1' do gem 'activerecord-jdbcsqlite3-adapter', '~> 61.1', platform: :jruby gem 'bootsnap', '>= 1.4.4' - gem 'rails', '6.1.4' + gem 'rails', '6.1.6' gem 'rspec-rails', '~> 5.0' gem 'sqlite3', '~> 1.4', platform: :ruby gem 'psych', '>= 4' diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index ee33c30d..fa9e23ce 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gem "activerecord-jdbcsqlite3-adapter", "~> 52.5", platform: :jruby gem "bootsnap", "~> 1.4" -gem "rails", "5.2.4.3" +gem "rails", "5.2.8" gem "rspec-rails", "~> 3.7" gem "sqlite3", "< 1.4.0", platform: :ruby diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index f42298fc..cae491fe 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gem "activerecord-jdbcsqlite3-adapter", "~> 60.1", platform: :jruby gem "bootsnap", "~> 1.4" -gem "rails", "6.0.3.1" +gem "rails", "6.0.5" gem "rspec-rails", "~> 3.7" gem "sqlite3", "~> 1.4.0", platform: :ruby diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index fe48332d..57a773c9 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -4,7 +4,7 @@ source "https://rubygems.org" gem "activerecord-jdbcsqlite3-adapter", "~> 61.1", platform: :jruby gem "bootsnap", ">= 1.4.4" -gem "rails", "6.1.4" +gem "rails", "6.1.6" gem "rspec-rails", "~> 5.0" gem "sqlite3", "~> 1.4", platform: :ruby gem "psych", ">= 4" From 4d313d2d7f3fcfaefc19305395a6ae324e0ab856 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Wed, 25 May 2022 09:41:42 +0100 Subject: [PATCH 2/2] Added a new config option called 'environment', which allows you to overide the default config environment which is the Rails.env. This allows us to have multiple different environments, without having to worry about making custom rails environments --- README.md | 2 ++ lib/config.rb | 3 ++- lib/config/integrations/rails/railtie.rb | 2 +- lib/generators/config/templates/config.rb | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 31dc77db..4990f611 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,8 @@ which will generate customizable config file `config/initializers/config.rb` and You can now edit them to adjust to your needs. +> Note: By default, the config environment will match the Rails environment (`Rails.env`). This can be changed by setting `config.environment`. + ### Installing on Padrino Add the gem to your `Gemfile` and run `bundle install` to install it. Then edit `app.rb` and register `Config` diff --git a/lib/config.rb b/lib/config.rb index c10b34d9..0ef431cb 100644 --- a/lib/config.rb +++ b/lib/config.rb @@ -25,7 +25,8 @@ module Config overwrite_arrays: true, merge_hash_arrays: false, validation_contract: nil, - evaluate_erb_in_yaml: true + evaluate_erb_in_yaml: true, + environment: nil ) def self.setup diff --git a/lib/config/integrations/rails/railtie.rb b/lib/config/integrations/rails/railtie.rb index 460fa5f3..6748c116 100644 --- a/lib/config/integrations/rails/railtie.rb +++ b/lib/config/integrations/rails/railtie.rb @@ -9,7 +9,7 @@ def preload # Parse the settings before any of the initializers Config.load_and_set_settings( - Config.setting_files(::Rails.root.join('config'), ::Rails.env) + Config.setting_files(::Rails.root.join('config'), Config.environment.nil? ? ::Rails.env : Config.environment.to_sym) ) end diff --git a/lib/generators/config/templates/config.rb b/lib/generators/config/templates/config.rb index 46ccb7b9..199baa52 100644 --- a/lib/generators/config/templates/config.rb +++ b/lib/generators/config/templates/config.rb @@ -15,6 +15,11 @@ # # config.overwrite_arrays = true + # Defines current environment, affecting which settings file will be loaded. + # Default: `Rails.env` + # + # config.environment = ENV.fetch('ENVIRONMENT', :development) + # Load environment variables from the `ENV` object and override any settings defined in files. # # config.use_env = false