load frills even if in subdirs

moonmaster9000 · May 13, 2012 · 4ca457b · 4ca457b
1 parent 74b6d42
commit 4ca457b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/frill/engine.rb b/lib/frill/engine.rb
@@ -8,18 +8,22 @@ class Engine < Rails::Engine
       require 'frill/rails'
     end
 
+    config.before_initialize do |app|
+      app.config.paths.add 'app/decorators', :eager_load => true
+    end
+
     config.to_prepare do
       if Rails.env.development? && !Rails.application.config.cache_classes
         Frill.reset!
 
-        Frill::Engine.force_load Dir["#{Frill::Engine.root}/app/frills/*"]
+        Frill::Engine.force_load Dir["#{Frill::Engine.root}/app/frills/**/*"]
-        Frill::Engine.force_load Dir["#{Rails.root}/app/frills/*"]
+        Frill::Engine.force_load Dir["#{Rails.root}/app/frills/**/*"]
       end
     end
 
     def self.force_load files
       files.each do |f| 
-        load f
+        require_dependency f
       end
     end
   end