svn commit: r689265 - in /incubator/buildr/docter/trunk: CHANGELOG Rakefile lib/docter/page.rb

[as...@apache.org]

Author: assaf
Date: Tue Aug 26 15:25:34 2008
New Revision: 689265

URL: http://svn.apache.org/viewvc?rev=689265&view=rev
Log:
Upgraded to Redcloth 4

Modified:
    incubator/buildr/docter/trunk/CHANGELOG
    incubator/buildr/docter/trunk/Rakefile
    incubator/buildr/docter/trunk/lib/docter/page.rb

Modified: incubator/buildr/docter/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/incubator/buildr/docter/trunk/CHANGELOG?rev=689265&r1=689264&r2=689265&view=diff
==============================================================================
--- incubator/buildr/docter/trunk/CHANGELOG (original)
+++ incubator/buildr/docter/trunk/CHANGELOG Tue Aug 26 15:25:34 2008
@@ -1,4 +1,5 @@
 1.1.4 (Pending)
+* Changed: upgraded to RedCloth 4.
 
 1.1.3 (2008-04-15)
 * Changed: Now using Syntax by default for syntax highlighting, which works

Modified: incubator/buildr/docter/trunk/Rakefile
URL: http://svn.apache.org/viewvc/incubator/buildr/docter/trunk/Rakefile?rev=689265&r1=689264&r2=689265&view=diff
==============================================================================
--- incubator/buildr/docter/trunk/Rakefile (original)
+++ incubator/buildr/docter/trunk/Rakefile Tue Aug 26 15:25:34 2008
@@ -34,8 +34,8 @@
     spec.rubyforge_project = 'buildr'
 
     # Tested against these dependencies.
-    spec.add_dependency 'RedCloth',    '~> 3.0'
-    spec.add_dependency 'haml',        '~> 1.8'
+    spec.add_dependency 'RedCloth',    '~> 4.0'
+    spec.add_dependency 'haml',        '~> 2.0'
     spec.add_dependency 'mongrel',     '~> 1.1'
     spec.add_dependency 'syntax',      '~> 1.0'
     spec.add_dependency 'rake',        '~> 0.8'

Modified: incubator/buildr/docter/trunk/lib/docter/page.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/docter/trunk/lib/docter/page.rb?rev=689265&r1=689264&r2=689265&view=diff
==============================================================================
--- incubator/buildr/docter/trunk/lib/docter/page.rb (original)
+++ incubator/buildr/docter/trunk/lib/docter/page.rb Tue Aug 26 15:25:34 2008
@@ -186,7 +186,7 @@
       # Process {{{ ... }}} code sections into pre tags.
       text = text.gsub(/^\{\{\{([^\n]*)\n(.*?)\n\}\}\}/m) do
         code, spec = $2, $1.scan(/^!(.*?)$/).to_s.strip
-        %{<notextile><pre class='#{spec.split(',').join(' ')}'>#{CGI.escapeHTML(code)}</pre></notextile>}
+        %{<notextile><pre class="#{spec.split(',').join(' ')}">#{CGI.escapeHTML(code)}</pre></notextile>\n}
       end
       # Create the HTML.
       RedCloth.new(text, [:no_span_caps]).to_html(format)