From f3cdc7f272e409d391979d3e6c58dd63573530c0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 24 Aug 2009 15:46:12 -0400
Subject: Add unit test directory and first test

---
 tests/URLDetectionTest.php | 189 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100644 tests/URLDetectionTest.php

(limited to 'tests')

diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
new file mode 100644
index 000000000..f35b03eaf
--- /dev/null
+++ b/tests/URLDetectionTest.php
@@ -0,0 +1,189 @@
+<?php
+
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+    print "This script must be run from the command line\n";
+    exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once INSTALLDIR . '/lib/common.php';
+
+class URLDetectionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provider
+     *
+     */
+    public function testProduction($content, $expected)
+    {
+        $rendered = common_render_text($content);
+        $this->assertEquals($expected, $rendered);
+    }
+
+    static public function provider()
+    {
+        return array(
+                     array('example',
+                           'example'),
+                     array('http://example',
+                           'http://example'),
+                     array('http://example/',
+                           'http://example/'),
+                     array('http://example/path',
+                           'http://example/path'),
+                     array('http://example.com',
+                           '<a href="http://example.com" class="extlink">http://example.com</a>'),
+                     array('https://example.com',
+                           '<a href="https://example.com" class="extlink">https://example.com</a>'),
+                     array('ftp://example.com',
+                           '<a href="ftp://example.com" class="extlink">ftp://example.com</a>'),
+                     array('ftps://example.com',
+                           '<a href="ftps://example.com" class="extlink">ftps://example.com</a>'),
+                     array('http://user@example.com',
+                           '<a href="http://user@example.com" class="extlink">http://user@example.com</a>'),
+                     array('http://user:pass@example.com',
+                           '<a href="http://user:pass@example.com" class="extlink">http://user:pass@example.com</a>'),
+                     array('http://example.com:8080',
+                           '<a href="http://example.com:8080" class="extlink">http://example.com:8080</a>'),
+                     array('http://www.example.com',
+                           '<a href="http://www.example.com" class="extlink">http://www.example.com</a>'),
+                     array('http://example.com/',
+                           '<a href="http://example.com/" class="extlink">http://example.com/</a>'),
+                     array('http://example.com/path',
+                           '<a href="http://example.com/path" class="extlink">http://example.com/path</a>'),
+                     array('http://example.com/path.html',
+                           '<a href="http://example.com/path.html" class="extlink">http://example.com/path.html</a>'),
+                     array('http://example.com/path.html#fragment',
+                           '<a href="http://example.com/path.html#fragment" class="extlink">http://example.com/path.html#fragment</a>'),
+                     array('http://example.com/path.php?foo=bar&bar=foo',
+                           '<a href="http://example.com/path.php?foo=bar&bar=foo" class="extlink">http://example.com/path.php?foo=bar&bar=foo</a>'),
+                     array('http://müllärör.de',
+                           '<a href="http://müllärör.de" class="extlink">http://müllärör.de</a>'),
+                     array('http://ﺱﺲﺷ.com',
+                           '<a href="http://ﺱﺲﺷ.com" class="extlink">http://ﺱﺲﺷ.com</a>'),
+                     array('http://сделаткартинки.com',
+                           '<a href="http://сделаткартинки.com" class="extlink">http://сделаткартинки.com</a>'),
+                     array('http://tūdaliņ.lv',
+                           '<a href="http://tūdaliņ.lv" class="extlink">http://tūdaliņ.lv</a>'),
+                     array('http://brændendekærlighed.com',
+                           '<a href="http://brændendekærlighed.com" class="extlink">http://brændendekærlighed.com</a>'),
+                     array('http://あーるいん.com',
+                           '<a href="http://あーるいん.com" class="extlink">http://あーるいん.com</a>'),
+                     array('http://예비교사.com',
+                           '<a href="http://예비교사.com" class="extlink">http://예비교사.com</a>'),
+                     array('http://example.com.',
+                           '<a href="http://example.com" class="extlink">http://example.com</a>.'),
+                     array('http://example.com?',
+                           '<a href="http://example.com" class="extlink">http://example.com</a>?'),
+                     array('http://example.com!',
+                           '<a href="http://example.com" class="extlink">http://example.com</a>!'),
+                     array('http://example.com,',
+                           '<a href="http://example.com" class="extlink">http://example.com</a>,'),
+                     array('http://example.com;',
+                           '<a href="http://example.com" class="extlink">http://example.com</a>;'),
+                     array('http://example.com:',
+                           '<a href="http://example.com" class="extlink">http://example.com</a>:'),
+                     array('\'http://example.com\'',
+                           '\'<a href="http://example.com" class="extlink">http://example.com</a>\''),
+                     array('"http://example.com"',
+                           '"<a href="http://example.com" class="extlink">http://example.com</a>"'),
+                     array('http://example.com
',
+                           '<a href="http://example.com" class="extlink">http://example.com</a>'),
+                     array('(http://example.com)',
+                           '(<a href="http://example.com" class="extlink">http://example.com</a>)'),
+                     array('[http://example.com]',
+                           '[<a href="http://example.com" class="extlink">http://example.com</a>]'),
+                     array('<http://example.com>',
+                           '<<a href="http://example.com" class="extlink">http://example.com</a>>'),
+                     array('http://example.com/path/(foo)/bar',
+                           '<a href="http://example.com/path/(foo)/bar" class="extlink">http://example.com/path/(foo)/bar</a>'),
+                     array('http://example.com/path/[foo]/bar',
+                           '<a href="http://example.com/path/[foo]/bar" class="extlink">http://example.com/path/[foo]/bar</a>'),
+                     array('http://example.com/path/foo/(bar)',
+                           '<a href="http://example.com/path/foo/(bar)" class="extlink">http://example.com/path/foo/(bar)</a>'),
+                     array('http://example.com/path/foo/[bar]',
+                           '<a href="http://example.com/path/foo/[bar]" class="extlink">http://example.com/path/foo/[bar]</a>'),
+                     array('Hey, check out my cool site http://example.com okay?',
+                           'Hey, check out my cool site <a href="http://example.com" class="extlink">http://example.com</a> okay?'),
+                     array('What about parens (e.g. http://example.com/path/foo/(bar))?',
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">http://example.com/path/foo/(bar)</a>)?'),
+                     array('What about parens (e.g. http://example.com/path/foo/(bar)?',
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">http://example.com/path/foo/(bar)</a>?'),
+                     array('What about parens (e.g. http://example.com/path/foo/(bar).)?',
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">http://example.com/path/foo/(bar)</a>.)?'),
+                     array('What about parens (e.g. http://example.com/path/(foo,bar)?',
+                           'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" class="extlink">http://example.com/path/(foo,bar)</a>?'),
+                     array('Unbalanced too (e.g. http://example.com/path/((((foo)/bar)?',
+                           'Unbalanced too (e.g. <a href="http://example.com/path/((((foo)/bar)" class="extlink">http://example.com/path/((((foo)/bar)</a>?'),
+                     array('Unbalanced too (e.g. http://example.com/path/(foo))))/bar)?',
+                           'Unbalanced too (e.g. <a href="http://example.com/path/(foo))))/bar" class="extlink">http://example.com/path/(foo))))/bar</a>)?'),
+                     array('Unbalanced too (e.g. http://example.com/path/foo/((((bar)?',
+                           'Unbalanced too (e.g. <a href="http://example.com/path/foo/((((bar)" class="extlink">http://example.com/path/foo/((((bar)</a>?'),
+                     array('Unbalanced too (e.g. http://example.com/path/foo/(bar))))?',
+                           'Unbalanced too (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">http://example.com/path/foo/(bar)</a>)))?'),
+                     array('example.com',
+                           '<a href="http://example.com" class="extlink">example.com</a>'),
+                     array('example.org',
+                           '<a href="http://example.org" class="extlink">example.org</a>'),
+                     array('example.co.uk',
+                           '<a href="http://example.co.uk" class="extlink">example.co.uk</a>'),
+                     array('www.example.co.uk',
+                           '<a href="http://www.example.co.uk" class="extlink">www.example.co.uk</a>'),
+                     array('farm1.images.example.co.uk',
+                           '<a href="http://farm1.images.example.co.uk" class="extlink">farm1.images.example.co.uk</a>'),
+                     array('example.museum',
+                           '<a href="http://example.museum" class="extlink">example.museum</a>'),
+                     array('example.travel',
+                           '<a href="http://example.travel" class="extlink">example.travel</a>'),
+                     array('example.com.',
+                           '<a href="http://example.com" class="extlink">example.com</a>.'),
+                     array('example.com?',
+                           '<a href="http://example.com" class="extlink">example.com</a>?'),
+                     array('example.com!',
+                           '<a href="http://example.com" class="extlink">example.com</a>!'),
+                     array('example.com,',
+                           '<a href="http://example.com" class="extlink">example.com</a>,'),
+                     array('example.com;',
+                           '<a href="http://example.com" class="extlink">example.com</a>;'),
+                     array('example.com:',
+                           '<a href="http://example.com" class="extlink">example.com</a>:'),
+                     array('\'example.com\'',
+                           '\'<a href="http://example.com" class="extlink">example.com</a>\''),
+                     array('"example.com"',
+                           '"<a href="http://example.com" class="extlink">example.com</a>"'),
+                     array('example.com
',
+                           '<a href="http://example.com" class="extlink">example.com</a>'),
+                     array('(example.com)',
+                           '(<a href="http://example.com" class="extlink">example.com</a>)'),
+                     array('[example.com]',
+                           '[<a href="http://example.com" class="extlink">example.com</a>]'),
+                     array('<example.com>',
+                           '<<a href="http://example.com" class="extlink">example.com</a>>'),
+                     array('Hey, check out my cool site example.com okay?',
+                           'Hey, check out my cool site <a href="http://example.com" class="extlink">example.com</a> okay?'),
+                     array('Hey, check out my cool site example.com.I made it.',
+                           'Hey, check out my cool site <a href="http://example.com" class="extlink">example.com</a>.I made it.'),
+                     array('Hey, check out my cool site example.com.Funny thing...',
+                           'Hey, check out my cool site <a href="http://example.com" class="extlink">example.com</a>.Funny thing...'),
+                     array('Hey, check out my cool site example.com.You will love it.',
+                           'Hey, check out my cool site <a href="http://example.com" class="extlink">example.com</a>.You will love it.'),
+                     array('What about parens (e.g. example.com/path/foo/(bar))?',
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">example.com/path/foo/(bar)</a>)?'),
+                     array('What about parens (e.g. example.com/path/foo/(bar)?',
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">example.com/path/foo/(bar)</a>?'),
+                     array('What about parens (e.g. example.com/path/foo/(bar).)?',
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">example.com/path/foo/(bar)</a>.)?'),
+                     array('What about parens (e.g. example.com/path/(foo,bar)?',
+                           'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" class="extlink">example.com/path/(foo,bar)</a>?'),
+                     array('file.ext',
+                           'file.ext'),
+                     array('file.html',
+                           'file.html'),
+                     array('file.php',
+                           'file.php')
+                     );
+    }
+}
+
-- 
cgit v1.2.3-54-g00ecf


From add42759c9ae1e8d765fa2098bd12ff8ba4d4eea Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 24 Aug 2009 17:48:24 -0400
Subject: change class to rel in unit tests for URL check

---
 tests/URLDetectionTest.php | 144 ++++++++++++++++++++++-----------------------
 1 file changed, 72 insertions(+), 72 deletions(-)

(limited to 'tests')

diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index f35b03eaf..ed29dc88e 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -34,149 +34,149 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('http://example/path',
                            'http://example/path'),
                      array('http://example.com',
-                           '<a href="http://example.com" class="extlink">http://example.com</a>'),
+                           '<a href="http://example.com" rel="external">http://example.com</a>'),
                      array('https://example.com',
-                           '<a href="https://example.com" class="extlink">https://example.com</a>'),
+                           '<a href="https://example.com" rel="external">https://example.com</a>'),
                      array('ftp://example.com',
-                           '<a href="ftp://example.com" class="extlink">ftp://example.com</a>'),
+                           '<a href="ftp://example.com" rel="external">ftp://example.com</a>'),
                      array('ftps://example.com',
-                           '<a href="ftps://example.com" class="extlink">ftps://example.com</a>'),
+                           '<a href="ftps://example.com" rel="external">ftps://example.com</a>'),
                      array('http://user@example.com',
-                           '<a href="http://user@example.com" class="extlink">http://user@example.com</a>'),
+                           '<a href="http://user@example.com" rel="external">http://user@example.com</a>'),
                      array('http://user:pass@example.com',
-                           '<a href="http://user:pass@example.com" class="extlink">http://user:pass@example.com</a>'),
+                           '<a href="http://user:pass@example.com" rel="external">http://user:pass@example.com</a>'),
                      array('http://example.com:8080',
-                           '<a href="http://example.com:8080" class="extlink">http://example.com:8080</a>'),
+                           '<a href="http://example.com:8080" rel="external">http://example.com:8080</a>'),
                      array('http://www.example.com',
-                           '<a href="http://www.example.com" class="extlink">http://www.example.com</a>'),
+                           '<a href="http://www.example.com" rel="external">http://www.example.com</a>'),
                      array('http://example.com/',
-                           '<a href="http://example.com/" class="extlink">http://example.com/</a>'),
+                           '<a href="http://example.com/" rel="external">http://example.com/</a>'),
                      array('http://example.com/path',
-                           '<a href="http://example.com/path" class="extlink">http://example.com/path</a>'),
+                           '<a href="http://example.com/path" rel="external">http://example.com/path</a>'),
                      array('http://example.com/path.html',
-                           '<a href="http://example.com/path.html" class="extlink">http://example.com/path.html</a>'),
+                           '<a href="http://example.com/path.html" rel="external">http://example.com/path.html</a>'),
                      array('http://example.com/path.html#fragment',
-                           '<a href="http://example.com/path.html#fragment" class="extlink">http://example.com/path.html#fragment</a>'),
+                           '<a href="http://example.com/path.html#fragment" rel="external">http://example.com/path.html#fragment</a>'),
                      array('http://example.com/path.php?foo=bar&bar=foo',
-                           '<a href="http://example.com/path.php?foo=bar&bar=foo" class="extlink">http://example.com/path.php?foo=bar&bar=foo</a>'),
+                           '<a href="http://example.com/path.php?foo=bar&bar=foo" rel="external">http://example.com/path.php?foo=bar&bar=foo</a>'),
                      array('http://müllärör.de',
-                           '<a href="http://müllärör.de" class="extlink">http://müllärör.de</a>'),
+                           '<a href="http://müllärör.de" rel="external">http://müllärör.de</a>'),
                      array('http://ﺱﺲﺷ.com',
-                           '<a href="http://ﺱﺲﺷ.com" class="extlink">http://ﺱﺲﺷ.com</a>'),
+                           '<a href="http://ﺱﺲﺷ.com" rel="external">http://ﺱﺲﺷ.com</a>'),
                      array('http://сделаткартинки.com',
-                           '<a href="http://сделаткартинки.com" class="extlink">http://сделаткартинки.com</a>'),
+                           '<a href="http://сделаткартинки.com" rel="external">http://сделаткартинки.com</a>'),
                      array('http://tūdaliņ.lv',
-                           '<a href="http://tūdaliņ.lv" class="extlink">http://tūdaliņ.lv</a>'),
+                           '<a href="http://tūdaliņ.lv" rel="external">http://tūdaliņ.lv</a>'),
                      array('http://brændendekærlighed.com',
-                           '<a href="http://brændendekærlighed.com" class="extlink">http://brændendekærlighed.com</a>'),
+                           '<a href="http://brændendekærlighed.com" rel="external">http://brændendekærlighed.com</a>'),
                      array('http://あーるいん.com',
-                           '<a href="http://あーるいん.com" class="extlink">http://あーるいん.com</a>'),
+                           '<a href="http://あーるいん.com" rel="external">http://あーるいん.com</a>'),
                      array('http://예비교사.com',
-                           '<a href="http://예비교사.com" class="extlink">http://예비교사.com</a>'),
+                           '<a href="http://예비교사.com" rel="external">http://예비교사.com</a>'),
                      array('http://example.com.',
-                           '<a href="http://example.com" class="extlink">http://example.com</a>.'),
+                           '<a href="http://example.com" rel="external">http://example.com</a>.'),
                      array('http://example.com?',
-                           '<a href="http://example.com" class="extlink">http://example.com</a>?'),
+                           '<a href="http://example.com" rel="external">http://example.com</a>?'),
                      array('http://example.com!',
-                           '<a href="http://example.com" class="extlink">http://example.com</a>!'),
+                           '<a href="http://example.com" rel="external">http://example.com</a>!'),
                      array('http://example.com,',
-                           '<a href="http://example.com" class="extlink">http://example.com</a>,'),
+                           '<a href="http://example.com" rel="external">http://example.com</a>,'),
                      array('http://example.com;',
-                           '<a href="http://example.com" class="extlink">http://example.com</a>;'),
+                           '<a href="http://example.com" rel="external">http://example.com</a>;'),
                      array('http://example.com:',
-                           '<a href="http://example.com" class="extlink">http://example.com</a>:'),
+                           '<a href="http://example.com" rel="external">http://example.com</a>:'),
                      array('\'http://example.com\'',
-                           '\'<a href="http://example.com" class="extlink">http://example.com</a>\''),
+                           '\'<a href="http://example.com" rel="external">http://example.com</a>\''),
                      array('"http://example.com"',
-                           '"<a href="http://example.com" class="extlink">http://example.com</a>"'),
+                           '"<a href="http://example.com" rel="external">http://example.com</a>"'),
                      array('http://example.com
',
-                           '<a href="http://example.com" class="extlink">http://example.com</a>'),
+                           '<a href="http://example.com" rel="external">http://example.com</a>'),
                      array('(http://example.com)',
-                           '(<a href="http://example.com" class="extlink">http://example.com</a>)'),
+                           '(<a href="http://example.com" rel="external">http://example.com</a>)'),
                      array('[http://example.com]',
-                           '[<a href="http://example.com" class="extlink">http://example.com</a>]'),
+                           '[<a href="http://example.com" rel="external">http://example.com</a>]'),
                      array('<http://example.com>',
-                           '<<a href="http://example.com" class="extlink">http://example.com</a>>'),
+                           '<<a href="http://example.com" rel="external">http://example.com</a>>'),
                      array('http://example.com/path/(foo)/bar',
-                           '<a href="http://example.com/path/(foo)/bar" class="extlink">http://example.com/path/(foo)/bar</a>'),
+                           '<a href="http://example.com/path/(foo)/bar" rel="external">http://example.com/path/(foo)/bar</a>'),
                      array('http://example.com/path/[foo]/bar',
-                           '<a href="http://example.com/path/[foo]/bar" class="extlink">http://example.com/path/[foo]/bar</a>'),
+                           '<a href="http://example.com/path/[foo]/bar" rel="external">http://example.com/path/[foo]/bar</a>'),
                      array('http://example.com/path/foo/(bar)',
-                           '<a href="http://example.com/path/foo/(bar)" class="extlink">http://example.com/path/foo/(bar)</a>'),
+                           '<a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>'),
                      array('http://example.com/path/foo/[bar]',
-                           '<a href="http://example.com/path/foo/[bar]" class="extlink">http://example.com/path/foo/[bar]</a>'),
+                           '<a href="http://example.com/path/foo/[bar]" rel="external">http://example.com/path/foo/[bar]</a>'),
                      array('Hey, check out my cool site http://example.com okay?',
-                           'Hey, check out my cool site <a href="http://example.com" class="extlink">http://example.com</a> okay?'),
+                           'Hey, check out my cool site <a href="http://example.com" rel="external">http://example.com</a> okay?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar))?',
-                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">http://example.com/path/foo/(bar)</a>)?'),
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar)?',
-                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">http://example.com/path/foo/(bar)</a>?'),
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar).)?',
-                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">http://example.com/path/foo/(bar)</a>.)?'),
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>.)?'),
                      array('What about parens (e.g. http://example.com/path/(foo,bar)?',
-                           'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" class="extlink">http://example.com/path/(foo,bar)</a>?'),
+                           'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" rel="external">http://example.com/path/(foo,bar)</a>?'),
                      array('Unbalanced too (e.g. http://example.com/path/((((foo)/bar)?',
-                           'Unbalanced too (e.g. <a href="http://example.com/path/((((foo)/bar)" class="extlink">http://example.com/path/((((foo)/bar)</a>?'),
+                           'Unbalanced too (e.g. <a href="http://example.com/path/((((foo)/bar)" rel="external">http://example.com/path/((((foo)/bar)</a>?'),
                      array('Unbalanced too (e.g. http://example.com/path/(foo))))/bar)?',
-                           'Unbalanced too (e.g. <a href="http://example.com/path/(foo))))/bar" class="extlink">http://example.com/path/(foo))))/bar</a>)?'),
+                           'Unbalanced too (e.g. <a href="http://example.com/path/(foo))))/bar" rel="external">http://example.com/path/(foo))))/bar</a>)?'),
                      array('Unbalanced too (e.g. http://example.com/path/foo/((((bar)?',
-                           'Unbalanced too (e.g. <a href="http://example.com/path/foo/((((bar)" class="extlink">http://example.com/path/foo/((((bar)</a>?'),
+                           'Unbalanced too (e.g. <a href="http://example.com/path/foo/((((bar)" rel="external">http://example.com/path/foo/((((bar)</a>?'),
                      array('Unbalanced too (e.g. http://example.com/path/foo/(bar))))?',
-                           'Unbalanced too (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">http://example.com/path/foo/(bar)</a>)))?'),
+                           'Unbalanced too (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)))?'),
                      array('example.com',
-                           '<a href="http://example.com" class="extlink">example.com</a>'),
+                           '<a href="http://example.com" rel="external">example.com</a>'),
                      array('example.org',
-                           '<a href="http://example.org" class="extlink">example.org</a>'),
+                           '<a href="http://example.org" rel="external">example.org</a>'),
                      array('example.co.uk',
-                           '<a href="http://example.co.uk" class="extlink">example.co.uk</a>'),
+                           '<a href="http://example.co.uk" rel="external">example.co.uk</a>'),
                      array('www.example.co.uk',
-                           '<a href="http://www.example.co.uk" class="extlink">www.example.co.uk</a>'),
+                           '<a href="http://www.example.co.uk" rel="external">www.example.co.uk</a>'),
                      array('farm1.images.example.co.uk',
-                           '<a href="http://farm1.images.example.co.uk" class="extlink">farm1.images.example.co.uk</a>'),
+                           '<a href="http://farm1.images.example.co.uk" rel="external">farm1.images.example.co.uk</a>'),
                      array('example.museum',
-                           '<a href="http://example.museum" class="extlink">example.museum</a>'),
+                           '<a href="http://example.museum" rel="external">example.museum</a>'),
                      array('example.travel',
-                           '<a href="http://example.travel" class="extlink">example.travel</a>'),
+                           '<a href="http://example.travel" rel="external">example.travel</a>'),
                      array('example.com.',
-                           '<a href="http://example.com" class="extlink">example.com</a>.'),
+                           '<a href="http://example.com" rel="external">example.com</a>.'),
                      array('example.com?',
-                           '<a href="http://example.com" class="extlink">example.com</a>?'),
+                           '<a href="http://example.com" rel="external">example.com</a>?'),
                      array('example.com!',
-                           '<a href="http://example.com" class="extlink">example.com</a>!'),
+                           '<a href="http://example.com" rel="external">example.com</a>!'),
                      array('example.com,',
-                           '<a href="http://example.com" class="extlink">example.com</a>,'),
+                           '<a href="http://example.com" rel="external">example.com</a>,'),
                      array('example.com;',
-                           '<a href="http://example.com" class="extlink">example.com</a>;'),
+                           '<a href="http://example.com" rel="external">example.com</a>;'),
                      array('example.com:',
-                           '<a href="http://example.com" class="extlink">example.com</a>:'),
+                           '<a href="http://example.com" rel="external">example.com</a>:'),
                      array('\'example.com\'',
-                           '\'<a href="http://example.com" class="extlink">example.com</a>\''),
+                           '\'<a href="http://example.com" rel="external">example.com</a>\''),
                      array('"example.com"',
-                           '"<a href="http://example.com" class="extlink">example.com</a>"'),
+                           '"<a href="http://example.com" rel="external">example.com</a>"'),
                      array('example.com
',
-                           '<a href="http://example.com" class="extlink">example.com</a>'),
+                           '<a href="http://example.com" rel="external">example.com</a>'),
                      array('(example.com)',
-                           '(<a href="http://example.com" class="extlink">example.com</a>)'),
+                           '(<a href="http://example.com" rel="external">example.com</a>)'),
                      array('[example.com]',
-                           '[<a href="http://example.com" class="extlink">example.com</a>]'),
+                           '[<a href="http://example.com" rel="external">example.com</a>]'),
                      array('<example.com>',
-                           '<<a href="http://example.com" class="extlink">example.com</a>>'),
+                           '<<a href="http://example.com" rel="external">example.com</a>>'),
                      array('Hey, check out my cool site example.com okay?',
-                           'Hey, check out my cool site <a href="http://example.com" class="extlink">example.com</a> okay?'),
+                           'Hey, check out my cool site <a href="http://example.com" rel="external">example.com</a> okay?'),
                      array('Hey, check out my cool site example.com.I made it.',
-                           'Hey, check out my cool site <a href="http://example.com" class="extlink">example.com</a>.I made it.'),
+                           'Hey, check out my cool site <a href="http://example.com" rel="external">example.com</a>.I made it.'),
                      array('Hey, check out my cool site example.com.Funny thing...',
-                           'Hey, check out my cool site <a href="http://example.com" class="extlink">example.com</a>.Funny thing...'),
+                           'Hey, check out my cool site <a href="http://example.com" rel="external">example.com</a>.Funny thing...'),
                      array('Hey, check out my cool site example.com.You will love it.',
-                           'Hey, check out my cool site <a href="http://example.com" class="extlink">example.com</a>.You will love it.'),
+                           'Hey, check out my cool site <a href="http://example.com" rel="external">example.com</a>.You will love it.'),
                      array('What about parens (e.g. example.com/path/foo/(bar))?',
-                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">example.com/path/foo/(bar)</a>)?'),
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>)?'),
                      array('What about parens (e.g. example.com/path/foo/(bar)?',
-                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">example.com/path/foo/(bar)</a>?'),
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>?'),
                      array('What about parens (e.g. example.com/path/foo/(bar).)?',
-                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" class="extlink">example.com/path/foo/(bar)</a>.)?'),
+                           'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>.)?'),
                      array('What about parens (e.g. example.com/path/(foo,bar)?',
-                           'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" class="extlink">example.com/path/(foo,bar)</a>?'),
+                           'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" rel="external">example.com/path/(foo,bar)</a>?'),
                      array('file.ext',
                            'file.ext'),
                      array('file.html',
-- 
cgit v1.2.3-54-g00ecf


From 9fd3a41576bd5365f9156b47490eecddfb2aa842 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 24 Aug 2009 20:44:06 -0400
Subject: ftps protocol should be handled the same way as ftp Canon urls that
 have a protocol followed by a host (and no path) automatcally get a trailing
 slash by the canon function - make the unit test match that

---
 classes/File_redirection.php |  2 +-
 tests/URLDetectionTest.php   | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'tests')

diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index d6fa0bcb6..363e3b947 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -182,7 +182,7 @@ class File_redirection extends Memcached_DataObject
             }
         }
 
-        if (('ftp' == $p['scheme']) || ('http' == $p['scheme']) || ('https' == $p['scheme'])) {
+        if (('ftp' == $p['scheme']) || ('ftps' == $p['scheme']) || ('http' == $p['scheme']) || ('https' == $p['scheme'])) {
             if (empty($p['host'])) return false;
             if (empty($p['path'])) {
                 $out_url .= '/';
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index ed29dc88e..e69f1a2c3 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -28,27 +28,27 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('example',
                            'example'),
                      array('http://example',
-                           'http://example'),
+                           '<a href="http://example/" rel="external">http://example</a>'),
                      array('http://example/',
-                           'http://example/'),
+                           '<a href="http://example/" rel="external">http://example/</a>'),
                      array('http://example/path',
-                           'http://example/path'),
+                           '<a href="http://example/path" rel="external">http://example/path</a>'),
                      array('http://example.com',
-                           '<a href="http://example.com" rel="external">http://example.com</a>'),
+                           '<a href="http://example.com/" rel="external">http://example.com</a>'),
                      array('https://example.com',
-                           '<a href="https://example.com" rel="external">https://example.com</a>'),
+                           '<a href="https://example.com/" rel="external">https://example.com</a>'),
                      array('ftp://example.com',
-                           '<a href="ftp://example.com" rel="external">ftp://example.com</a>'),
+                           '<a href="ftp://example.com/" rel="external">ftp://example.com</a>'),
                      array('ftps://example.com',
-                           '<a href="ftps://example.com" rel="external">ftps://example.com</a>'),
+                           '<a href="ftps://example.com/" rel="external">ftps://example.com</a>'),
                      array('http://user@example.com',
-                           '<a href="http://user@example.com" rel="external">http://user@example.com</a>'),
+                           '<a href="http://user@example.com/" rel="external">http://user@example.com</a>'),
                      array('http://user:pass@example.com',
-                           '<a href="http://user:pass@example.com" rel="external">http://user:pass@example.com</a>'),
+                           '<a href="http://user:pass@example.com/" rel="external">http://user:pass@example.com</a>'),
                      array('http://example.com:8080',
-                           '<a href="http://example.com:8080" rel="external">http://example.com:8080</a>'),
+                           '<a href="http://example.com:8080/" rel="external">http://example.com:8080</a>'),
                      array('http://www.example.com',
-                           '<a href="http://www.example.com" rel="external">http://www.example.com</a>'),
+                           '<a href="http://www.example.com/" rel="external">http://www.example.com</a>'),
                      array('http://example.com/',
                            '<a href="http://example.com/" rel="external">http://example.com/</a>'),
                      array('http://example.com/path',
@@ -58,7 +58,7 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('http://example.com/path.html#fragment',
                            '<a href="http://example.com/path.html#fragment" rel="external">http://example.com/path.html#fragment</a>'),
                      array('http://example.com/path.php?foo=bar&bar=foo',
-                           '<a href="http://example.com/path.php?foo=bar&bar=foo" rel="external">http://example.com/path.php?foo=bar&bar=foo</a>'),
+                           '<a href="http://example.com/path.php?foo=bar&amp;bar=foo" rel="external">http://example.com/path.php?foo=bar&amp;bar=foo</a>'),
                      array('http://müllärör.de',
                            '<a href="http://müllärör.de" rel="external">http://müllärör.de</a>'),
                      array('http://ﺱﺲﺷ.com',
-- 
cgit v1.2.3-54-g00ecf


From 3ff67b3bc185be255d0b54f7f9af7c9578b4330b Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Tue, 25 Aug 2009 10:33:16 +1200
Subject: beginning of hashtag tests

---
 tests/HashTagDetectionTest.php | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 tests/HashTagDetectionTest.php

(limited to 'tests')

diff --git a/tests/HashTagDetectionTest.php b/tests/HashTagDetectionTest.php
new file mode 100644
index 000000000..71137b0b5
--- /dev/null
+++ b/tests/HashTagDetectionTest.php
@@ -0,0 +1,35 @@
+<?php
+
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+    print "This script must be run from the command line\n";
+    exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once INSTALLDIR . '/lib/common.php';
+
+class HashTagDetectionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provider
+     *
+     */
+    public function testProduction($content, $expected)
+    {
+        $rendered = common_render_text($content);
+        $this->assertEquals($expected, $rendered);
+    }
+
+    static public function provider()
+    {
+        return array(
+                     array('hello',
+                           'hello'),
+                     array('#hello',
+                           '<a href="/tag/hello">hello</a>'),
+                     );
+    }
+}
+
-- 
cgit v1.2.3-54-g00ecf


