1 files changed, 40 insertions, 20 deletions
diff --git a/railties/guides/rails_guides/textile_extensions.rb b/railties/guides/rails_guides/textile_extensions.rb
index 352c5e91dd..4677fae504 100644
--- a/railties/guides/rails_guides/textile_extensions.rb
+++ b/railties/guides/rails_guides/textile_extensions.rb
@@ -3,23 +3,24 @@ require 'active_support/core_ext/object/inclusion'
 module RailsGuides
   module TextileExtensions
     def notestuff(body)
-      body.gsub!(/^(IMPORTANT|CAUTION|WARNING|NOTE|INFO)[.:](.*)$/) do |m|
-        css_class = $1.downcase
-        css_class = 'warning' if css_class.in?(['caution', 'important'])
-
-        result = "<div class='#{css_class}'><p>"
-        result << $2.strip
-        result << '</p></div>'
-        result
-      end
-    end
-
-    def tip(body)
-      body.gsub!(/^TIP[.:](.*)$/) do |m|
-        result = "<div class='info'><p>"
-        result << $1.strip
-        result << '</p></div>'
-        result
+      # The following regexp detects special labels followed by a
+      # paragraph, perhaps at the end of the document.
+      #
+      # It is important that we do not eat more than one newline
+      # because formatting may be wrong otherwise. For example,
+      # if a bulleted list follows the first item is not rendered
+      # as a list item, but as a paragraph starting with a plain
+      # asterisk.
+      body.gsub!(/^(TIP|IMPORTANT|CAUTION|WARNING|NOTE|INFO)[.:](.*?)(\n(?=\n)|\Z)/m) do |m|
+        css_class = case $1
+                    when 'CAUTION', 'IMPORTANT'
+                      'warning'
+                    when 'TIP'
+                      'info'
+                    else
+                      $1.downcase
+                    end
+        %Q(<div class="#{css_class}"><p>#{$2.strip}</p></div>)
       end
     end
 
@@ -32,11 +33,30 @@ module RailsGuides
       body.gsub!('<plus>', '+')
     end
 
+    def brush_for(code_type)
+      case code_type
+        when 'ruby', 'sql', 'plain'
+          code_type
+        when 'erb'
+          'ruby; html-script: true'
+        when 'html'
+          'xml' # html is understood, but there are .xml rules in the CSS
+        else
+          'plain'
+      end
+    end
+
     def code(body)
       body.gsub!(%r{<(yaml|shell|ruby|erb|html|sql|plain)>(.*?)</\1>}m) do |m|
-        es = ERB::Util.h($2)
-        css_class = $1.in?(['erb', 'shell']) ? 'html' : $1
-        %{<notextile><div class="code_container"><code class="#{css_class}">#{es}</code></div></notextile>}
+        <<HTML
+<notextile>
+<div class="code_container">
+<pre class="brush: #{brush_for($1)}; gutter: false; toolbar: false">
+#{ERB::Util.h($2).strip}
+</pre>
+</div>
+</notextile>
+HTML
       end
     end
   end