From 6fd04069aec67ff115cac4296c013cb5eea6782b Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 8 Dec 2009 12:50:13 -0800
Subject: Add another error handler "not found" to the rest API. Implement the
 get_album rest request handler.

---
 modules/gallery/tests/Gallery_Rest_Helper_Test.php | 75 ++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 modules/gallery/tests/Gallery_Rest_Helper_Test.php

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
new file mode 100644
index 00000000..ea1841d0
--- /dev/null
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -0,0 +1,75 @@
+<?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 Gallery_Rest_Helper_Test extends Unit_Test_Case {
+  public function setup() {
+    $this->_save = array($_GET, $_POST, $_SERVER);
+    $this->_saved_active_user = identity::active_user();
+
+    $this->_user = identity::create_user("access_test", "Access Test", "password");
+    $key = ORM::factory("user_access_token");
+    $this->_access_key = $key->access_key = md5($this->_user->name . rand());
+    $key->user_id = $this->_user->id;
+    $key->save();
+
+    $root = ORM::factory("item", 1);
+    $this->_album = album::create($root, "album", "Test Album", rand());
+    $this->_child = album::create($this->_album, "child", "Test Child Album", rand());
+
+    $filename = MODPATH . "gallery/tests/test.jpg";
+    $rand = rand();
+    $this->_photo = photo::create($this->_child, $filename, "$rand.jpg", $rand);
+
+    identity::set_active_user($this->_user);
+  }
+
+  public function teardown() {
+    list($_GET, $_POST, $_SERVER) = $this->_save;
+    identity::set_active_user($this->_saved_active_user);
+
+    try {
+      if (!empty($this->_user)) {
+        $this->_user->delete();
+      }
+      if (!empty($this->_album)) {
+        $this->_album->delete();
+      }
+    } catch (Exception $e) { }
+  }
+
+  public function gallery_rest_get_album_test() {
+    $request = (object)array("path" => $this->_child->relative_path());
+    print Kohana::debug($request) . "\n";
+
+    $this->assert_equal(
+      json_encode(array("status" => "OK",
+                        "album" => array("path" => $this->_child->relative_path(),
+                                         "title" => $this->_child->title,
+                                         "thumb_url" => $this->_child->thumb_url(),
+                                         "url" => $this->_child->abs_url(),
+                                         "description" => $this->_child->description,
+                                         "internet_address" => $this->_child->slug,
+                                         "children" => array(array(
+                                           "type" => "photo",
+                                           "has_children" => false,
+                                           "path" => $this->_photo->relative_path(),
+                                           "title" => $this->_photo->title))))),
+      gallery_rest::get_album($request));
+  }
+}
-- 
cgit v1.2.3


From 9319f37c4f157c5b0787df9116889e4e9ea5df78 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 8 Dec 2009 23:27:43 -0800
Subject: Correct the error message when the item is not found; remove the
 check for no request_key (access_token) as athat is treated as public
 permissions

---
 modules/gallery/tests/Gallery_Rest_Helper_Test.php | 17 +++++++++++++++--
 modules/rest/controllers/rest.php                  | 13 ++-----------
 modules/rest/helpers/rest.php                      |  2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index ea1841d0..1bf0b1ca 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -55,7 +55,6 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
 
   public function gallery_rest_get_album_test() {
     $request = (object)array("path" => $this->_child->relative_path());
-    print Kohana::debug($request) . "\n";
 
     $this->assert_equal(
       json_encode(array("status" => "OK",
@@ -70,6 +69,20 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
                                            "has_children" => false,
                                            "path" => $this->_photo->relative_path(),
                                            "title" => $this->_photo->title))))),
-      gallery_rest::get_album($request));
+      gallery_rest::get($request));
+  }
+
+  public function gallery_rest_get_photo_test() {
+    $request = (object)array("path" => $this->_photo->relative_path());
+
+    $this->assert_equal(
+      json_encode(array("status" => "OK",
+                        "photo" => array("path" => $this->_photo->relative_path(),
+                                         "title" => $this->_photo->title,
+                                         "thumb_url" => $this->_photo->thumb_url(),
+                                         "url" => $this->_photo->abs_url(),
+                                         "description" => $this->_photo->description,
+                                         "internet_address" => $this->_photo->slug))),
+      gallery_rest::get($request));
   }
 }
diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index 0c88877a..1ec24493 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -48,16 +48,10 @@ class Rest_Controller extends Controller {
 
   public function __call($function, $args) {
     $request = $this->_normalize_request($args);
-
-    if (empty($request->access_token)) {
-      print rest::forbidden("No access token supplied.");
-      return;
-    }
-
     try {
       if ($this->_set_active_user($request->access_token)) {
         $handler_class = "{$function}_rest";
-        $handler_method = "{$request->method}";
+        $handler_method = $request->method;
 
         if (!method_exists($handler_class, $handler_method)) {
           print rest::not_implemented("$handler_class::$handler_method is not implemented");
@@ -67,7 +61,7 @@ class Rest_Controller extends Controller {
         print call_user_func(array($handler_class, $handler_method), $request);
       }
     } catch (Exception $e) {
-      print rest::internal_error($e);
+      print rest::internal_error($e->__toString());
     }
   }
 
@@ -83,9 +77,6 @@ class Rest_Controller extends Controller {
     } else {
       $request = new stdClass();
       foreach (array_keys($_GET) as $key) {
-        if ($key == "request_key") {
-          continue;
-        }
         $request->$key = $this->input->get($key);
       }
     }
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index 22c13be9..fbbd6733 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -49,7 +49,7 @@ class rest_Core {
    * Resource Not Found
    */
   static function not_found($log_message=null) {
-    return self::_format_response(t("Internal error"), $log_message);
+    return self::_format_response(t("Resource not found"), $log_message);
   }
 
   /**
-- 
cgit v1.2.3


From 367f2218f6bc278a7d0bd870e03a5d631155871a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 9 Dec 2009 08:41:38 -0800
Subject: Use the relative url cache to look up resources instead of the
 relative path.  This allows us to forego the extension as part of the REST
 url.  As well, urls are consistent between normal usage and rest usage.

---
 modules/gallery/helpers/gallery_rest.php           |  6 +++---
 modules/gallery/tests/Gallery_Rest_Helper_Test.php |  4 ++--
 modules/rest/controllers/rest.php                  |  1 +
 modules/rest/tests/Rest_Controller_Test.php        | 16 ++++++++--------
 4 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/helpers/gallery_rest.php b/modules/gallery/helpers/gallery_rest.php
index dba109fd..043e17b5 100644
--- a/modules/gallery/helpers/gallery_rest.php
+++ b/modules/gallery/helpers/gallery_rest.php
@@ -24,7 +24,7 @@ class gallery_rest_Core {
     }
 
     $item = ORM::factory("item")
-      ->where("relative_path_cache", $request->path)
+      ->where("relative_url_cache", $request->path)
       ->viewable()
       ->find();
 
@@ -32,7 +32,7 @@ class gallery_rest_Core {
       return rest::not_found("Resource: {$request->path} missing.");
     }
 
-    $response_data = array("path" => $item->relative_path(),
+    $response_data = array("path" => $item->relative_url(),
                            "title" => $item->title,
                            "thumb_url" => $item->thumb_url(),
                            "url" => $item->abs_url(),
@@ -54,7 +54,7 @@ class gallery_rest_Core {
     foreach ($item->viewable()->children($limit, $offset, $where) as $child) {
       $children[] = array("type" => $child->type,
                           "has_children" => $child->children_count() > 0,
-                          "path" => $child->relative_path(),
+                          "path" => $child->relative_url(),
                           "title" => $child->title);
     }
 
diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index 1bf0b1ca..b874863f 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -58,7 +58,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
 
     $this->assert_equal(
       json_encode(array("status" => "OK",
-                        "album" => array("path" => $this->_child->relative_path(),
+                        "album" => array("path" => $this->_child->relative_url_path(),
                                          "title" => $this->_child->title,
                                          "thumb_url" => $this->_child->thumb_url(),
                                          "url" => $this->_child->abs_url(),
@@ -67,7 +67,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
                                          "children" => array(array(
                                            "type" => "photo",
                                            "has_children" => false,
-                                           "path" => $this->_photo->relative_path(),
+                                           "path" => $this->_photo->relative_url_path(),
                                            "title" => $this->_photo->title))))),
       gallery_rest::get($request));
   }
diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index 1ec24493..577d8aeb 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -34,6 +34,7 @@ class Rest_Controller extends Controller {
       print rest::forbidden("Invalid password for '{$request->user}'.");
       return;
     }
+
     $key = ORM::factory("user_access_token")
       ->where("user_id", $user->id)
       ->find();
diff --git a/modules/rest/tests/Rest_Controller_Test.php b/modules/rest/tests/Rest_Controller_Test.php
index d9b576de..5f7bdfe4 100644
--- a/modules/rest/tests/Rest_Controller_Test.php
+++ b/modules/rest/tests/Rest_Controller_Test.php
@@ -100,12 +100,12 @@ class Rest_Controller_Test extends Unit_Test_Case {
 
     $this->assert_equal(
       json_encode(array("status" => "OK", "message" => (string)t("Processed"),
-                        "photo" => array("path" => $this->_photo->relative_path(),
+                        "photo" => array("path" => $this->_photo->relative_url(),
                                         "title" => $this->_photo->title,
                                         "thumb_url" => $this->_photo->thumb_url(),
                                         "description" => $this->_photo->description,
                                         "internet_address" => $this->_photo->slug))),
-      $this->_call_controller("rest", explode("/", $this->_photo->relative_path())));
+      $this->_call_controller("rest", explode("/", $this->_photo->relative_url())));
   }
 
   public function rest_get_resource_invalid_key_test() {
@@ -126,7 +126,7 @@ class Rest_Controller_Test extends Unit_Test_Case {
 
     $this->assert_equal(
       json_encode(array("status" => "ERROR", "message" => (string)t("Authorization failed"))),
-      $this->_call_controller("rest", explode("/", $this->_photo->relative_path())));
+      $this->_call_controller("rest", explode("/", $this->_photo->relative_url())));
   }
 
   public function rest_get_resource_no_handler_test() {
@@ -136,7 +136,7 @@ class Rest_Controller_Test extends Unit_Test_Case {
 
     $this->assert_equal(
       json_encode(array("status" => "ERROR", "message" => (string)t("Service not implemented"))),
-      $this->_call_controller("rest", explode("/", $this->_photo->relative_path())));
+      $this->_call_controller("rest", explode("/", $this->_photo->relative_url())));
   }
 
   public function rest_get_resource_test() {
@@ -145,12 +145,12 @@ class Rest_Controller_Test extends Unit_Test_Case {
 
     $this->assert_equal(
       json_encode(array("status" => "OK", "message" => (string)t("Processed"),
-                        "photo" => array("path" => $this->_photo->relative_path(),
+                        "photo" => array("path" => $this->_photo->relative_url(),
                                         "title" => $this->_photo->title,
                                         "thumb_url" => $this->_photo->thumb_url(),
                                         "description" => $this->_photo->description,
                                         "internet_address" => $this->_photo->slug))),
-      $this->_call_controller("rest", explode("/", $this->_photo->relative_path())));
+      $this->_call_controller("rest", explode("/", $this->_photo->relative_url())));
   }
 
   private function _call_controller($method="access_key", $arg=null) {
@@ -171,9 +171,9 @@ class rest_rest {
   static function get($request) {
     self::$request = $request;
     $item = ORM::factory("item")
-      ->where("relative_path_cache", $request->path)
+      ->where("relative_url_cache", $request->path)
       ->find();
-    $response["path"] = $item->relative_path();
+    $response["path"] = $item->relative_url();
     $response["title"] = $item->title;
     $response["thumb_url"] = $item->thumb_url();
     $response["description"] = $item->description;
-- 
cgit v1.2.3


From dfc556e8a6e2c0636a93d87bc0cdb0f85f588fd4 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 9 Dec 2009 12:06:45 -0800
Subject: Implement the RESTful interface for albums/photos/movies

---
 modules/gallery/controllers/photos.php             |   3 +-
 modules/gallery/helpers/gallery_rest.php           |  51 ++++++++++
 modules/gallery/tests/Gallery_Rest_Helper_Test.php | 108 +++++++++++++++++++--
 modules/rest/helpers/rest.php                      |  21 ++--
 4 files changed, 168 insertions(+), 15 deletions(-)

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index f2c0f5dd..455ac25c 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -102,8 +102,7 @@ class Photos_Controller extends Items_Controller {
 
       log::success("content", "Updated photo", "<a href=\"{$photo->url()}\">view</a>");
       message::success(
-                       t("Saved photo %photo_title",
-                         array("photo_title" => html::purify($photo->title))));
+        t("Saved photo %photo_title", array("photo_title" => html::purify($photo->title))));
 
       print json_encode(
         array("result" => "success",
diff --git a/modules/gallery/helpers/gallery_rest.php b/modules/gallery/helpers/gallery_rest.php
index 043e17b5..82d1bb5b 100644
--- a/modules/gallery/helpers/gallery_rest.php
+++ b/modules/gallery/helpers/gallery_rest.php
@@ -46,6 +46,57 @@ class gallery_rest_Core {
     return rest::success(array($item->type => $response_data));
   }
 
+  static function put($request) {
+    if (empty($request->path)) {
+      return rest::invalid_request();
+    }
+
+    $item = ORM::factory("item")
+      ->where("relative_url_cache", $request->path)
+      ->viewable()
+      ->find();
+
+    if (!$item->loaded) {
+      return rest::not_found("Resource: {$request->path} missing.");
+    }
+
+    if (!access::can("edit", $item)) {
+      return rest::not_found("Resource: {$request->path} permission denied.");
+    }
+
+    // Normalize the request
+    $new_values = array();
+    $fields = array("title", "description", "name", "slug");
+    if ($item->is_album()) {
+      $fields = array_merge($fields, array("sort_column", "sort_order"));
+    }
+    foreach ($fields as $field) {
+      $new_values[$field] = !empty($request->$field) ? $request->$field : $item->$field;
+    }
+    if ($item->id == 1) {
+      unset($new_values["name"]);
+    }
+    if ($item->id != 1 &&
+        ($new_values["name"] != $item->name || $new_values["slug"] != $item->slug)) {
+      // Make sure that there's not a conflict
+      $errors = item::check_for_conflicts($item, $new_values["name"], $new_values["slug"]);
+      if (!empty($errors["name_conflict"])) {
+        return rest::fail(t("Renaming %path failed: new name exists",
+                            array("path" => $request->path)));
+      }
+      if (!empty($errors["slug_conflict"])) {
+        return rest::fail(t("Renaming %path failed: new internet address exists",
+                            array("path" => $request->path)));
+      }
+    }
+
+    item::update($item, $new_values);
+
+    log::success("content", "Updated $item->type", "<a href=\"{$item->type}s/$item->id\">view</a>");
+
+    return rest::success();
+  }
+
   private static function _get_children($item, $request) {
     $children = array();
     $limit = empty($request->limit) ? null : $request->limit;
diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index b874863f..9c960409 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -36,7 +36,9 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     $rand = rand();
     $this->_photo = photo::create($this->_child, $filename, "$rand.jpg", $rand);
 
-    identity::set_active_user($this->_user);
+    $filename = MODPATH . "gallery/tests/test.jpg";
+    $rand = rand();
+    $this->_sibling = photo::create($this->_album, $filename, "$rand.jpg", $rand);
   }
 
   public function teardown() {
@@ -54,11 +56,11 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
   }
 
   public function gallery_rest_get_album_test() {
-    $request = (object)array("path" => $this->_child->relative_path());
+    $request = (object)array("path" => $this->_child->relative_url());
 
     $this->assert_equal(
       json_encode(array("status" => "OK",
-                        "album" => array("path" => $this->_child->relative_url_path(),
+                        "album" => array("path" => $this->_child->relative_url(),
                                          "title" => $this->_child->title,
                                          "thumb_url" => $this->_child->thumb_url(),
                                          "url" => $this->_child->abs_url(),
@@ -67,17 +69,17 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
                                          "children" => array(array(
                                            "type" => "photo",
                                            "has_children" => false,
-                                           "path" => $this->_photo->relative_url_path(),
+                                           "path" => $this->_photo->relative_url(),
                                            "title" => $this->_photo->title))))),
       gallery_rest::get($request));
   }
 
   public function gallery_rest_get_photo_test() {
-    $request = (object)array("path" => $this->_photo->relative_path());
+    $request = (object)array("path" => $this->_photo->relative_url());
 
     $this->assert_equal(
       json_encode(array("status" => "OK",
-                        "photo" => array("path" => $this->_photo->relative_path(),
+                        "photo" => array("path" => $this->_photo->relative_url(),
                                          "title" => $this->_photo->title,
                                          "thumb_url" => $this->_photo->thumb_url(),
                                          "url" => $this->_photo->abs_url(),
@@ -85,4 +87,98 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
                                          "internet_address" => $this->_photo->slug))),
       gallery_rest::get($request));
   }
+
+  public function gallery_rest_put_album_no_path_test() {
+    access::allow(identity::registered_users(), "edit", $this->_child);
+
+    identity::set_active_user($this->_user);
+    $request = (object)array("description" => "Updated description",
+                             "title" => "Updated Title",
+                             "sort_order" => "DESC",
+                             "sort_column" => "title",
+                             "name" => "new name");
+
+    $this->assert_equal(json_encode(array("status" => "ERROR", "message" => "Invalid request")),
+                        gallery_rest::put($request));
+  }
+
+  public function gallery_rest_put_album_not_found_test() {
+    access::allow(identity::registered_users(), "edit", $this->_child);
+
+    identity::set_active_user($this->_user);
+    $request = (object)array("path" => $this->_child->relative_url() . rand(),
+                             "description" => "Updated description",
+                             "title" => "Updated Title",
+                             "sort_order" => "DESC",
+                             "sort_column" => "title",
+                             "name" => "new name");
+
+    $this->assert_equal(json_encode(array("status" => "ERROR", "message" => "Resource not found")),
+                        gallery_rest::put($request));
+  }
+
+  public function gallery_rest_put_album_no_edit_permission_test() {
+    identity::set_active_user($this->_user);
+    $request = (object)array("path" => $this->_child->relative_url(),
+                             "description" => "Updated description",
+                             "title" => "Updated Title",
+                             "sort_order" => "DESC",
+                             "sort_column" => "title",
+                             "name" => "new name");
+
+    $this->assert_equal(json_encode(array("status" => "ERROR", "message" => "Resource not found")),
+                        gallery_rest::put($request));
+  }
+
+  public function gallery_rest_put_album_rename_conflict_test() {
+    access::allow(identity::registered_users(), "edit", $this->_child);
+    identity::set_active_user($this->_user);
+    $request = (object)array("path" => $this->_child->relative_url(),
+                             "description" => "Updated description",
+                             "title" => "Updated Title",
+                             "sort_order" => "DESC",
+                             "sort_column" => "title",
+                             "name" => $this->_sibling->name);
+
+    $this->assert_equal(
+      json_encode(array("status" => "ERROR",
+                        "message" => "Renaming album/child failed: new name exists")),
+      gallery_rest::put($request));
+  }
+
+  public function gallery_rest_put_album_test() {
+    access::allow(identity::registered_users(), "edit", $this->_child);
+
+    identity::set_active_user($this->_user);
+    $request = (object)array("path" => $this->_child->relative_url(),
+                             "description" => "Updated description",
+                             "title" => "Updated Title",
+                             "sort_order" => "DESC",
+                             "sort_column" => "title",
+                             "name" => "new name");
+
+    $this->assert_equal(json_encode(array("status" => "OK")), gallery_rest::put($request));
+    $this->_child->reload();
+    $this->assert_equal("Updated description", $this->_child->description);
+    $this->assert_equal("Updated Title", $this->_child->title);
+    $this->assert_equal("DESC", $this->_child->sort_order);
+    $this->assert_equal("title", $this->_child->sort_column);
+    $this->assert_equal("new name",  $this->_child->name);
+  }
+
+  public function gallery_rest_put_photo_test() {
+    access::allow(identity::registered_users(), "edit", $this->_child);
+
+    identity::set_active_user($this->_user);
+    $request = (object)array("path" => $this->_photo->relative_url(),
+                             "description" => "Updated description",
+                             "title" => "Updated Title",
+                             "name" => "new name");
+
+    $this->assert_equal(json_encode(array("status" => "OK")), gallery_rest::put($request));
+    $this->_photo->reload();
+    $this->assert_equal("Updated description", $this->_photo->description);
+    $this->assert_equal("Updated Title", $this->_photo->title);
+    $this->assert_equal("new name",  $this->_photo->name);
+  }
 }
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index fbbd6733..2c653f21 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -21,41 +21,48 @@ class rest_Core {
    * Authorization Failure
    */
   static function forbidden($log_message=null) {
-    return self::_format_response(t("Authorization failed"), $log_message);
+    return self::_format_failure_response(t("Authorization failed"), $log_message);
   }
 
   /**
    * Invalid Failure
    */
   static function invalid_request($log_message=null) {
-    return self::_format_response(t("Invalid request"), $log_message);
+    return self::_format_failure_response(t("Invalid request"), $log_message);
   }
 
   /**
    * Not Implemented
    */
   static function not_implemented($log_message=null) {
-    return self::_format_response(t("Service not implemented"), $log_message);
+    return self::_format_failure_response(t("Service not implemented"), $log_message);
   }
 
   /**
    * Internal Error
    */
   static function internal_error($log_message=null) {
-    return self::_format_response(t("Internal error"), $log_message);
+    return self::_format_failure_response(t("Internal error"), $log_message);
   }
 
   /**
    * Resource Not Found
    */
   static function not_found($log_message=null) {
-    return self::_format_response(t("Resource not found"), $log_message);
+    return self::_format_failure_response(t("Resource not found"), $log_message);
+  }
+
+  /**
+   * Resource Not Found
+   */
+  static function fail($log_message=null) {
+    return self::_format_failure_response($log_message, $log_message);
   }
 
   /**
    * Success
    */
-  static function success($response_data, $message=null) {
+  static function success($response_data=null, $message=null) {
     $response = array("status" => "OK");
     if (!empty($message)) {
       $response["message"] = (string)$message;
@@ -68,7 +75,7 @@ class rest_Core {
     return json_encode($response);
   }
 
-  private static function _format_response($message, $log_message) {
+  private static function _format_failure_response($message, $log_message) {
     if (!empty($log_message)) {
       Kohana::log("info", $log_message);
     }
-- 
cgit v1.2.3


From d521faf63d6fcca13445a3bd89387b3a6dc591d4 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 9 Dec 2009 16:04:08 -0800
Subject: Add the REST delete processing for albums/photos/movies

---
 modules/gallery/helpers/gallery_rest.php           | 34 ++++++++++++++++++++++
 modules/gallery/tests/Gallery_Rest_Helper_Test.php | 22 ++++++++++++++
 2 files changed, 56 insertions(+)

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/helpers/gallery_rest.php b/modules/gallery/helpers/gallery_rest.php
index 82d1bb5b..8b209bae 100644
--- a/modules/gallery/helpers/gallery_rest.php
+++ b/modules/gallery/helpers/gallery_rest.php
@@ -97,6 +97,40 @@ class gallery_rest_Core {
     return rest::success();
   }
 
+  static function delete($request) {
+    if (empty($request->path)) {
+      return rest::invalid_request();
+    }
+
+    $item = ORM::factory("item")
+      ->where("relative_url_cache", $request->path)
+      ->viewable()
+      ->find();
+
+    if (!$item->loaded) {
+      return rest::success();
+    }
+
+    if (!access::can("edit", $item)) {
+      return rest::not_found("Resource: {$request->path} permission denied.");
+    }
+
+    if ($item->id == 1) {
+      return rest::invalid_request("Attempt to delete the root album");
+    }
+
+    $item->delete();
+
+    if ($item->is_album()) {
+      $msg = t("Deleted album <b>%title</b>", array("title" => html::purify($item->title)));
+    } else {
+      $msg = t("Deleted photo <b>%title</b>", array("title" => html::purify($item->title)));
+    }
+    log::success("content", $msg);
+
+    return rest::success();
+  }
+
   private static function _get_children($item, $request) {
     $children = array();
     $limit = empty($request->limit) ? null : $request->limit;
diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index 9c960409..dae55952 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -181,4 +181,26 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     $this->assert_equal("Updated Title", $this->_photo->title);
     $this->assert_equal("new name",  $this->_photo->name);
   }
+
+  public function gallery_rest_delete_album_test() {
+    access::allow(identity::registered_users(), "edit", $this->_album);
+
+    identity::set_active_user($this->_user);
+    $request = (object)array("path" => $this->_child->relative_url());
+
+    $this->assert_equal(json_encode(array("status" => "OK")), gallery_rest::delete($request));
+    $this->_child->reload();
+    $this->assert_false($this->_child->loaded);
+  }
+
+  public function gallery_rest_delete_photo_test() {
+    access::allow(identity::registered_users(), "edit", $this->_album);
+
+    identity::set_active_user($this->_user);
+    $request = (object)array("path" => $this->_sibling->relative_url());
+
+    $this->assert_equal(json_encode(array("status" => "OK")), gallery_rest::delete($request));
+    $this->_sibling->reload();
+    $this->assert_false($this->_sibling->loaded);
+  }
 }
-- 
cgit v1.2.3


From 22e813d0be73a95585cebcf30a1f4e03d7652d3a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 15 Dec 2009 10:57:10 -0800
Subject: Updates the the interface based on actually using it.

---
 modules/gallery/helpers/gallery_rest.php           | 70 +++++++++++++++++++++-
 modules/gallery/tests/Gallery_Rest_Helper_Test.php | 22 ++++++-
 modules/rest/controllers/rest.php                  |  6 +-
 3 files changed, 89 insertions(+), 9 deletions(-)

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/helpers/gallery_rest.php b/modules/gallery/helpers/gallery_rest.php
index 8b209bae..5bd65901 100644
--- a/modules/gallery/helpers/gallery_rest.php
+++ b/modules/gallery/helpers/gallery_rest.php
@@ -20,7 +20,7 @@
 class gallery_rest_Core {
   static function get($request) {
     if (empty($request->path)) {
-      return rest::invalid_request();
+      $request->path = "";
     }
 
     $item = ORM::factory("item")
@@ -32,7 +32,8 @@ class gallery_rest_Core {
       return rest::not_found("Resource: {$request->path} missing.");
     }
 
-    $response_data = array("path" => $item->relative_url(),
+    $response_data = array("type" => $item->type,
+                           "path" => $item->relative_url(),
                            "title" => $item->title,
                            "thumb_url" => $item->thumb_url(),
                            "url" => $item->abs_url(),
@@ -43,7 +44,7 @@ class gallery_rest_Core {
     if (!empty($children)) {
       $response_data["children"] = $children;
     }
-    return rest::success(array($item->type => $response_data));
+    return rest::success(array("resource" => $response_data));
   }
 
   static function put($request) {
@@ -97,6 +98,65 @@ class gallery_rest_Core {
     return rest::success();
   }
 
+  static function post($request) {
+    if (empty($request->path)) {
+      return rest::invalid_request();
+    }
+
+    $components = explode("/", $request->path);
+    $name = urldecode(array_pop($components));
+
+    $parent = ORM::factory("item")
+      ->where("relative_url_cache", implode("/", $components))
+      ->viewable()
+      ->find();
+
+    if (!$parent->loaded) {
+      return rest::not_found("Resource: {$request->path} missing.");
+    }
+
+    if (!access::can("edit", $parent)) {
+      return rest::not_found("Resource: {$request->path} permission denied.");
+    }
+
+    if (empty($_FILES["image"])) {
+      $new_item = album::create(
+        $parent,
+        $name,
+        empty($request->title) ? $name : $request->title,
+        empty($request->description) ? null : $request->description,
+        identity::active_user()->id,
+        empty($request->slug) ? $name : $request->slug);
+      $log_message = t("Added an album");
+    } else {
+      $file_validation = new Validation($_FILES);
+      $file_validation->add_rules(
+        "image", "upload::valid", "upload::required", "upload::type[gif,jpg,jpeg,png,flv,mp4]");
+      if (!$file_validation->validate()) {
+        $errors = $file_validation->errors();
+        return rest::fail(
+          $errors["image"] == "type" ? "Upload failed: Unsupported file type" :
+                                       "Upload failed: Uploaded file missing");
+      }
+      $temp_filename = upload::save("image");
+      $name = substr(basename($temp_filename), 10);  // Skip unique identifier Kohana adds
+      $title = item::convert_filename_to_title($name);
+      $path_info = @pathinfo($temp_filename);
+      if (array_key_exists("extension", $path_info) &&
+          in_array(strtolower($path_info["extension"]), array("flv", "mp4"))) {
+        $new_item = movie::create($parent, $temp_filename, $name, $title);
+        $log_message = t("Added a movie");
+      } else {
+        $new_item = photo::create($parent, $temp_filename, $name, $title);
+        $log_message = t("Added a photo");
+      }
+    }
+
+    log::success("content", $log_message, "<a href=\"{$new_item->type}s/$new_item->id\">view</a>");
+
+    return rest::success(array("path" => $new_item->relative_url()));
+  }
+
   static function delete($request) {
     if (empty($request->path)) {
       return rest::invalid_request();
@@ -140,6 +200,10 @@ class gallery_rest_Core {
       $children[] = array("type" => $child->type,
                           "has_children" => $child->children_count() > 0,
                           "path" => $child->relative_url(),
+                          "thumb_url" => $child->thumb_url(true),
+                          "thumb_dimensions" => array("width" => $child->thumb_width,
+                                                     "height" => $child->thumb_height),
+                          "has_thumb" => $child->has_thumb(),
                           "title" => $child->title);
     }
 
diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index dae55952..f1a06388 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -19,7 +19,7 @@
  */
 class Gallery_Rest_Helper_Test extends Unit_Test_Case {
   public function setup() {
-    $this->_save = array($_GET, $_POST, $_SERVER);
+    $this->_save = array($_GET, $_POST, $_SERVER, $_FILES);
     $this->_saved_active_user = identity::active_user();
 
     $this->_user = identity::create_user("access_test", "Access Test", "password");
@@ -42,7 +42,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
   }
 
   public function teardown() {
-    list($_GET, $_POST, $_SERVER) = $this->_save;
+    list($_GET, $_POST, $_SERVER, $_FILES) = $this->_save;
     identity::set_active_user($this->_saved_active_user);
 
     try {
@@ -50,7 +50,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
         $this->_user->delete();
       }
       if (!empty($this->_album)) {
-        $this->_album->delete();
+        //$this->_album->delete();
       }
     } catch (Exception $e) { }
   }
@@ -203,4 +203,20 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     $this->_sibling->reload();
     $this->assert_false($this->_sibling->loaded);
   }
+
+  public function gallery_rest_post_album_test() {
+    access::allow(identity::registered_users(), "edit", $this->_album);
+
+    $new_path = $this->_child->relative_url() . "/new%20child";
+    identity::set_active_user($this->_user);
+    $request = (object)array("path" => $new_path);
+
+    $this->assert_equal(json_encode(array("status" => "OK", "path" => $new_path)),
+                        gallery_rest::post($request));
+    $album = ORM::factory("item")
+      ->where("relative_url_cache", $new_path)
+      ->find();
+    $this->assert_true($album->loaded);
+    $this->assert_equal("new child", $album->slug);
+  }
 }
diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index 577d8aeb..0a39e02c 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -18,7 +18,7 @@
  */
 class Rest_Controller extends Controller {
   public function access_key() {
-    $request = json_decode($this->input->post("request"));
+    $request = (object)$this->input->get();
     if (empty($request->user) || empty($request->password)) {
       print rest::forbidden("No user or password supplied");
       return;
@@ -66,7 +66,7 @@ class Rest_Controller extends Controller {
     }
   }
 
-  private function _normalize_request($args) {
+  private function _normalize_request($args=array()) {
    $method = strtolower($this->input->server("REQUEST_METHOD"));
     if ($method != "get") {
       $request = $this->input->post("request", null);
@@ -77,7 +77,7 @@ class Rest_Controller extends Controller {
       }
     } else {
       $request = new stdClass();
-      foreach (array_keys($_GET) as $key) {
+      foreach (array_keys($this->input->get()) as $key) {
         $request->$key = $this->input->get($key);
       }
     }
-- 
cgit v1.2.3


From d622d1aa4f3b7c844de2f29cca2e04d9bb56bb86 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 23 Dec 2009 09:32:32 -0800
Subject: Updated the unit tests to match the current API Corrected a problem
 identified with the unit tests... failed if the path was empty on PUT.

---
 modules/gallery/helpers/gallery_rest.php           |  4 +
 modules/gallery/tests/Gallery_Rest_Helper_Test.php | 87 ++++++++++++++--------
 modules/rest/tests/Rest_Controller_Test.php        | 10 ++-
 3 files changed, 64 insertions(+), 37 deletions(-)

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/helpers/gallery_rest.php b/modules/gallery/helpers/gallery_rest.php
index a3b1997d..a052ae64 100644
--- a/modules/gallery/helpers/gallery_rest.php
+++ b/modules/gallery/helpers/gallery_rest.php
@@ -58,6 +58,10 @@ class gallery_rest_Core {
   }
 
   static function put($request) {
+    if (empty($request->path)) {
+      return rest::invalid_request();
+    }
+
     $item = ORM::factory("item")
       ->where("relative_url_cache", $request->path)
       ->viewable()
diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index f1a06388..74df407e 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -60,17 +60,33 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
 
     $this->assert_equal(
       json_encode(array("status" => "OK",
-                        "album" => array("path" => $this->_child->relative_url(),
-                                         "title" => $this->_child->title,
-                                         "thumb_url" => $this->_child->thumb_url(),
-                                         "url" => $this->_child->abs_url(),
-                                         "description" => $this->_child->description,
-                                         "internet_address" => $this->_child->slug,
-                                         "children" => array(array(
-                                           "type" => "photo",
-                                           "has_children" => false,
-                                           "path" => $this->_photo->relative_url(),
-                                           "title" => $this->_photo->title))))),
+                        "resource" =>
+                          array("type" => $this->_child->type,
+                                "name" => $this->_child->name,
+                                "path" => $this->_child->relative_url(),
+                                "parent_path" => $this->_album->relative_url(),
+                                "title" => $this->_child->title,
+                                "thumb_url" => $this->_child->thumb_url(),
+                                "thumb_size" => array("height" => $this->_child->thumb_height,
+                                                      "width" => $this->_child->thumb_width),
+                                "resize_url" => $this->_child->resize_url(),
+                                "resize_size" => array("height" => 0,
+                                                       "width" => 0),
+                                "url" => $this->_child->file_url(),
+                                "size" => array("height" => $this->_child->height,
+                                                "width" => $this->_child->width),
+                                "description" => $this->_child->description,
+                                "slug" => $this->_child->slug,
+                                "children" => array(array(
+                                   "type" => "photo",
+                                   "has_children" => false,
+                                   "path" => $this->_photo->relative_url(),
+                                   "thumb_url" => $this->_photo->thumb_url(),
+                                   "thumb_dimensions" => array(
+                                     "width" => $this->_photo->thumb_width,
+                                     "height" => $this->_photo->thumb_height),
+                                   "has_thumb" => true,
+                                   "title" => $this->_photo->title))))),
       gallery_rest::get($request));
   }
 
@@ -79,12 +95,23 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
 
     $this->assert_equal(
       json_encode(array("status" => "OK",
-                        "photo" => array("path" => $this->_photo->relative_url(),
-                                         "title" => $this->_photo->title,
-                                         "thumb_url" => $this->_photo->thumb_url(),
-                                         "url" => $this->_photo->abs_url(),
-                                         "description" => $this->_photo->description,
-                                         "internet_address" => $this->_photo->slug))),
+                        "resource" =>
+                        array("type" => $this->_photo->type,
+                              "name" => $this->_photo->name,
+                              "path" => $this->_photo->relative_url(),
+                              "parent_path" => $this->_child->relative_url(),
+                              "title" => $this->_photo->title,
+                              "thumb_url" => $this->_photo->thumb_url(),
+                              "thumb_size" => array("height" => $this->_photo->thumb_height,
+                                                    "width" => $this->_photo->thumb_width),
+                              "resize_url" => $this->_photo->resize_url(),
+                              "resize_size" => array("height" => $this->_photo->resize_height,
+                                                       "width" => $this->_photo->resize_width),
+                              "url" => $this->_photo->file_url(),
+                              "size" => array("height" => $this->_photo->height,
+                                              "width" => $this->_photo->width),
+                              "description" => $this->_photo->description,
+                              "slug" => $this->_photo->slug))),
       gallery_rest::get($request));
   }
 
@@ -94,8 +121,6 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     identity::set_active_user($this->_user);
     $request = (object)array("description" => "Updated description",
                              "title" => "Updated Title",
-                             "sort_order" => "DESC",
-                             "sort_column" => "title",
                              "name" => "new name");
 
     $this->assert_equal(json_encode(array("status" => "ERROR", "message" => "Invalid request")),
@@ -109,8 +134,6 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     $request = (object)array("path" => $this->_child->relative_url() . rand(),
                              "description" => "Updated description",
                              "title" => "Updated Title",
-                             "sort_order" => "DESC",
-                             "sort_column" => "title",
                              "name" => "new name");
 
     $this->assert_equal(json_encode(array("status" => "ERROR", "message" => "Resource not found")),
@@ -122,8 +145,6 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     $request = (object)array("path" => $this->_child->relative_url(),
                              "description" => "Updated description",
                              "title" => "Updated Title",
-                             "sort_order" => "DESC",
-                             "sort_column" => "title",
                              "name" => "new name");
 
     $this->assert_equal(json_encode(array("status" => "ERROR", "message" => "Resource not found")),
@@ -136,13 +157,11 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     $request = (object)array("path" => $this->_child->relative_url(),
                              "description" => "Updated description",
                              "title" => "Updated Title",
-                             "sort_order" => "DESC",
-                             "sort_column" => "title",
                              "name" => $this->_sibling->name);
 
     $this->assert_equal(
-      json_encode(array("status" => "ERROR",
-                        "message" => "Renaming album/child failed: new name exists")),
+      json_encode(array("status" => "VALIDATE_ERROR",
+                        "fields" => array("slug" => "Duplicate Internet Address"))),
       gallery_rest::put($request));
   }
 
@@ -153,16 +172,12 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     $request = (object)array("path" => $this->_child->relative_url(),
                              "description" => "Updated description",
                              "title" => "Updated Title",
-                             "sort_order" => "DESC",
-                             "sort_column" => "title",
                              "name" => "new name");
 
     $this->assert_equal(json_encode(array("status" => "OK")), gallery_rest::put($request));
     $this->_child->reload();
     $this->assert_equal("Updated description", $this->_child->description);
     $this->assert_equal("Updated Title", $this->_child->title);
-    $this->assert_equal("DESC", $this->_child->sort_order);
-    $this->assert_equal("title", $this->_child->sort_column);
     $this->assert_equal("new name",  $this->_child->name);
   }
 
@@ -188,7 +203,10 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     identity::set_active_user($this->_user);
     $request = (object)array("path" => $this->_child->relative_url());
 
-    $this->assert_equal(json_encode(array("status" => "OK")), gallery_rest::delete($request));
+    $this->assert_equal(json_encode(array("status" => "OK",
+                                          "resource" => array(
+                                            "parent_path" => $this->_album->relative_url()))),
+                        gallery_rest::delete($request));
     $this->_child->reload();
     $this->assert_false($this->_child->loaded);
   }
@@ -199,7 +217,10 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     identity::set_active_user($this->_user);
     $request = (object)array("path" => $this->_sibling->relative_url());
 
-    $this->assert_equal(json_encode(array("status" => "OK")), gallery_rest::delete($request));
+    $this->assert_equal(json_encode(array("status" => "OK",
+                                          "resource" => array(
+                                            "parent_path" => $this->_album->relative_url()))),
+                        gallery_rest::delete($request));
     $this->_sibling->reload();
     $this->assert_false($this->_sibling->loaded);
   }
diff --git a/modules/rest/tests/Rest_Controller_Test.php b/modules/rest/tests/Rest_Controller_Test.php
index 5f7bdfe4..39e79a81 100644
--- a/modules/rest/tests/Rest_Controller_Test.php
+++ b/modules/rest/tests/Rest_Controller_Test.php
@@ -49,8 +49,9 @@ class Rest_Controller_Test extends Unit_Test_Case {
   }
 
   public function rest_access_key_exists_test() {
-    $_SERVER["REQUEST_METHOD"] = "POST";
-    $_POST["request"] = json_encode(array("user" => "access_test", "password" => "password"));
+    $_SERVER["REQUEST_METHOD"] = "GET";
+    $_GET["user"] = "access_test";
+    $_GET["password"] = "password";
 
     $this->assert_equal(
       json_encode(array("status" => "OK", "token" => $this->_access_key)),
@@ -61,8 +62,9 @@ class Rest_Controller_Test extends Unit_Test_Case {
     ORM::factory("user_access_token")
       ->where("access_key", $this->_access_key)
       ->delete();
-    $_SERVER["REQUEST_METHOD"] = "POST";
-    $_POST["request"] = json_encode(array("user" => "access_test", "password" => "password"));
+    $_SERVER["REQUEST_METHOD"] = "GET";
+    $_GET["user"] = "access_test";
+    $_GET["password"] = "password";
 
     $results = json_decode($this->_call_controller());
 
-- 
cgit v1.2.3


From 4268889fbf82705867211a6949f6b3411dde0de3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 24 Dec 2009 19:24:22 -0800
Subject: Update the gallery_rest handlers test to pass the path in as an array
 in the request arguments property instead of the path property.

---
 modules/gallery/tests/Gallery_Rest_Helper_Test.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index 74df407e..14c73248 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -50,13 +50,13 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
         $this->_user->delete();
       }
       if (!empty($this->_album)) {
-        //$this->_album->delete();
+        $this->_album->delete();
       }
     } catch (Exception $e) { }
   }
 
   public function gallery_rest_get_album_test() {
-    $request = (object)array("path" => $this->_child->relative_url());
+    $request = (object)array("arguments" => explode("/", $this->_child->relative_url()));
 
     $this->assert_equal(
       json_encode(array("status" => "OK",
@@ -91,7 +91,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
   }
 
   public function gallery_rest_get_photo_test() {
-    $request = (object)array("path" => $this->_photo->relative_url());
+    $request = (object)array("arguments" => explode("/", $this->_photo->relative_url()));
 
     $this->assert_equal(
       json_encode(array("status" => "OK",
@@ -131,7 +131,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     access::allow(identity::registered_users(), "edit", $this->_child);
 
     identity::set_active_user($this->_user);
-    $request = (object)array("path" => $this->_child->relative_url() . rand(),
+    $request = (object)array("arguments" => explode("/", $this->_photo->relative_url() . rand()),
                              "description" => "Updated description",
                              "title" => "Updated Title",
                              "name" => "new name");
@@ -142,7 +142,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
 
   public function gallery_rest_put_album_no_edit_permission_test() {
     identity::set_active_user($this->_user);
-    $request = (object)array("path" => $this->_child->relative_url(),
+    $request = (object)array("arguments" => explode("/", $this->_child->relative_url()),
                              "description" => "Updated description",
                              "title" => "Updated Title",
                              "name" => "new name");
@@ -154,7 +154,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
   public function gallery_rest_put_album_rename_conflict_test() {
     access::allow(identity::registered_users(), "edit", $this->_child);
     identity::set_active_user($this->_user);
-    $request = (object)array("path" => $this->_child->relative_url(),
+    $request = (object)array("arguments" => explode("/", $this->_child->relative_url()),
                              "description" => "Updated description",
                              "title" => "Updated Title",
                              "name" => $this->_sibling->name);
@@ -169,7 +169,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     access::allow(identity::registered_users(), "edit", $this->_child);
 
     identity::set_active_user($this->_user);
-    $request = (object)array("path" => $this->_child->relative_url(),
+    $request = (object)array("arguments" => explode("/", $this->_child->relative_url()),
                              "description" => "Updated description",
                              "title" => "Updated Title",
                              "name" => "new name");
@@ -185,7 +185,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     access::allow(identity::registered_users(), "edit", $this->_child);
 
     identity::set_active_user($this->_user);
-    $request = (object)array("path" => $this->_photo->relative_url(),
+    $request = (object)array("arguments" => explode("/", $this->_photo->relative_url()),
                              "description" => "Updated description",
                              "title" => "Updated Title",
                              "name" => "new name");
@@ -201,7 +201,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     access::allow(identity::registered_users(), "edit", $this->_album);
 
     identity::set_active_user($this->_user);
-    $request = (object)array("path" => $this->_child->relative_url());
+    $request = (object)array("arguments" => explode("/", $this->_child->relative_url()));
 
     $this->assert_equal(json_encode(array("status" => "OK",
                                           "resource" => array(
@@ -215,7 +215,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     access::allow(identity::registered_users(), "edit", $this->_album);
 
     identity::set_active_user($this->_user);
-    $request = (object)array("path" => $this->_sibling->relative_url());
+    $request = (object)array("arguments" => explode("/", $this->_sibling->relative_url()));
 
     $this->assert_equal(json_encode(array("status" => "OK",
                                           "resource" => array(
@@ -230,7 +230,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
 
     $new_path = $this->_child->relative_url() . "/new%20child";
     identity::set_active_user($this->_user);
-    $request = (object)array("path" => $new_path);
+    $request = (object)array("arguments" => explode("/", $new_path));
 
     $this->assert_equal(json_encode(array("status" => "OK", "path" => $new_path)),
                         gallery_rest::post($request));
-- 
cgit v1.2.3


From bccb6fc02146fb07cd1b472a90092e78e2259e91 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 27 Dec 2009 08:32:12 -0800
Subject: Clean up validation the check for duplicate names or slugs, finish
 converting the rest API to Kohana 2.4

---
 modules/gallery/helpers/gallery_rest.php           | 93 ++++++++++++++--------
 modules/gallery/helpers/item.php                   |  8 +-
 modules/gallery/tests/Gallery_Rest_Helper_Test.php |  8 +-
 modules/image_block/helpers/image_block_rest.php   | 12 +--
 modules/rest/controllers/rest.php                  | 27 ++++---
 modules/rest/helpers/rest.php                      |  2 +-
 modules/rest/tests/Rest_Controller_Test.php        |  2 +-
 modules/tag/helpers/tag_rest.php                   | 62 ++++++++-------
 modules/tag/models/tag.php                         |  4 +-
 modules/tag/tests/Tag_Rest_Helper_Test.php         |  4 +-
 10 files changed, 129 insertions(+), 93 deletions(-)

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/helpers/gallery_rest.php b/modules/gallery/helpers/gallery_rest.php
index 227a6f02..1d790d8c 100644
--- a/modules/gallery/helpers/gallery_rest.php
+++ b/modules/gallery/helpers/gallery_rest.php
@@ -22,11 +22,11 @@ class gallery_rest_Core {
     $path = implode("/", $request->arguments);
 
     $item = ORM::factory("item")
-      ->where("relative_url_cache", $path)
+      ->where("relative_url_cache", "=", $path)
       ->viewable()
       ->find();
 
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       return rest::not_found("Resource: {$path} missing.");
     }
 
@@ -62,11 +62,11 @@ class gallery_rest_Core {
     $path = implode("/", $request->arguments);
 
     $item = ORM::factory("item")
-      ->where("relative_url_cache", $path)
+      ->where("relative_url_cache", "=", $path)
       ->viewable()
       ->find();
 
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       return rest::not_found("Resource: {$path} missing.");
     }
 
@@ -75,12 +75,13 @@ class gallery_rest_Core {
     }
 
     // Validate the request data
-    $new_values = gallery_rest::_validate($request, $item);
+    $new_values = gallery_rest::_validate($request, $item->parent_id, $item->id);
     $errors = $new_values->errors();
     if (empty($errors)) {
       item::update($item, $new_values->as_array());
 
-      log::success("content", "Updated $item->type", "<a href=\"{$item->type}s/$item->id\">view</a>");
+      log::success("content", "Updated $item->type",
+                   "<a href=\"{$item->type}s/$item->id\">view</a>");
 
       return rest::success();
     } else {
@@ -94,15 +95,15 @@ class gallery_rest_Core {
     }
     $path = implode("/", $request->arguments);
 
-    $components = explode("/", $path);
+    $components = $request->arguments;
     $name = urldecode(array_pop($components));
 
     $parent = ORM::factory("item")
-      ->where("relative_url_cache", implode("/", $components))
+      ->where("relative_url_cache", "=", implode("/", $components))
       ->viewable()
       ->find();
 
-    if (!$parent->loaded) {
+    if (!$parent->loaded()) {
       return rest::not_found("Resource: {$path} missing.");
     }
 
@@ -111,7 +112,7 @@ class gallery_rest_Core {
     }
 
     // Validate the request data
-    $new_values = gallery_rest::_validate($request);
+    $new_values = gallery_rest::_validate($request, $parent->id);
     $errors = $new_values->errors();
     if (!empty($errors)) {
       return rest::validation_error($errors);
@@ -121,10 +122,10 @@ class gallery_rest_Core {
       $new_item = album::create(
         $parent,
         $name,
-        empty($request->title) ? $name : $request->title,
-        empty($request->description) ? null : $request->description,
+        empty($new_values["title"]) ? $name : $new_values["title"],
+        empty($new_values["description"]) ? null : $new_values["description"],
         identity::active_user()->id,
-        empty($request->slug) ? $name : $request->slug);
+        empty($new_values["slug"]) ? $name : $new_values["slug"]);
       $log_message = t("Added an album");
     } else {
       $temp_filename = upload::save("image");
@@ -153,11 +154,11 @@ class gallery_rest_Core {
     $path = implode("/", $request->arguments);
 
     $item = ORM::factory("item")
-      ->where("relative_url_cache", $path)
+      ->where("relative_url_cache", "=", $path)
       ->viewable()
       ->find();
 
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       return rest::success();
     }
 
@@ -193,7 +194,7 @@ class gallery_rest_Core {
                           "path" => $child->relative_url(),
                           "thumb_url" => $child->thumb_url(true),
                           "thumb_dimensions" => array("width" => $child->thumb_width,
-                                                     "height" => $child->thumb_height),
+                                                      "height" => $child->thumb_height),
                           "has_thumb" => $child->has_thumb(),
                           "title" => $child->title);
     }
@@ -201,38 +202,40 @@ class gallery_rest_Core {
     return $children;
   }
 
-  private static function _validate($request, $item=null) {
+  private static function _validate($request, $parent_id, $item_id=0) {
     $new_values = array();
-    $fields = array("title", "description", "name", "slug", "image");
-    if (empty($item)) {
-      $item = ORM::factory("item");
-      $item->id = 0;
-    }
-    if ($item->id == 1) {
+    $fields = array("name" => "length[0,255]",
+                    "title" => "required|length[0,255]",
+                    "description" => "length[0,65535]",
+                    "slug" => "required|length[0,255]");
+    if ($item_id == 1) {
       unset($request["name"]);
       unset($request["slug"]);
     }
-    foreach ($fields as $field) {
+    foreach (array_keys($fields) as $field) {
       if (isset($request->$field)) {
         $new_values[$field] = $request->$field;
       } else if (isset($item->$field)) {
         $new_values[$field] = $item->$field;
       }
     }
-
-    $new_values = new Validation($new_values);
-    foreach ($item->rules as $field => $rules) {
-      foreach (explode("|", $rules) as $rule) {
-        $new_values->add_rules($field, $rule);
-      }
+    if (!empty($request->image)) {
+      $new_values["image"] = $request->image;
     }
+
+    $new_values = Validation::factory($new_values)
+      ->add_rules("name", "length[0,255]")
+      ->add_rules("title", "length[0,255]")
+      ->add_rules("description", "length[0,65535]")
+      ->add_rules("slug", "length[0,255]");
     if (isset($new_values["image"])) {
       $new_values->add_rules(
         "image", "upload::valid", "upload::required", "upload::type[gif,jpg,jpeg,png,flv,mp4]");
     }
 
-    if ($new_values->validate() && $item->id != 1) {
-      $errors = item::check_for_conflicts($item, $new_values["name"], $new_values["slug"]);
+    if ($new_values->validate() && $item_id != 1) {
+      $errors = gallery_rest::_check_for_conflicts($parent_id, $item_id,
+                                                   $new_values["name"], $new_values["slug"]);
       if (!empty($errors)) {
         !empty($errors["name_conflict"]) OR $new_values->add_error("name", "Duplicate Name");
         !empty($errors["slug_conflict"]) OR
@@ -242,4 +245,30 @@ class gallery_rest_Core {
 
     return $new_values;
   }
+
+  private static function _check_for_conflicts($parent_id, $item_id, $new_name, $new_slug) {
+    $errors = array();
+
+    if ($row = db::build()
+        ->select(array("name", "slug"))
+        ->from("items")
+        ->where("parent_id", "=", $parent_id)
+        ->where("id", "<>", $item_id)
+        ->and_open()
+        ->where("name", "=", $new_name)
+        ->or_where("slug", "=", $new_slug)
+        ->close()
+        ->execute()
+        ->current()) {
+      if ($row->name == $new_name) {
+        $errors["name_conflict"] = 1;
+      }
+      if ($row->slug == $new_slug) {
+        $errors["slug_conflict"] = 1;
+      }
+    }
+
+    return $errors;
+  }
+
 }
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index c620ba95..fc390e70 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -122,11 +122,11 @@ class item_Core {
     if ($row = db::build()
         ->select(array("name", "slug"))
         ->from("items")
-        ->where("parent_id", $item->parent_id)
-        ->where("id <>", $item->id)
+        ->where("parent_id", "=", $item->parent_id)
+        ->where("id", "<>", $item->id)
         ->and_open()
-        ->where("name", $new_name)
-        ->orwhere("slug", $new_slug)
+        ->where("name", "=", $new_name)
+        ->or_where("slug", "=", $new_slug)
         ->close()
         ->execute()
         ->current()) {
diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index 14c73248..f36f6aaf 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -208,7 +208,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
                                             "parent_path" => $this->_album->relative_url()))),
                         gallery_rest::delete($request));
     $this->_child->reload();
-    $this->assert_false($this->_child->loaded);
+    $this->assert_false($this->_child->loaded());
   }
 
   public function gallery_rest_delete_photo_test() {
@@ -222,7 +222,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
                                             "parent_path" => $this->_album->relative_url()))),
                         gallery_rest::delete($request));
     $this->_sibling->reload();
-    $this->assert_false($this->_sibling->loaded);
+    $this->assert_false($this->_sibling->loaded());
   }
 
   public function gallery_rest_post_album_test() {
@@ -235,9 +235,9 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     $this->assert_equal(json_encode(array("status" => "OK", "path" => $new_path)),
                         gallery_rest::post($request));
     $album = ORM::factory("item")
-      ->where("relative_url_cache", $new_path)
+      ->where("relative_url_cache", "=", $new_path)
       ->find();
-    $this->assert_true($album->loaded);
+    $this->assert_true($album->loaded());
     $this->assert_equal("new child", $album->slug);
   }
 }
diff --git a/modules/image_block/helpers/image_block_rest.php b/modules/image_block/helpers/image_block_rest.php
index 45f849b1..7afd974c 100644
--- a/modules/image_block/helpers/image_block_rest.php
+++ b/modules/image_block/helpers/image_block_rest.php
@@ -26,18 +26,18 @@ class image_block_rest_Core {
 
       $items = ORM::factory("item")
         ->viewable()
-        ->where("type !=", "album")
-        ->where("rand_key < ", $random)
-        ->orderby(array("rand_key" => "DESC"))
+        ->where("type", "!=", "album")
+        ->where("rand_key", "<", $random)
+        ->order_by(array("rand_key" => "DESC"))
         ->find_all(1);
 
       if ($items->count() == 0) {
         // Try once more.  If this fails, just ditch the block altogether
         $items = ORM::factory("item")
           ->viewable()
-          ->where("type !=", "album")
-          ->where("rand_key >= ", $random)
-          ->orderby(array("rand_key" => "DESC"))
+          ->where("type", "!=", "album")
+          ->where("rand_key",  ">= ", $random)
+          ->order_by(array("rand_key" => "DESC"))
           ->find_all(1);
       }
       break;
diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index 1289d62b..6715bc15 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -18,7 +18,7 @@
  */
 class Rest_Controller extends Controller {
   public function access_key() {
-    $request = (object)$this->input->get();
+    $request = (object)Input::instance()->get();
     if (empty($request->user) || empty($request->password)) {
       print rest::forbidden("No user or password supplied");
       return;
@@ -36,13 +36,13 @@ class Rest_Controller extends Controller {
     }
 
     $key = ORM::factory("user_access_token")
-      ->where("user_id", $user->id)
+      ->where("user_id", "=", $user->id)
       ->find();
-    if (!$key->loaded) {
+    if (!$key->loaded()) {
       $key->user_id = $user->id;
       $key->access_key = md5($user->name . rand());
       $key->save();
-      Kohana::log("alert",  Kohana::debug($key->as_array()));
+      Kohana_Log::add("alert",  Kohana::debug($key->as_array()));
     }
     print rest::success(array("token" => $key->access_key));
   }
@@ -67,22 +67,23 @@ class Rest_Controller extends Controller {
   }
 
   private function _normalize_request($args=array()) {
-    $method = strtolower($this->input->server("REQUEST_METHOD"));
+    $input = Input::instance();
+    $method = strtolower($input->server("REQUEST_METHOD"));
     $request = new stdClass();
-    foreach (array_keys($this->input->get()) as $key) {
-      $request->$key = $this->input->get($key);
+    foreach (array_keys($input->get()) as $key) {
+      $request->$key = $input->get($key);
     }
     if ($method != "get") {
-      foreach (array_keys($this->input->post()) as $key) {
-        $request->$key = $this->input->post($key);
+      foreach (array_keys($input->post()) as $key) {
+        $request->$key = $input->post($key);
       }
       foreach (array_keys($_FILES) as $key) {
         $request->$key = $_FILES[$key];
       }
     }
 
-    $request->method = strtolower($this->input->server("HTTP_X_GALLERY_REQUEST_METHOD", $method));
-    $request->access_token = $this->input->server("HTTP_X_GALLERY_REQUEST_KEY");
+    $request->method = strtolower($input->server("HTTP_X_GALLERY_REQUEST_METHOD", $method));
+    $request->access_token = $input->server("HTTP_X_GALLERY_REQUEST_KEY");
     $request->arguments = $args;  // Let the rest handler figure out what the arguments mean
 
     return $request;
@@ -93,10 +94,10 @@ class Rest_Controller extends Controller {
       $user = identity::guest();
     } else {
       $key = ORM::factory("user_access_token")
-        ->where("access_key", $access_token)
+        ->where("access_key", "=", $access_token)
         ->find();
 
-      if ($key->loaded) {
+      if ($key->loaded()) {
         $user = identity::lookup_user($key->user_id);
         if (empty($user)) {
           print rest::forbidden("User not found: {$key->user_id}");
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index ad6ca7c7..276ff0c2 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -88,7 +88,7 @@ class rest_Core {
 
   private static function _format_failure_response($message, $log_message) {
     if (!empty($log_message)) {
-      Kohana::log("info", $log_message);
+      Kohana_Log::add("info", $log_message);
     }
     // We don't need to save the session for this request
     Session::abort_save();
diff --git a/modules/rest/tests/Rest_Controller_Test.php b/modules/rest/tests/Rest_Controller_Test.php
index b7fbd5a3..6bebc47d 100644
--- a/modules/rest/tests/Rest_Controller_Test.php
+++ b/modules/rest/tests/Rest_Controller_Test.php
@@ -173,7 +173,7 @@ class rest_rest {
   static function get($request) {
     self::$request = $request;
     $item = ORM::factory("item")
-      ->where("relative_url_cache", implode("/", $request->arguments))
+      ->where("relative_url_cache", "=", implode("/", $request->arguments))
       ->find();
     $response["path"] = $item->relative_url();
     $response["title"] = $item->title;
diff --git a/modules/tag/helpers/tag_rest.php b/modules/tag/helpers/tag_rest.php
index d62c0231..cca9a88b 100644
--- a/modules/tag/helpers/tag_rest.php
+++ b/modules/tag/helpers/tag_rest.php
@@ -18,40 +18,44 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class tag_rest_Core {
+  // If no arguments just return all the tags.  If 2 or more then it is a path then
+  // return the tags for that item.  But if its only 1, then is it a path or a tag?
+  // Assume a tag first, if nothing is found then try finding the item.
   static function get($request) {
-    if (empty($request->arguments)) {
+    $resources = array();
+    switch (count($request->arguments)) {
+    case 0:
       $tags = ORM::factory("tag")
         ->select("name", "count")
-        ->orderby("count", "DESC");
+        ->order_by("count", "DESC");
       if (!empty($request->limit)) {
         $tags->limit($request->limit);
       }
       if (!empty($request->offset)) {
         $tags->offset($request->offset);
       }
-      $response = array("tags" => array());
+      $resources = array("tags" => array());
       foreach ($tags->find_all() as $row) {
-        $response["tags"][] = array("name" => $row->name, "count" => $row->count);
+        $resources["tags"][] = array("name" => $row->name, "count" => $row->count);
       }
-    } else {
-      $path = implode("/", $request->arguments);
-      if (strpos($path, ",") === false) {
-        $item = ORM::factory("item")
-          ->where("relative_url_cache", $path)
-          ->viewable()
-          ->find();
-        // If we didn't find it and there was only one argument, retry as a tag not a path
-        if ($item->loaded || count($request->arguments) != 1) {
-          $response = array("tags" => $item->loaded ? tag::item_tags($item) : array());
-        } else {
-          $response = array("resources" => tag_rest::_get_items($request));
-        }
-      } else {
-        $response = array("resources" => tag_rest::_get_items($request));
+      break;
+    case 1:
+      $resources = tag_rest::_get_items($request);
+      if (!empty($resources)) {
+        $resources = array("resources" =>$resources);
+        break;
+      }
+    default:
+      $item = ORM::factory("item")
+        ->where("relative_url_cache", "=", implode("/", $request->arguments))
+        ->viewable()
+        ->find();
+      if ($item->loaded()) {
+        $resources = array("tags" => tag::item_tags($item));
       }
     }
 
-    return rest::success($response);
+    return rest::success($resources);
   }
 
   static function post($request) {
@@ -62,10 +66,10 @@ class tag_rest_Core {
     $tags = explode(",", $request->arguments[0]);
 
     $item = ORM::factory("item")
-      ->where("relative_url_cache", $path)
+      ->where("relative_url_cache", "=", $path)
       ->viewable()
       ->find();
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       return rest::not_found("Resource: {$path} missing.");
     }
 
@@ -87,9 +91,9 @@ class tag_rest_Core {
     $name = $request->arguments[0];
 
     $tag = ORM::factory("tag")
-      ->where("name", $name)
+      ->where("name", "=", $name)
       ->find();
-    if (!$tag->loaded) {
+    if (!$tag->loaded()) {
       return rest::not_found("Tag: {$name} not found.");
     }
 
@@ -108,13 +112,13 @@ class tag_rest_Core {
       $tag_list = ORM::factory("tag")
         ->join("items_tags", "tags.id", "items_tags.tag_id")
         ->join("items", "items.id", "items_tags.item_id")
-        ->in("tags.name", $tags)
-        ->where("relative_url_cache", $request->path)
+        ->where("tags.name", "IN",  $tags)
+        ->where("relative_url_cache", "=", $request->path)
         ->viewable()
         ->find_all();
     } else {
       $tag_list = ORM::factory("tag")
-        ->in("name", $tags)
+        ->where("name", "IN", $tags)
         ->find_all();
     }
 
@@ -129,10 +133,10 @@ class tag_rest_Core {
   private static function _get_items($request) {
     $tags = explode(",", $request->arguments[0]);
     $items = ORM::factory("item")
-      ->select("distinct *")
+      ->select_distinct("*")
       ->join("items_tags", "items.id", "items_tags.item_id")
       ->join("tags", "tags.id", "items_tags.tag_id")
-      ->in("tags.name", $tags);
+      ->where("tags.name", "IN",  $tags);
     if (!empty($request->limit)) {
       $items->limit($request->limit);
     }
diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index b2ce9eda..d0d2117c 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -108,7 +108,9 @@ class Tag_Model extends ORM {
     $result = parent::delete();
 
     if ($related_item_ids) {
-      foreach (ORM::factory("item")->in("id", array_keys($related_item_ids))->find_all() as $item) {
+      foreach (ORM::factory("item")
+               ->where("id", "IN", array_keys($related_item_ids))
+               ->find_all() as $item) {
         module::event("item_related_update", $item);
       }
     }
diff --git a/modules/tag/tests/Tag_Rest_Helper_Test.php b/modules/tag/tests/Tag_Rest_Helper_Test.php
index 1c550366..6b1c9a33 100644
--- a/modules/tag/tests/Tag_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tag_Rest_Helper_Test.php
@@ -210,11 +210,11 @@ class Tag_Rest_Helper_Test extends Unit_Test_Case {
     $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", "resources" => array())),
+    $this->assert_equal(json_encode(array("status" => "OK")),
                         tag_rest::get($request));
   }
 
-  public function tag_rest_delete_tag_from_item_test() {
+  public function tag_rest_delete_tagc_from_item_test() {
     $request = (object)array("arguments" => array("T1,P1"),
                              $this->_photo->relative_url());
 
-- 
cgit v1.2.3


From 11792a12bb2002a434217efabe232022dd253b67 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 30 Dec 2009 17:08:01 -0800
Subject: 1) Remove the rest::not_found method and replace it with "throw new
 Kohana_404_Exception 2) Don't use the input path to lookup the item via
 relative_path_cache.  Instead use url::get_item_from_uri method.

---
 modules/gallery/helpers/gallery_rest.php           | 72 ++++++++--------------
 modules/gallery/tests/Gallery_Rest_Helper_Test.php | 16 +++--
 modules/rest/helpers/rest.php                      |  9 +--
 modules/tag/helpers/tag_rest.php                   |  6 +-
 modules/tag/tests/Tag_Rest_Helper_Test.php         | 27 +++++---
 5 files changed, 59 insertions(+), 71 deletions(-)

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/helpers/gallery_rest.php b/modules/gallery/helpers/gallery_rest.php
index 1d790d8c..94c7dc6f 100644
--- a/modules/gallery/helpers/gallery_rest.php
+++ b/modules/gallery/helpers/gallery_rest.php
@@ -21,14 +21,7 @@ class gallery_rest_Core {
   static function get($request) {
     $path = implode("/", $request->arguments);
 
-    $item = ORM::factory("item")
-      ->where("relative_url_cache", "=", $path)
-      ->viewable()
-      ->find();
-
-    if (!$item->loaded()) {
-      return rest::not_found("Resource: {$path} missing.");
-    }
+    $item = gallery_rest::_get_item($path);
 
     $parent = $item->parent();
     $response_data = array("type" => $item->type,
@@ -60,25 +53,19 @@ class gallery_rest_Core {
       return rest::invalid_request();
     }
     $path = implode("/", $request->arguments);
-
-    $item = ORM::factory("item")
-      ->where("relative_url_cache", "=", $path)
-      ->viewable()
-      ->find();
-
-    if (!$item->loaded()) {
-      return rest::not_found("Resource: {$path} missing.");
-    }
-
-    if (!access::can("edit", $item)) {
-      return rest::not_found("Resource: {$path} permission denied.");
-    }
+    $item = gallery_rest::_get_item($path, "edit");
 
     // Validate the request data
     $new_values = gallery_rest::_validate($request, $item->parent_id, $item->id);
     $errors = $new_values->errors();
     if (empty($errors)) {
-      item::update($item, $new_values->as_array());
+      $item->title = $new_values->title;
+      $item->description = $new_values->description;
+      if ($item->id != 1) {
+        $item->rename($new_values->name);
+      }
+      $item->slug = $new_values->slug;
+      $item->save();
 
       log::success("content", "Updated $item->type",
                    "<a href=\"{$item->type}s/$item->id\">view</a>");
@@ -93,23 +80,11 @@ class gallery_rest_Core {
     if (empty($request->arguments)) {
       return rest::invalid_request();
     }
-    $path = implode("/", $request->arguments);
 
     $components = $request->arguments;
     $name = urldecode(array_pop($components));
 
-    $parent = ORM::factory("item")
-      ->where("relative_url_cache", "=", implode("/", $components))
-      ->viewable()
-      ->find();
-
-    if (!$parent->loaded()) {
-      return rest::not_found("Resource: {$path} missing.");
-    }
-
-    if (!access::can("edit", $parent)) {
-      return rest::not_found("Resource: {$path} permission denied.");
-    }
+    $parent = gallery_rest::_get_item(implode("/", $components), "edit");
 
     // Validate the request data
     $new_values = gallery_rest::_validate($request, $parent->id);
@@ -153,18 +128,7 @@ class gallery_rest_Core {
     }
     $path = implode("/", $request->arguments);
 
-    $item = ORM::factory("item")
-      ->where("relative_url_cache", "=", $path)
-      ->viewable()
-      ->find();
-
-    if (!$item->loaded()) {
-      return rest::success();
-    }
-
-    if (!access::can("edit", $item)) {
-      return rest::not_found("Resource: {$path} permission denied.");
-    }
+    $item = gallery_rest::_get_item($path, "edit");
 
     if ($item->id == 1) {
       return rest::invalid_request("Attempt to delete the root album");
@@ -183,6 +147,20 @@ class gallery_rest_Core {
     return rest::success(array("resource" => array("parent_path" => $parent->relative_url())));
   }
 
+  private static function _get_item($path, $permission="view") {
+    $item = url::get_item_from_uri($path);
+
+    if (!$item->loaded()) {
+      throw new Kohana_404_Exception();
+    }
+
+    if (!access::can($permission, $item)) {
+      throw new Kohana_404_Exception();
+    }
+
+    return $item;
+  }
+
   private static function _get_children($item, $request) {
     $children = array();
     $limit = empty($request->limit) ? null : $request->limit;
diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index f36f6aaf..fba83d47 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -136,8 +136,12 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
                              "title" => "Updated Title",
                              "name" => "new name");
 
-    $this->assert_equal(json_encode(array("status" => "ERROR", "message" => "Resource not found")),
-                        gallery_rest::put($request));
+    try {
+      gallery_rest::put($request);
+    } catch (Kohana_404_Exception $k404) {
+    } catch (Exception $e) {
+      $this->assert_false(true, $e->__toString());
+    }
   }
 
   public function gallery_rest_put_album_no_edit_permission_test() {
@@ -147,8 +151,12 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
                              "title" => "Updated Title",
                              "name" => "new name");
 
-    $this->assert_equal(json_encode(array("status" => "ERROR", "message" => "Resource not found")),
-                        gallery_rest::put($request));
+    try {
+      gallery_rest::put($request);
+    } catch (Kohana_404_Exception $k404) {
+    } catch (Exception $e) {
+      $this->assert_false(true, $e->__toString());
+    }
   }
 
   public function gallery_rest_put_album_rename_conflict_test() {
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index 276ff0c2..4b3166c0 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -46,14 +46,7 @@ class rest_Core {
   }
 
   /**
-   * Resource Not Found
-   */
-  static function not_found($log_message=null) {
-    return self::_format_failure_response(t("Resource not found"), $log_message);
-  }
-
-  /**
-   * Resource Not Found
+   * Request failed
    */
   static function fail($log_message=null) {
     return self::_format_failure_response($log_message, $log_message);
diff --git a/modules/tag/helpers/tag_rest.php b/modules/tag/helpers/tag_rest.php
index ed6cfc1c..cfcf93b2 100644
--- a/modules/tag/helpers/tag_rest.php
+++ b/modules/tag/helpers/tag_rest.php
@@ -70,11 +70,11 @@ class tag_rest_Core {
       ->viewable()
       ->find();
     if (!$item->loaded()) {
-      return rest::not_found("Resource: {$path} missing.");
+      throw new Kohana_404_Exception();
     }
 
     if (!access::can("edit", $item)) {
-      return rest::not_found("Resource: {$path} permission denied.");
+      throw new Kohana_404_Exception();
     }
 
     foreach ($tags as $tag) {
@@ -94,7 +94,7 @@ class tag_rest_Core {
       ->where("name", "=", $name)
       ->find();
     if (!$tag->loaded()) {
-      return rest::not_found("Tag: {$name} not found.");
+      throw new Kohana_404_Exception();
     }
 
     $tag->name = $request->new_name;
diff --git a/modules/tag/tests/Tag_Rest_Helper_Test.php b/modules/tag/tests/Tag_Rest_Helper_Test.php
index 6b1c9a33..4408bf4b 100644
--- a/modules/tag/tests/Tag_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tag_Rest_Helper_Test.php
@@ -119,9 +119,12 @@ class Tag_Rest_Helper_Test extends Unit_Test_Case {
   public function tag_rest_add_tags_for_item_not_found_test() {
     $request = (object)array("path" => $this->_photo->relative_url() . "b",
                              "arguments" => array("new,one"));
-    $this->assert_equal(
-      json_encode(array("status" => "ERROR", "message" => "Resource not found")),
-      tag_rest::post($request));
+    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() {
@@ -129,9 +132,12 @@ class Tag_Rest_Helper_Test extends Unit_Test_Case {
     $request = (object)array("path" => $this->_photo->relative_url(),
                              "arguments" => array("new,one"));
 
-    $this->assert_equal(
-      json_encode(array("status" => "ERROR", "message" => "Resource not found")),
-      tag_rest::post($request));
+    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_test() {
@@ -175,9 +181,12 @@ class Tag_Rest_Helper_Test extends Unit_Test_Case {
   public function tag_rest_update_tags_not_found_test() {
     $request = (object)array("arguments" => array("not"), "new_name" => "found");
 
-    $this->assert_equal(
-      json_encode(array("status" => "ERROR", "message" => "Resource not found")),
-      tag_rest::put($request));
+    try {
+      tag_rest::put($request);
+    } catch (Kohana_404_Exception $k404) {
+    } catch (Exception $e) {
+      $this->assert_false(true, $e->__toString());
+    }
   }
 
   public function tag_rest_update_tags_test() {
-- 
cgit v1.2.3


From 732047e9c3cbd178acd07c531ed78afade9a4918 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 31 Dec 2009 09:56:41 -0800
Subject: Create helper functions to create a test user, an album or image. 
 Don't create the test objects in the setup, but do it in each test.

---
 modules/gallery/tests/Gallery_Rest_Helper_Test.php | 223 +++++++++++----------
 1 file changed, 117 insertions(+), 106 deletions(-)

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index fba83d47..4cd3f2a6 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -21,104 +21,105 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
   public function setup() {
     $this->_save = array($_GET, $_POST, $_SERVER, $_FILES);
     $this->_saved_active_user = identity::active_user();
-
-    $this->_user = identity::create_user("access_test", "Access Test", "password");
-    $key = ORM::factory("user_access_token");
-    $this->_access_key = $key->access_key = md5($this->_user->name . rand());
-    $key->user_id = $this->_user->id;
-    $key->save();
-
-    $root = ORM::factory("item", 1);
-    $this->_album = album::create($root, "album", "Test Album", rand());
-    $this->_child = album::create($this->_album, "child", "Test Child Album", rand());
-
-    $filename = MODPATH . "gallery/tests/test.jpg";
-    $rand = rand();
-    $this->_photo = photo::create($this->_child, $filename, "$rand.jpg", $rand);
-
-    $filename = MODPATH . "gallery/tests/test.jpg";
-    $rand = rand();
-    $this->_sibling = photo::create($this->_album, $filename, "$rand.jpg", $rand);
   }
 
   public function teardown() {
     list($_GET, $_POST, $_SERVER, $_FILES) = $this->_save;
     identity::set_active_user($this->_saved_active_user);
+  }
 
-    try {
-      if (!empty($this->_user)) {
-        $this->_user->delete();
-      }
-      if (!empty($this->_album)) {
-        $this->_album->delete();
-      }
-    } catch (Exception $e) { }
+  private function _create_user() {
+    $user = identity::create_user("access_test" . rand(), "Access Test", "password");
+    $key = ORM::factory("user_access_token");
+    $key->access_key = md5($user->name . rand());
+    $key->user_id = $user->id;
+    $key->save();
+    identity::set_active_user($user);
+    return $user;
+  }
+  private function _create_album($parent=null) {
+    $album_name = "album_" . rand();
+    if (empty($parent)) {
+      $parent = ORM::factory("item", 1);
+    }
+    return album::create($parent, $album_name, $album_name, $album_name);
+  }
+
+  private function _create_image($parent=null) {
+    $filename = MODPATH . "gallery/tests/test.jpg";
+    $image_name = "image_" . rand();
+    if (empty($parent)) {
+      $parent = ORM::factory("item", 1);
+    }
+    return photo::create($parent, $filename, "$image_name.jpg", $image_name);
   }
 
   public function gallery_rest_get_album_test() {
-    $request = (object)array("arguments" => explode("/", $this->_child->relative_url()));
+    $album = $this->_create_album();
+    $child = $this->_create_album($album);
+    $photo = $this->_create_image($child);
+    $request = (object)array("arguments" => explode("/", $child->relative_url()));
 
     $this->assert_equal(
       json_encode(array("status" => "OK",
                         "resource" =>
-                          array("type" => $this->_child->type,
-                                "name" => $this->_child->name,
-                                "path" => $this->_child->relative_url(),
-                                "parent_path" => $this->_album->relative_url(),
-                                "title" => $this->_child->title,
-                                "thumb_url" => $this->_child->thumb_url(),
-                                "thumb_size" => array("height" => $this->_child->thumb_height,
-                                                      "width" => $this->_child->thumb_width),
-                                "resize_url" => $this->_child->resize_url(),
+                          array("type" => $child->type,
+                                "name" => $child->name,
+                                "path" => $child->relative_url(),
+                                "parent_path" => $album->relative_url(),
+                                "title" => $child->title,
+                                "thumb_url" => $child->thumb_url(),
+                                "thumb_size" => array("height" => $child->thumb_height,
+                                                      "width" => $child->thumb_width),
+                                "resize_url" => $child->resize_url(),
                                 "resize_size" => array("height" => 0,
                                                        "width" => 0),
-                                "url" => $this->_child->file_url(),
-                                "size" => array("height" => $this->_child->height,
-                                                "width" => $this->_child->width),
-                                "description" => $this->_child->description,
-                                "slug" => $this->_child->slug,
+                                "url" => $child->file_url(),
+                                "size" => array("height" => $child->height,
+                                                "width" => $child->width),
+                                "description" => $child->description,
+                                "slug" => $child->slug,
                                 "children" => array(array(
                                    "type" => "photo",
                                    "has_children" => false,
-                                   "path" => $this->_photo->relative_url(),
-                                   "thumb_url" => $this->_photo->thumb_url(),
+                                   "path" => $photo->relative_url(),
+                                   "thumb_url" => $photo->thumb_url(),
                                    "thumb_dimensions" => array(
-                                     "width" => $this->_photo->thumb_width,
-                                     "height" => $this->_photo->thumb_height),
+                                     "width" => $photo->thumb_width,
+                                     "height" => $photo->thumb_height),
                                    "has_thumb" => true,
-                                   "title" => $this->_photo->title))))),
+                                   "title" => $photo->title))))),
       gallery_rest::get($request));
   }
 
   public function gallery_rest_get_photo_test() {
-    $request = (object)array("arguments" => explode("/", $this->_photo->relative_url()));
+    $child = $this->_create_album();
+    $photo = $this->_create_image($child);
+    $request = (object)array("arguments" => explode("/", $photo->relative_url()));
 
     $this->assert_equal(
       json_encode(array("status" => "OK",
                         "resource" =>
-                        array("type" => $this->_photo->type,
-                              "name" => $this->_photo->name,
-                              "path" => $this->_photo->relative_url(),
-                              "parent_path" => $this->_child->relative_url(),
-                              "title" => $this->_photo->title,
-                              "thumb_url" => $this->_photo->thumb_url(),
-                              "thumb_size" => array("height" => $this->_photo->thumb_height,
-                                                    "width" => $this->_photo->thumb_width),
-                              "resize_url" => $this->_photo->resize_url(),
-                              "resize_size" => array("height" => $this->_photo->resize_height,
-                                                       "width" => $this->_photo->resize_width),
-                              "url" => $this->_photo->file_url(),
-                              "size" => array("height" => $this->_photo->height,
-                                              "width" => $this->_photo->width),
-                              "description" => $this->_photo->description,
-                              "slug" => $this->_photo->slug))),
+                        array("type" => $photo->type,
+                              "name" => $photo->name,
+                              "path" => $photo->relative_url(),
+                              "parent_path" => $child->relative_url(),
+                              "title" => $photo->title,
+                              "thumb_url" => $photo->thumb_url(),
+                              "thumb_size" => array("height" => $photo->thumb_height,
+                                                    "width" => $photo->thumb_width),
+                              "resize_url" => $photo->resize_url(),
+                              "resize_size" => array("height" => $photo->resize_height,
+                                                       "width" => $photo->resize_width),
+                              "url" => $photo->file_url(),
+                              "size" => array("height" => $photo->height,
+                                              "width" => $photo->width),
+                              "description" => $photo->description,
+                              "slug" => $photo->slug))),
       gallery_rest::get($request));
   }
 
   public function gallery_rest_put_album_no_path_test() {
-    access::allow(identity::registered_users(), "edit", $this->_child);
-
-    identity::set_active_user($this->_user);
     $request = (object)array("description" => "Updated description",
                              "title" => "Updated Title",
                              "name" => "new name");
@@ -128,10 +129,8 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
   }
 
   public function gallery_rest_put_album_not_found_test() {
-    access::allow(identity::registered_users(), "edit", $this->_child);
-
-    identity::set_active_user($this->_user);
-    $request = (object)array("arguments" => explode("/", $this->_photo->relative_url() . rand()),
+    $photo = $this->_create_image();
+    $request = (object)array("arguments" => explode("/", $photo->relative_url() . rand()),
                              "description" => "Updated description",
                              "title" => "Updated Title",
                              "name" => "new name");
@@ -145,8 +144,9 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
   }
 
   public function gallery_rest_put_album_no_edit_permission_test() {
-    identity::set_active_user($this->_user);
-    $request = (object)array("arguments" => explode("/", $this->_child->relative_url()),
+    $child = $this->_create_album();
+    $this->_create_user();
+    $request = (object)array("arguments" => explode("/", $child->relative_url()),
                              "description" => "Updated description",
                              "title" => "Updated Title",
                              "name" => "new name");
@@ -160,84 +160,95 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
   }
 
   public function gallery_rest_put_album_rename_conflict_test() {
-    access::allow(identity::registered_users(), "edit", $this->_child);
-    identity::set_active_user($this->_user);
-    $request = (object)array("arguments" => explode("/", $this->_child->relative_url()),
+    $child = $this->_create_album();
+    $sibling = $this->_create_image();
+    $this->_create_user();
+    access::allow(identity::registered_users(), "edit", $child);
+    $request = (object)array("arguments" => explode("/", $child->relative_url()),
                              "description" => "Updated description",
                              "title" => "Updated Title",
-                             "name" => $this->_sibling->name);
+                             "name" => $sibling->name);
 
     $this->assert_equal(
       json_encode(array("status" => "VALIDATE_ERROR",
-                        "fields" => array("slug" => "Duplicate Internet Address"))),
+                        "fields" => array("slug" => "Duplicate Internet address"))),
       gallery_rest::put($request));
   }
 
   public function gallery_rest_put_album_test() {
-    access::allow(identity::registered_users(), "edit", $this->_child);
+    $child = $this->_create_album();
+    $sibling = $this->_create_image();
+    $this->_create_user();
+    access::allow(identity::registered_users(), "edit", $child);
 
-    identity::set_active_user($this->_user);
-    $request = (object)array("arguments" => explode("/", $this->_child->relative_url()),
+    $request = (object)array("arguments" => explode("/", $child->relative_url()),
                              "description" => "Updated description",
                              "title" => "Updated Title",
                              "name" => "new name");
 
     $this->assert_equal(json_encode(array("status" => "OK")), gallery_rest::put($request));
-    $this->_child->reload();
-    $this->assert_equal("Updated description", $this->_child->description);
-    $this->assert_equal("Updated Title", $this->_child->title);
-    $this->assert_equal("new name",  $this->_child->name);
+    $child->reload();
+    $this->assert_equal("Updated description", $child->description);
+    $this->assert_equal("Updated Title", $child->title);
+    $this->assert_equal("new name",  $child->name);
   }
 
   public function gallery_rest_put_photo_test() {
-    access::allow(identity::registered_users(), "edit", $this->_child);
+    $child = $this->_create_album();
+    $photo = $this->_create_image($child);
+    $this->_create_user();
+    access::allow(identity::registered_users(), "edit", $child);
 
-    identity::set_active_user($this->_user);
-    $request = (object)array("arguments" => explode("/", $this->_photo->relative_url()),
+    $request = (object)array("arguments" => explode("/", $photo->relative_url()),
                              "description" => "Updated description",
                              "title" => "Updated Title",
                              "name" => "new name");
 
     $this->assert_equal(json_encode(array("status" => "OK")), gallery_rest::put($request));
-    $this->_photo->reload();
-    $this->assert_equal("Updated description", $this->_photo->description);
-    $this->assert_equal("Updated Title", $this->_photo->title);
-    $this->assert_equal("new name",  $this->_photo->name);
+    $photo->reload();
+    $this->assert_equal("Updated description", $photo->description);
+    $this->assert_equal("Updated Title", $photo->title);
+    $this->assert_equal("new name",  $photo->name);
   }
 
   public function gallery_rest_delete_album_test() {
-    access::allow(identity::registered_users(), "edit", $this->_album);
+    $album = $this->_create_album();
+    $child = $this->_create_album($album);
+    $this->_create_user();
+    access::allow(identity::registered_users(), "edit", $album);
 
-    identity::set_active_user($this->_user);
-    $request = (object)array("arguments" => explode("/", $this->_child->relative_url()));
+    $request = (object)array("arguments" => explode("/", $child->relative_url()));
 
     $this->assert_equal(json_encode(array("status" => "OK",
                                           "resource" => array(
-                                            "parent_path" => $this->_album->relative_url()))),
+                                            "parent_path" => $album->relative_url()))),
                         gallery_rest::delete($request));
-    $this->_child->reload();
-    $this->assert_false($this->_child->loaded());
+    $child->reload();
+    $this->assert_false($child->loaded());
   }
 
   public function gallery_rest_delete_photo_test() {
-    access::allow(identity::registered_users(), "edit", $this->_album);
+    $album = $this->_create_album();
+    $photo = $this->_create_image($album);
+    $this->_create_user();
+    access::allow(identity::registered_users(), "edit", $album);
 
-    identity::set_active_user($this->_user);
-    $request = (object)array("arguments" => explode("/", $this->_sibling->relative_url()));
+    $request = (object)array("arguments" => explode("/", $photo->relative_url()));
 
     $this->assert_equal(json_encode(array("status" => "OK",
                                           "resource" => array(
-                                            "parent_path" => $this->_album->relative_url()))),
+                                            "parent_path" => $album->relative_url()))),
                         gallery_rest::delete($request));
-    $this->_sibling->reload();
-    $this->assert_false($this->_sibling->loaded());
+    $photo->reload();
+    $this->assert_false($photo->loaded());
   }
 
   public function gallery_rest_post_album_test() {
-    access::allow(identity::registered_users(), "edit", $this->_album);
+    $album = $this->_create_album();
+    $this->_create_user();
+    access::allow(identity::registered_users(), "edit", $album);
 
-    $new_path = $this->_child->relative_url() . "/new%20child";
-    identity::set_active_user($this->_user);
+    $new_path = $album->relative_url() . "/new%20child";
     $request = (object)array("arguments" => explode("/", $new_path));
 
     $this->assert_equal(json_encode(array("status" => "OK", "path" => $new_path)),
-- 
cgit v1.2.3


From 28597ba53354537704899e7ad9eb39bbd5718b21 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 2 Jan 2010 14:31:59 -0800
Subject: Correct file structure tests, Have the tests delete the userid they
 create so as not to impact other tests.

---
 modules/gallery/tests/Gallery_Rest_Helper_Test.php | 22 ++++++++++------
 modules/rest/controllers/rest.php                  |  3 ++-
 modules/rest/helpers/rest.php                      |  3 ++-
 modules/rest/helpers/rest_event.php                |  3 ++-
 modules/rest/tests/Rest_Controller_Test.php        | 29 ++++++++++++++--------
 modules/tag/tests/Tag_Rest_Helper_Test.php         | 20 +++++++++------
 6 files changed, 52 insertions(+), 28 deletions(-)

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index 4cd3f2a6..605a4f37 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -26,17 +26,25 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
   public function teardown() {
     list($_GET, $_POST, $_SERVER, $_FILES) = $this->_save;
     identity::set_active_user($this->_saved_active_user);
+    if (!empty($this->_user)) {
+      try {
+        $this->_user->delete();
+      } catch (Exception $e) { }
+    }
   }
 
   private function _create_user() {
-    $user = identity::create_user("access_test" . rand(), "Access Test", "password");
-    $key = ORM::factory("user_access_token");
-    $key->access_key = md5($user->name . rand());
-    $key->user_id = $user->id;
-    $key->save();
-    identity::set_active_user($user);
-    return $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($parent=null) {
     $album_name = "album_" . rand();
     if (empty($parent)) {
diff --git a/modules/rest/controllers/rest.php b/modules/rest/controllers/rest.php
index 446ec7cb..39ca4797 100644
--- a/modules/rest/controllers/rest.php
+++ b/modules/rest/controllers/rest.php
@@ -1,4 +1,5 @@
-<?php defined("SYSPATH") or die("No direct script access.");/**
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
  * Gallery - a web based photo album viewer and editor
  * Copyright (C) 2000-2009 Bharat Mediratta
  *
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index 7e2445e4..00790e6b 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -1,4 +1,5 @@
-<?php defined("SYSPATH") or die("No direct script access.");/**
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
  * Gallery - a web based photo album viewer and editor
  * Copyright (C) 2000-2009 Bharat Mediratta
  *
diff --git a/modules/rest/helpers/rest_event.php b/modules/rest/helpers/rest_event.php
index a06f43ea..00cea7eb 100644
--- a/modules/rest/helpers/rest_event.php
+++ b/modules/rest/helpers/rest_event.php
@@ -1,4 +1,5 @@
-<?php defined("SYSPATH") or die("No direct script access.");/**
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
  * Gallery - a web based photo album viewer and editor
  * Copyright (C) 2000-2009 Bharat Mediratta
  *
diff --git a/modules/rest/tests/Rest_Controller_Test.php b/modules/rest/tests/Rest_Controller_Test.php
index 3e0c4063..83bd9db6 100644
--- a/modules/rest/tests/Rest_Controller_Test.php
+++ b/modules/rest/tests/Rest_Controller_Test.php
@@ -23,12 +23,24 @@ class Rest_Controller_Test extends Unit_Test_Case {
   }
 
   private function _create_user() {
-    $user = identity::create_user("access_test" . rand(), "Access Test", "password");
-    $key = ORM::factory("user_access_token");
-    $key->access_key = md5($user->name . rand());
-    $key->user_id = $user->id;
-    $key->save();
-    return array($key->access_key, $user);
+    if (empty($this->_user)) {
+      $this->_user = identity::create_user("access_test" . rand(), "Access Test", "password");
+      $this->_key = ORM::factory("user_access_token");
+      $this->_key->access_key = md5($this->_user->name . rand());
+      $this->_key->user_id = $this->_user->id;
+      $this->_key->save();
+      identity::set_active_user($this->_user);
+    }
+    return array($this->_key->access_key, $this->_user);
+  }
+
+  public function teardown() {
+    list($_GET, $_POST, $_SERVER) = $this->_save;
+    if (!empty($this->_user)) {
+      try {
+        $this->_user->delete();
+      } catch (Exception $e) { }
+    }
   }
 
   private function _create_image($parent=null) {
@@ -40,11 +52,6 @@ class Rest_Controller_Test extends Unit_Test_Case {
     return photo::create($parent, $filename, "$image_name.jpg", $image_name);
   }
 
-
-  public function teardown() {
-    list($_GET, $_POST, $_SERVER) = $this->_save;
-  }
-
   public function rest_access_key_exists_test() {
     list ($access_key, $user) = $this->_create_user();
     $_SERVER["REQUEST_METHOD"] = "GET";
diff --git a/modules/tag/tests/Tag_Rest_Helper_Test.php b/modules/tag/tests/Tag_Rest_Helper_Test.php
index ac64470c..055e5cec 100644
--- a/modules/tag/tests/Tag_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tag_Rest_Helper_Test.php
@@ -31,18 +31,24 @@ class Tag_Rest_Helper_Test extends Unit_Test_Case {
       Database::instance()->query("TRUNCATE {tags}");
       Database::instance()->query("TRUNCATE {items_tags}");
 
+      if (!empty($this->_user)) {
+        $this->_user->delete();
+      }
     } catch (Exception $e) { }
   }
 
   private function _create_user() {
-    $user = identity::create_user("access_test" . rand(), "Access Test", "password");
-    $key = ORM::factory("user_access_token");
-    $key->access_key = md5($user->name . rand());
-    $key->user_id = $user->id;
-    $key->save();
-    identity::set_active_user($user);
-    return $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 = "album_" . rand();
     if (empty($parent)) {
-- 
cgit v1.2.3


From d4ad81e657e08630cca80c69b05d7d5fcc6c83d8 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 2 Jan 2010 15:04:43 -0800
Subject: Correct unexpected error in gallery_rest_put_album_no_path_test

---
 modules/gallery/tests/Gallery_Rest_Helper_Test.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index 605a4f37..65a60ff1 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -132,8 +132,13 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
                              "title" => "Updated Title",
                              "name" => "new name");
 
-    $this->assert_equal(json_encode(array("status" => "ERROR", "message" => "Invalid request")),
-                        gallery_rest::put($request));
+    try {
+      gallery_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 gallery_rest_put_album_not_found_test() {
-- 
cgit v1.2.3


From 07f8e256cf140c41e7eaf293c6c41b31aff8c661 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 2 Jan 2010 16:22:03 -0800
Subject: Clean up gallery_rest helper test

---
 modules/gallery/tests/Gallery_Rest_Helper_Test.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'modules/gallery/tests/Gallery_Rest_Helper_Test.php')

diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index 65a60ff1..cd0aabae 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -46,7 +46,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
   }
 
   private function _create_album($parent=null) {
-    $album_name = "album_" . rand();
+    $album_name = "rest_album_" . rand();
     if (empty($parent)) {
       $parent = ORM::factory("item", 1);
     }
@@ -55,7 +55,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
 
   private function _create_image($parent=null) {
     $filename = MODPATH . "gallery/tests/test.jpg";
-    $image_name = "image_" . rand();
+    $image_name = "rest_image_" . rand();
     if (empty($parent)) {
       $parent = ORM::factory("item", 1);
     }
@@ -66,6 +66,7 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     $album = $this->_create_album();
     $child = $this->_create_album($album);
     $photo = $this->_create_image($child);
+    $child->reload();
     $request = (object)array("arguments" => explode("/", $child->relative_url()));
 
     $this->assert_equal(
@@ -194,16 +195,17 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
     $this->_create_user();
     access::allow(identity::registered_users(), "edit", $child);
 
+    $new_name = "new_album_name" . rand();
     $request = (object)array("arguments" => explode("/", $child->relative_url()),
                              "description" => "Updated description",
                              "title" => "Updated Title",
-                             "name" => "new name");
+                             "name" => $new_name);
 
     $this->assert_equal(json_encode(array("status" => "OK")), gallery_rest::put($request));
     $child->reload();
     $this->assert_equal("Updated description", $child->description);
     $this->assert_equal("Updated Title", $child->title);
-    $this->assert_equal("new name",  $child->name);
+    $this->assert_equal($new_name,  $child->name);
   }
 
   public function gallery_rest_put_photo_test() {
-- 
cgit v1.2.3