Merge pull request #9555 from tmm1/optimize-erb

Optimize generated ERB to reduce method calls

2 files changed, 35 insertions, 3 deletions

diff --git a/actionpack/lib/action_view/buffers.rb b/actionpack/lib/action_view/buffers.rb
index 2372d3c433..361a0dccbe 100644
--- a/actionpack/lib/action_view/buffers.rb
+++ b/actionpack/lib/action_view/buffers.rb
@@ -8,9 +8,15 @@ module ActionView
     end
 
     def <<(value)
+      return self if value.nil?
       super(value.to_s)
     end
     alias :append= :<<
+
+    def safe_concat(value)
+      return self if value.nil?
+      super(value.to_s)
+    end
     alias :safe_append= :safe_concat
   end
 
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 5aaafc15c1..7d7a7af51d 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -6,12 +6,23 @@ module ActionView
     module Handlers
       class Erubis < ::Erubis::Eruby
         def add_preamble(src)
+          @newline_pending = 0
           src << "@output_buffer = output_buffer || ActionView::OutputBuffer.new;"
         end
 
         def add_text(src, text)
           return if text.empty?
-          src << "@output_buffer.safe_concat('" << escape_text(text) << "');"
+
+          if text == "\n"
+            @newline_pending += 1
+          else
+            src << "@output_buffer.safe_append='"
+            src << "\n" * @newline_pending if @newline_pending > 0
+            src << escape_text(text)
+            src << "';"
+
+            @newline_pending = 0
+          end
         end
 
         # Erubis toggles <%= and <%== behavior when escaping is enabled.
@@ -28,24 +39,39 @@ module ActionView
         BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/
 
         def add_expr_literal(src, code)
+          flush_newline_if_pending(src)
           if code =~ BLOCK_EXPR
             src << '@output_buffer.append= ' << code
           else
-            src << '@output_buffer.append= (' << code << ');'
+            src << '@output_buffer.append=(' << code << ');'
           end
         end
 
         def add_expr_escaped(src, code)
+          flush_newline_if_pending(src)
           if code =~ BLOCK_EXPR
             src << "@output_buffer.safe_append= " << code
           else
-            src << "@output_buffer.safe_concat((" << code << ").to_s);"
+            src << "@output_buffer.safe_append=(" << code << ");"
           end
         end
 
+        def add_stmt(src, code)
+          flush_newline_if_pending(src)
+          super
+        end
+
         def add_postamble(src)
+          flush_newline_if_pending(src)
           src << '@output_buffer.to_s'
         end
+
+        def flush_newline_if_pending(src)
+          if @newline_pending > 0
+            src << "@output_buffer.safe_append='#{"\n" * @newline_pending}';"
+            @newline_pending = 0
+          end
+        end
       end
 
       class ERB