Do not build view_paths on each request

Add plugin view paths at initialization. Calling prepend_view_path on each request is too slow. Do not include theme dir at view path. Themes must use theme_include method to render rhtml files (instead of using render directly). This avoids conflict of files with same name at different themes and reduces the amount of paths in view_paths.

Do not build view_paths on each request
Add plugin view paths at initialization. Calling prepend_view_path on each request is too slow. Do not include theme dir at view path. Themes must use theme_include method to render rhtml files (instead of using render directly). This avoids conflict of files with same name at different themes and reduces the amount of paths in view_paths.
Victor Costa · Rodrigo Souto
1 parent 54df9315
Showing 3 changed files with 22 additions and 15 deletions Show diff stats
app/controllers/application_controller.rb
app/helpers/application_helper.rb
lib/noosfero/plugin.rb
@@ -2,7 +2,7 @@ class ApplicationController &lt; ActionController::Base
   before_filter :setup_multitenancy
   before_filter :detect_stuff_by_domain
-  before_filter :init_noosfero_plugins
+  before_filter :init_noosfero_plugins_controller_filters
   before_filter :allow_cross_domain_access
   def allow_cross_domain_access
@@ -21,8 +21,12 @@ class ApplicationController &lt; ActionController::Base
   include ApplicationHelper
   layout :get_layout
   def get_layout
-    prepend_view_path('public/' + theme_path)
-    theme_option(:layout) || 'application'
+    theme_layout = theme_option(:layout)
+    if theme_layout
+      theme_view_file('layouts/'+theme_layout) || theme_layout
+    else
+     'application'
+    end
   end
   filter_parameter_logging :password
@@ -122,13 +126,6 @@ class ApplicationController &lt; ActionController::Base
   include Noosfero::Plugin::HotSpot
-  def init_noosfero_plugins
-    plugins.each do |plugin|
-      prepend_view_path(plugin.class.view_path)
-    end
-    init_noosfero_plugins_controller_filters
-  end
-
   # This is a generic method that initialize any possible filter defined by a
   # plugin to the current controller being initialized.
   def init_noosfero_plugins_controller_filters
@@ -399,16 +399,23 @@ module ApplicationHelper
       end
   end
-  def theme_include(template)
+  def theme_view_file(template)
     ['.rhtml', '.html.erb'].each do |ext|
-      file = (RAILS_ROOT + '/public' + theme_path + '/' + template  + ext)
-      if File.exists?(file)
-        return render :file => file, :use_full_path => false
-      end
+      file = (RAILS_ROOT + '/public' + theme_path + '/' + template + ext)
+      return file if File.exists?(file)
     end
     nil
   end
+  def theme_include(template)
+    file = theme_view_file(template)
+    if file
+      render :file => file, :use_full_path => false
+    else
+      nil
+    end
+  end
+
   def theme_favicon
     return '/designs/themes/' + current_theme + '/favicon.ico' if profile.nil? || profile.theme.nil?
     if File.exists?(File.join(RAILS_ROOT, 'public', theme_path, 'favicon.ico'))
@@ -57,6 +57,9 @@ class Noosfero::Plugin
         path << File.join(dir, 'lib')
       end
+      # add view path
+      ActionController::Base.view_paths.unshift(File.join(dir, 'views'))
+
       # load vendor/plugins
       Dir.glob(File.join(dir, '/vendor/plugins/*')).each do |vendor_plugin|
         [ ActiveSupport::Dependencies.load_paths, $:].each{ |path| path << "#{vendor_plugin}/lib" }