From ea50bb9cba18243dcf0bd37b2e1b79ff49c7d9e2 Mon Sep 17 00:00:00 2001 From: Martin Meyerhoff Date: Thu, 9 Jan 2025 10:38:09 +0100 Subject: [PATCH] Make Controller Helpers autoloadable There's no real good reason to keep these files in lib and require them on app startup. Let's put them in app/ and let Zeitwerk handle their loading. --- .../helpers}/spree/core/controller_helpers/auth.rb | 0 .../helpers}/spree/core/controller_helpers/common.rb | 0 .../helpers}/spree/core/controller_helpers/order.rb | 2 -- .../spree/core/controller_helpers/payment_parameters.rb | 0 .../helpers}/spree/core/controller_helpers/pricing.rb | 0 .../helpers}/spree/core/controller_helpers/search.rb | 0 .../helpers}/spree/core/controller_helpers/store.rb | 0 .../spree/core/controller_helpers/strong_parameters.rb | 0 core/lib/spree/core.rb | 8 -------- 9 files changed, 10 deletions(-) rename core/{lib => app/helpers}/spree/core/controller_helpers/auth.rb (100%) rename core/{lib => app/helpers}/spree/core/controller_helpers/common.rb (100%) rename core/{lib => app/helpers}/spree/core/controller_helpers/order.rb (98%) rename core/{lib => app/helpers}/spree/core/controller_helpers/payment_parameters.rb (100%) rename core/{lib => app/helpers}/spree/core/controller_helpers/pricing.rb (100%) rename core/{lib => app/helpers}/spree/core/controller_helpers/search.rb (100%) rename core/{lib => app/helpers}/spree/core/controller_helpers/store.rb (100%) rename core/{lib => app/helpers}/spree/core/controller_helpers/strong_parameters.rb (100%) diff --git a/core/lib/spree/core/controller_helpers/auth.rb b/core/app/helpers/spree/core/controller_helpers/auth.rb similarity index 100% rename from core/lib/spree/core/controller_helpers/auth.rb rename to core/app/helpers/spree/core/controller_helpers/auth.rb diff --git a/core/lib/spree/core/controller_helpers/common.rb b/core/app/helpers/spree/core/controller_helpers/common.rb similarity index 100% rename from core/lib/spree/core/controller_helpers/common.rb rename to core/app/helpers/spree/core/controller_helpers/common.rb diff --git a/core/lib/spree/core/controller_helpers/order.rb b/core/app/helpers/spree/core/controller_helpers/order.rb similarity index 98% rename from core/lib/spree/core/controller_helpers/order.rb rename to core/app/helpers/spree/core/controller_helpers/order.rb index e3bb2b61c69..ed3d858c55a 100644 --- a/core/lib/spree/core/controller_helpers/order.rb +++ b/core/app/helpers/spree/core/controller_helpers/order.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require 'spree/core/controller_helpers/pricing' - module Spree module Core module ControllerHelpers diff --git a/core/lib/spree/core/controller_helpers/payment_parameters.rb b/core/app/helpers/spree/core/controller_helpers/payment_parameters.rb similarity index 100% rename from core/lib/spree/core/controller_helpers/payment_parameters.rb rename to core/app/helpers/spree/core/controller_helpers/payment_parameters.rb diff --git a/core/lib/spree/core/controller_helpers/pricing.rb b/core/app/helpers/spree/core/controller_helpers/pricing.rb similarity index 100% rename from core/lib/spree/core/controller_helpers/pricing.rb rename to core/app/helpers/spree/core/controller_helpers/pricing.rb diff --git a/core/lib/spree/core/controller_helpers/search.rb b/core/app/helpers/spree/core/controller_helpers/search.rb similarity index 100% rename from core/lib/spree/core/controller_helpers/search.rb rename to core/app/helpers/spree/core/controller_helpers/search.rb diff --git a/core/lib/spree/core/controller_helpers/store.rb b/core/app/helpers/spree/core/controller_helpers/store.rb similarity index 100% rename from core/lib/spree/core/controller_helpers/store.rb rename to core/app/helpers/spree/core/controller_helpers/store.rb diff --git a/core/lib/spree/core/controller_helpers/strong_parameters.rb b/core/app/helpers/spree/core/controller_helpers/strong_parameters.rb similarity index 100% rename from core/lib/spree/core/controller_helpers/strong_parameters.rb rename to core/app/helpers/spree/core/controller_helpers/strong_parameters.rb diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb index e5c3fe42794..765ef833a50 100644 --- a/core/lib/spree/core.rb +++ b/core/lib/spree/core.rb @@ -111,14 +111,6 @@ class GatewayError < RuntimeError; end require 'spree/core/importer' require 'spree/core/permalinks' require 'spree/core/product_duplicator' -require 'spree/core/controller_helpers/auth' -require 'spree/core/controller_helpers/common' -require 'spree/core/controller_helpers/order' -require 'spree/core/controller_helpers/payment_parameters' -require 'spree/core/controller_helpers/pricing' -require 'spree/core/controller_helpers/search' -require 'spree/core/controller_helpers/store' -require 'spree/core/controller_helpers/strong_parameters' require 'spree/core/role_configuration' require 'spree/core/state_machines' require 'spree/core/stock_configuration'