From 0e3327bca70623175791ee41085d55d0cb13fe5b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 3 Jan 2010 20:30:35 -0800
Subject: Simplify the REST API code.   Here's what I did: 1) Simplify
 gallery_rest to return flat models, no children and do no    validation for
 now. 2) Flatten the REST replies and use HTTP codes to indicate   
 success/failure instead of additional status messages. 3) Use the message and
 error code support in the base Exception class,    instead of brewing our own
 in Rest_Exception. 4) Get rid of rest::success() and rest::fail() -- we only
 need    rest::reply() since all failures are covered by throwing an   
 exception. 5) Get rid of /rest/access_key and just use /rest for
 authentication. 6) Inline and simplify rest::normalize_request since we only
 use it once 7) Change rest::set_active_user to succeed or throw an exception
 8) Extract Rest_Exception::sendHeaders into rest::send_headers()

Here's what's currently broken:
1) Data validation.  There currently is none
2) Logging.  That's gone too
3) image block and tag code is broken
4) Tests are broken
5) No movie support
---
 modules/rest/libraries/Rest_Exception.php | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'modules/rest/libraries')

diff --git a/modules/rest/libraries/Rest_Exception.php b/modules/rest/libraries/Rest_Exception.php
index 905b94a0..596b3712 100644
--- a/modules/rest/libraries/Rest_Exception.php
+++ b/modules/rest/libraries/Rest_Exception.php
@@ -18,19 +18,4 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Rest_Exception_Core extends Exception {
-  /**
-   * Set internal properties.
-   */
-  public function __construct($code, $text) {
-    parent::__construct("$code $text");
-  }
-
-  /**
-   * Sends the headers, to emulate server behavior.
-   *
-   * @return void
-   */
-  public function sendHeaders() {
-    header('HTTP/1.1 {$this->getMessage()}');
-  }
-} // End Rest Exception
\ No newline at end of file
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 92d96548e9b365cfa8e888a2103ab09e9f45914a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 19 Jan 2010 23:28:18 -0800
Subject: Make Rest_Exception extend Kohana_Exception so that we can let it
 bubble to the top and then in sendHeaders have it send the right response
 code.

---
 modules/rest/libraries/Rest_Exception.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'modules/rest/libraries')

diff --git a/modules/rest/libraries/Rest_Exception.php b/modules/rest/libraries/Rest_Exception.php
index 596b3712..c3548b7e 100644
--- a/modules/rest/libraries/Rest_Exception.php
+++ b/modules/rest/libraries/Rest_Exception.php
@@ -17,5 +17,14 @@
  * 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_Exception_Core extends Exception {
+class Rest_Exception_Core extends Kohana_Exception {
+  public function __construct($message, $code) {
+    parent::__construct($message, null, $code);
+  }
+
+  public function sendHeaders() {
+    if (!headers_sent()) {
+      header("HTTP/1.1 " . $this->getCode() . " " . $this->getMessage());
+    }
+  }
 }
\ No newline at end of file
-- 
cgit v1.2.3