From 6a3a25b5a2b65e54841cc60c4f2254f6d7b6b54b Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 25 Aug 2009 11:21:45 -0400
Subject: Improved the URL tests, and improve the matcher so more tests are
 passed. The remaining failing tests I believe are incorrect.

---
 lib/util.php               |  24 ++++----
 tests/URLDetectionTest.php | 143 ++++++++++++++++++++++++++++++---------------
 2 files changed, 110 insertions(+), 57 deletions(-)

(limited to 'tests')

diff --git a/lib/util.php b/lib/util.php
index 2be4213e7..ee3fe5ddc 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -412,30 +412,34 @@ function common_render_text($text)
 function common_replace_urls_callback($text, $callback, $notice_id = null) {
     // Start off with a regex
     $regex = '#'.
-    '(?:^|[\s\(\)\[\]\{\}]+)'.
-        '('.
+    '(?:^|[\s\(\)\[\]\{\}\\\'\\\";]+)(?![\@\!\#])'.
+    '('.
         '(?:'.
             '(?:'. //Known protocols
                 '(?:'.
                     '(?:https?|ftps?|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|irc)://'.
                     '|'.
                     '(?:mailto|aim|tel|xmpp):'.
-                ')[^\s\/]+'.
+                ')'.
+                '(?:[\pN\pL\-\_\+]+(?:\:[\pN\pL\-\_\+]+)?\@)?'. //user:pass@
+                '[\pN\pL\-\_\:\.]+(?<![\.\:])'. //dns
             ')'.
             '|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'. //IPv4
             '|(?:'. //IPv6
                 '(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}(?:(?:[0-9A-Fa-f]{1,4})|:))|(?:(?:[0-9A-Fa-f]{1,4}:){6}(?::|(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})|(?::[0-9A-Fa-f]{1,4})))|(?:(?:[0-9A-Fa-f]{1,4}:){5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){4}(?::[0-9A-Fa-f]{1,4}){0,1}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){3}(?::[0-9A-Fa-f]{1,4}){0,2}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){2}(?::[0-9A-Fa-f]{1,4}){0,3}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:)(?::[0-9A-Fa-f]{1,4}){0,4}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?::(?::[0-9A-Fa-f]{1,4}){0,5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))'.
             ')|(?:'. //DNS
-                '\S+\.(?:museum|travel|onion|local|[a-z]{2,4})'.
-            ')'.
+                '(?:[\pN\pL\-\_\+]+(?:\:[\pN\pL\-\_\+]+)?\@)?'. //user:pass@
+                '[\pN\pL\-\_]+(?:\.[\pN\pL\-\_]+)*\.(?:museum|travel|onion|local|[a-z]{2,4})'.
+            ')(?![\pN\pL\-\_])'.
         ')'.
         '(?:'.
-            '$|(?:'.
-                '/[^\s\(\)\[\]\{\}]*'.
-            ')'.
-        ')'.
+            '(?:\:\d+)?'. //:port
+            '(?:/[\pN\pL$\!\(\)\.\-\_\+\/\=\&\;]*)?'. // /path
+            '(?:\?[\pN\pL\$\!\(\)\.\-\_\+\/\=\&\;\/]*)?'. // ?query string
+            '(?:\#[\pN\pL$\!\(\)\.\-\_\+\/\=\&\;\/\?\#]*)?'. // #fragment
+        ')(?<![\?\.\,\#\)])'.
     ')'.
-    '#ix';
+    '#ixu';
     return preg_replace_callback($regex, curry(callback_helper,$callback,$notice_id) ,$text);
 }
 
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index e69f1a2c3..05c02d6bb 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -25,10 +25,50 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
     static public function provider()
     {
         return array(
+                     array('127.0.0.1',
+                           '<a href="http://127.0.0.1/" rel="external">127.0.0.1</a>'),
+                     array('127.0.0.1/test.php',
+                           '<a href="http://127.0.0.1/test.php" rel="external">127.0.0.1/test.php</a>'),
+                     array('http://::1/test.php',
+                           '<a href="http://::1/test.php" rel="external">http://::1/test.php</a>'),
+                     array('http://::1',
+                           '<a href="http://::1/" rel="external">http://::1</a>'),
+                     array('2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php',
+                           '<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php</a>'),
+                     array('2001:4978:1b5:0:21d:e0ff:fe66:59ab',
+                           '<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab</a>'),
+                     array('http://127.0.0.1',
+                           '<a href="http://127.0.0.1/" rel="external">http://127.0.0.1</a>'),
+                     array('example.com',
+                           '<a href="http://example.com/" rel="external">example.com</a>'),
+                     array('example.com',
+                           '<a href="http://example.com/" rel="external">example.com</a>'),
+                     array('http://example.com',
+                           '<a href="http://example.com/" rel="external">http://example.com</a>'),
+                     array('http://example.com.',
+                           '<a href="http://example.com/" rel="external">http://example.com</a>.'),
+                     array('/var/lib/example.so',
+                           '/var/lib/example.so'),
                      array('example',
                            'example'),
+                     array('user@example.com',
+                           '<a href="mailto:user@example.com" rel="external">user@example.com</a>'),
+                     array('user_name+other@example.com',
+                           '<a href="mailto:user_name+other@example.com" rel="external">user_name+other@example.com</a>'),
+                     array('mailto:user@example.com',
+                           '<a href="mailto:user@example.com" rel="external">mailto:user@example.com</a>'),
+                     array('mailto:user@example.com?subject=test',
+                           '<a href="mailto:user@example.com?subject=test" rel="external">mailto:user@example.com?subject=test</a>'),
+                     array('#example',
+                           '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('example'))) . '" rel="tag">example</a></span>'),
+                     array('#example.com',
+                           '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('example.com'))) . '" rel="tag">example.com</a></span>'),
+                     array('#.net',
+                           '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('.net'))) . '" rel="tag">.net</a></span>'),
                      array('http://example',
                            '<a href="http://example/" rel="external">http://example</a>'),
+                     array('http://3xampl3',
+                           '<a href="http://3xampl3/" rel="external">http://3xampl3</a>'),
                      array('http://example/',
                            '<a href="http://example/" rel="external">http://example/</a>'),
                      array('http://example/path',
@@ -47,6 +87,10 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                            '<a href="http://user:pass@example.com/" rel="external">http://user:pass@example.com</a>'),
                      array('http://example.com:8080',
                            '<a href="http://example.com:8080/" rel="external">http://example.com:8080</a>'),
+                     array('http://example.com:8080/test.php',
+                           '<a href="http://example.com:8080/test.php" rel="external">http://example.com:8080/test.php</a>'),
+                     array('example.com:8080/test.php',
+                           '<a href="http://example.com:8080/test.php" rel="external">example.com:8080/test.php</a>'),
                      array('http://www.example.com',
                            '<a href="http://www.example.com/" rel="external">http://www.example.com</a>'),
                      array('http://example.com/',
@@ -59,60 +103,65 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                            '<a href="http://example.com/path.html#fragment" rel="external">http://example.com/path.html#fragment</a>'),
                      array('http://example.com/path.php?foo=bar&bar=foo',
                            '<a href="http://example.com/path.php?foo=bar&amp;bar=foo" rel="external">http://example.com/path.php?foo=bar&amp;bar=foo</a>'),
+                     array('http://example.com.',
+                           '<a href="http://example.com/" rel="external">http://example.com</a>.'),
                      array('http://müllärör.de',
-                           '<a href="http://müllärör.de" rel="external">http://müllärör.de</a>'),
+                           '<a href="http://m&#xFC;ll&#xE4;r&#xF6;r.de/" rel="external">http://müllärör.de</a>'),
                      array('http://ﺱﺲﺷ.com',
-                           '<a href="http://ﺱﺲﺷ.com" rel="external">http://ﺱﺲﺷ.com</a>'),
+                           '<a href="http://&#xFEB1;&#xFEB2;&#xFEB7;.com/" rel="external">http://ﺱﺲﺷ.com</a>'),
                      array('http://сделаткартинки.com',
-                           '<a href="http://сделаткартинки.com" rel="external">http://сделаткартинки.com</a>'),
+                           '<a href="http://&#x441;&#x434;&#x435;&#x43B;&#x430;&#x442;&#x43A;&#x430;&#x440;&#x442;&#x438;&#x43D;&#x43A;&#x438;.com/" rel="external">http://сделаткартинки.com</a>'),
                      array('http://tūdaliņ.lv',
-                           '<a href="http://tūdaliņ.lv" rel="external">http://tūdaliņ.lv</a>'),
+                           '<a href="http://t&#x16B;dali&#x146;.lv/" rel="external">http://tūdaliņ.lv</a>'),
                      array('http://brændendekærlighed.com',
-                           '<a href="http://brændendekærlighed.com" rel="external">http://brændendekærlighed.com</a>'),
+                           '<a href="http://br&#xE6;ndendek&#xE6;rlighed.com/" rel="external">http://brændendekærlighed.com</a>'),
                      array('http://あーるいん.com',
-                           '<a href="http://あーるいん.com" rel="external">http://あーるいん.com</a>'),
+                           '<a href="http://&#x3042;&#x30FC;&#x308B;&#x3044;&#x3093;.com/" rel="external">http://あーるいん.com</a>'),
                      array('http://예비교사.com',
-                           '<a href="http://예비교사.com" rel="external">http://예비교사.com</a>'),
+                           '<a href="http://&#xC608;&#xBE44;&#xAD50;&#xC0AC;.com/" rel="external">http://예비교사.com</a>'),
                      array('http://example.com.',
-                           '<a href="http://example.com" rel="external">http://example.com</a>.'),
+                           '<a href="http://example.com/" rel="external">http://example.com</a>.'),
                      array('http://example.com?',
-                           '<a href="http://example.com" rel="external">http://example.com</a>?'),
+                           '<a href="http://example.com/" rel="external">http://example.com</a>?'),
                      array('http://example.com!',
-                           '<a href="http://example.com" rel="external">http://example.com</a>!'),
+                           '<a href="http://example.com/" rel="external">http://example.com</a>!'),
                      array('http://example.com,',
-                           '<a href="http://example.com" rel="external">http://example.com</a>,'),
+                           '<a href="http://example.com/" rel="external">http://example.com</a>,'),
                      array('http://example.com;',
-                           '<a href="http://example.com" rel="external">http://example.com</a>;'),
+                           '<a href="http://example.com/" rel="external">http://example.com</a>;'),
                      array('http://example.com:',
-                           '<a href="http://example.com" rel="external">http://example.com</a>:'),
+                           '<a href="http://example.com/" rel="external">http://example.com</a>:'),
                      array('\'http://example.com\'',
-                           '\'<a href="http://example.com" rel="external">http://example.com</a>\''),
+                           '\'<a href="http://example.com/" rel="external">http://example.com</a>\''),
                      array('"http://example.com"',
-                           '"<a href="http://example.com" rel="external">http://example.com</a>"'),
-                     array('http://example.com
',
-                           '<a href="http://example.com" rel="external">http://example.com</a>'),
+                           '&quot;<a href="http://example.com/" rel="external">http://example.com</a>&quot;'),
+                     array('http://example.com',
+                           '<a href="http://example.com/" rel="external">http://example.com</a>'),
                      array('(http://example.com)',
-                           '(<a href="http://example.com" rel="external">http://example.com</a>)'),
+                           '(<a href="http://example.com/" rel="external">http://example.com</a>)'),
                      array('[http://example.com]',
-                           '[<a href="http://example.com" rel="external">http://example.com</a>]'),
+                           '[<a href="http://example.com/" rel="external">http://example.com</a>]'),
                      array('<http://example.com>',
-                           '<<a href="http://example.com" rel="external">http://example.com</a>>'),
+                           '&lt;<a href="http://example.com/" rel="external">http://example.com</a>&gt;'),
                      array('http://example.com/path/(foo)/bar',
                            '<a href="http://example.com/path/(foo)/bar" rel="external">http://example.com/path/(foo)/bar</a>'),
