deface 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 040fb8885174112590762a0220dfeb4c1597ff6f4f54804be959d60a9eb80924
-  data.tar.gz: f87d8e95f18c21a1e75b445556723232365a25003bfdce3898a90c0889eab52d
+  metadata.gz: d6fdcb87226be6d4fc38d8b056826594fc3ceb74d9234efcd398817f39121e5a
+  data.tar.gz: 7183351e3cd1fe93e4f0d7321e5dbf78f42d9104b465ada920d352d05ebe88b9
 SHA512:
-  metadata.gz: 39cab3b39f780056f9c47354f20b868d2409eec007bab49f2b60af96392d34d38d412cd9cee634a64847dcab23552c7a7814b2eb5cebd70534ab380feb7833f8
-  data.tar.gz: 4d2e948527682681bb53fc8e37aeb7b6f9f71b77f571606ed3e78d59991ae8e7362d6d6319af7f1eb50b0cc52fe279d8bab3daa2f7b34df0b29992a134dae677
+  metadata.gz: 828dd08f7d102616db1786851f3e3d9c68aac40a3bc4a2bb04b384d8638e6d38eec98ee76cc5c25d513feb649ea43ff9ad68897b7cb26e2c30fdbcc438d11cd9
+  data.tar.gz: cd2f685fd6ad04b559fafadfda375f6f5d58c480db307f34b0d2dddef062d02369f1ed3c8d2dd3f5d7f2a643fe33235291dd55f538a04f1119735eb46e71cbad

data/deface.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "deface"
-  s.version = "1.5.2"
+  s.version = "1.5.3"
 
   s.authors = ["Brian D Quinn"]
   s.description = "Deface is a library that allows you to customize ERB, Haml and Slim views in a Rails application without editing the underlying view."

data/lib/deface/railtie.rb

@@ -36,7 +36,7 @@ module Deface
     initializer "deface.tweak_eager_loading", :before => :set_load_path do |app|
 
       # application
-      app.config.eager_load_paths = app.config.eager_load_paths.reject { |path| path.to_s  =~ /app\/overrides\z/ }
+      tweak_eager_loading(app)
 
       # railites / engines / extensions
       railties = if Rails.version >= "4.0"
@@ -47,8 +47,10 @@ module Deface
 
       railties.each do |railtie|
         next unless railtie.respond_to?(:root) && railtie.config.respond_to?(:eager_load_paths)
-        railtie.config.eager_load_paths = railtie.config.eager_load_paths.reject { |path| path.to_s  =~ /app\/overrides\z/ }
+
+        tweak_eager_loading(railtie)
       end
+
     end
 
     # sets up deface environment and requires / loads all
@@ -87,5 +89,15 @@ module Deface
       end
     end
 
+    private
+
+    def tweak_eager_loading(railtie)
+      paths_to_reject = railtie.config.eager_load_paths.select { |path| path.to_s  =~ /app\/overrides\z/ }
+      railtie.config.eager_load_paths = railtie.config.eager_load_paths.reject { |path| path.in?(paths_to_reject) }
+
+      if Rails.version >= "6.0" && Rails.configuration.autoloader == :zeitwerk
+        Rails.autoloaders.each { |autoloader| autoloader.ignore(*paths_to_reject) }
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deface
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Brian D Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri