Anonymous avatar Anonymous committed b744496

[svn] Fixed auto_link to parse more valid url formats
fixes #100
(Thanks Jamie Wilkinson)

Comments (0)

Files changed (2)

 WebHelpers ChangeLog
 
 0.2.1 (**svn**)
+* Fixed auto_link to parse more valid url formats (Thanks Jamie Wilkinson).
 * Sync'd text helper from latest Rails version.
 * Fixed form tag's method matching to be case insensitive.
 

webhelpers/rails/text.py

 import webhelpers.markdown as markdown
 import itertools, re
 
-AUTO_LINK_RE = re.compile(r"""(<\w+.*?>|[^=!:'"/]|^)((?:https?://)|(?:www\.))([-\w]+(?:\.[-\w]+)*(?::\d+)?(?:/(?:[~\w%.;-]+)?)*(?:\?[\w%&=.;-]+)?(?:\#\w*)?)([\.,"'?!;:]|\s|<|$)""")
+AUTO_LINK_RE = re.compile(r"""(<\w+.*?>|[^=!:'"/]|^)((?:https?://)|(?:www\.))([-\w]+(?:\.[-\w]+)*(?::\d+)?(?:/(?:[~\w%.;-]+)?)*(?:\?[\w%&+=.;-]+)?(?:\#\w*)?)([\.,"'?!;:]|\s|<|$)""")
     
 def iterdict(items):
     return dict(items=items, iter=itertools.cycle(items))
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.