fix on embed links

lepture · May 15, 2013 · 3ca7992 · 3ca7992
1 parent 343da8c
commit 3ca7992
Showing 1 changed file with 36 additions and 20 deletions.
diff --git a/june/markdown.py b/june/markdown.py
@@ -9,40 +9,56 @@ def autolink(self, link, is_email):
         title = link.replace('http://', '').replace('https://', '')
 
         #: youtube.com
-        pattern = r'http://www.youtube.com/watch\?v=([a-zA-Z0-9\-\_]+)'
+        pattern = r'http://www\.youtube\.com\/watch\?v=([a-zA-Z0-9\-\_]+)'
         match = re.match(pattern, link)
         if not match:
-            pattern = r'http://youtu.be/([a-zA-Z0-9\-\_]+)'
+            pattern = r'http:\/\/youtu.be\/([a-zA-Z0-9\-\_]+)'
             match = re.match(pattern, link)
         if match:
-            value = ('<iframe width="560" height="315" src='
-                     '"http://www.youtube.com/embed/%(id)s" '
-                     'frameborder="0" allowfullscreen></iframe>'
-                     '<div><a rel="nofollow" href="%(link)s">'
-                     '%(title)s</a></div>'
-                    ) % {'id': match.group(1), 'link': link, 'title': title}
+            value = (
+                '<iframe width="560" height="315" src='
+                '"http://www.youtube.com/embed/%(id)s" '
+                'frameborder="0" allowfullscreen></iframe>'
+                '<div><a rel="nofollow" href="%(link)s">'
+                '%(title)s</a></div>'
+            ) % {'id': match.group(1), 'link': link, 'title': title}
             return value
 
         #: gist support
-        pattern = r'(https?://gist.github.com/[\d]+)'
+        pattern = r'(https?:\/\/gist\.github\.com\/.+\d+)'
         match = re.match(pattern, link)
         if match:
-            value = ('<script src="%(link)s.js"></script>'
-                     '<div><a rel="nofollow" href="%(link)s">'
-                     '%(title)s</a></div>'
-                    ) % {'link': match.group(1), 'title': title}
+            value = (
+                '<script src="%(link)s.js"></script>'
+                '<div><a rel="nofollow" href="%(link)s">'
+                '%(title)s</a></div>'
+            ) % {'link': match.group(1), 'title': title}
             return value
 
         #: vimeo.com
-        pattern = r'http://vimeo.com/([\d]+)'
+        pattern = r'https?:\/\/vimeo\.com\/([\d]+)'
         match = re.match(pattern, link)
         if match:
-            value = ('<iframe width="500" height="281" frameborder="0" '
-                     'src="http://player.vimeo.com/video/%(id)s" '
-                     'allowFullScreen></iframe>'
-                     '<div><a rel="nofollow" href="%(link)s">'
-                     '%(title)s</a></div>'
-                    ) % {'id': match.group(1), 'link': link, 'title': title}
+            value = (
+                '<iframe width="566" height="318" frameborder="0" '
+                'src="https://player.vimeo.com/video/%(id)s" '
+                'allowFullScreen></iframe>'
+                '<div><a rel="nofollow" href="%(link)s">'
+                '%(title)s</a></div>'
+            ) % {'id': match.group(1), 'link': link, 'title': title}
+            return value
+
+        #: ascii.io
+        pattern = r'(http:\/\/ascii\.io\/a\/\d+)'
+        match = re.match(pattern, link)
+        if match:
+            value = (
+                '<iframe width="566" height="600" frameborder="0" '
+                'src="%(url)s/raw" '
+                'allowFullScreen></iframe>'
+                '<div><a rel="nofollow" href="%(link)s">'
+                '%(title)s</a></div>'
+            ) % {'url': match.group(1), 'link': link, 'title': title}
             return value
 
         if is_email: