RedCloth 3.0.1 → 3.0.2

data/bin/redcloth

@@ -1,3 +1,3 @@
-#!/usr/local/bin/ruby18
+#!/usr/local/bin/ruby
 require 'redcloth'
 puts RedCloth.new( ARGF.read ).to_html

data/lib/redcloth.rb

@@ -166,7 +166,7 @@
 
 class RedCloth < String
 
-    VERSION = '3.0.1'
+    VERSION = '3.0.2'
     DEFAULT_RULES = [:textile, :markdown]
 
     #
@@ -271,16 +271,19 @@ class RedCloth < String
         no_textile text
 
         # start processor
-        pre_list = rip_offtags text
+        @pre_list = []
+        rip_offtags text
+        hard_break text
         refs text
         blocks text
         inline text
-        smooth_offtags text, pre_list
+        smooth_offtags text
 
         retrieve text
 
         text.gsub!( /<\/?notextile>/, '' )
         text.gsub!( /x%x%/, '&#38;' )
+        clean_html text if filter_html
         text.strip!
         text
 
@@ -364,36 +367,39 @@ class RedCloth < String
         '~' => 'bottom'
     }
 
-    QTAGS_1 = [
+    QTAGS = [
         ['**', 'b'],
         ['*', 'strong'],
         ['??', 'cite'],
+        ['-', 'del', :limit],
         ['__', 'i'],
+        ['_', 'em', :limit],
+        ['%', 'span', :limit],
+        ['+', 'ins', :limit],
         ['^', 'sup'],
         ['~', 'sub']
     ] 
-    QTAGS_RE_1 = /(#{ QTAGS_1.collect { |rc, ht| Regexp::quote( rc ) }.join( '|' ) })
-        (#{C})
-        (?::(\S+?))?
-        ([^\s\1]+?(?:[^\n]|\n(?!\n))*?)
-        \1/xm 
-
-    QTAGS_2 = [
-        ['-', 'del'],
-        ['_', 'em'],
-        ['%', 'span'],
-        ['+', 'ins'],
-        ['^', 'sup'],
-        ['~', 'sub']
-    ]
-    QTAGS_RE_2 = /(^|[\s\>#{ PUNCT }{(\[])
-        (#{ QTAGS_2.collect { |rc, ht| Regexp::quote( rc ) }.join( '|' ) })
-        (#{C})
-        (?::(\S+?))?
-        ([^\s\2]+?(?:[^\n]|\n(?!\n))*?)
-        \2
-        (?=[\s\])}<#{ PUNCT }]|$)/xm 
-    QTAGS = QTAGS_1 + QTAGS_2
+    QTAGS.collect! do |rc, ht, rtype|
+        rcq = Regexp::quote rc
+        re =
+            case rtype
+            when :limit
+                /(\W)
+                (#{rcq})
+                (#{C})
+                (?::(\S+?))?
+                (.+?)
+                #{rcq}
+                (?=\W)/x
+            else
+                /(#{rcq})
+                (#{C})
+                (?::(\S+?))?
+                (.+?)
+                #{rcq}/xm 
+            end
+        [rc, ht, re, rtype]
+    end
 
     #
     # Flexible HTML escaping
@@ -426,7 +432,7 @@ class RedCloth < String
             style << "vertical-align:#{ v_align( $& ) };" if text =~ A_VLGN
         end
 
-        style << "#{ $1 };" if not @filter_styles and
+        style << "#{ $1 };" if not filter_styles and
             text.sub!( /\{([^}]*)\}/, '' )
 
         lang = $1 if
@@ -553,7 +559,7 @@ class RedCloth < String
         text.gsub!( CODE_RE ) do |m|
             before,lang,code,after = $~[1..4]
             lang = " lang=\"#{ lang }\"" if lang
-            "#{ before }<code#{ lang }>#{ code }</code>#{ after }"
+            rip_offtags( "#{ before }<code#{ lang }>#{ code }</code>#{ after }" )
         end
     end
 
@@ -562,14 +568,14 @@ class RedCloth < String
     end
 
     def hard_break( text )
-        text.gsub!( /(.)\n(?! *[#*\s|])/, "\\1<br />" ) if @hard_breaks
+        text.gsub!( /(.)\n(?! *[#*\s|]|$)/, "\\1<br />" ) if hard_breaks
     end
 
-    BLOCKS_GROUP_RE = /((?:^([#*> ])(?:[^\n]|\n+(?:\2|>)|\n(?!\n|\Z))+))|((?:[^\n]+|\n+ +|\n(?![#*\n]|\Z))+)/m
+    BLOCKS_GROUP_RE = /\n{2,}(?! )/m
 
     def blocks( text, deep_code = false )
-        text.gsub!( BLOCKS_GROUP_RE ) do |blk|
-            plain = $3 ? true : false
+        text.replace( text.split( BLOCKS_GROUP_RE ).collect do |blk|
+            plain = blk !~ /\A[#*> ]/
 
             # skip blocks that are complex HTML
             if blk =~ /^<\/?(\w+).*>/ and not SIMPLE_HTML_TAGS.include? $1
@@ -592,11 +598,11 @@ class RedCloth < String
                         end
                     end
 
-                    block_applied = nil
+                    block_applied = 0 
                     @rules.each do |rule_name|
-                        break if block_applied = ( rule_name.to_s.match /^block_/ and method( rule_name ).call( blk ) )
+                        block_applied += 1 if ( rule_name.to_s.match /^block_/ and method( rule_name ).call( blk ) )
                     end
-                    unless block_applied
+                    if block_applied.zero?
                         if deep_code
                             blk = "\t<pre><code>#{ blk }</code></pre>"
                         else
@@ -608,7 +614,7 @@ class RedCloth < String
                 end
             end
 
-        end
+        end.join( "\n\n" ) )
     end
 
     def textile_bq( tag, atts, cite, content )
@@ -708,27 +714,23 @@ class RedCloth < String
     end
 
     def inline_textile_span( text ) 
-        text.gsub!( QTAGS_RE_1 ) do |m|
-         
-            qtag,atts,cite,content = $~[1..4]
-            ht = QTAGS.assoc( qtag ).last
-            atts = pba( atts )
-            atts << " cite=\"#{ cite }\"" if cite
-            atts = shelve( atts ) if atts
-
-            "<#{ ht }#{ atts }>#{ content }</#{ ht }>"
-
-        end
-        text.gsub!( QTAGS_RE_2 ) do |m|
-         
-            sta,qtag,atts,cite,content = $~[1..5]
-            ht = QTAGS.assoc( qtag ).last
-            atts = pba( atts )
-            atts << " cite=\"#{ cite }\"" if cite
-            atts = shelve( atts ) if atts
+        QTAGS.each do |qtag_rc, ht, qtag_re, rtype|
+            text.gsub!( qtag_re ) do |m|
+             
+                case rtype
+                when :limit
+                    sta,qtag,atts,cite,content = $~[1..5]
+                else
+                    qtag,atts,cite,content = $~[1..4]
+                    sta = ''
+                end
+                atts = pba( atts )
+                atts << " cite=\"#{ cite }\"" if cite
+                atts = shelve( atts ) if atts
 
-            "#{ sta }<#{ ht }#{ atts }>#{ content }</#{ ht }>"
+                "#{ sta }<#{ ht }#{ atts }>#{ content }</#{ ht }>"
 
+            end
         end
     end
 
@@ -980,7 +982,6 @@ class RedCloth < String
     end
 
     def rip_offtags( text )
-        pre_list = []
         if text =~ /<.*>/
             ## strip and encode <pre> content
             codepre, used_offtags = 0, {}
@@ -991,17 +992,17 @@ class RedCloth < String
                     used_offtags[offtag] = true
                     if codepre - used_offtags.length > 0
                         htmlesc( line, :NoQuotes ) unless used_offtags['notextile']
-                        pre_list.last << line
+                        @pre_list.last << line
                         line = ""
                     else
                         htmlesc( aftertag, :NoQuotes ) if aftertag and not used_offtags['notextile']
-                        line = "<redpre##{ pre_list.length }>"
-                        pre_list << "#{ $3 }#{ aftertag }"
+                        line = "<redpre##{ @pre_list.length }>"
+                        @pre_list << "#{ $3 }#{ aftertag }"
                     end
                 elsif $1 and codepre > 0
                     if codepre - used_offtags.length > 0
                         htmlesc( line, :NoQuotes ) unless used_offtags['notextile']
-                        pre_list.last << line
+                        @pre_list.last << line
                         line = ""
                     end
                     codepre -= 1 unless codepre.zero?
@@ -1010,13 +1011,13 @@ class RedCloth < String
                 line
             end
         end
-        pre_list
+        text
     end
 
-    def smooth_offtags( text, pre_list )
-        unless pre_list.empty?
+    def smooth_offtags( text )
+        unless @pre_list.empty?
             ## replace <pre> content
-            text.gsub!( /<redpre#(\d+)>/ ) { pre_list[$1.to_i] }
+            text.gsub!( /<redpre#(\d+)>/ ) { @pre_list[$1.to_i] }
         end
     end
 
@@ -1038,5 +1039,64 @@ class RedCloth < String
         ' <a target="_blank" href="http://hobix.com/textile/#' + helpvar + '" onclick="window.open(this.href, \'popupwindow\', \'width=' + windowW + ',height=' + windowH + ',scrollbars,resizable\'); return false;">' + name + '</a><br />'
     end
 
+    # HTML cleansing stuff
+    BASIC_TAGS = {
+        'a' => ['href', 'title'],
+        'img' => ['src', 'alt', 'title'],
+        'br' => [],
+        'i' => nil,
+        'u' => nil, 
+        'b' => nil,
+        'pre' => nil,
+        'kbd' => nil,
+        'code' => ['lang'],
+        'cite' => nil,
+        'strong' => nil,
+        'em' => nil,
+        'ins' => nil,
+        'sup' => nil,
+        'sub' => nil,
+        'del' => nil,
+        'table' => nil,
+        'tr' => nil,
+        'td' => ['colspan', 'rowspan'],
+        'th' => nil,
+        'ol' => nil,
+        'ul' => nil,
+        'li' => nil,
+        'p' => nil,
+        'h1' => nil,
+        'h2' => nil,
+        'h3' => nil,
+        'h4' => nil,
+        'h5' => nil,
+        'h6' => nil, 
+        'blockquote' => ['cite']
+    }
+
+    def clean_html( text, tags = BASIC_TAGS )
+        text.gsub!( /<!\[CDATA\[/, '' )
+        text.gsub!( /<(\/*)(\w+)([^>]*)>/ ) do
+            raw = $~
+            tag = raw[2].downcase
+            if tags.has_key? tag
+                pcs = [tag]
+                tags[tag].each do |prop|
+                    ['"', "'", ''].each do |q|
+                        q2 = ( q != '' ? q : '\s' )
+                        if raw[3] =~ /#{prop}\s*=\s*#{q}([^#{q2}]+)#{q}/i
+                            attrv = $1
+                            next if prop == 'src' and attrv !~ /^http/
+                            pcs << "#{prop}=\"#{$1.gsub('"', '\\"')}\""
+                            break
+                        end
+                    end
+                end if tags[tag]
+                "<#{raw[1]}#{pcs.join " "}>"
+            else
+                " "
+            end
+        end
+    end
 end
 

data/run-tests.rb

@@ -12,6 +12,9 @@ Dir["tests/*.yml"].each do |testfile|
                        red.to_html
                    end
             puts "---"
+
+            html.gsub!( /\n+/, "\n" )
+            doc['out'].gsub!( /\n+/, "\n" )
             if html == doc['out']
                 puts "success: true"
             else

data/tests/instiki.yml

@@ -18,6 +18,7 @@ out: '<p><span style="color:red;">nested span because of <span><span class="newW
 ---
 in: |-
   h2. Version History
+
   * "Version
   0.0":http://www.threewordslong.com/render-0-8-9b.patch - Early version using MD5 hashes.
   * "Version
@@ -25,6 +26,7 @@ in: |-
   * "Version 0.2":http://www.threewordslong.com/chunk-0-2.patch.gz - Fixed problem with "authors" page and some tests.
 out: |-
   <h2>Version History</h2>
+
   	<ul>
   	<li><a href="http://www.threewordslong.com/render-0-8-9b.patch">Version
   0.0</a> &#8211; Early version using <span class="caps">MD5</span> hashes.</li>

data/tests/lists.yml

@@ -45,7 +45,6 @@ in: |-
   yeah number
   #* bullet
   *** okay
-
   ****# what
 
 
@@ -66,7 +65,6 @@ out: |-
   	<li>bullet
   	<ul>
   	<li>okay
-  
   	<ol>
   	<li>what</li>
   	</ul></li>

data/tests/table.yml

@@ -0,0 +1,198 @@
+in: |
+  {background:#ddd}. |S|Target|Complete|App|Milestone|
+  |!/i/g.gif!|11/18/04|11/18/04|070|XML spec complete|
+  |!/i/g.gif!|11/29/04|11/29/04|011|XML spec complete (KH is on schedule)|
+  |!/i/g.gif!|11/29/04|11/29/04|051|XML spec complete (KH is on schedule)|
+  |!/i/g.gif!|11/29/04|11/29/04|081|XML spec complete (KH is on schedule)|
+  |!/i/g.gif!|11/19/04|11/22/04|070|Preprocessor complete|
+  |!/i/g.gif!|11/22/04|11/22/04|070|Dialog pass 1 builds an index file|
+  |!/i/g.gif!|11/24/04|11/24/04|070|Dialog pass 2 98% complete|
+  |!/i/g.gif!|11/30/04|11/30/04|070|Feature complete. Passes end-to-end smoke test.|
+  |!/i/g.gif!|11/30/04|11/30/04|011|Preprocessor updates complete|
+  |!/i/g.gif!|11/30/04|11/30/04|051|Preprocessor updates complete|
+  |!/i/g.gif!|11/30/04|11/29/04|081|Preprocessor updates complete|
+  |!/i/w.gif!|12/02/04|.|011|Dialog pass 1 and 2 complete (98+%)|
+  |!/i/w.gif!|12/02/04|.|051|Dialog pass 1 and 2 complete (98+%)|
+  |!/i/w.gif!|12/02/04|.|081|Dialog pass 1 and 2 complete (98+%)|
+  |!/i/w.gif!|12/03/04|.|011|Feature complete|
+  |!/i/w.gif!|12/03/04|.|051|Feature complete|
+  |!/i/w.gif!|12/03/04|.|081|Feature complete|
+  |!/i/w.gif!|12/10/04|.|011|Deployed to Napa test workstation. Passes smoke test.|
+  |!/i/w.gif!|12/10/04|.|051|Deployed to Napa test workstation. Passes smoke test.|
+  |!/i/w.gif!|12/10/04|.|081|Deployed to Napa test workstation. Passes smoke test.|
+  |!/i/w.gif!|12/10/04|.|070|Deployed to Napa test workstation. Passes smoke test.|
+  |!/i/w.gif!|12/17/04|.|011|System testing complete. Begin testing with live customer data.|
+  |!/i/w.gif!|12/17/04|.|051|System testing complete. Begin testing with live customer data.|
+  |!/i/w.gif!|12/17/04|.|081|System testing complete. Begin testing with live customer data.|
+  |!/i/w.gif!|12/17/04|.|070|System testing complete. Begin testing with live customer data.|
+out: |-
+  <table>
+  		<tr style="background:#ddd;">
+  			<td>S</td>
+  			<td>Target</td>
+  			<td>Complete</td>
+  			<td>App</td>
+  			<td>Milestone</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/g.gif" alt="" /></td>
+  			<td>11/18/04</td>
+  			<td>11/18/04</td>
+  			<td>070</td>
+  			<td>XML spec complete</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/g.gif" alt="" /></td>
+  			<td>11/29/04</td>
+  			<td>11/29/04</td>
+  			<td>011</td>
+  			<td>XML spec complete (KH is on schedule)</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/g.gif" alt="" /></td>
+  			<td>11/29/04</td>
+  			<td>11/29/04</td>
+  			<td>051</td>
+  			<td>XML spec complete (KH is on schedule)</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/g.gif" alt="" /></td>
+  			<td>11/29/04</td>
+  			<td>11/29/04</td>
+  			<td>081</td>
+  			<td>XML spec complete (KH is on schedule)</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/g.gif" alt="" /></td>
+  			<td>11/19/04</td>
+  			<td>11/22/04</td>
+  			<td>070</td>
+  			<td>Preprocessor complete</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/g.gif" alt="" /></td>
+  			<td>11/22/04</td>
+  			<td>11/22/04</td>
+  			<td>070</td>
+  			<td>Dialog pass 1 builds an index file</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/g.gif" alt="" /></td>
+  			<td>11/24/04</td>
+  			<td>11/24/04</td>
+  			<td>070</td>
+  			<td>Dialog pass 2 98% complete</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/g.gif" alt="" /></td>
+  			<td>11/30/04</td>
+  			<td>11/30/04</td>
+  			<td>070</td>
+  			<td>Feature complete. Passes end-to-end smoke test.</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/g.gif" alt="" /></td>
+  			<td>11/30/04</td>
+  			<td>11/30/04</td>
+  			<td>011</td>
+  			<td>Preprocessor updates complete</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/g.gif" alt="" /></td>
+  			<td>11/30/04</td>
+  			<td>11/30/04</td>
+  			<td>051</td>
+  			<td>Preprocessor updates complete</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/g.gif" alt="" /></td>
+  			<td>11/30/04</td>
+  			<td>11/29/04</td>
+  			<td>081</td>
+  			<td>Preprocessor updates complete</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/02/04</td>
+  			<td>011</td>
+  			<td>Dialog pass 1 and 2 complete (98+%)</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/02/04</td>
+  			<td>051</td>
+  			<td>Dialog pass 1 and 2 complete (98+%)</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/02/04</td>
+  			<td>081</td>
+  			<td>Dialog pass 1 and 2 complete (98+%)</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/03/04</td>
+  			<td>011</td>
+  			<td>Feature complete</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/03/04</td>
+  			<td>051</td>
+  			<td>Feature complete</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/03/04</td>
+  			<td>081</td>
+  			<td>Feature complete</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/10/04</td>
+  			<td>011</td>
+  			<td>Deployed to Napa test workstation. Passes smoke test.</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/10/04</td>
+  			<td>051</td>
+  			<td>Deployed to Napa test workstation. Passes smoke test.</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/10/04</td>
+  			<td>081</td>
+  			<td>Deployed to Napa test workstation. Passes smoke test.</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/10/04</td>
+  			<td>070</td>
+  			<td>Deployed to Napa test workstation. Passes smoke test.</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/17/04</td>
+  			<td>011</td>
+  			<td>System testing complete. Begin testing with live customer data.</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/17/04</td>
+  			<td>051</td>
+  			<td>System testing complete. Begin testing with live customer data.</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/17/04</td>
+  			<td>081</td>
+  			<td>System testing complete. Begin testing with live customer data.</td>
+  		</tr>
+  		<tr>
+  			<td><img src="/i/w.gif" alt="" /></td>
+  			<td>12/17/04</td>
+  			<td>070</td>
+  			<td>System testing complete. Begin testing with live customer data.</td>
+  		</tr>
+  	</table>