a lot of fixes. almost ready to go live

Author: ricardofiorani

config/config.php

@@ -14,13 +14,13 @@
         'patterns' => array(
             '#(https?://vimeo.com)/([0-9]+)#i'
         ),
-        'factory' => 'RicardoFiorani\\Container\\Factory\\VimeoVideoContainerFactory',
+        'factory' => 'RicardoFiorani\\Adapter\\Vimeo\\Factory\\VimeoServiceAdapterFactory',
     ),
     'Youtube' => array(
         'patterns' => array(
             '#(?:<\>]+href=\")?(?:http://)?((?:[a-zA-Z]{1,4}\.)?youtube.com/(?:watch)?\?v=(.{11}?))[^"]*(?:\"[^\<\>]*>)?([^\<\>]*)(?:)?#',
             '%(?:youtube\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu\.be/)([^"&?/ ]{11})%i',
         ),
-        'factory' => 'RicardoFiorani\\Container\\Factory\\YoutubeVideoContainerFactory',
+        'factory' => 'RicardoFiorani\\Container\\Youtube\\Factory\\YoutubeVideoContainerFactory',
     ),
 );

src/Adapter/AbstractServiceContainer.php

@@ -25,7 +25,7 @@ abstract class AbstractServiceAdapter implements VideoAdapterInterface
      * AbstractVideoAdapter constructor.
      * @param string $url
      */
-    public function __construct($url, $regex)
+    public function __construct($url, $pattern)
     {
         $this->rawUrl = $url;
     }

src/Adapter/Factory/CallableFactoryInterface.php

@@ -15,8 +15,8 @@ interface CallableFactoryInterface
 {
     /**
      * @param string $url
-     * @param string $regex
+     * @param string $pattern
      * @return VideoAdapterInterface
      */
-    public function __invoke($url, $regex);
+    public function __invoke($url, $pattern);
 }

src/Adapter/VideoAdapterInterface.php

@@ -13,8 +13,9 @@ interface VideoAdapterInterface
 {
     /**
      * @param string $url
+     * @param string $pattern
      */
-    public function __construct($url, $regex);
+    public function __construct($url, $pattern);
 
     /**
      * Returns the service name (ie: "Youtube" or "Vimeo")

src/Adapter/Vimeo/Factory/VimeoServiceAdapterFactory.php

@@ -16,12 +16,13 @@ class VimeoServiceAdapterFactory implements CallableFactoryInterface
 {
     /**
      * @param string $url
-     * @param string $regex
+     * @param string $pattern
      * @return VimeoServiceAdapter
      */
-    public function __invoke($url, $regex)
+    public function __invoke($url, $pattern)
     {
-        $vimeoAdapter = new VimeoServiceAdapter($url,$regex);
-        return $vimeoAdapter;
+        $adapter = new VimeoServiceAdapter($url, $pattern);
+
+        return $adapter;
     }
 }

src/Adapter/Vimeo/VimeoServiceAdapter.php

@@ -20,10 +20,10 @@ class VimeoServiceAdapter extends AbstractServiceAdapter
     const THUMBNAIL_LARGE = 'thumbnail_large';
 
 
-    public function __construct($url, $regex)
+    public function __construct($url, $pattern)
     {
         $match = array();
-        preg_match($regex, $url, $match);
+        preg_match($pattern, $url, $match);
         /*Gets the Video ID*/
         $videoId = $match[2];
         if (empty($videoId)) {
@@ -46,7 +46,7 @@ public function __construct($url, $regex)
         $this->setTitle($data['title']);
         $this->setDescription($data['description']);
 
-        return parent::__construct($url, $regex);
+        return parent::__construct($url, $pattern);
     }
 
     /**

src/Adapter/Youtube/Factory/YoutubeServiceAdapterFactory.php

@@ -17,13 +17,13 @@ class YoutubeServiceAdapterFactory implements CallableFactoryInterface
 
     /**
      * @param string $url
-     * @param string $regex
+     * @param string $pattern
      * @return YoutubeServiceAdapter
      */
-    public function __invoke($url, $regex)
+    public function __invoke($url, $pattern)
     {
-        $youtubeVideoAdapter = new YoutubeServiceAdapter($url, $regex);
+        $adapter = new YoutubeServiceAdapter($url, $pattern);
 
-        return $youtubeVideoAdapter;
+        return $adapter;
     }
 }

