Tidy up Owner::createRepo() to use \Api\Repo->create() properly

Standardized responses (addresses #1)

lib/Github/Model/DeployKey.php

@@ -26,7 +26,7 @@ public function __construct(Repo $repo, $id)
 
     public function update($title, $key)
     {
-        return $this->api('repo')->keys()->update(
+        $data = $this->api('repo')->keys()->update(
             $this->repo->owner->name,
             $this->repo->name,
             $this->id,
@@ -35,14 +35,18 @@ public function update($title, $key)
                 'key'   => $key
             )
         );
+
+        return DeployKey::fromArray($this->repo, $data);
     }
 
     public function remove()
     {
-        return $this->api('repo')->keys()->remove(
+        $this->api('repo')->keys()->remove(
             $this->repo->owner->name,
             $this->repo->name,
             $this->id
         );
+
+        return true;
     }
 }

lib/Github/Model/Hook.php

@@ -13,13 +13,22 @@ class Hook extends AbstractModel
         'events',
         'active',
         'config',
-        'id'
+        'id',
+        'last_response'
     );
 
     public static function fromArray(Repo $repo, array $data)
     {
         $hook = Hook::factory($repo, $data['id']);
 
+        if (isset($data['last_response'])) {
+            $data['last_response'] = (object) $data['last_response'];
+        }
+
+        if (isset($data['config'])) {
+            $data['config'] = (object) $data['config'];
+        }
+
         return $hook->hydrate($data);
     }
 
@@ -54,20 +63,24 @@ public function update(array $params)
 
     public function remove()
     {
-        return $this->api('repo')->hooks()->remove(
+        $this->api('repo')->hooks()->remove(
             $this->repo->owner->login,
             $this->repo->name,
             $this->id
         );
+
+        return true;
     }
 
     public function test()
     {
-        return $this->api('repo')->hooks()->test(
+        $this->api('repo')->hooks()->test(
             $this->repo->owner->login,
             $this->repo->name,
             $this->id
         );
+
+        return true;
     }
 
 }

lib/Github/Model/Issue.php

@@ -201,7 +201,7 @@ public function updateMilestone($number, array $data)
 
     public function removeMilestone($number)
     {
-       return Milestone::factory($this, $number)->remove();
+        return Milestone::factory($this, $number)->remove();
     }
 
     public function comments($page = 1)

lib/Github/Model/Label.php

@@ -27,7 +27,7 @@ public function __construct(Repo $repo, $name)
     public function update($name, $color)
     {
         $data = $this->api('repo')->labels()->update(
-            $this->owner->name,
+            $this->repo->owner->login,
             $this->repo->name,
             $this->name,
             array(
@@ -42,7 +42,7 @@ public function update($name, $color)
     public function remove()
     {
         $this->api('repo')->labels()->remove(
-            $this->owner->name,
+            $this->repo->owner->login,
             $this->repo->name,
             $this->name
         );

lib/Github/Model/Org.php

@@ -4,9 +4,11 @@
 
 class Org extends Owner implements OwnerInterface
 {
-    public function getCreateRepoPath()
+    public function createRepo($name, array $params = array())
     {
-        return 'orgs/'.$this->name.'/repos';
+        $params['organization'] = $this->login;
+
+        return parent::createRepo($name, $params);
     }
 
     public function show()

lib/Github/Model/Owner.php

@@ -51,21 +51,18 @@ public function repo($name)
     public function createRepo($name, array $params = array())
     {
         $params = array_merge(array(
-            'name'                  => $name,
             'description'           => null,
             'homepage'              => null,
             'public'                => true,
-            'has_issues'            => true,
-            'has_wiki'              => true,
-            'has_downloads'         => true,
-            'team_id'               => null,
-            'auto_init'             => false,
-            'gitignore_template'    => null
+            'organization'          => null
         ), $params);
 
-        $data = $this->api('repo')->post(
-            $this->getCreateRepoPath(),
-            $params
+        $data = $this->api('repo')->create(
+            $name,
+            $params['description'],
+            $params['homepage'],
+            $params['public'],
+            $params['organization']
         );
 
         return Repo::fromArray($data);

lib/Github/Model/OwnerInterface.php

@@ -4,5 +4,4 @@
 
 interface OwnerInterface
 {
-    public function getCreateRepoPath();
 }

lib/Github/Model/Repo.php

@@ -135,7 +135,7 @@ public function issues(array $params = array())
 
     public function issue($number)
     {
-       return Issue::factory($this, $number)->show();
+        return Issue::factory($this, $number)->show();
     }
 
     public function labels()
@@ -181,14 +181,23 @@ public function addLabel($name, $color)
 
     public function updateLabel($name, $color)
     {
-         return Label::factory($this, $name)->update($name, $color);
+        return Label::factory($this, $name)->update($name, $color);
     }
 
     public function removeLabel($name)
     {
         return Label::factory($this, $name)->remove($name);
     }
 
+    public function removeLabels()
+    {
+        foreach ($this->labels() as $label) {
+            $label->remove();
+        }
+
+        return true;
+    }
+
     public function keys()
     {
         $data = $this->api('repo')->keys()->all(

lib/Github/Model/Team.php

@@ -48,9 +48,11 @@ public function update(array $params)
 
     public function remove()
     {
-        return $this->api('organization')->teams()->remove(
+        $this->api('organization')->teams()->remove(
             $this->id
         );
+
+        return true;
     }
 
     public function members()
@@ -69,26 +71,32 @@ public function members()
 
     public function check($login)
     {
-        return $this->api('organization')->teams()->check(
+        $this->api('organization')->teams()->check(
             $this->id,
             $login
         );
+
+        return true;
     }
 
     public function addMember($login)
     {
-        return $this->api('organization')->teams()->addMember(
+        $this->api('organization')->teams()->addMember(
             $this->id,
             $login
         );
+
+        return true;
     }
 
     public function removeMember($login)
     {
-        return $this->api('organization')->teams()->removeMember(
+        $this->api('organization')->teams()->removeMember(
             $this->id,
             $login
         );
+
+        return true;
     }
 
     public function repositories()
@@ -105,35 +113,49 @@ public function repositories()
         return $repos;
     }
 
-    public function repository($login, $repository)
+    public function repository($repository)
     {
+        if ($repository instanceof Repo) {
+            $repository = $repository->name;
+        }
+
         $data = $this->api('organization')->teams()->repository(
             $this->id,
-            $login,
+            $this->org->login,
             $repository
         );
 
         return Repo::fromArray($data);
     }
 
-    public function addRepository($login, $repository)
+    public function addRepository($repository)
     {
-        $data = $this->api('organization')->teams()->addRepository(
+        if ($repository instanceof Repo) {
+            $repository = $repository->name;
+        }
+
+        $this->api('organization')->teams()->addRepository(
             $this->id,
-            $login,
+            $this->org->login,
             $repository
         );
 
-        return Repo::fromArray($data);
+        return true;
     }
 
-    public function removeRepository($login, $repository)
+    public function removeRepository($repository)
     {
-        return $this->api('organization')->teams()->removeRepository(
+        if ($repository instanceof Repo) {
+            $repository = $repository->name;
+        }
+
+        $this->api('organization')->teams()->removeRepository(
             $this->id,
-            $login,
+            $this->org->login,
             $repository
         );
+
+        return true;
     }
 
 }

lib/Github/Model/User.php

@@ -4,8 +4,4 @@
 
 class User extends Owner implements OwnerInterface
 {
-    public function getCreateRepoPath()
-    {
-        return '/user/repos';
-    }
 }