Changeset 2368

Timestamp:

09/27/05 16:45:39 (3 years ago)

Author:

ulysses

Message:

Streamline render process, code cleaning. Closes #2294.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/base.rb (modified) (6 diffs)
• trunk/actionpack/lib/action_view/partials.rb (modified) (1 diff)
• trunk/actionpack/test/controller/custom_handler_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Streamline render process, code cleaning. Closes #2294. [skae]
-
-* Keep flash after components are rendered. #2291 [Rick Olson, Scott]

trunk/actionpack/lib/action_view.rb

@@ -25 +25 @@
-require 'action_view/vendor/builder'
-
-require 'action_view/compiled_templates'
-require 'action_view/base'
-require 'action_view/partials'

trunk/actionpack/lib/action_view/base.rb

@@ -130 +130 @@
-    cattr_accessor :erb_trim_mode
-
-
+
+
-    cattr_accessor :cache_template_loading
-
-    @@template_handlers = {}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    class ObjectWrapper < Struct.new(:value) #:nodoc:
@@ -222 +234 @@
-    end
-
-iv
+ovi
-    # local assigns yet, or if the template has been updated on disk, then the template will be compiled to a method.
-    #
-
+
+
-    # will only be read if it has to be compiled.
-    #
-    def compile_and_render_template(extension, template = nil, file_path = nil, local_assigns = {})
-
-
-
-
-
-
-
-
-
-
-
+
+
-        template ||= read_template_file(file_path, extension)
-file_path || 'inline-template', identifier, template, name
-
-
-selector for this template and names, then call the method.
-selector = @@compiled_templates.selector(identifier, names)
+template, file_path, local_assign
+
+
+method name for this template and run it
+method_name = @@method_names[file_path || template]
-      evaluate_assigns                                    
-selector, *param
+method_name, local_assign
-        instance_variable_get "@content_for_#{name.first || 'layout'}"
-      end
@@ -269 +273 @@
-
-    def erb_template_exists?(template_path)#:nodoc:
-'rhtml'
+:rhtml
-    end
-
-    def builder_template_exists?(template_path)#:nodoc:
-'rxml'
+:rxml
-    end
-
@@ -291 +295 @@
-
-      def template_exists?(template_path, extension)
-File.file?(full_template_path(template_path, extension)
-end
-
-
-has been compiled, or check your date of birth. It reads the template file. Crazy, I know
+file_path = full_template_path(template_path, extension
+  @@method_names.has_key?(file_path) || FileTest.exists?(file_path)
+
+
+This method reads a template file
-      def read_template_file(template_path, extension)
-        File.read(template_path)
-      end
-
-      # Split the provided hash of local assigns into two arrays, one of the names, and another of the value
-      # The arrays are guarenteed to be in matching order, and also ordered the same for different hashes.
-      def split_locals(assigns)
-        names, values = [], []
-        assigns.to_a.sort_by {|pair| pair.first.to_s}.each do |name, value|
-          names << name
-          values << value
-        end
-        return [names, values]
-      end
-
@@ -318 +311 @@
-      end
-
-      # Compile the template to a method using a CompiledTemplates instance.
-      def compile_template(extension, file_path, identifier, template, local_names = [])
-        line_no = 0
-
-        case extension && extension.to_sym
-          when :rxml
-            # Initialize the xml variable to the builder instance.
-            source_code = \
-"xml = Builder::XmlMarkup.new(:indent => 2)
-@controller.headers['Content-Type'] ||= 'text/xml'\n" + template
-            line_no = -2 # offset extra line.
-          else # Assume rhtml
-            source_code = ERB.new(template, nil, @@erb_trim_mode).src
-        end
-
-        @@compiled_templates.compile_source(identifier, local_names, source_code, line_no, file_path)
-      end
-
-      def delegate_render(handler, template, local_assigns)
-        handler.new(self).render(template, local_assigns)
@@ -343 +318 @@
-        @assigns.each { |key, value| instance_variable_set("@#{key}", value) }
-      end
+
+
+      # Return true if the given template was compiled for a superset of the keys in local_assigns
+      def supports_local_assigns?(render_symbol, local_assigns)
+        local_assigns.empty? ||
+          ((args = @@template_args[render_symbol]) && local_assigns.all? { |k,_| args.has_key?(k) })
+      end
+      
+      # Check whether compilation is necessary.
+      # Compile if the inline template or file has not been compiled yet.
+      # Or if local_assigns has a new key, which isn't supported by the compiled code yet.
+      # Or if the file has changed on disk and checking file mods hasn't been disabled. 
+      def compile_template?(template, file_name, local_assigns)
+        method_key = file_name || template
+        render_symbol = @@method_names[method_key]
+        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)
+          end
+        else
+          true
+        end
+      end
+
+      # Create source code for given template
+      def create_template_source(extension, template, render_symbol, locals)
+        # logger.debug "Creating source for :#{render_symbol}" if logger
+        if extension && (extension.to_sym == :rxml)
+          body = "xml = Builder::XmlMarkup.new(:indent => 2)\n" +
+                 "@controller.headers['Content-Type'] ||= 'text/xml'\n" +
+                 template
+        else
+          body = ERB.new(template, nil, @@erb_trim_mode).src
+        end
+        @@template_args[render_symbol] ||= {}
+        locals_keys = @@template_args[render_symbol].keys | locals
+        @@template_args[render_symbol] = locals_keys.inject({}) { |h, k| h[k] = true; h }
+        locals_code = locals_keys.inject("") do |code, key|
+          code << "#{key} = local_assigns[:#{key}] if local_assigns.has_key?(:#{key})\n"
+        end
+        "def #{render_symbol}(local_assigns)\n#{locals_code}#{body}\nend"
+      end
+
+      def assign_method_name(extension, template, file_name)
+        method_name = '_run_'
+        if extension && (extension.to_sym == :rxml)
+          method_name << 'xml_'
+        else
+          method_name << 'html_'
+        end
+        if file_name
+          file_path = File.expand_path(file_name)
+          base_path = File.expand_path(@base_path)
+          i = file_path.index(base_path)
+          l = base_path.length
+          method_name_file_part = i ? file_path[i+l+1,file_path.length-l-1] : file_path.clone
+          method_name_file_part.sub!(/\.r(ht|x)ml$/,'')
+          method_name_file_part.tr!('/:-', '_')
+          method_name_file_part.gsub!(/[^a-zA-Z0-9_]/){|s| s[0].to_s}
+          method_name += method_name_file_part
+        else
+          @@inline_template_count += 1
+          method_name << @@inline_template_count.to_s
+        end
+        @@method_names[file_name || template] = method_name.intern
+      end
+
+      def compile_template(extension, template, file_name, local_assigns)
+        method_key = file_name || template
+        render_symbol = @@method_names[method_key] || assign_method_name(extension, template, file_name)
+        render_source = create_template_source(extension, template, render_symbol, local_assigns.keys)
+        line_offset = @@template_args[render_symbol].size
+        line_offset += 2 if extension && (extension.to_sym == :rxml)
+        begin
+          if file_name
+            CompiledTemplates.module_eval(render_source, file_name, -line_offset)
+          else
+            CompiledTemplates.module_eval(render_source)
+          end
+        rescue Object => e
+          if logger
+            logger.debug "ERROR: compiling #{render_symbol} RAISED #{e}"
+            logger.debug "Function body: #{render_source}"
+            logger.debug "Backtrace: #{e.backtrace.join("\n")}"
+          end
+          raise TemplateError.new(@base_path, method_key, @assigns, template, e)
+        end
+
+        @@compile_time[render_symbol] = Time.now
+        logger.debug "Compiled template #{method_key}\n  ==> #{render_symbol}" if logger
+        # logger.debug  "CompiledTemplates methods: #{CompiledTemplates.instance_methods.sort.inspect}" if logger
+      end
+
-  end
-end

trunk/actionpack/lib/action_view/partials.rb

@@ -90 +90 @@
-
-      def partial_counter_name(partial_name)
-
+.intern
-      end
-      

trunk/actionpack/test/controller/custom_handler_test.rb

@@ -20 +20 @@
-
-  def test_custom_render
-"one"
+:one
-    assert_equal(
-"one"
+:one
-      result )
-  end
@@ -28 +28 @@
-  def test_unhandled_extension
-    # uses the ERb handler by default if the extension isn't recognized
-"one"
+:one
-    assert_equal "hello two", result
-  end