From 10ce2461450e38889ab6826af3c64426d42cffa0 Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Mon, 30 Sep 2024 02:11:47 +0200 Subject: [PATCH] Coding style --- lib/draper.rb | 15 +++++++++------ lib/draper/engine.rb | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/draper.rb b/lib/draper.rb index 34b39b4..76460ef 100644 --- a/lib/draper.rb +++ b/lib/draper.rb @@ -1,16 +1,19 @@ # frozen_string_literal: true +# require external dependencies require 'active_support/concern' require 'request_store' - require 'zeitwerk' -loader = Zeitwerk::Loader.for_gem -loader.ignore("#{__dir__}/draper/rails") -loader.ignore("#{__dir__}/draper/test") -loader.setup + +# load zeitwerk +Zeitwerk::Loader.for_gem.tap do |loader| + loader.ignore("#{__dir__}/draper/rails") + loader.ignore("#{__dir__}/draper/test") + loader.setup +end module Draper - require 'draper/engine' if defined?(Rails) + require_relative 'draper/engine' if defined?(Rails) class UninferrableDecoratorError < NameError def initialize(klass, decorator) diff --git a/lib/draper/engine.rb b/lib/draper/engine.rb index 33c16a7..9b9b243 100644 --- a/lib/draper/engine.rb +++ b/lib/draper/engine.rb @@ -18,7 +18,7 @@ class Engine < ::Rails::Engine config.after_initialize do |_app| if Rails.env.test? && defined?(RSpec) && RSpec.respond_to?(:configure) - require 'draper/test/rspec_integration' + require_relative 'test/rspec_integration' RSpec.configure do |config| config.include Draper::Test::RspecIntegration, file_path: %r{spec/decorators}, type: :decorator