URL autolinking bypasses inlined HTML (or any other URL preceded by double or single quote)

app/models/chunks/uri.rb

@@ -68,12 +68,13 @@ class URIChunk < Chunk::Abstract
         "(#{ABS_PATH})?"  +           # Optional absolute path  (\5)
         "(?:\\?(#{QUERY}))?" +        # Optional ?query         (\6)
         "(?:\\#(#{FRAGMENT}))?"  +    # Optional #fragment      (\7)
-        '(?=\.?(?:\s|\)|\z))'       # ends only with 
+        '(?=\.?(?:\s|\)|\z))'         # ends only with optional dot + space or ")" 
-                                    # optional dot +  space or ")" or end of string  
+                                      # or end of the string
 
-    TEXTILE_SYNTAX_PREFIX = '(!|\"\:)?'  # ! or ":
+    SUSPICIOUS_PRECEDING_CHARACTER = '(!|\"\:|\"|\\\')?'  # any of !, ":, ", '
   
-    INTERNET_URI_REGEXP = Regexp.new(TEXTILE_SYNTAX_PREFIX + INTERNET_URI, Regexp::EXTENDED, 'N')
+    INTERNET_URI_REGEXP = 
+        Regexp.new(SUSPICIOUS_PRECEDING_CHARACTER + INTERNET_URI, Regexp::EXTENDED, 'N')
 
   end
 
@@ -86,7 +87,7 @@ class URIChunk < Chunk::Abstract
   def self.apply_to(content)
     content.gsub!( self.pattern ) do |matched_text|
       chunk = self.new($~)
-      if chunk.textile_url? or chunk.textile_image?
+      if chunk.avoid_autolinking?
         # do not substitute
         matched_text
       else
@@ -99,17 +100,13 @@ class URIChunk < Chunk::Abstract
   def initialize(match_data)
     super(match_data)
     @link_text = match_data[0]
-    @textile_prefix, @original_scheme, @user, @host, @port, @path, @query, @fragment = 
+    @suspicious_preceding_character = match_data[1]
-        match_data[1..-1]
+    @original_scheme, @user, @host, @port, @path, @query, @fragment = match_data[2..-1]
     treat_trailing_character
   end
 
-  def textile_url?
+  def avoid_autolinking?
-    @textile_prefix == '":'
+    not @suspicious_preceding_character.nil?
-  end
-
-  def textile_image?
-    @textile_prefix == '!' and @trailing_punctuation == '!'
   end
 
   def treat_trailing_character
@@ -121,6 +118,8 @@ class URIChunk < Chunk::Abstract
       @trailing_punctuation = last_char
       @link_text.chop!
       [@original_scheme, @user, @host, @port, @path, @query, @fragment].compact.last.chop!
+    else 
+      @trailing_punctuation = nil
     end
   end
 
@@ -180,9 +179,11 @@ class LocalURIChunk < URIChunk
         "(?::(#{PORT}))?" +           # Optional :port          (\4)
         "(#{ABS_PATH})?"  +           # Optional absolute path  (\5)
         "(?:\\?(#{QUERY}))?" +        # Optional ?query         (\6)
-           "(?:\\#(#{FRAGMENT}))?"  # Optional #fragment      (\7)
+        "(?:\\#(#{FRAGMENT}))?" +     # Optional #fragment      (\7)
+        '(?=\.?(?:\s|\)|\z))'         # ends only with optional dot + space or ")" 
+                                      # or end of the string
   
-    LOCAL_URI_REGEXP = Regexp.new(TEXTILE_SYNTAX_PREFIX + LOCAL_URI, Regexp::EXTENDED, 'N')
+    LOCAL_URI_REGEXP = Regexp.new(SUSPICIOUS_PRECEDING_CHARACTER + LOCAL_URI, Regexp::EXTENDED, 'N')
   end
 
   def LocalURIChunk.pattern

app/models/revision.rb

@@ -12,6 +12,7 @@ class Revision
   def initialize(page, number, content, created_at, author)
     @page, @number, @created_at, @author = page, number, created_at, author
     self.content = content
+    @display_cache = nil
   end
 
   def created_on

test/unit/revision_test.rb

@@ -139,6 +139,15 @@ class RevisionTest < Test::Unit::TestCase
 	    'This !http://hobix.com/sample.jpg! is a Textile image link.')
   end
 
+  def test_content_with_inlined_img_tag
+	assert_markup_parsed_as( 
+	    '<p>This <img src="http://hobix.com/sample.jpg" alt="" /> is an inline image link.</p>', 
+	    'This <img src="http://hobix.com/sample.jpg" alt="" /> is an inline image link.')
+	assert_markup_parsed_as( 
+	    '<p>This <IMG SRC="http://hobix.com/sample.jpg" alt=""> is an inline image link.</p>', 
+	    'This <IMG SRC="http://hobix.com/sample.jpg" alt=""> is an inline image link.')
+  end
+
   def test_content_with_nowiki_text
 	assert_markup_parsed_as( 
 	    '<p>Do not mark up [[this text]] or http://www.thislink.com.</p>', 

test/unit/uri_test.rb

@@ -132,6 +132,11 @@ class URITest < Test::Unit::TestCase
           :link_text => 'http://hobix.com/sample.jpg')
   end
   
+  def test_inline_html
+    assert_conversion_does_not_apply(URIChunk, '<IMG SRC="http://hobix.com/sample.jpg">')
+    assert_conversion_does_not_apply(URIChunk, "<img src='http://hobix.com/sample.jpg'/>")
+  end
+
   def test_non_uri
     # "so" is a valid country code; "libproxy.so" is a valid url
     match(URIChunk, 'libproxy.so', :link_text => 'libproxy.so')