sitepress-rails 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de65ed0cb60dae87a90fb914dd4dfd5183d4eccd6286e071d556533d1501e184
-  data.tar.gz: 4b0d4add465aea7037216b26dffbebf7ea000624740e8b5ab893acd97fa7cd65
+  metadata.gz: 268f05e4eecb9441d38b0540eb12499bc2c64a5c81279ae2cd0a192e7fae0be9
+  data.tar.gz: 87a7aed9ffea0e8f0ce51b5e609f1be691f4b2c76a34a2cc35a217adc16691d4
 SHA512:
-  metadata.gz: 3895c25f0bba45c456c28e6204650d8d15034609b1f8b5c14e7f86126aa9f7b12acab20c9baacc93f667aa406fae24bdfbbc60c90b30224a9f5f843f19cf5491
-  data.tar.gz: 5769f5831e3039e05835e5fd1a308df25621d3ac947b36d1ae3b39b13a3c7dcd892d594d745070d6fdb4246e406b92b5249777bbcea5f415660634a89e132f41
+  metadata.gz: a3e3fa7fde24a2c5c5ed309be1d8aafdd0090feca0e7f9ebeb29915762b66e6adc2f33ad65f6da87e9c3db8d0e0dea84eaea782ecb6ece4d0220f9f067089731
+  data.tar.gz: 8e3b5da97c69419b9bbec400d79a452e369d023b89d7379ee04eb63cefce57d3333d91dac463e0f857f46ccc4c880c1664c7c420fb2d7a660077edb2b3880fc9

data/lib/sitepress/engine.rb

@@ -41,19 +41,25 @@ module Sitepress
       # Helpers: autoloadable and available to controllers
       # Collapsed so app/content/helpers/sample_helper.rb defines SampleHelper (not Helpers::SampleHelper)
       site.helpers_path.expand_path.tap do |path|
-        app.paths["app/helpers"].push path
-        app.config.autoload_paths << path
-        app.config.eager_load_paths << path
-        Rails.autoloaders.main.collapse(path)
+        if path.exist?
+          app.paths["app/helpers"].push path
+          app.config.autoload_paths << path
+          app.config.eager_load_paths << path
+          Rails.autoloaders.main.push_dir(path)
+          Rails.autoloaders.main.collapse(path)
+        end
       end
 
       # Models: autoloadable
       # Collapsed so models don't require namespace prefixes
       site.models_path.expand_path.tap do |path|
-        app.paths["app/models"].push path
-        app.config.autoload_paths << path
-        app.config.eager_load_paths << path
-        Rails.autoloaders.main.collapse(path)
+        if path.exist?
+          app.paths["app/models"].push path
+          app.config.autoload_paths << path
+          app.config.eager_load_paths << path
+          Rails.autoloaders.main.push_dir(path)
+          Rails.autoloaders.main.collapse(path)
+        end
       end
 
       # Assets: available to Sprockets (no autoloading needed)
@@ -85,15 +91,5 @@ module Sitepress
         app.config.cache_classes
       end
     end
-
-    # Set handler extensions once, after ActionView and all template engines are loaded.
-    initializer "sitepress.set_handler_extensions" do
-      ActiveSupport.on_load(:action_view) do
-        ActiveSupport.on_load(:after_initialize) do
-          Sitepress::Path.handler_extensions =
-            ActionView::Template::Handlers.extensions
-        end
-      end
-    end
   end
 end