Refactoring API, moving stuff up to factories

lib/Tmdb/Factory/AbstractFactory.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * This file is part of the Wrike PHP API created by B-Found IM&S.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ * 
+ * @package Wrike
+ * @author Michael Roterman <[email protected]>
+ * @copyright (c) 2013, B-Found Internet Marketing & Services
+ * @version 0.0.1
+ */
+
+namespace Tmdb\Factory;
+
+abstract class AbstractFactory {
+    /**
+     * Convert an array to an hydrated object
+     *
+     * @param array $data
+     * @return $this
+     */
+    abstract public static function create(array $data = array());
+
+    /**
+     * Convert an array with an collection of items to an hydrated object collection
+     *
+     * @param array $data
+     * @return $this
+     */
+    abstract public static function createCollection(array $data = array());
+}

lib/Tmdb/Factory/GenreFactory.php

@@ -18,10 +18,7 @@
 
 class GenreFactory {
     /**
-     * Convert an array to an hydrated object
-     *
-     * @param array $data
-     * @return $this
+     * {@inheritdoc}
      */
     public static function create(array $data = array())
     {
@@ -31,10 +28,7 @@ public static function create(array $data = array())
     }
 
     /**
-     * Convert an array to an hydrated object
-     *
-     * @param array $data
-     * @return Genre[]
+     * {@inheritdoc}
      */
     public static function createCollection(array $data = array())
     {

lib/Tmdb/Factory/Movie/AlternativeTitleFactory.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * This file is part of the Wrike PHP API created by B-Found IM&S.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ * 
+ * @package Wrike
+ * @author Michael Roterman <[email protected]>
+ * @copyright (c) 2013, B-Found Internet Marketing & Services
+ * @version 0.0.1
+ */
+
+namespace Tmdb\Factory\Movie;
+
+use Tmdb\Factory\AbstractFactory;
+use Tmdb\Model\Common\Collection;
+use Tmdb\Model\Movie\AlternativeTitle;
+
+class AlternativeTitleFactory extends AbstractFactory
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function create(array $data = array())
+    {
+        $title = new AlternativeTitle();
+
+        return $title->hydrate($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function createCollection(array $data = array())
+    {
+        $collection = new Collection();
+
+        foreach($data as $item) {
+            $collection->add(null, self::create($item));
+        }
+
+        return $collection;
+    }
+}

lib/Tmdb/Factory/MovieFactory.php

@@ -13,48 +13,47 @@
 
 namespace Tmdb\Factory;
 
+use Tmdb\Api\Movies;
+use Tmdb\Model\Common\Collection;
 use Tmdb\Model\Movie;
 
-class MovieFactory {
+class MovieFactory extends AbstractFactory {
     /**
-     * Convert an array to an hydrated object
-     *
-     * @param array $data
-     * @return $this
+     * {@inheritdoc}
      */
     public static function create(array $data = array())
     {
         if (!$data) {
             return null;
         }
 
-        $movie = new Movie($data['id']);
+        $movie = new Movie();
 
-//        if (array_key_exists('alternative_titles', $data) && array_key_exists('titles', $data['alternative_titles'])) {
-//            $movie->setAlternativeTitles(Movie::collectGenericCollection($client, $data['alternative_titles']['titles'], new AlternativeTitle()));
-//        }
-//
-//        $casts   = array();
-//        $credits = $movie->getCredits();
-//
-//        /** Credits */
-//        if (array_key_exists('credits', $data)) {
-//            $casts = $data['credits'];
-//        }
-//
-//        if (array_key_exists('casts', $data)) {
-//            $casts = $data['casts'];
-//        }
-//
-//        if (array_key_exists('cast', $casts)) {
-//            $credits->setCast(parent::collectCast($client, $casts['cast']));
-//        }
-//
-//        if (array_key_exists('crew', $casts)) {
-//            $credits->setCrew(parent::collectCrew($client, $casts['crew']));
-//        }
-//
-//        $movie->setCredits($credits);
+        if (array_key_exists('alternative_titles', $data) && array_key_exists('titles', $data['alternative_titles'])) {
+            $movie->setAlternativeTitles(Movie::collectGenericCollection($client, $data['alternative_titles']['titles'], new AlternativeTitle()));
+        }
+
+        $casts   = array();
+        $credits = $movie->getCredits();
+
+        /** Credits */
+        if (array_key_exists('credits', $data)) {
+            $casts = $data['credits'];
+        }
+
+        if (array_key_exists('casts', $data)) {
+            $casts = $data['casts'];
+        }
+
+        if (array_key_exists('cast', $casts)) {
+            $credits->setCast(parent::collectCast($client, $casts['cast']));
+        }
+
+        if (array_key_exists('crew', $casts)) {
+            $credits->setCrew(parent::collectCrew($client, $casts['crew']));
+        }
+
+        $movie->setCredits($credits);
 //
         /** Genres */
         if (array_key_exists('genres', $data)) {
@@ -94,4 +93,17 @@ public static function create(array $data = array())
         return $movie->hydrate($data);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public static function createCollection(array $data = array())
+    {
+        $collection = new Collection();
+
+        foreach($data as $item) {
+            $collection->add(null, self::create($item));
+        }
+
+        return $collection;
+    }
 } 

lib/Tmdb/Factory/People/CastFactory.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * This file is part of the Wrike PHP API created by B-Found IM&S.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ * 
+ * @package Wrike
+ * @author Michael Roterman <[email protected]>
+ * @copyright (c) 2013, B-Found Internet Marketing & Services
+ * @version 0.0.1
+ */
+
+namespace Tmdb\Factory\People;
+
+use Tmdb\Factory\AbstractFactory;
+use Tmdb\Model\Collection\People\Cast;
+use Tmdb\Model\Collection\People;
+
+class CastFactory extends AbstractFactory
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function create(array $data = array())
+    {
+        $cast = new Cast();
+
+        return $cast->hydrate($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function createCollection(array $data = array())
+    {
+        $collection = new People();
+
+        foreach($data as $item) {
+            $collection->add(null, self::create($item));
+        }
+
+        return $collection;
+    }
+}

lib/Tmdb/Factory/People/CrewFactory.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * This file is part of the Wrike PHP API created by B-Found IM&S.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ * 
+ * @package Wrike
+ * @author Michael Roterman <[email protected]>
+ * @copyright (c) 2013, B-Found Internet Marketing & Services
+ * @version 0.0.1
+ */
+
+namespace Tmdb\Factory\People;
+
+use Tmdb\Factory\AbstractFactory;
+use Tmdb\Model\Collection\People\Crew;
+use Tmdb\Model\Collection\People;
+
+class CrewFactory extends AbstractFactory
+{
+    /**
+     * {@inheritdoc}
+     */
+    public static function create(array $data = array())
+    {
+        $crew = new Crew();
+
+        return $crew->hydrate($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function createCollection(array $data = array())
+    {
+        $collection = new People();
+
+        foreach($data as $item) {
+            $collection->add(null, self::create($item));
+        }
+
+        return $collection;
+    }
+}

lib/Tmdb/Model/Collection/Genres.php

@@ -31,7 +31,7 @@ public function getGenres()
      * Retrieve a genre from the collection
      *
      * @param $id
-     * @return null
+     * @return Genre|null
      */
     public function getGenre($id) {
         foreach($this->data as $genre) {

lib/Tmdb/Model/Genre.php

@@ -13,6 +13,7 @@
 namespace Tmdb\Model;
 
 use Tmdb\Client;
+use Tmdb\Factory\GenreFactory;
 
 class Genre extends AbstractModel {
 
@@ -50,7 +51,7 @@ public static function fromArray(Client $client, array $data)
     public static function load(Client $client, $id, array $parameters = array()) {
         $data = $client->api('genres')->getGenre($id, parent::parseQueryParameters($parameters));
 
-        return Genre::fromArray($client, $data);
+        return GenreFactory::create($data);
     }
 
     /**