minor fixes and tests

Author: ricardofiorani

README.md

@@ -109,7 +109,7 @@ require __DIR__ . '/vendor/autoload.php';
 $vsd = new VideoServiceDetector();
 
 //This is where the magic is done
-$vsd->setRenderer('MyOwnRenderer', 'MyVendor\\MyRenderer\\Factory\\MyOwnRendererFactory');
+$vsd->getServiceContainer()->setRenderer('MyOwnRenderer', 'MyVendor\\MyRenderer\\Factory\\MyOwnRendererFactory');
 
 $video = $vsd->parse('https://www.youtube.com/watch?v=PkOcm_XaWrw');
 
@@ -121,9 +121,9 @@ echo $video->getEmbedCode(500,500);
 ### Currently Suported Services
 * Youtube
 * Vimeo
+* Dailymotion
 
 # TODO List goals for release 1.0:
 
 * Fix the Exceptions Messages
 * Create PHPUnit Tests
-* Add more Services

example/RegisteringANewService.md

@@ -174,7 +174,7 @@ $patterns = array(
 );
 
 //Register the new service
-$vsd->registerService($serviceName, $patterns, "\\MyVendor\\ServiceAdapter\\Factory\\DailyMotionServiceAdapterFactory");
+$vsd->getServiceContainer()->registerService($serviceName, $patterns, "\\MyVendor\\ServiceAdapter\\Factory\\DailyMotionServiceAdapterFactory");
 
 //This will get you an DailyMotionServiceAdapter
 $video = $vsd->parse('http://www.dailymotion.com/video/x33ncwc_kittens-fight-in-tiny-boxing-ring_animals');

src/Adapter/Vimeo/VimeoServiceAdapter.php

@@ -160,7 +160,7 @@ public function getThumbnail($size)
      */
     public function getEmbedUrl($autoplay = false)
     {
-        return "http://player.vimeo.com/video/" . $this->getVideoId() . "?byline=0&portrait=0&amp" . ($autoplay ? '&amp&autoplay=1' : '');
+        return "http://player.vimeo.com/video/" . $this->getVideoId() . ($autoplay ? '?autoplay=1' : '');
     }
 
     /**

src/Adapter/Youtube/YoutubeServiceAdapter.php

@@ -31,7 +31,9 @@ class YoutubeServiceAdapter extends AbstractServiceAdapter
     public function __construct($url, $pattern, EmbedRendererInterface $renderer)
     {
         preg_match($pattern, $url, $match);
-        $videoId = $match[2];
+        if (isset($match[2])) {
+            $videoId = $match[2];
+        }
         if (empty($videoId)) {
             $videoId = $match[1];
         }

src/Detector/VideoServiceDetector.php

@@ -17,6 +17,11 @@ class VideoServiceDetector
      */
     private $serviceContainer;
 
+    /**
+     * @var array
+     */
+    private $parsedUrls = array();
+
     /**
      * VideoServiceDetector constructor.
      */
@@ -32,6 +37,9 @@ public function __construct()
      */
     public function parse($url)
     {
+        if (isset($this->parsedUrls[$url])) {
+            return $this->parsedUrls[$url];
+        }
         /** @var array $patterns */
         /** @var string $serviceName */
         foreach ($this->getServiceContainer()->getPatterns() as $serviceName => $patterns) {
@@ -40,7 +48,8 @@ public function parse($url)
                 if (false != preg_match($pattern, $url)) {
                     $factory = $this->getServiceContainer()->getFactory($serviceName);
 
-                    return $factory($url, $pattern, $this->getServiceContainer()->getRenderer());
+                    return $this->parsedUrls[$url] = $factory($url, $pattern,
+                        $this->getServiceContainer()->getRenderer());
                 }
             }
         }

src/Exception/DuplicatedServiceNameException.php

@@ -14,14 +14,4 @@
 class DuplicatedServiceNameException extends Exception
 {
 
-    /**
-     * DuplicatedServiceNameException constructor.
-     * @param string $message
-     * @param int $code
-     * @param Exception $previous
-     */
-    public function __construct($code = 0, Exception $previous = null)
-    {
-        return parent::__construct("", $code, $previous);
-    }
 }

test/Detector/ServiceDetectorTest.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Ricardo Fiorani
+ * Date: 31/08/2015
+ * Time: 21:54
+ */
+
+namespace RicardoFiorani\Test;
+
+use PHPUnit_Framework_TestCase;
+use RicardoFiorani\Detector\VideoServiceDetector;
+use RicardoFiorani\Exception\ServiceNotAvailableException;
+
+class ServiceDetectorTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider youtubeDataProvider
+     * @param $url
+     * @param $expectedEmbedCode
+     * @throws ServiceNotAvailableException
+     */
+    public function testCanParseYoutubeUrl($url, $expectedEmbedCode)
+    {
+        $detector = new VideoServiceDetector();
+        $video = $detector->parse($url);
+        $this->assertEquals($video->getEmbedUrl(), $expectedEmbedCode);
+    }
+
+    public function youtubeDataProvider()
+    {
+
+        return array(
+            'Normal Youtube URL' => array(
+                'https://www.youtube.com/watch?v=mWRsgZuwf_8',
+                'http://www.youtube.com/embed/mWRsgZuwf_8',
+            ),
+            'Short Youtube URL' => array(
+                'https://youtu.be/JMLBOKVfHaA',
+                'http://www.youtube.com/embed/JMLBOKVfHaA',
+            ),
+            'Embed Youtube URL' => array(
+                '<iframe width="420" height="315" src="https://www.youtube.com/embed/vwp9JkaESdg" frameborder="0" allowfullscreen></iframe>',
+                'http://www.youtube.com/embed/vwp9JkaESdg',
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider vimeoDataProvider
+     * @param string $url
+     * @param string $expectedEmbedCode
+     */
+    public function testCanParseVimeoUrl($url, $expectedEmbedCode)
+    {
+        $detector = new VideoServiceDetector();
+        $video = $detector->parse($url);
+        $this->assertEquals($video->getEmbedUrl(), $expectedEmbedCode);
+    }
+
+    public function vimeoDataProvider()
+    {
+        return array(
+            'Common Vimeo URL' => array(
+                'https://vimeo.com/137781541',
+                'http://player.vimeo.com/video/137781541'
+            )
+        );
+    }
+}