Merge pull request #1115 from kawazrepos/support-shorten-url

Support shorten YouTube URL closes #1102
kawazrepos · Nov 27, 2016 · ac344fe · ac344fe
2 parents eab2219 + 853f035
commit ac344fe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/kawaz/apps/kfm/extras/youtube.py b/src/kawaz/apps/kfm/extras/youtube.py
@@ -4,7 +4,7 @@
 
 
 PATTERN = re.compile(
-    r"https?://www\.youtube\.com/watch\?v=(?P<id>[a-zA-Z0-9_\-]+)"
+    r"https?://(:?www\.youtube\.com/watch\?v=|youtu\.be/)(?P<id>[a-zA-Z0-9_\-]+)"
 )
 TEMPLATE_NAME = r"kfm/extras/youtube.html"
 

diff --git a/src/kawaz/apps/kfm/tests/test_extras/test_youtube.py b/src/kawaz/apps/kfm/tests/test_extras/test_youtube.py
@@ -25,6 +25,12 @@ def test_parse_youtube_urls(self):
         value = parse_youtube_urls(value)
         self.assertEqual(value, self._render_template(self.video_id))
 
+    def test_parse_shorten_youtube_urls(self):
+        """短縮されたYouTubeのURLは展開される"""
+        value = "https://youtu.be/{}".format(self.video_id)
+        value = parse_youtube_urls(value)
+        self.assertEqual(value, self._render_template(self.video_id))
+
     def test_parse_youtube_urls_responsive(self):
         """YouTubeのURLはレスポンシブ展開される"""
         value = self.template_str.format(self.video_id)