Merge branch 'master' of github.com:dereuromark/MediaEmbed

dereuromark · Jun 23, 2015 · 15c8d87 · 15c8d87
2 parents eed5dcf + 6c40673
commit 15c8d87
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/MediaEmbed/Data/stubs.php b/src/MediaEmbed/Data/stubs.php
@@ -68,7 +68,7 @@
 	[
 		'name' => 'Vimeo',
 		'website' => 'http://www.vimeo.com',
-		'url-match' => '^https?://(?:www\.)?vimeo\.com/(?:[0-9a-z_-]+/)?(?:[0-9a-z_-]+/)?([0-9]{1,})$',
+		'url-match' => 'https?://(?:www\.)?vimeo\.com/(?:[0-9a-z_-]+/)?(?:[0-9a-z_-]+/)?([0-9]{1,})',
 		'embed-src' => 'http://vimeo.com/moogaloop.swf?clip_id=$2&server=vimeo.com&fullscreen=1&show_title=1&show_byline=1&show_portrait=0&color=01AAEA',
 		'embed-width' => '400',
 		'embed-height' => '302',
@@ -336,7 +336,7 @@
 	[
 		'name' => 'CrunchyRoll',
 		'website' => 'http://www.crunchyroll.com',
-		'url-match' => '^http://(?:www\.)?crunchyroll\.com/[a-z0-9\-_]+/[a-z0-9\-_]+-([0-9]{1,12})$',
+		'url-match' => 'http://(?:www\.)?crunchyroll\.com/[a-z0-9\-_]+/[a-z0-9\-_]+-([0-9]{1,12})',
 		'embed-src' => ' http://www.crunchyroll.com/flash/20080910153703.043ec803b06cc356a1e15c1184831a24/oldplayer2.swf?file=http%3A%2F%2Fwww.crunchyroll.com%2Fgetitem%3Fih%3D$2%26videoid%3D$3%26mediaid%3D$4%26hash%3D$5&autostart=false',
 		'embed-width' => '576',
 		'embed-height' => '325',
@@ -1024,7 +1024,7 @@
 	[
 		'name' => 'RuTube',
 		'website' => 'http://www.rutube.ru',
-		'url-match' => 'http://(?:www\.|video\.)?rutube\.ru/(?:tracks/\d+?\.html\?(?:(?:pos|related)=1&(?:amp;)?)?v=)?([0-9a-f]{32})',
+		'url-match' => 'http://(?:www\.|video\.)?rutube\.ru/(?:video/|tracks/\d+?\.html\?(?:(?:pos|related)=1&(?:amp;)?)?v=)?([0-9a-f]{32})',
 		'embed-src' => 'http://video.rutube.ru/$2',
 		'embed-width' => '470',
 		'embed-height' => '353',
@@ -1263,7 +1263,7 @@
 	[
 		'name' => 'Ustream',
 		'website' => 'http://www.ustream.tv',
-		'url-match' => '^https?://www\.ustream\.tv/channel/[0-9a-z-]+$',
+		'url-match' => 'https?://www\.ustream\.tv/channel/[0-9a-z-]+',
 		'fetch-match' => 'https?://www\.ustream\.tv/embed/([0-9]+)',
 		'embed-src' => 'http://www.ustream.tv/flash/viewer.swf',
 		'embed-width' => '480',

diff --git a/tests/MediaEmbed/MediaEmbedTest.php b/tests/MediaEmbed/MediaEmbedTest.php
@@ -86,6 +86,8 @@ class MediaEmbedTest extends \PHPUnit_Framework_TestCase {
 		'http://blip.tv/stylestar/shine-6866879' => 'AYOjkCMC',
 
 		'http://example.wistia.com/medias/1voyrefhy9' => '1voyrefhy9',
+
+		'http://rutube.ru/video/c1b3c6c6ee77def7a8e54553c1fabbb8/' => 'c1b3c6c6ee77def7a8e54553c1fabbb8',
 
 		// Not available anymore
 		//'http://video.google.com/videoplay?docid=-5767589436465272649#' => '-5767589436465272649',