Merge branch 'master' of git://github.com/gallery/gallery3

4 files changed, 218 insertions, 246 deletions

diff --git a/modules/tag/tests/Tag_Item_Rest_Helper_Test.php b/modules/tag/tests/Tag_Item_Rest_Helper_Test.php
new file mode 100644
index 00000000..cb368790
--- /dev/null
+++ b/modules/tag/tests/Tag_Item_Rest_Helper_Test.php
@@ -0,0 +1,70 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Tag_Item_Rest_Helper_Test extends Gallery_Unit_Test_Case {
+  public function setup() {
+    try {
+      Database::instance()->query("TRUNCATE {tags}");
+      Database::instance()->query("TRUNCATE {items_tags}");
+    } catch (Exception $e) { }
+  }
+
+  public function get_test() {
+    $tag = tag::add(item::root(), "tag1")->reload();
+
+    $request = new stdClass();
+    $request->url = rest::url("tag_item", $tag, item::root());
+    $this->assert_equal_array(
+      array("url" => rest::url("tag_item", $tag, item::root()),
+            "members" => array(
+              "tag" => rest::url("tag", $tag),
+              "item" => rest::url("item", item::root()))),
+      tag_item_rest::get($request));
+  }
+
+  public function get_with_invalid_url_test() {
+    $request = new stdClass();
+    $request->url = "bogus";
+    try {
+      tag_item_rest::get($request);
+    } catch (Kohana_404_Exception $e) {
+      return;  // pass
+    }
+    $this->assert_true(false, "Shouldn't get here");
+  }
+
+  public function delete_test() {
+    $tag = tag::add(item::root(), "tag1")->reload();
+
+    $request = new stdClass();
+    $request->url = rest::url("tag_item", $tag, item::root());
+    tag_item_rest::delete($request);
+
+    $this->assert_false($tag->reload()->has(item::root()));
+  }
+
+  public function resolve_test() {
+    $album = test::random_album();
+    $tag = tag::add($album, "tag1")->reload();
+
+    $tuple = rest::resolve(rest::url("tag_item", $tag, $album));
+    $this->assert_equal_array($tag->as_array(), $tuple[0]->as_array());
+    $this->assert_equal_array($album->as_array(), $tuple[1]->as_array());
+  }
+}
diff --git a/modules/tag/tests/Tag_Rest_Helper_Test.php b/modules/tag/tests/Tag_Rest_Helper_Test.php
index 514538d4..838de975 100644
--- a/modules/tag/tests/Tag_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tag_Rest_Helper_Test.php
@@ -17,272 +17,110 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Tag_Rest_Helper_Test extends Unit_Test_Case {
+class Tag_Rest_Helper_Test extends Gallery_Unit_Test_Case {
   public function setup() {
     try {
       Database::instance()->query("TRUNCATE {tags}");
       Database::instance()->query("TRUNCATE {items_tags}");
     } catch (Exception $e) { }
-    $this->_save = array($_GET, $_POST, $_SERVER, $_FILES);
-    $this->_saved_active_user = identity::active_user();
   }
 
-  public function teardown() {
-    list($_GET, $_POST, $_SERVER, $_FILES) = $this->_save;
-    identity::set_active_user($this->_saved_active_user);
+  public function get_test() {
+    $tag = tag::add(item::root(), "tag1")->reload();
 
-    try {
-      if (!empty($this->_user)) {
-        $this->_user->delete();
-      }
-    } catch (Exception $e) { }
-  }
-
-  private function _create_user() {
-    if (empty($this->_user)) {
-      $this->_user = identity::create_user("access_test" . rand(), "Access Test", "password");
-      $key = ORM::factory("user_access_token");
-      $key->access_key = md5($this->_user->name . rand());
-      $key->user_id = $this->_user->id;
-      $key->save();
-      identity::set_active_user($this->_user);
-    }
-    return $this->_user;
-  }
-
-  private function _create_album($tags=array(), $parent=null) {
-    $album_name = "tag_album_" . rand();
-    if (empty($parent)) {
-      $parent = ORM::factory("item", 1);
-    }
-    $album = album::create($parent, $album_name, $album_name, $album_name);
-    foreach ($tags as $tag) {
-      tag::add($album, $tag);
-    }
-    return $album;
+    $request = new stdClass();
+    $request->url = rest::url("tag", $tag);
+    $this->assert_equal_array(
+      array("url" => rest::url("tag", $tag),
+            "entity" => $tag->as_array(),
+            "relationships" => array(
+              "items" => array(
+                "url" => rest::url("tag_items", $tag),
+                "members" => array(
+                  rest::url("tag_item", $tag, item::root()))))),
+      tag_rest::get($request));
   }
 
-  private function _create_image($tags=array(), $parent=null) {
-    $filename = MODPATH . "gallery/tests/test.jpg";
-    $image_name = "tag_image_" . rand();
-    if (empty($parent)) {
-      $parent = ORM::factory("item", 1);
-    }
-    $photo = photo::create($parent, $filename, "$image_name.jpg", $image_name);
-    foreach ($tags as $tag) {
-      tag::add($photo, $tag);
+  public function get_with_invalid_url_test() {
+    $request = new stdClass();
+    $request->url = "bogus";
+    try {
+      tag_rest::get($request);
+    } catch (Kohana_404_Exception $e) {
+      return;  // pass
     }
-    return $photo;
-  }
-
-  public function tag_rest_get_all_test() {
-    $album = $this->_create_album(array("albums", "A1", "T1"));
-    $child = $this->_create_album(array("albums", "C1", "T1"), $album);
-    $photo = $this->_create_image(array("photos", "P1", "T1"), $child);
-    $sibling = $this->_create_image(array("photos", "P3"), $album);
-
-    $request = (object)array("arguments" => array(), "limit" => 2, "offset" => 1);
-
-    $this->assert_equal(
-      json_encode(array("status" => "OK",
-                        "tags" => array(array("name" => "albums", "count" => "2"),
-                                        array("name" => "photos", "count" => "2")))),
-      tag_rest::get($request));
+    $this->assert_true(false, "Shouldn't get here");
   }
 
-  public function tag_rest_get_tags_for_item_test() {
-    $photo = $this->_create_image(array("photos", "P1", "T1"));
-
-    $request = (object)array("arguments" => explode("/", $photo->relative_url()));
+  public function get_with_no_relationships_test() {
+    $tag = test::random_tag();
 
-    $this->assert_equal(
-      json_encode(array("status" => "OK",
-                        "tags" => array("photos", "P1", "T1"))),
+    $request = new stdClass();
+    $request->url = rest::url("tag", $tag);
+    $this->assert_equal_array(
+      array("url" => rest::url("tag", $tag),
+            "entity" => $tag->as_array(),
+            "relationships" => array(
+              "items" => array(
+                "url" => rest::url("tag_items", $tag),
+                "members" => array()))),
       tag_rest::get($request));
   }
 
-  public function tag_rest_get_items_test() {
-    $album = $this->_create_album(array("albums", "A1", "T1"));
-    $child = $this->_create_album(array("albums", "A1", "T1"), $album);
-    $photo = $this->_create_image(array("photos", "P1", "T1"), $child);
-    $sibling = $this->_create_image(array("photos", "P3"), $album);
-    $child->reload();
-    $album->reload();
+  public function post_test() {
+    $tag = test::random_tag();
 
-    $request = (object)array("arguments" => array("albums"));
+    // Create an editable item to be tagged
+    $album = test::random_album();
+    access::allow(identity::everybody(), "edit", $album);
 
-    $resources = array();
-    foreach (array($album, $child) as $resource) {
-      $resources[] = array("type" => $resource->type,
-                           "has_children" => $resource->children_count() > 0,
-                           "path" => $resource->relative_url(),
-                           "thumb_url" => $resource->thumb_url(),
-                           "thumb_dimensions" => array("width" => $resource->thumb_width,
-                                                       "height" => $resource->thumb_height),
-                           "has_thumb" => $resource->has_thumb(),
-                           "title" => $resource->title);
-
-    }
-    $this->assert_equal(json_encode(array("status" => "OK", "resources" => $resources)),
-                        tag_rest::get($request));
+    // Add the album to the tag
+    $request = new stdClass();
+    $request->url = rest::url("tag", $tag);
+    $request->params = new stdClass();
+    $request->params->url = rest::url("item", $album);
+    $this->assert_equal_array(
+      array("url" => rest::url("tag_item", $tag, $album)),
+      tag_rest::post($request));
   }
 
-  public function tag_rest_add_tags_for_item_no_path_test() {
-    $request = (object)array("arguments" => array("new,one"));
-
+  public function post_with_no_item_url_test() {
+    $request = new stdClass();
     try {
       tag_rest::post($request);
     } catch (Rest_Exception $e) {
-      $this->assert_equal("400 Bad request", $e->getMessage());
-    } catch (Exception $e) {
-      $this->assert_false(true, $e->__toString());
-    }
-  }
-
-  public function tag_rest_add_tags_for_item_not_found_test() {
-    $photo = $this->_create_image(array("photos", "P1", "T1"));
-    $request = (object)array("path" => $photo->relative_url() . "b",
-                             "arguments" => array("new,one"));
-    try {
-      tag_rest::post($request);
-    } catch (Kohana_404_Exception $k404) {
-    } catch (Exception $e) {
-      $this->assert_false(true, $e->__toString());
-    }
-  }
-
-  public function tag_rest_add_tags_for_item_no_access_test() {
-    $photo = $this->_create_image(array("photos", "P1", "T1"));
-    $this->_create_user();
-    $request = (object)array("path" => $photo->relative_url(),
-                             "arguments" => array("new,one"));
-
-    try {
-      tag_rest::post($request);
-    } catch (Kohana_404_Exception $k404) {
-    } catch (Exception $e) {
-      $this->assert_false(true, $e->__toString());
+      $this->assert_equal(400, $e->getCode());
+      return;
     }
-  }
-
-  public function tag_rest_add_tags_for_item_test() {
-    $album = $this->_create_album(array("albums", "A1", "T1"));
-    $child = $this->_create_album(array("albums", "A1", "T1"), $album);
-    $photo = $this->_create_image(array("photos", "P1", "T1"), $child);
-    $sibling = $this->_create_image(array("photos", "P3"), $album);
-    access::allow(identity::registered_users(), "edit", $child);
-    $this->_create_user();
-    $request = (object)array("path" => $photo->relative_url(),
-                             "arguments" => array("new,one"));
 
-    $this->assert_equal(
-      json_encode(array("status" => "OK")),
-      tag_rest::post($request));
-    $request = (object)array("arguments" => explode("/", $photo->relative_url()));
-    $this->assert_equal(
-      json_encode(array("status" => "OK",
-                        "tags" => array("photos", "P1", "T1", "new", "one"))),
-      tag_rest::get($request));
+    $this->assert_true(false, "Shouldn't get here");
   }
 
-  public function tag_rest_update_tag_no_arguments_test() {
-    $request = (object)array("arguments" => array());
+  public function put_test() {
+    $tag = test::random_tag();
+    $request = new stdClass();
+    $request->url = rest::url("tag", $tag);
+    $request->params = new stdClass();
+    $request->params->name = "new name";
 
-    try {
-      tag_rest::put($request);
-    } catch (Rest_Exception $e) {
-      $this->assert_equal("400 Bad request", $e->getMessage());
-    } catch (Exception $e) {
-      $this->assert_false(true, $e->__toString());
-    }
-  }
-
-  public function tag_rest_update_tag_one_arguments_test() {
-    $request = (object)array("arguments" => array("photos"));
-    try {
-      tag_rest::put($request);
-    } catch (Rest_Exception $e) {
-      $this->assert_equal("400 Bad request", $e->getMessage());
-    } catch (Exception $e) {
-      $this->assert_false(true, $e->__toString());
-    }
-
-    $request = (object)array("arguments" => array(), "new_name" => "valid");
-    try {
-      tag_rest::put($request);
-    } catch (Rest_Exception $e) {
-      $this->assert_equal("400 Bad request", $e->getMessage());
-    } catch (Exception $e) {
-      $this->assert_false(true, $e->__toString());
-    }
+    tag_rest::put($request);
+    $this->assert_equal("new name", $tag->reload()->name);
   }
 
-  public function tag_rest_update_tags_not_found_test() {
-    $request = (object)array("arguments" => array("not"), "new_name" => "found");
+  public function delete_tag_test() {
+    $tag = test::random_tag();
+    $request = new stdClass();
+    $request->url = rest::url("tag", $tag);
+    tag_rest::delete($request);
 
-    try {
-      tag_rest::put($request);
-    } catch (Kohana_404_Exception $k404) {
-    } catch (Exception $e) {
-      $this->assert_false(true, $e->__toString());
-    }
+    $this->assert_false($tag->reload()->loaded());
   }
 
-  public function tag_rest_update_tags_test() {
-    $album = $this->_create_album(array("albums", "A1", "T1"));
-    $child = $this->_create_album(array("albums", "A1", "T1"), $album);
-    $photo = $this->_create_image(array("photos", "P1", "T1"), $child);
-    $child->reload();
-    $sibling = $this->_create_image(array("photos", "P3"), $album);
-    $child->reload();
-    $album->reload();
-
-    $request = (object)array("arguments" => array("albums"), "new_name" => "new name");
+  public function resolve_test() {
+    $tag = test::random_tag();
 
-    $this->assert_equal(json_encode(array("status" => "OK")), tag_rest::put($request));
-
-    $request = (object)array("arguments" => array("new name"));
-    $resources = array();
-    foreach (array($album, $child) as $resource) {
-      $resources[] = array("type" => $resource->type,
-                           "has_children" => $resource->children_count() > 0,
-                           "path" => $resource->relative_url(),
-                           "thumb_url" => $resource->thumb_url(),
-                           "thumb_dimensions" => array("width" => $resource->thumb_width,
-                                                       "height" => $resource->thumb_height),
-                           "has_thumb" => $resource->has_thumb(),
-                           "title" => $resource->title);
-
-    }
     $this->assert_equal(
-      json_encode(array("status" => "OK", "resources" => $resources)),
-      tag_rest::get($request));
-  }
-
-  public function tag_rest_delete_tag_test() {
-    $album = $this->_create_album(array("albums", "A1", "T1"));
-    $child = $this->_create_album(array("albums", "A1", "T1"), $album);
-    $photo = $this->_create_image(array("photos", "P1", "T1"), $child);
-
-    $request = (object)array("arguments" => array("T1,P1"));
-    $this->assert_equal(json_encode(array("status" => "OK")), tag_rest::delete($request));
-
-    $request = (object)array("arguments" => array("T1,P1"));
-    $this->assert_equal(json_encode(array("status" => "OK")),
-                        tag_rest::get($request));
-  }
-
-  public function tag_rest_delete_tagc_from_item_test() {
-    $album = $this->_create_album(array("albums", "A1", "T1"));
-    $child = $this->_create_album(array("albums", "A1", "T1"), $album);
-    $photo = $this->_create_image(array("photos", "P1", "T1"), $child);
-    $request = (object)array("arguments" => array("T1,P1"),
-                             $photo->relative_url());
-
-    $this->assert_equal(json_encode(array("status" => "OK")), tag_rest::delete($request));
-
-    $request = (object)array("arguments" => explode("/", $photo->relative_url()));
-    $this->assert_equal(json_encode(array("status" => "OK", "tags" => array("photos"))),
-                        tag_rest::get($request));
+      $tag->as_array(),
+      rest::resolve(rest::url("tag", $tag))->as_array());
   }
 }
diff --git a/modules/tag/tests/Tag_Test.php b/modules/tag/tests/Tag_Test.php
index c96e7f2b..defc4e89 100644
--- a/modules/tag/tests/Tag_Test.php
+++ b/modules/tag/tests/Tag_Test.php
@@ -17,26 +17,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Tag_Test extends Unit_Test_Case {
+class Tag_Test extends Gallery_Unit_Test_Case {
   public function create_tag_test() {
-    $rand = rand();
-    $root = ORM::factory("item", 1);
-    $album = album::create($root, $rand, $rand, $rand);
-    $tag1 = "tag1";
+    $album = test::random_album();
 
-    tag::add($album, $tag1);
-    $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
+    tag::add($album, "tag1");
+    $tag = ORM::factory("tag")->where("name", "=", "tag1")->find();
     $this->assert_true(1, $tag->count);
 
     // Make sure adding the tag again doesn't increase the count
-    tag::add($album, $tag1);
-    $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
-    $this->assert_true(1, $tag->count);
+    tag::add($album, "tag1");
+    $this->assert_true(1, $tag->reload()->count);
 
-    $rand = rand();
-    $album = album::create($root, $rand, $rand, $rand);
-    tag::add($album, $tag1);
-    $tag = ORM::factory("tag")->where("name", "=", $tag1)->find();
-    $this->assert_true(2, $tag->count);
+    tag::add(test::random_album(), "tag1");
+    $this->assert_true(2, $tag->reload()->count);
   }
 }
\ No newline at end of file
diff --git a/modules/tag/tests/Tags_Rest_Helper_Test.php b/modules/tag/tests/Tags_Rest_Helper_Test.php
new file mode 100644
index 00000000..cdf7bfdf
--- /dev/null
+++ b/modules/tag/tests/Tags_Rest_Helper_Test.php
@@ -0,0 +1,71 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Tags_Rest_Helper_Test extends Gallery_Unit_Test_Case {
+  public function setup() {
+    try {
+      Database::instance()->query("TRUNCATE {tags}");
+      Database::instance()->query("TRUNCATE {items_tags}");
+    } catch (Exception $e) {
+    }
+  }
+
+  public function get_test() {
+    $t1 = tag::add(item::root(), "t1");
+    $t2 = tag::add(item::root(), "t2");
+
+    $request = new stdClass();
+    $this->assert_equal_array(
+      array(
+        "url" => rest::url("tags"),
+        "members" => array(
+          rest::url("tag", $t1),
+          rest::url("tag", $t2))),
+      tags_rest::get($request));
+  }
+
+  public function post_test() {
+    access::allow(identity::everybody(), "edit", item::root());
+
+    $request = new stdClass();
+    $request->params = new stdClass();
+    $request->params->name = "test tag";
+    $this->assert_equal(
+      array("url" => url::site("rest/tag/1")),
+      tags_rest::post($request));
+  }
+
+  public function post_fails_without_permissions_test() {
+    // We have to remove edit permissions from everywhere
+    Database::instance()->query("UPDATE {access_caches} SET edit_1=0");
+    identity::set_active_user(identity::guest());
+
+    try {
+      $request = new stdClass();
+      $request->params = new stdClass();
+      $request->params->name = "test tag";
+      tags_rest::post($request);
+    } catch (Exception $e) {
+      $this->assert_equal(403, $e->getCode());
+      return;
+    }
+    $this->assert_true(false, "Shouldnt get here");
+  }
+
+}