src/Adapter/Youtube/YoutubeServiceAdapter.php

@@ -22,14 +22,16 @@ class YoutubeServiceAdapter extends AbstractServiceAdapter
     const THUMBNAIL_MAX_QUALITY = 'maxresdefault';
 
 
-    public function __construct($url,$regex){
-        preg_match($regex, $url, $match);
+    public function __construct($url, $pattern)
+    {
+        preg_match($pattern, $url, $match);
         $videoId = $match[2];
         if (empty($videoId)) {
             $videoId = $match[1];
         }
-        $this->videoId($videoId);
-        return parent::__construct($url,$regex);
+        $this->setVideoId($videoId);
+
+        return parent::__construct($url, $pattern);
     }
 
     /**

src/Detector/VideoDetector.php

@@ -2,16 +2,104 @@
 
 namespace RicardoFiorani\Detector;
 
+use RicardoFiorani\Adapter\VideoAdapterInterface;
+use RicardoFiorani\Exception\DuplicatedServiceNameException;
+use RicardoFiorani\Exception\ServiceNotAvailableException;
+
 /**
  * @author Ricardo Fiorani
  */
 class VideoDetector
 {
+    /**
+     * @var array
+     */
+    private $services = array();
+
+    /**
+     * @var array
+     */
+    private $patterns = array();
+
+    /**
+     * @var
+     */
+    private $factories = array();
+
     /**
      * VideoDetector constructor.
      */
     public function __construct()
     {
-        
+        $this->loadConfigFile();
+    }
+
+    /**
+     * Loads de default config file
+     * @throws DuplicatedServiceNameException
+     */
+    private function loadConfigFile()
+    {
+        $configFile = require __DIR__ . '../../config/config.php';
+        foreach ($configFile as $serviceName => $serviceConfig) {
+            $this->registerService($serviceName, $serviceConfig['patterns'], $serviceConfig['factory']);
+        }
+    }
+
+    /**
+     * Register a Service
+     * @param string $serviceName
+     * @param array $regex
+     * @param string|callable $factory
+     * @throws DuplicatedServiceNameException
+     */
+    public function registerService($serviceName, array $regex, $factory)
+    {
+        if ($this->hasService($serviceName)) {
+            throw new DuplicatedServiceNameException();
+        }
+
+        $this->services[] = $serviceName;
+        $this->patterns[$serviceName] = $regex;
+        $this->factories[$serviceName] = $factory;
+    }
+
+    /**
+     * @return array
+     */
+    public function getServiceNameList()
+    {
+        return $this->services;
     }
+
+
+    /**
+     * @param string $serviceName
+     * @return bool
+     */
+    public function hasService($serviceName)
+    {
+        return in_array($serviceName, $this->services);
+    }
+
+    /**
+     * @param string $url
+     * @return VideoAdapterInterface
+     * @throws ServiceNotAvailableException
+     */
+    public function parse($url)
+    {
+        /** @var array $patterns */
+        /** @var string $serviceName */
+        foreach ($this->patterns as $serviceName => $patterns) {
+            /** @var string $pattern */
+            foreach ($patterns as $pattern) {
+                if (true === preg_match($pattern, $url)) {
+                    return $this->factories[$serviceName]($url, $pattern);
+                }
+            }
+        }
+        throw new ServiceNotAvailableException();
+    }
+
 }

src/Exception/DuplicatedServiceNameException.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Ricardo Fiorani
+ * Date: 29/08/2015
+ * Time: 23:28
+ */
+
+namespace RicardoFiorani\Exception;
+
+
+use Exception;
+
+class DuplicatedServiceNameException extends Exception
+{
+
+}