Fix for Rails 2.0.2. No monkey patch required now!

git-svn-id: https://rails-multisite.googlecode.com/svn/trunk@8 64db17d9-5632-0410-b012-75deaefb9678

Author: gabriel.d

README

@@ -2,7 +2,12 @@
 
 This plugin provides basic support for hosting multiple sites on the same Rails code base.  It is based on Matt McCray's theme_support plugin, but is essentially completely gutted and rewritten with a different focus.  
 
-The essential functionality of the plugin is to add a specific site's views to the view path.  The concept of a view_path is new to Rails 2.0, so you will need to be running edge to use this plugin for right now.
+The essential functionality of the plugin is to add a specific site's views to the view path.  The concept of a view_path is new to Rails 2.0.
+
+== Requirements
+
+* This plugin is tested in Rails 2.0.2.
+* Template caching must be disabled (this includes both cache_template_loading and cache_template_extensions action_view config options)
 
 == Differences from theme_support 
 
@@ -57,5 +62,5 @@ the site for the whole application.
 
 
 ---
-Copyright (c) 2007 Gabe da Silveira, based on code from theme_support by Matt McCray, based on code from Typo by Tobias Luetke 
+Copyright (c) 2007-2008 Gabe da Silveira, based on code from theme_support by Matt McCray, based on code from Typo by Tobias Luetke 
 released under the MIT license

init.rb

@@ -1,2 +1,2 @@
 # Initializes multisite support by adding a macro to ActionController::Base
-require 'patches/actioncontroller_ex'
+require 'patches/actioncontroller_ex'

lib/patches/actioncontroller_ex.rb

@@ -17,7 +17,7 @@
   #  end
   def self.site(site_name)
     write_inheritable_attribute "site", site_name
-    around_filter :temporarily_add_multisite_path
+    before_filter :add_multisite_path
   end
 
   # Retrieves the current set site
@@ -32,17 +32,14 @@ def current_site(passed_site=nil)
   end
 
   protected
-  def temporarily_add_multisite_path
+  def add_multisite_path
     if current_site
-      begin
-        ActionController::Base.view_paths.unshift(File.join(RAILS_ROOT,'sites', @active_site, 'views'))
-        logger.info "paths: " + ActionController::Base.view_paths.join(":")
-        yield
-      ensure
-        ActionController::Base.view_paths.shift
-      end
-    else
-      yield
+      raise "Multisite plugin is incompatible with template caching.  You must set config.action_view.cache_template_loading to false in your environment." if ActionView::Base.cache_template_loading
+      raise "Multisite plugin is incompatible with template extension caching.  You must set config.action_view.cache_template_extensions to false in your environment." if ActionView::Base.cache_template_extensions
+      new_path = File.join(RAILS_ROOT, 'sites', @active_site, 'views')
+      @template.prepend_view_path(new_path)
+      logger.info "  Template View Paths: #{@template.view_paths.inspect}"
     end
+    return true
   end
 end