summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modules/gallery/helpers/gallery_rest.php64
-rw-r--r--modules/gallery/tests/Gallery_Rest_Helper_Test.php75
-rw-r--r--modules/rest/helpers/rest.php11
3 files changed, 148 insertions, 2 deletions
diff --git a/modules/gallery/helpers/gallery_rest.php b/modules/gallery/helpers/gallery_rest.php
new file mode 100644
index 00000000..367c2684
--- /dev/null
+++ b/modules/gallery/helpers/gallery_rest.php
@@ -0,0 +1,64 @@
+<?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_Core {
+ static function get_album($request) {
+ if (empty($request->path)) {
+ return rest::invalid_request();
+ }
+
+ $album = ORM::factory("item")
+ ->where("relative_path_cache", $request->path)
+ ->where("type", "album")
+ ->viewable()
+ ->find();
+
+ if (!$album->loaded) {
+ return rest::not_found();
+ }
+
+ $response_data = array("path" => $album->relative_path(),
+ "title" => $album->title,
+ "thumb_url" => $album->thumb_url(),
+ "url" => $album->abs_url(),
+ "description" => $album->description,
+ "internet_address" => $album->slug);
+
+ $children = self::_get_children($album, $request);
+ if (!empty($children)) {
+ $response_data["children"] = $children;
+ }
+ return rest::success(array("album" => $response_data));
+ }
+
+ private static function _get_children($album, $request) {
+ $children = array();
+ $limit = empty($request->limit) ? null : $request->limit;
+ $offset = empty($request->offset) ? null : $request->offset;
+ $where = empty($request->filter) ? array() : array("type" => $request->filter);
+ foreach ($album->children($limit, $offset, $where) as $child) {
+ $children[] = array("type" => $child->type,
+ "has_children" => $child->children_count() > 0,
+ "path" => $child->relative_path(),
+ "title" => $child->title);
+ }
+
+ return $children;
+ }
+}
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));
+ }
+}
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index 34852a9e..64a32d40 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -32,7 +32,7 @@ class rest_Core {
}
/**
- * Not implemented
+ * Not Implemented
*/
static function not_implemented($log_message=null) {
return self::_format_response(t("Service not implemented"), $log_message);
@@ -46,7 +46,14 @@ class rest_Core {
}
/**
- * Not implemented
+ * Resource Not Found
+ */
+ static function not_found($log_message=null) {
+ return self::_format_response(t("Internal error"), $log_message);
+ }
+
+ /**
+ * Success
*/
static function success($response_data, $message=null) {
$response = array("status" => "OK");
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 12:45:53 +0000