+                     //Not a valid url - urls cannot contain unencoded square brackets
                      array('http://example.com/path/[foo]/bar',
                            '<a href="http://example.com/path/[foo]/bar" rel="external">http://example.com/path/[foo]/bar</a>'),
                      array('http://example.com/path/foo/(bar)',
                            '<a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>'),
-                     array('http://example.com/path/foo/[bar]',
-                           '<a href="http://example.com/path/foo/[bar]" rel="external">http://example.com/path/foo/[bar]</a>'),
+                     //Not a valid url - urls cannot contain unencoded square brackets
+                     //array('http://example.com/path/foo/[bar]',
+                     //      '<a href="http://example.com/path/foo/[bar]" rel="external">http://example.com/path/foo/[bar]</a>'),
                      array('Hey, check out my cool site http://example.com okay?',
-                           'Hey, check out my cool site <a href="http://example.com" rel="external">http://example.com</a> okay?'),
+                           'Hey, check out my cool site <a href="http://example.com/" rel="external">http://example.com</a> okay?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar))?',
                            'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar)?',
                            'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar).)?',
                            'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>.)?'),
+                     //Not a valid url - urls cannot contain unencoded commas
                      array('What about parens (e.g. http://example.com/path/(foo,bar)?',
                            'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" rel="external">http://example.com/path/(foo,bar)</a>?'),
                      array('Unbalanced too (e.g. http://example.com/path/((((foo)/bar)?',
@@ -124,51 +173,51 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('Unbalanced too (e.g. http://example.com/path/foo/(bar))))?',
                            'Unbalanced too (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)))?'),
                      array('example.com',
-                           '<a href="http://example.com" rel="external">example.com</a>'),
+                           '<a href="http://example.com/" rel="external">example.com</a>'),
                      array('example.org',
-                           '<a href="http://example.org" rel="external">example.org</a>'),
+                           '<a href="http://example.org/" rel="external">example.org</a>'),
                      array('example.co.uk',
-                           '<a href="http://example.co.uk" rel="external">example.co.uk</a>'),
+                           '<a href="http://example.co.uk/" rel="external">example.co.uk</a>'),
                      array('www.example.co.uk',
-                           '<a href="http://www.example.co.uk" rel="external">www.example.co.uk</a>'),
+                           '<a href="http://www.example.co.uk/" rel="external">www.example.co.uk</a>'),
                      array('farm1.images.example.co.uk',
-                           '<a href="http://farm1.images.example.co.uk" rel="external">farm1.images.example.co.uk</a>'),
+                           '<a href="http://farm1.images.example.co.uk/" rel="external">farm1.images.example.co.uk</a>'),
                      array('example.museum',
-                           '<a href="http://example.museum" rel="external">example.museum</a>'),
+                           '<a href="http://example.museum/" rel="external">example.museum</a>'),
                      array('example.travel',
-                           '<a href="http://example.travel" rel="external">example.travel</a>'),
+                           '<a href="http://example.travel/" rel="external">example.travel</a>'),
                      array('example.com.',
-                           '<a href="http://example.com" rel="external">example.com</a>.'),
+                           '<a href="http://example.com/" rel="external">example.com</a>.'),
                      array('example.com?',
-                           '<a href="http://example.com" rel="external">example.com</a>?'),
+                           '<a href="http://example.com/" rel="external">example.com</a>?'),
                      array('example.com!',
-                           '<a href="http://example.com" rel="external">example.com</a>!'),
+                           '<a href="http://example.com/" rel="external">example.com</a>!'),
                      array('example.com,',
-                           '<a href="http://example.com" rel="external">example.com</a>,'),
+                           '<a href="http://example.com/" rel="external">example.com</a>,'),
                      array('example.com;',
-                           '<a href="http://example.com" rel="external">example.com</a>;'),
+                           '<a href="http://example.com/" rel="external">example.com</a>;'),
                      array('example.com:',
-                           '<a href="http://example.com" rel="external">example.com</a>:'),
+                           '<a href="http://example.com/" rel="external">example.com</a>:'),
                      array('\'example.com\'',
-                           '\'<a href="http://example.com" rel="external">example.com</a>\''),
+                           '\'<a href="http://example.com/" rel="external">example.com</a>\''),
                      array('"example.com"',
-                           '"<a href="http://example.com" rel="external">example.com</a>"'),
-                     array('example.com
',
-                           '<a href="http://example.com" rel="external">example.com</a>'),
+                           '&quot;<a href="http://example.com/" rel="external">example.com</a>&quot;'),
+                     array('example.com',
+                           '<a href="http://example.com/" rel="external">example.com</a>'),
                      array('(example.com)',
-                           '(<a href="http://example.com" rel="external">example.com</a>)'),
+                           '(<a href="http://example.com/" rel="external">example.com</a>)'),
                      array('[example.com]',
-                           '[<a href="http://example.com" rel="external">example.com</a>]'),
+                           '[<a href="http://example.com/" rel="external">example.com</a>]'),
                      array('<example.com>',
-                           '<<a href="http://example.com" rel="external">example.com</a>>'),
+                           '&lt;<a href="http://example.com/" rel="external">example.com</a>&gt;'),
                      array('Hey, check out my cool site example.com okay?',
-                           'Hey, check out my cool site <a href="http://example.com" rel="external">example.com</a> okay?'),
+                           'Hey, check out my cool site <a href="http://example.com/" rel="external">example.com</a> okay?'),
                      array('Hey, check out my cool site example.com.I made it.',
-                           'Hey, check out my cool site <a href="http://example.com" rel="external">example.com</a>.I made it.'),
+                           'Hey, check out my cool site <a href="http://example.com/" rel="external">example.com</a>.I made it.'),
                      array('Hey, check out my cool site example.com.Funny thing...',
-                           'Hey, check out my cool site <a href="http://example.com" rel="external">example.com</a>.Funny thing...'),
+                           'Hey, check out my cool site <a href="http://example.com/" rel="external">example.com</a>.Funny thing...'),
                      array('Hey, check out my cool site example.com.You will love it.',
-                           'Hey, check out my cool site <a href="http://example.com" rel="external">example.com</a>.You will love it.'),
+                           'Hey, check out my cool site <a href="http://example.com/" rel="external">example.com</a>.You will love it.'),
                      array('What about parens (e.g. example.com/path/foo/(bar))?',
                            'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>)?'),
                      array('What about parens (e.g. example.com/path/foo/(bar)?',
-- 
cgit v1.2.3-54-g00ecf


From 210bc4248b5e0c8bd577ac51c2f8df9ac05166ae Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 25 Aug 2009 14:12:31 -0400
Subject: All tests pass except for those that require matching parens or
 brackets

---
 lib/util.php               | 40 +++++++++++++++++++++++++---------------
 tests/URLDetectionTest.php | 13 ++++++++++---
 2 files changed, 35 insertions(+), 18 deletions(-)

(limited to 'tests')

diff --git a/lib/util.php b/lib/util.php
index ee3fe5ddc..36d1e4c0a 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -413,45 +413,55 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) {
     // Start off with a regex
     $regex = '#'.
     '(?:^|[\s\(\)\[\]\{\}\\\'\\\";]+)(?![\@\!\#])'.
-    '('.
+    '(?P<url>'.
         '(?:'.
             '(?:'. //Known protocols
                 '(?:'.
-                    '(?:https?|ftps?|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|irc)://'.
+                    '(?:(?:https?|ftps?|mms|rtsp|gopher|news|nntp|telnet|wais|file|prospero|webcal|irc)://)'.
                     '|'.
-                    '(?:mailto|aim|tel|xmpp):'.
+                    '(?:(?:mailto|aim|tel|xmpp):)'.
+                ')'.
+                '(?:[\pN\pL\-\_\+]+(?::[\pN\pL\-\_\+]+)?\@)?'. //user:pass@
+                '(?:'.
+                    '(?:'.
+                        '\[[\pN\pL\-\_\:\.]+(?<![\.\:])\]'. //[dns]
+                    ')|(?:'.
+                        '[\pN\pL\-\_\:\.]+(?<![\.\:])'. //dns
+                    ')'.
                 ')'.
-                '(?:[\pN\pL\-\_\+]+(?:\:[\pN\pL\-\_\+]+)?\@)?'. //user:pass@
-                '[\pN\pL\-\_\:\.]+(?<![\.\:])'. //dns
             ')'.
             '|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'. //IPv4
             '|(?:'. //IPv6
-                '(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}(?:(?:[0-9A-Fa-f]{1,4})|:))|(?:(?:[0-9A-Fa-f]{1,4}:){6}(?::|(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})|(?::[0-9A-Fa-f]{1,4})))|(?:(?:[0-9A-Fa-f]{1,4}:){5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){4}(?::[0-9A-Fa-f]{1,4}){0,1}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){3}(?::[0-9A-Fa-f]{1,4}){0,2}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){2}(?::[0-9A-Fa-f]{1,4}){0,3}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:)(?::[0-9A-Fa-f]{1,4}){0,4}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?::(?::[0-9A-Fa-f]{1,4}){0,5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))'.
+                '\[?(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}(?:(?:[0-9A-Fa-f]{1,4})|:))|(?:(?:[0-9A-Fa-f]{1,4}:){6}(?::|(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})|(?::[0-9A-Fa-f]{1,4})))|(?:(?:[0-9A-Fa-f]{1,4}:){5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){4}(?::[0-9A-Fa-f]{1,4}){0,1}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){3}(?::[0-9A-Fa-f]{1,4}){0,2}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){2}(?::[0-9A-Fa-f]{1,4}){0,3}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:)(?::[0-9A-Fa-f]{1,4}){0,4}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?::(?::[0-9A-Fa-f]{1,4}){0,5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))\]?'.
             ')|(?:'. //DNS
                 '(?:[\pN\pL\-\_\+]+(?:\:[\pN\pL\-\_\+]+)?\@)?'. //user:pass@
-                '[\pN\pL\-\_]+(?:\.[\pN\pL\-\_]+)*\.(?:museum|travel|onion|local|[a-z]{2,4})'.
+                '[\pN\pL\-\_]+(?:\.[\pN\pL\-\_]+)*\.'.
+                //tld list from http://data.iana.org/TLD/tlds-alpha-by-domain.txt, also added local, loc, and onion
+                '(?:AC|AD|AE|AERO|AF|AG|AI|AL|AM|AN|AO|AQ|AR|ARPA|AS|ASIA|AT|AU|AW|AX|AZ|BA|BB|BD|BE|BF|BG|BH|BI|BIZ|BJ|BM|BN|BO|BR|BS|BT|BV|BW|BY|BZ|CA|CAT|CC|CD|CF|CG|CH|CI|CK|CL|CM|CN|CO|COM|COOP|CR|CU|CV|CX|CY|CZ|DE|DJ|DK|DM|DO|DZ|EC|EDU|EE|EG|ER|ES|ET|EU|FI|FJ|FK|FM|FO|FR|GA|GB|GD|GE|GF|GG|GH|GI|GL|GM|GN|GOV|GP|GQ|GR|GS|GT|GU|GW|GY|HK|HM|HN|HR|HT|HU|ID|IE|IL|IM|IN|INFO|INT|IO|IQ|IR|IS|IT|JE|JM|JO|JOBS|JP|KE|KG|KH|KI|KM|KN|KP|KR|KW|KY|KZ|LA|LB|LC|LI|LK|LR|LS|LT|LU|LV|LY|MA|MC|MD|ME|MG|MH|MIL|MK|ML|MM|MN|MO|MOBI|MP|MQ|MR|MS|MT|MU|MUSEUM|MV|MW|MX|MY|MZ|NA|NAME|NC|NE|NET|NF|NG|NI|NL|NO|NP|NR|NU|NZ|OM|ORG|PA|PE|PF|PG|PH|PK|PL|PM|PN|PR|PRO|PS|PT|PW|PY|QA|RE|RO|RS|RU|RW|SA|SB|SC|SD|SE|SG|SH|SI|SJ|SK|SL|SM|SN|SO|SR|ST|SU|SV|SY|SZ|TC|TD|TEL|TF|TG|TH|TJ|TK|TL|TM|TN|TO|TP|TR|TRAVEL|TT|TV|TW|TZ|UA|UG|UK|US|UY|UZ|VA|VC|VE|VG|VI|VN|VU|WF|WS|XN--0ZWM56D|XN--11B5BS3A9AJ6G|XN--80AKHBYKNJ4F|XN--9T4B11YI5A|XN--DEBA0AD|XN--G6W251D|XN--HGBK6AJ7F53BBA|XN--HLCJ6AYA9ESC7A|XN--JXALPDLP|XN--KGBECHTV|XN--ZCKZAH|YE|YT|YU|ZA|ZM|ZW|local|loc|onion)'.
             ')(?![\pN\pL\-\_])'.
         ')'.
         '(?:'.
             '(?:\:\d+)?'. //:port
-            '(?:/[\pN\pL$\!\(\)\.\-\_\+\/\=\&\;]*)?'. // /path
-            '(?:\?[\pN\pL\$\!\(\)\.\-\_\+\/\=\&\;\/]*)?'. // ?query string
-            '(?:\#[\pN\pL$\!\(\)\.\-\_\+\/\=\&\;\/\?\#]*)?'. // #fragment
-        ')(?<![\?\.\,\#\)])'.
+            '(?:/[\pN\pL$\[\]\,\!\(\)\.\-\_\+\/\=\&\;]*)?'. // /path
+            '(?:\?[\pN\pL\$\[\]\,\!\(\)\.\-\_\+\/\=\&\;\/]*)?'. // ?query string
+            '(?:\#[\pN\pL$\[\]\,\!\(\)\.\-\_\+\/\=\&\;\/\?\#]*)?'. // #fragment
+        ')(?<![\?\.\,\#\)\]\,])'.
     ')'.
     '#ixu';
+    preg_match_all($regex,$text,$matches);
+    //print_r($matches);
     return preg_replace_callback($regex, curry(callback_helper,$callback,$notice_id) ,$text);
 }
 
 function callback_helper($matches, $callback, $notice_id) {
-    $pos = strpos($matches[0],$matches[1]);
+    $pos = strpos($matches[0],$matches['url']);
     $left = substr($matches[0],0,$pos);
-    $right = substr($matches[0],$pos+strlen($matches[1]));
+    $right = substr($matches[0],$pos+strlen($matches['url']));
     
     if(empty($notice_id)){
-        $result = call_user_func_array($callback,$matches[1]);
+        $result = call_user_func_array($callback,$matches['url']);
     }else{
-        $result = call_user_func_array($callback, array($matches[1],$notice_id) );
+        $result = call_user_func_array($callback, array($matches['url'],$notice_id) );
     }
     return $left . $result . $right;
 }
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index 05c02d6bb..7b2e8c5ae 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -25,16 +25,24 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
     static public function provider()
     {
         return array(
+                     array('http://127.0.0.1',
+                           '<a href="http://127.0.0.1/" rel="external">http://127.0.0.1</a>'),
                      array('127.0.0.1',
                            '<a href="http://127.0.0.1/" rel="external">127.0.0.1</a>'),
+                     array('127.0.0.1:99',
+                           '<a href="http://127.0.0.1:99/" rel="external">127.0.0.1:99</a>'),
                      array('127.0.0.1/test.php',
                            '<a href="http://127.0.0.1/test.php" rel="external">127.0.0.1/test.php</a>'),
+                     array('http://[::1]:99/test.php',
+                           '<a href="http://[::1]:99/test.php" rel="external">http://[::1]:99/test.php</a>'),
                      array('http://::1/test.php',
                            '<a href="http://::1/test.php" rel="external">http://::1/test.php</a>'),
                      array('http://::1',
                            '<a href="http://::1/" rel="external">http://::1</a>'),
                      array('2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php',
                            '<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php</a>'),
+                     array('[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php',
+                           '<a href="http://[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php" rel="external">[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php</a>'),
                      array('2001:4978:1b5:0:21d:e0ff:fe66:59ab',
                            '<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab</a>'),
                      array('http://127.0.0.1',
@@ -145,14 +153,13 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                            '&lt;<a href="http://example.com/" rel="external">http://example.com</a>&gt;'),
                      array('http://example.com/path/(foo)/bar',
                            '<a href="http://example.com/path/(foo)/bar" rel="external">http://example.com/path/(foo)/bar</a>'),
-                     //Not a valid url - urls cannot contain unencoded square brackets
                      array('http://example.com/path/[foo]/bar',
                            '<a href="http://example.com/path/[foo]/bar" rel="external">http://example.com/path/[foo]/bar</a>'),
                      array('http://example.com/path/foo/(bar)',
                            '<a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>'),
                      //Not a valid url - urls cannot contain unencoded square brackets
-                     //array('http://example.com/path/foo/[bar]',
-                     //      '<a href="http://example.com/path/foo/[bar]" rel="external">http://example.com/path/foo/[bar]</a>'),
+                     array('http://example.com/path/foo/[bar]',
+                           '<a href="http://example.com/path/foo/[bar]" rel="external">http://example.com/path/foo/[bar]</a>'),
                      array('Hey, check out my cool site http://example.com okay?',
                            'Hey, check out my cool site <a href="http://example.com/" rel="external">http://example.com</a> okay?'),
                      array('What about parens (e.g. http://example.com/path/foo/(bar))?',
-- 
cgit v1.2.3-54-g00ecf


From 8cd474e985fcce754f435b8b8fa84c33a9d623e7 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 25 Aug 2009 16:06:04 -0400
Subject: Correct the hash tag test

---
 tests/HashTagDetectionTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/HashTagDetectionTest.php b/tests/HashTagDetectionTest.php
index 71137b0b5..55e1f65bf 100644
--- a/tests/HashTagDetectionTest.php
+++ b/tests/HashTagDetectionTest.php
@@ -28,7 +28,7 @@ class HashTagDetectionTest extends PHPUnit_Framework_TestCase
                      array('hello',
                            'hello'),
                      array('#hello',
-                           '<a href="/tag/hello">hello</a>'),
+                           '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>'),
                      );
     }
 }
