Rename the backing table from rest_keys to user_access_tokens

Implement an api to format the errors and success messages
Removed the custom routing... urls are now /rest/<module_name>/<resource>

3 files changed, 75 insertions, 6 deletions

diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
new file mode 100644
index 00000000..34852a9e
--- /dev/null
+++ b/modules/rest/helpers/rest.php
@@ -0,0 +1,69 @@
+<?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 rest_Core {
+  /**
+   * Authorization Failure
+   */
+  static function forbidden($log_message=null) {
+    return self::_format_response(t("Authorization failed"), $log_message);
+  }
+
+  /**
+   * Invalid Failure
+   */
+  static function invalid_request($log_message=null) {
+    return self::_format_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);
+  }
+
+  /**
+   * Internal Error
+   */
+  static function internal_error($log_message=null) {
+    return self::_format_response(t("Internal error"), $log_message);
+  }
+
+  /**
+   * Not implemented
+   */
+  static function success($response_data, $message=null) {
+    $response = array("status" => "OK");
+    if (!empty($message)) {
+      $response["message"] = (string)$message;
+    }
+    // We don't need to save the session for this request
+    Session::abort_save();
+    return json_encode(array_merge($response, $response_data));
+  }
+
+  private static function _format_response($message, $log_message) {
+    if (!empty($log_message)) {
+      Kohana::log("info", $log_message);
+    }
+    // We don't need to save the session for this request
+    Session::abort_save();
+    return json_encode(array("status" => "ERROR", "message" => (string)$message));
+  }
+}
diff --git a/modules/rest/helpers/rest_event.php b/modules/rest/helpers/rest_event.php
index fd1c25be..ce926107 100644
--- a/modules/rest/helpers/rest_event.php
+++ b/modules/rest/helpers/rest_event.php
@@ -22,7 +22,7 @@ class rest_event {
    * the user_homes directory.
    */
   static function user_before_delete($user) {
-     ORM::factory("rest_key")
+     ORM::factory("user_access_token")
       ->where("id", $user->id)
       ->delete_all();
   }
@@ -32,7 +32,7 @@ class rest_event {
    * on every add.
    */
   static function user_add_form_admin_completed($user, $form) {
-    $key = ORM::factory("rest_key");
+    $key = ORM::factory("user_access_token");
     $key->user_id = $user->id;
     $key->access_key = md5($user->name . rand());
     $key->save();
@@ -56,7 +56,7 @@ class rest_event {
    * Get the form fields for user edit
    */
   static function _get_access_key_form($user, $form) {
-    $key = ORM::factory("rest_key")
+    $key = ORM::factory("user_access_token")
       ->where("user_id", $user->id)
       ->find();
 
@@ -66,7 +66,7 @@ class rest_event {
       $key->save();
     }
 
-    $form->edit_user->input("access_key")
+    $form->edit_user->input("user_access_token")
       ->value($key->access_key)
       ->readonly("readonly")
       ->class("g-form-static")
diff --git a/modules/rest/helpers/rest_installer.php b/modules/rest/helpers/rest_installer.php
index 274002c0..9fbc5b2e 100644
--- a/modules/rest/helpers/rest_installer.php
+++ b/modules/rest/helpers/rest_installer.php
@@ -20,7 +20,7 @@
 class rest_installer {
   static function install() {
     Database::instance()
-      ->query("CREATE TABLE {rest_keys} (
+      ->query("CREATE TABLE {user_access_tokens} (
                 `id` int(9) NOT NULL auto_increment,
                 `user_id` int(9) NOT NULL,
                 `access_key` char(32) NOT NULL,
@@ -32,6 +32,6 @@ class rest_installer {
   }
 
   static function uninstall() {
-    Database::instance()->query("DROP TABLE IF EXISTS {rest_keys}");
+    Database::instance()->query("DROP TABLE IF EXISTS {user_access_tokens}");
   }
 }