diff options
author | Xavier Noria <fxn@hashref.com> | 2009-02-28 17:07:46 +0100 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2009-02-28 17:07:46 +0100 |
commit | 0d145d9b37a224955f2bbd346376988358966dde (patch) | |
tree | 12d79d71e1dfdf344a65742e91d271aa77a15c6b /railties | |
parent | 1108bd7fe9b7a474b244dead8944a4b0d34fba89 (diff) | |
download | rails-0d145d9b37a224955f2bbd346376988358966dde.tar.gz rails-0d145d9b37a224955f2bbd346376988358966dde.tar.bz2 rails-0d145d9b37a224955f2bbd346376988358966dde.zip |
implements a temporary workaround for failing notextile
Diffstat (limited to 'railties')
-rw-r--r-- | railties/guides/rails_guides/generator.rb | 30 | ||||
-rw-r--r-- | railties/guides/rails_guides/textile_extensions.rb | 4 |
2 files changed, 28 insertions, 6 deletions
diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb index 085605a0d4..18fdb81810 100644 --- a/railties/guides/rails_guides/generator.rb +++ b/railties/guides/rails_guides/generator.rb @@ -109,11 +109,33 @@ module RailsGuides end def textile(body) - t = RedCloth.new(body) - t.hard_breaks = false - t.to_html(:notestuff, :plusplus, :code, :tip) + # If the issue with nontextile is fixed just remove the wrapper. + with_workaround_for_nontextile(body) do |body| + t = RedCloth.new(body) + t.hard_breaks = false + t.to_html(:notestuff, :plusplus, :code, :tip) + end + end + + # For some reason the notextile tag does not always turn off textile. See + # LH ticket of the security guide (#7). As a temporary workaround we deal + # with code blocks by hand. + def with_workaround_for_nontextile(body) + code_blocks = [] + body.gsub!(%r{<(yaml|shell|ruby|erb|html|sql|plain)>(.*?)</\1>}m) do |m| + es = ERB::Util.h($2) + css_class = ['erb', 'shell'].include?($1) ? 'html' : $1 + code_blocks << %{<div class="code_container"><code class="#{css_class}">#{es}</code></div>} + "dirty_workaround_for_nontextile_#{code_blocks.size - 1}" + end + + body = yield body + + body.gsub(%r{<p>dirty_workaround_for_nontextile_(\d+)</p>}) do |_| + code_blocks[$1.to_i] + end end - + def warn_about_broken_links(html) # Textile generates headers with IDs computed from titles. anchors = Set.new(html.scan(/<h\d\s+id="([^"]+)/).flatten) diff --git a/railties/guides/rails_guides/textile_extensions.rb b/railties/guides/rails_guides/textile_extensions.rb index 794083b44b..504b527398 100644 --- a/railties/guides/rails_guides/textile_extensions.rb +++ b/railties/guides/rails_guides/textile_extensions.rb @@ -1,5 +1,5 @@ module RailsGuides - module TextileExtensions + module TextileExtensions def notestuff(body) body.gsub!(/^(IMPORTANT|CAUTION|WARNING|NOTE|INFO)(?:\.|\:)(.*)$/) do |m| css_class = $1.downcase @@ -31,7 +31,7 @@ module RailsGuides end def code(body) - body.gsub!(%r{<(yaml|shell|ruby|erb|html|sql)>(.*?)</\1>}m) do |m| + body.gsub!(%r{<(yaml|shell|ruby|erb|html|sql|plain)>(.*?)</\1>}m) do |m| es = ERB::Util.h($2) css_class = ['erb', 'shell'].include?($1) ? 'html' : $1 %{<notextile><div class="code_container"><code class="#{css_class}">#{es}</code></div></notextile>} |