Changeset 4189

Timestamp:

04/06/06 18:08:31 (2 years ago)

Author:

david

Message:

Fixed that template extensions would be cached development mode #4624 [Stefan Kaes]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/base.rb (modified) (3 diffs)
• trunk/railties/environments/development.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*1.12.1* (April 6th, 2005)
+
+* Fixed that template extensions would be cached development mode #4624 [Stefan Kaes]
-
-* Update to Prototype 1.5.0_rc0 [Sam Stephenson]

trunk/actionpack/lib/action_view/base.rb

@@ -158 +158 @@
-    cattr_accessor :cache_template_loading
-
+    # Specify whether file extension lookup should be cached.
+    # Should be +false+ for development environments. Defaults to +true+.
+    @@cache_template_extensions = true
+    cattr_accessor :cache_template_extensions
+
-    # Specify whether local_assigns should be able to use string keys.
-    # Defaults to +true+. String keys are deprecated and will be removed
@@ -313 +318 @@
-
-    def pick_template_extension(template_path)#:nodoc:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if match = delegate_template_exists?(template_path)
-          match.first.to_sym
@@ -322 +387 @@
-          raise ActionViewError, "No rhtml, rxml, rjs or delegate template found for #{template_path}"
-        end
-    end
-
-    def delegate_template_exists?(template_path)#:nodoc:
-      @@template_handlers.find { |k,| template_exists?(template_path, k) }
-    end
-
-    def erb_template_exists?(template_path)#:nodoc:
-      template_exists?(template_path, :rhtml)
-    end
-
-    def builder_template_exists?(template_path)#:nodoc:
-      template_exists?(template_path, :rxml)
-    end
-    
-    def javascript_template_exists?(template_path)#:nodoc:
-      template_exists?(template_path, :rjs)
-    end
-
-    def file_exists?(template_path)#:nodoc:
-      template_file_name, template_file_extension = path_and_extension(template_path)
-      
-      if template_file_extension
-        template_exists?(template_file_name, template_file_extension)
-      else
-        @@cached_template_extension[template_path] ||
-           %w(erb builder javascript delegate).any? do |template_type| 
-             send("#{template_type}_template_exists?", template_path)
-           end
-      end
-    end
-
-    # Returns true is the file may be rendered implicitly.
-    def file_public?(template_path)#:nodoc:
-      template_path.split('/').last[0,1] != '_'
-    end
-
-    private
-      def full_template_path(template_path, extension)
-        "#{@base_path}/#{template_path}.#{extension}"
-      end
-
-      def template_exists?(template_path, extension)
-        file_path = full_template_path(template_path, extension)
-        @@method_names.has_key?(file_path) || FileTest.exists?(file_path)
-      end
-
-      def path_and_extension(template_path)
-        template_path_without_extension = template_path.sub(/\.(\w+)$/, '')
-        [ template_path_without_extension, $1 ]
-      end
-

trunk/railties/environments/development.rb

@@ -15 +15 @@
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
+config.action_view.cache_template_extensions         = false
-config.action_view.debug_rjs                         = true
-