-- 
cgit v1.2.3-54-g00ecf


From a2117961be463d566c8f3c6ccd9b8e840f171804 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 25 Aug 2009 17:52:16 -0400
Subject: Allow ({['" to preceded #tags

---
 lib/util.php                   |  2 +-
 tests/HashTagDetectionTest.php | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/lib/util.php b/lib/util.php
index 29eb6cbbc..7c1e21913 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -404,7 +404,7 @@ function common_render_text($text)
 
     $r = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $r);
     $r = common_replace_urls_callback($r, 'common_linkify');
-    $r = preg_replace('/(^|\(|\[|\s+)#([\pL\pN_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r);
+    $r = preg_replace('/(^|\&quot\;|\'|\(|\[|\{|\s+)#([\pL\pN_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r);
     // XXX: machine tags
     return $r;
 }
diff --git a/tests/HashTagDetectionTest.php b/tests/HashTagDetectionTest.php
index 55e1f65bf..901e0611c 100644
--- a/tests/HashTagDetectionTest.php
+++ b/tests/HashTagDetectionTest.php
@@ -27,8 +27,20 @@ class HashTagDetectionTest extends PHPUnit_Framework_TestCase
         return array(
                      array('hello',
                            'hello'),
-                     array('#hello',
-                           '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>'),
+                     array('#hello people',
+                           '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span> people'),
+                     array('"#hello" people',
+                           '&quot;#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>&quot; people'),
+                     array('say "#hello" people',
+                           'say &quot;#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>&quot; people'),
+                     array('say (#hello) people',
+                           'say (#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>) people'),
+                     array('say [#hello] people',
+                           'say [#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>] people'),
+                     array('say {#hello} people',
+                           'say {#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>} people'),
+                     array('say \'#hello\' people',
+                           'say \'#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>\' people'),
                      );
     }
 }
-- 
cgit v1.2.3-54-g00ecf