test fixs remniement code factorys

src/Muzich/CoreBundle/Command/CheckModerateCommand.php

@@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 
 class CheckModerateCommand extends ContainerAwareCommand
 {

src/Muzich/CoreBundle/Command/RefreshEmbedsCommand.php

@@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 
 class RefreshEmbedsCommand extends ContainerAwareCommand
 {

src/Muzich/CoreBundle/Command/UpdateTagSlugsCommand.php

@@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 
 class UpdateTagSlugsCommand extends ContainerAwareCommand
 {

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -8,7 +8,7 @@ use Muzich\CoreBundle\Entity\FollowUser;
 use Muzich\CoreBundle\Entity\FollowGroup;
 //use Doctrine\ORM\Query;
 use Muzich\CoreBundle\Form\Element\ElementAddForm;
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 use Muzich\CoreBundle\Entity\Element;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Muzich\CoreBundle\Form\Search\ElementSearchForm;

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -3,7 +3,7 @@
 namespace Muzich\CoreBundle\Controller;
 
 use Muzich\CoreBundle\lib\Controller;
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 use Muzich\CoreBundle\Propagator\EventElement;
 use Muzich\CoreBundle\Entity\ElementTagsProposition;
 

src/Muzich/CoreBundle/Factory/Elements/Dailymotioncom.php

@@ -31,7 +31,7 @@ class Dailymotioncom extends ElementFactory
     // Récupération de données auprés de l'API
     if ($ref_id)
     {
-      $api_url = curl_init('https://api.dailymotion.com/video/'.$chaines[2]
+      $api_url = curl_init('https://api.dailymotion.com/video/'.$ref_id
         .'&fields=thumbnail_medium_url');
       
       $options = array(

src/Muzich/CoreBundle/Factory/Elements/Jamendocom.php

@@ -96,7 +96,7 @@ class Jamendocom extends ElementFactory
     {
       $height = $this->container->getParameter('jamendo_player_height');
       $width = $this->container->getParameter('jamendo_player_width');
-      $embed_url = "http://widgets.jamendo.com/fr/$type/?album_id=$ref_id&playertype=2008";
+      $embed_url = "http://widgets.jamendo.com/fr/$type/?".$type."_id=$ref_id&playertype=2008";
       $this->element->setEmbed(
         '<object width="'.$width.'" height="'.$height.'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"'
             .' codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" align="middle">

src/Muzich/CoreBundle/Factory/Elements/Soundcloudcom.php

@@ -9,7 +9,7 @@ use Muzich\CoreBundle\Factory\ElementFactory;
  *
  * @author bux
  */
-class SoundcloudcomFactory extends ElementFactory
+class Soundcloudcom extends ElementFactory
 {
   
   /**
@@ -24,12 +24,12 @@ class SoundcloudcomFactory extends ElementFactory
     // ??SET
     if (preg_match("#^\/[a-zA-Z0-9_-]+\/sets\/[a-zA-Z0-9_-]+#", $url_clean, $chaines))
     {
-      $ref_id = $url;
+      $ref_id = $url_clean;
     }
     // ???
     else if (preg_match("#^\/[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+#", $url_clean, $chaines))
     {
-      $ref_id = $url;
+      $ref_id = $url_clean;
     }
     
     // On en gère pas encore les recherches
@@ -43,7 +43,7 @@ class SoundcloudcomFactory extends ElementFactory
     // récupération de données avec l'API
     if ($ref_id)
     {
-      $ch = curl_init('http://api.soundcloud.com/resolve.json?url='.$url_object.'&client_id=39946ea18e3d78d64c0ac95a025794e1');
+      $ch = curl_init('http://api.soundcloud.com/resolve.json?url='.$ref_id.'&client_id=39946ea18e3d78d64c0ac95a025794e1');
 
       $options = array(
         CURLOPT_RETURNTRANSFER => true,
@@ -77,6 +77,7 @@ class SoundcloudcomFactory extends ElementFactory
   {
     if (($ref_id = $this->element->getData('ref_id')))
     {
+      $ref_id = 'http://soundcloud.com'.$ref_id;
       $embed_id = md5($ref_id);
       $height = $this->container->getParameter('soundcloud_player_height');
       $this->element->setEmbed(

src/Muzich/CoreBundle/Factory/Elements/Youtube.php

@@ -19,7 +19,7 @@ class Youtube extends Youtubecom
     
     if (preg_match("#\/([a-zA-Z0-9]+)#", $url_clean, $chaines))
     {
-      $ref_id = $chaines[2];
+      $ref_id = $chaines[1];
     }
     
     $this->element->setData('ref_id', $ref_id);

src/Muzich/CoreBundle/Managers/ElementManager.php

@@ -7,12 +7,12 @@ use Muzich\CoreBundle\Entity\User;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\DependencyInjection\Container;
 
-use Muzich\CoreBundle\Factory\Elements\YoutubecomFactory;
-use Muzich\CoreBundle\Factory\Elements\YoutubeFactory;
-use Muzich\CoreBundle\Factory\Elements\DailymotioncomFactory;
-use Muzich\CoreBundle\Factory\Elements\JamendocomFactory;
-use Muzich\CoreBundle\Factory\Elements\SoundcloudcomFactory;
-use Muzich\CoreBundle\Factory\Elements\DeezercomFactory;
+use Muzich\CoreBundle\Factory\Elements\Youtubecom;
+use Muzich\CoreBundle\Factory\Elements\Youtube;
+use Muzich\CoreBundle\Factory\Elements\Dailymotioncom;
+use Muzich\CoreBundle\Factory\Elements\Jamendocom;
+use Muzich\CoreBundle\Factory\Elements\Soundcloudcom;
+use Muzich\CoreBundle\Factory\Elements\Deezercom;
 
 /**
  * 
@@ -147,22 +147,22 @@ class ElementManager
     switch ($this->element->getType())
     {
       case 'youtube.com':
-        return new YoutubecomFactory($this->element, $this->container);
+        return new Youtubecom($this->element, $this->container);
       break;
       case 'youtu.be':
-        return new YoutubeFactory($this->element, $this->container);
+        return new Youtube($this->element, $this->container);
       break;
       case 'soundcloud.com':
-        return new SoundcloudcomFactory($this->element, $this->container);
+        return new Soundcloudcom($this->element, $this->container);
       break;
       case 'jamendo.com':
-        return new JamendocomFactory($this->element, $this->container);
+        return new Jamendocom($this->element, $this->container);
       break;
       case 'dailymotion.com':
-        return new DailymotioncomFactory($this->element, $this->container);
+        return new Dailymotioncom($this->element, $this->container);
       break;
       case 'deezer.com':
-        return new DeezercomFactory($this->element, $this->container);
+        return new Deezercom($this->element, $this->container);
       break;
       default:
         throw new \Exception("La Factory n'est pas prise en charge pour ce type.");

src/Muzich/CoreBundle/Tests/ElementFactory/ElementFactoryTest.php

@@ -4,7 +4,7 @@ namespace Muzich\CoreBundle\Tests\Searcher;
 
 use Muzich\CoreBundle\lib\UnitTest;
 use Muzich\CoreBundle\Entity\Element;
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 use Doctrine\Common\Collections\ArrayCollection;
 
 class ElementFactoryTest extends UnitTest
@@ -122,32 +122,43 @@ class ElementFactoryTest extends UnitTest
     /*
      * - soundcloud.com
      */
-    $id = md5('http://soundcloud.com/matas/sets/library-project');
+    $url_id = 'http://soundcloud.com/matas/sets/library-project';
+    $embed_id = md5($url_id);
     $this->proceed_elementAndFill(
       $bux, 
       'faez7tf8re9h4gf5j64dssz', 
       'http://soundcloud.com/matas/sets/library-project', 
       array($hardtek->getId(), $tribe->getId()), 
-      '<object height="'.$this->getParam('soundcloud_player_height').'" width="100%" id="embed_'.$id.'" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
-          <param name="movie" value="http://player.soundcloud.com/player.swf?url=http://soundcloud.com/matas/sets/library-project&amp;enable_api=true&amp;object_id=embed_'.$id.'"></param>
+      '<object height="'.$this->getParam('soundcloud_player_height').'" width="100%" id="embed_'.$embed_id.'" '
+          .'classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
+          <param name="movie" value="http://player.soundcloud.com/player.swf?url='.$url_id.'&amp;'
+          .'enable_api=true&amp;object_id=embed_'.$embed_id.'"></param>
           <param name="allowscriptaccess" value="always"></param>
-          <embed allowscriptaccess="always" height="'.$this->getParam('soundcloud_player_height').'" src="http://player.soundcloud.com/player.swf?url=http://soundcloud.com/matas/sets/library-project&amp;enable_api=true&amp;object_id=embed_'.$id.'" type="application/x-shockwave-flash" width="100%" name="embed_'.$id.'"></embed>
-        </object>
-        '
+          <embed allowscriptaccess="always" height="'.$this->getParam('soundcloud_player_height').'" '
+          .'src="http://player.soundcloud.com/player.swf?url='.$url_id.'&amp;enable_api=true'
+          .'&amp;object_id=embed_'.$embed_id.'" type="application/x-shockwave-flash" '
+          .'width="100%" name="embed_'.$embed_id.'"></embed>
+        </object>'
     );
     
-    $id = md5('http://soundcloud.com/matas/above-hyperion-redux');
+    $url_id = 'http://soundcloud.com/matas/above-hyperion-redux';
+    $embed_id = md5($url_id);
     $this->proceed_elementAndFill(
       $bux, 
       'faez7tf8re9h4gf5j64dssz', 
       'http://soundcloud.com/matas/above-hyperion-redux', 
       array($hardtek->getId(), $tribe->getId()), 
-      '<object height="'.$this->getParam('soundcloud_player_height').'" width="100%" id="embed_'.$id.'" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
-          <param name="movie" value="http://player.soundcloud.com/player.swf?url=http://soundcloud.com/matas/above-hyperion-redux&amp;enable_api=true&amp;object_id=embed_'.$id.'"></param>
+      
+        '<object height="'.$this->getParam('soundcloud_player_height').'" width="100%" id="embed_'.$embed_id.'" '
+          .'classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000">
+          <param name="movie" value="http://player.soundcloud.com/player.swf?url='.$url_id.'&amp;'
+          .'enable_api=true&amp;object_id=embed_'.$embed_id.'"></param>
           <param name="allowscriptaccess" value="always"></param>
-          <embed allowscriptaccess="always" height="'.$this->getParam('soundcloud_player_height').'" src="http://player.soundcloud.com/player.swf?url=http://soundcloud.com/matas/above-hyperion-redux&amp;enable_api=true&amp;object_id=embed_'.$id.'" type="application/x-shockwave-flash" width="100%" name="embed_'.$id.'"></embed>
-        </object>
-        '
+          <embed allowscriptaccess="always" height="'.$this->getParam('soundcloud_player_height').'" '
+          .'src="http://player.soundcloud.com/player.swf?url='.$url_id.'&amp;enable_api=true'
+          .'&amp;object_id=embed_'.$embed_id.'" type="application/x-shockwave-flash" '
+          .'width="100%" name="embed_'.$embed_id.'"></embed>
+        </object>'
     );
     
     $this->proceed_elementAndFill(
@@ -183,20 +194,21 @@ class ElementFactoryTest extends UnitTest
       'gthyk456+liszz', 
       'http://www.jamendo.com/fr/album/30661', 
       array($hardtek->getId(), $tribe->getId()), 
-      '
-          <object width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" align="middle">
+      
+        '<object width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"'
+            .' codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" align="middle">
             <param name="allowScriptAccess" value="always" />
             <param name="wmode" value="transparent" />
             <param name="movie" value="http://widgets.jamendo.com/fr/album/?album_id=30661&playertype=2008" />
             <param name="quality" value="high" />
             <param name="bgcolor" value="#FFFFFF" />
-            <embed src="http://widgets.jamendo.com/fr/album/?album_id=30661&playertype=2008" quality="high" wmode="transparent" bgcolor="#FFFFFF" width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer">
+            <embed src="http://widgets.jamendo.com/fr/album/?album_id=30661&playertype=2008" quality="high" wmode="transparent" bgcolor="#FFFFFF"'
+            .' width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" align="middle" allowScriptAccess="always"'
+            .' type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer">
               &nbsp;
             </embed>
             &nbsp;
-          </object>
-          <a href="http://pro.jamendo.com/" style="display:block;font-size:8px !important;">Catalogue professionnel de musique libre</a>
-        '
+          </object>' 
     );
     
     $this->proceed_elementAndFill(
@@ -204,20 +216,21 @@ class ElementFactoryTest extends UnitTest
       'gthyk456+liszz', 
       'http://www.jamendo.com/fr/track/207079', 
       array($hardtek->getId(), $tribe->getId()), 
-      '
-          <object width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" align="middle">
+      
+      '<object width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"'
+      .' codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" align="middle">
             <param name="allowScriptAccess" value="always" />
             <param name="wmode" value="transparent" />
-            <param name="movie" value="http://widgets.jamendo.com/fr/track/?playertype=2008&track_id=207079" />
+            <param name="movie" value="http://widgets.jamendo.com/fr/track/?track_id=207079&playertype=2008" />
             <param name="quality" value="high" />
             <param name="bgcolor" value="#FFFFFF" />
-            <embed src="http://widgets.jamendo.com/fr/track/?playertype=2008&track_id=207079" quality="high" wmode="transparent" bgcolor="#FFFFFF" width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer">
+            <embed src="http://widgets.jamendo.com/fr/track/?track_id=207079&playertype=2008" quality="high" wmode="transparent" bgcolor="#FFFFFF"'
+      .' width="'.$this->getParam('jamendo_player_width').'" height="'.$this->getParam('jamendo_player_height').'" align="middle" allowScriptAccess="always"'
+      .' type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer">
               &nbsp;
             </embed>
             &nbsp;
-          </object>
-          <a href="http://pro.jamendo.com/" style="display:block;font-size:8px !important;">Catalogue professionnel de musique libre</a>
-        '
+          </object>' 
     );
     
     $this->proceed_elementAndFill(

src/Muzich/CoreBundle/lib/UnitTest.php

@@ -4,7 +4,7 @@ namespace Muzich\CoreBundle\lib;
 
 require_once(__DIR__ . "/../../../../app/AppKernel.php");
 use Muzich\CoreBundle\Entity\Element;
-use Muzich\CoreBundle\ElementFactory\ElementManager;
+use Muzich\CoreBundle\Managers\ElementManager;
 
 class UnitTest extends \PHPUnit_Framework_TestCase
 {