Revert "Various optimizations"

This reverts commit 15c99cd.
judofyr · May 21, 2016 · 6af08b9 · 6af08b9
1 parent 6d9d64a
commit 6af08b9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/lib/temple/erb/parser.rb b/lib/temple/erb/parser.rb
@@ -12,12 +12,15 @@ def call(input)
         input.scan(ERB_PATTERN) do |token, indicator, code|
           text = input[pos...$~.begin(0)]
           pos  = $~.end(0)
-          if token == "\n"
-            result << [:static, "#{text}\n"] << [:newline]
-          elsif token # <%% | %%>
-            result << [:static, text] unless text.empty?
-            token.slice!(1)
-            result << [:static, token]
+          if token
+            case token
+            when "\n"
+              result << [:static, "#{text}\n"] << [:newline]
+            when '<%%', '%%>'
+              result << [:static, text] unless text.empty?
+              token.slice!(1)
+              result << [:static, token]
+            end
           else
             result << [:static, text] unless text.empty?
             case indicator

diff --git a/lib/temple/utils.rb b/lib/temple/utils.rb
@@ -55,13 +55,7 @@ def escape_html(html)
       # @param html [String] The string to escape
       # @return [String] The escaped string
       def escape_html(html)
-        if html.nil?
-          ''.freeze
-        else
-          result = html.to_s
-          result.gsub!(ESCAPE_HTML_PATTERN, ESCAPE_HTML)
-          result
-        end
+        html.to_s.gsub(ESCAPE_HTML_PATTERN, ESCAPE_HTML)
       end
     end