Merge 21e328d into e4cde2b

cookpad · May 26, 2014 · 4855000 · 4855000
2 parents e4cde2b + 21e328d
commit 4855000
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/lib/chanko/loader.rb b/lib/chanko/loader.rb
@@ -10,6 +10,12 @@ def load(unit_name)
       def cache
         @cache ||= {}
       end
+
+      def eager_load_units!
+        Pathname.glob("#{Rails.root}/#{Config.units_directory_path}/*").select(&:directory?).each do |path|
+          load(path.to_s.split("/").last.to_sym) rescue nil
+        end
+      end
     end
 
     def initialize(name)

diff --git a/lib/chanko/railtie.rb b/lib/chanko/railtie.rb
@@ -13,5 +13,11 @@ class Railtie < Rails::Railtie
         ::ActiveRecord::Associations::CollectionAssociation.send(:include, UnitProxyProvider)
       end
     end
+
+    if Rails.env.production?
+      initializer "chanko.prevent_units_directory_from_eager_loading" do |app|
+        config.eager_load_paths.delete(Rails.root.join(Chanko::Config.units_directory_path).to_s)
+        Chanko::Loader.eager_load_units!
+      end
   end
 end