From 0a99e5fd06ce9891f9b8a689fc53c4f7290015ce Mon Sep 17 00:00:00 2001 From: Armando Fox Date: Thu, 26 Sep 2024 17:46:34 -0700 Subject: [PATCH] moved lib/ under app/ to make it findable by eager loader; fixed eager loading annotations in config files --- .../lib}/active_model/errors/html_formatter.rb | 0 {lib => app/lib}/authenticated_system.rb | 0 {lib => app/lib}/authenticated_test_helper.rb | 0 {lib => app/lib}/authentication.rb | 0 {lib => app/lib}/authentication/by_cookie_token.rb | 0 {lib => app/lib}/authentication/by_password.rb | 0 {lib => app/lib}/core_extensions/date/season.rb | 0 .../lib}/core_extensions/string/colorize.rb | 0 {lib => app/lib}/core_extensions/string/name.rb | 0 .../lib}/core_extensions/time/rounded_to.rb | 0 {lib => app/lib}/core_extensions/time/season.rb | 0 .../core_extensions/time/showtime_date_formats.rb | 0 {lib => app/lib}/core_extensions/time/to_param.rb | 0 {lib => app/lib}/customer_import.rb | 0 {lib => app/lib}/datetime_range.rb | 0 {lib => app/lib}/purchasemethod.rb | 0 {lib => app/lib}/show_name_matcher.rb | 0 {lib => app/lib}/simple_uri_checker.rb | 0 {lib => app/lib}/tasks/clients.rake | 0 {lib => app/lib}/tasks/create_import.rake | 0 {lib => app/lib}/tasks/create_staging_data.rake | 0 {lib => app/lib}/tasks/cucumber.rake | 0 {lib => app/lib}/tasks/figaro_travis.rake | 0 {lib => app/lib}/tasks/goldstar.json.erb | 0 {lib => app/lib}/tasks/import_vendini.rake | 0 {lib => app/lib}/tasks/restart.rake | 0 {lib => app/lib}/tasks/simple_import.yml | 0 config/application.rb | 14 +------------- config/environments/development.rb | 2 +- 29 files changed, 2 insertions(+), 14 deletions(-) rename {lib => app/lib}/active_model/errors/html_formatter.rb (100%) rename {lib => app/lib}/authenticated_system.rb (100%) rename {lib => app/lib}/authenticated_test_helper.rb (100%) rename {lib => app/lib}/authentication.rb (100%) rename {lib => app/lib}/authentication/by_cookie_token.rb (100%) rename {lib => app/lib}/authentication/by_password.rb (100%) rename {lib => app/lib}/core_extensions/date/season.rb (100%) rename {lib => app/lib}/core_extensions/string/colorize.rb (100%) rename {lib => app/lib}/core_extensions/string/name.rb (100%) rename {lib => app/lib}/core_extensions/time/rounded_to.rb (100%) rename {lib => app/lib}/core_extensions/time/season.rb (100%) rename {lib => app/lib}/core_extensions/time/showtime_date_formats.rb (100%) rename {lib => app/lib}/core_extensions/time/to_param.rb (100%) rename {lib => app/lib}/customer_import.rb (100%) rename {lib => app/lib}/datetime_range.rb (100%) rename {lib => app/lib}/purchasemethod.rb (100%) rename {lib => app/lib}/show_name_matcher.rb (100%) rename {lib => app/lib}/simple_uri_checker.rb (100%) rename {lib => app/lib}/tasks/clients.rake (100%) rename {lib => app/lib}/tasks/create_import.rake (100%) rename {lib => app/lib}/tasks/create_staging_data.rake (100%) rename {lib => app/lib}/tasks/cucumber.rake (100%) rename {lib => app/lib}/tasks/figaro_travis.rake (100%) rename {lib => app/lib}/tasks/goldstar.json.erb (100%) rename {lib => app/lib}/tasks/import_vendini.rake (100%) rename {lib => app/lib}/tasks/restart.rake (100%) rename {lib => app/lib}/tasks/simple_import.yml (100%) diff --git a/lib/active_model/errors/html_formatter.rb b/app/lib/active_model/errors/html_formatter.rb similarity index 100% rename from lib/active_model/errors/html_formatter.rb rename to app/lib/active_model/errors/html_formatter.rb diff --git a/lib/authenticated_system.rb b/app/lib/authenticated_system.rb similarity index 100% rename from lib/authenticated_system.rb rename to app/lib/authenticated_system.rb diff --git a/lib/authenticated_test_helper.rb b/app/lib/authenticated_test_helper.rb similarity index 100% rename from lib/authenticated_test_helper.rb rename to app/lib/authenticated_test_helper.rb diff --git a/lib/authentication.rb b/app/lib/authentication.rb similarity index 100% rename from lib/authentication.rb rename to app/lib/authentication.rb diff --git a/lib/authentication/by_cookie_token.rb b/app/lib/authentication/by_cookie_token.rb similarity index 100% rename from lib/authentication/by_cookie_token.rb rename to app/lib/authentication/by_cookie_token.rb diff --git a/lib/authentication/by_password.rb b/app/lib/authentication/by_password.rb similarity index 100% rename from lib/authentication/by_password.rb rename to app/lib/authentication/by_password.rb diff --git a/lib/core_extensions/date/season.rb b/app/lib/core_extensions/date/season.rb similarity index 100% rename from lib/core_extensions/date/season.rb rename to app/lib/core_extensions/date/season.rb diff --git a/lib/core_extensions/string/colorize.rb b/app/lib/core_extensions/string/colorize.rb similarity index 100% rename from lib/core_extensions/string/colorize.rb rename to app/lib/core_extensions/string/colorize.rb diff --git a/lib/core_extensions/string/name.rb b/app/lib/core_extensions/string/name.rb similarity index 100% rename from lib/core_extensions/string/name.rb rename to app/lib/core_extensions/string/name.rb diff --git a/lib/core_extensions/time/rounded_to.rb b/app/lib/core_extensions/time/rounded_to.rb similarity index 100% rename from lib/core_extensions/time/rounded_to.rb rename to app/lib/core_extensions/time/rounded_to.rb diff --git a/lib/core_extensions/time/season.rb b/app/lib/core_extensions/time/season.rb similarity index 100% rename from lib/core_extensions/time/season.rb rename to app/lib/core_extensions/time/season.rb diff --git a/lib/core_extensions/time/showtime_date_formats.rb b/app/lib/core_extensions/time/showtime_date_formats.rb similarity index 100% rename from lib/core_extensions/time/showtime_date_formats.rb rename to app/lib/core_extensions/time/showtime_date_formats.rb diff --git a/lib/core_extensions/time/to_param.rb b/app/lib/core_extensions/time/to_param.rb similarity index 100% rename from lib/core_extensions/time/to_param.rb rename to app/lib/core_extensions/time/to_param.rb diff --git a/lib/customer_import.rb b/app/lib/customer_import.rb similarity index 100% rename from lib/customer_import.rb rename to app/lib/customer_import.rb diff --git a/lib/datetime_range.rb b/app/lib/datetime_range.rb similarity index 100% rename from lib/datetime_range.rb rename to app/lib/datetime_range.rb diff --git a/lib/purchasemethod.rb b/app/lib/purchasemethod.rb similarity index 100% rename from lib/purchasemethod.rb rename to app/lib/purchasemethod.rb diff --git a/lib/show_name_matcher.rb b/app/lib/show_name_matcher.rb similarity index 100% rename from lib/show_name_matcher.rb rename to app/lib/show_name_matcher.rb diff --git a/lib/simple_uri_checker.rb b/app/lib/simple_uri_checker.rb similarity index 100% rename from lib/simple_uri_checker.rb rename to app/lib/simple_uri_checker.rb diff --git a/lib/tasks/clients.rake b/app/lib/tasks/clients.rake similarity index 100% rename from lib/tasks/clients.rake rename to app/lib/tasks/clients.rake diff --git a/lib/tasks/create_import.rake b/app/lib/tasks/create_import.rake similarity index 100% rename from lib/tasks/create_import.rake rename to app/lib/tasks/create_import.rake diff --git a/lib/tasks/create_staging_data.rake b/app/lib/tasks/create_staging_data.rake similarity index 100% rename from lib/tasks/create_staging_data.rake rename to app/lib/tasks/create_staging_data.rake diff --git a/lib/tasks/cucumber.rake b/app/lib/tasks/cucumber.rake similarity index 100% rename from lib/tasks/cucumber.rake rename to app/lib/tasks/cucumber.rake diff --git a/lib/tasks/figaro_travis.rake b/app/lib/tasks/figaro_travis.rake similarity index 100% rename from lib/tasks/figaro_travis.rake rename to app/lib/tasks/figaro_travis.rake diff --git a/lib/tasks/goldstar.json.erb b/app/lib/tasks/goldstar.json.erb similarity index 100% rename from lib/tasks/goldstar.json.erb rename to app/lib/tasks/goldstar.json.erb diff --git a/lib/tasks/import_vendini.rake b/app/lib/tasks/import_vendini.rake similarity index 100% rename from lib/tasks/import_vendini.rake rename to app/lib/tasks/import_vendini.rake diff --git a/lib/tasks/restart.rake b/app/lib/tasks/restart.rake similarity index 100% rename from lib/tasks/restart.rake rename to app/lib/tasks/restart.rake diff --git a/lib/tasks/simple_import.yml b/app/lib/tasks/simple_import.yml similarity index 100% rename from lib/tasks/simple_import.yml rename to app/lib/tasks/simple_import.yml diff --git a/config/application.rb b/config/application.rb index 50ab5d19e..d0f0f76a5 100644 --- a/config/application.rb +++ b/config/application.rb @@ -26,22 +26,10 @@ class Application < Rails::Application config.active_record.default_timezone = :local # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = 'en' - config.autoload_paths << Rails.root.join('lib') - config.assets.enabled = true - - # Add additional load paths for your own custom dirs - additional_paths = Dir.glob(File.join Rails.root, "app/models/**/*").select { |f| File.directory? f } - config.eager_load_paths += additional_paths - # for autoload, also include stuff in services/, but don't eager-load that since it - # references autoloadable stuff and gives the weird 'has been removed from the module tree - # but is still active' error - additional_paths += Dir.glob(File.join Rails.root, "app/services/**/*").select { |f| File.directory? f } - config.autoload_paths += additional_paths - + config.eager_load = true config.after_initialize do config.action_mailer.delivery_method = :smtp diff --git a/config/environments/development.rb b/config/environments/development.rb index a6b5cc833..c1934d5f4 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -7,7 +7,7 @@ config.cache_classes = false # Do not eager load code on boot. - config.eager_load = false + #config.eager_load = false # Log error messages when you accidentally call methods on nil. config.whiny_nils = true