Fixed that real files and symlinks should be treated the same when compiling...

Fixed that real files and symlinks should be treated the same when compiling templates (closes #5438) [zachary@panandscan.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4546 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/CHANGELOG

 *SVN*
 
+* Fixed that real files and symlinks should be treated the same when compiling templates #5438 [zachary@panandscan.com]
+
 * Fixed that the flash should be reset when reset_session is called #5584 [shugo@ruby-lang.org]
 
 * Added special case for "1 Byte" in NumberHelper#number_to_human_size #5593 [murpyh@rubychan.de]

actionpack/lib/action_view/base.rb

@@ -425,7 +425,8 @@ def compile_template?(template, file_name, local_assigns)
 
         if @@compile_time[render_symbol] && supports_local_assigns?(render_symbol, local_assigns)
           if file_name && !@@cache_template_loading 
-            @@compile_time[render_symbol] < File.mtime(file_name)
+            @@compile_time[render_symbol] < File.mtime(file_name) || (File.symlink?(file_name) ? 
+              @@compile_time[render_symbol] < File.lstat(file_name).mtime : false)
           end
         else
           true

actionpack/test/template/compiled_templates_tests.rb → actionpack/test/template/compiled_templates_test.rb

@@ -8,6 +8,14 @@ def setup
     @ct = ActionView::CompiledTemplates.new
     @v = Class.new
     @v.send :include, @ct
+    @a = './test_compile_template_a.rhtml'
+    @b = './test_compile_template_b.rhtml'
+    @s = './test_compile_template_link.rhtml'
+  end
+  def teardown
+    [@a, @b, @s].each do |f|
+      `rm #{f}` if File.exist?(f) || File.symlink?(f)
+    end
   end
   attr_reader :ct, :v
 
@@ -60,4 +68,67 @@ def test_mtime
     test_compile_source_single_method
     assert (t1..Time.now).include?(ct.mtime('doubling method', [:a]))
   end
+
+  def test_compile_time
+    `echo '#{@a}' > #{@a}; echo '#{@b}' > #{@b}; ln -s #{@a} #{@s}`
+
+    v = ActionView::Base.new
+    v.base_path = '.'
+    v.cache_template_loading = false;
+
+    sleep 1
+    t = Time.now
+    v.compile_and_render_template(:rhtml, '', @a)
+    v.compile_and_render_template(:rhtml, '', @b)
+    v.compile_and_render_template(:rhtml, '', @s)
+    a_n = v.method_names[@a]
+    b_n = v.method_names[@b]
+    s_n = v.method_names[@s]
+    # all of the files have changed since last compile
+    assert v.compile_time[a_n] > t
+    assert v.compile_time[b_n] > t
+    assert v.compile_time[s_n] > t
+
+    sleep 1
+    t = Time.now
+    v.compile_and_render_template(:rhtml, '', @a)
+    v.compile_and_render_template(:rhtml, '', @b)
+    v.compile_and_render_template(:rhtml, '', @s)
+    # none of the files have changed since last compile
+    assert v.compile_time[a_n] < t
+    assert v.compile_time[b_n] < t
+    assert v.compile_time[s_n] < t
+
+    `rm #{@s}; ln -s #{@b} #{@s}`
+    v.compile_and_render_template(:rhtml, '', @a)
+    v.compile_and_render_template(:rhtml, '', @b)
+    v.compile_and_render_template(:rhtml, '', @s)
+    # the symlink has changed since last compile
+    assert v.compile_time[a_n] < t
+    assert v.compile_time[b_n] < t
+    assert v.compile_time[s_n] > t
+
+    sleep 1
+    `touch #{@b}`
+    t = Time.now
+    v.compile_and_render_template(:rhtml, '', @a)
+    v.compile_and_render_template(:rhtml, '', @b)
+    v.compile_and_render_template(:rhtml, '', @s)
+    # the file at the end of the symlink has changed since last compile
+    # both the symlink and the file at the end of it should be recompiled
+    assert v.compile_time[a_n] < t
+    assert v.compile_time[b_n] > t
+    assert v.compile_time[s_n] > t
+  end
+end
+
+module ActionView
+  class Base
+    def compile_time
+      @@compile_time
+    end
+    def method_names
+      @@method_names
+    end
+  end
 end