Merge pull request #180 from nebulab/kennyadsl/zeitwerk-support

Add support for Zeitwerk

Author: kennyadsl

lib/assets/javascripts/spree/backend/solidus_auth.js

@@ -20,22 +20,41 @@ class Engine < Rails::Engine
       config.to_prepare do
         auth = Spree::Auth::Engine
 
-        auth.prepare_backend  if SolidusSupport.backend_available?
-        auth.prepare_frontend if SolidusSupport.frontend_available?
+        if SolidusSupport.backend_available?
+          auth.load_decorators_for('backend')
+          auth.prepare_backend
+        end
+
+        if SolidusSupport.frontend_available?
+          auth.load_decorators_for('frontend')
+          auth.prepare_frontend
+        end
 
-        ApplicationController.send :include, Spree::AuthenticationHelpers
+        ApplicationController.include Spree::AuthenticationHelpers
       end
 
-      def self.prepare_backend
-        Rails.application.config.assets.precompile += %w[
-          lib/assets/javascripts/spree/backend/solidus_auth.js
-          lib/assets/javascripts/spree/backend/solidus_auth.css
-        ]
+      def self.load_decorators_for(component_name)
+        base_path = root.join('lib/decorators', component_name)
+
+        if Rails.respond_to?(:autoloaders) && Rails.autoloaders.main
+          # Add decorators folder to the Rails autoloader. This
+          # allows Zeitwerk to resolve decorators paths correctly,
+          # when used.
+          base_path.glob('*') do |decorators_folder|
+            Rails.autoloaders.main.push_dir(decorators_folder)
+          end
+        end
 
-        Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/backend/*/*/*_decorator*.rb")) do |c|
-          Rails.configuration.cache_classes ? require(c) : load(c)
+        # Load decorator files. This is needed since they are
+        # never explicitely referenced in the application code
+        # and won't be loaded by default. We need them to be
+        # executed anyway to extend exisiting classes.
+        base_path.glob('**/*_decorator*.rb') do |decorator_path|
+          require_dependency(decorator_path)
         end
+      end
 
+      def self.prepare_backend
         Spree::Admin::BaseController.unauthorized_redirect = -> do
           if try_spree_current_user
             flash[:error] = I18n.t('spree.authorization_failure')
@@ -48,15 +67,6 @@ def self.prepare_backend
       end
 
       def self.prepare_frontend
-        Rails.application.config.assets.precompile += %w[
-          lib/assets/javascripts/spree/frontend/solidus_auth.js
-          lib/assets/javascripts/spree/frontend/solidus_auth.css
-        ]
-
-        Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/*/*_decorator*.rb")) do |c|
-          Rails.configuration.cache_classes ? require(c) : load(c)
-        end
-
         Spree::BaseController.unauthorized_redirect = -> do
           if try_spree_current_user
             flash[:error] = I18n.t('spree.authorization_failure')