From c590fed132b07647c38b1d5b4a93ffe30b6ac4bf Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 19 Jan 2010 01:33:57 -0800
Subject: Change rest::url() to take a module name and a resource.  The module
 does the rest.  This function is symmetrical to rest::resolve.

---
 modules/tag/helpers/tag_rest.php  | 15 +++++++++------
 modules/tag/helpers/tags_rest.php |  6 +++---
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'modules/tag/helpers')

diff --git a/modules/tag/helpers/tag_rest.php b/modules/tag/helpers/tag_rest.php
index 0aac5291..a4eaee90 100644
--- a/modules/tag/helpers/tag_rest.php
+++ b/modules/tag/helpers/tag_rest.php
@@ -22,10 +22,10 @@ class tag_rest_Core {
     $tag = rest::resolve($request->url);
     $items = array();
     foreach ($tag->items() as $item) {
-      $items[] = url::abs_site("rest/gallery/" . $item->relative_url());
+      $items[] = rest::url("gallery", $item);
     }
 
-    return rest::reply(array("resource" => $tag->as_array(), "members" => $items));
+    return array("resource" => $tag->as_array(), "members" => $items);
   }
 
   static function post($request) {
@@ -38,7 +38,7 @@ class tag_rest_Core {
     access::required("edit", $item);
 
     tag::add($item, $tag->name);
-    return rest::reply(array("url" => url::abs_site("rest/tag/" . rawurlencode($tag->name))));
+    return array("url" => rest::url("tag", $tag));
   }
 
   static function put($request) {
@@ -61,7 +61,7 @@ class tag_rest_Core {
     }
 
     $tag->save();
-    return rest::reply(array("url" => url::abs_site("rest/tag/" . rawurlencode($tag->name))));
+    return array("url" => rest::url("tag", $tag));
   }
 
   static function delete($request) {
@@ -70,7 +70,6 @@ class tag_rest_Core {
     if (empty($request->params->url)) {
       // Delete the tag
       $tag->delete();
-      return rest::reply();
     } else {
       // Remove an item from the tag
       $item = rest::resolve($request->params->url);
@@ -78,7 +77,7 @@ class tag_rest_Core {
       $tag->save();
 
       tag::compact();
-      return rest::reply(array("url" => url::abs_site("rest/tag/" . rawurlencode($tag->name))));
+      return array("url" => rest::url("tag", $tag));
     }
   }
 
@@ -90,4 +89,8 @@ class tag_rest_Core {
 
     return $tag;
   }
+
+  static function url($item) {
+    return url::abs_site("rest/tag/" . rawurlencode($tag->name));
+  }
 }
diff --git a/modules/tag/helpers/tags_rest.php b/modules/tag/helpers/tags_rest.php
index 7f0ed66a..dd23e97f 100644
--- a/modules/tag/helpers/tags_rest.php
+++ b/modules/tag/helpers/tags_rest.php
@@ -21,9 +21,9 @@ class tags_rest_Core {
   static function get($request) {
     $tags = array();
     foreach (ORM::factory("tag")->find_all() as $tag) {
-      $tags[$tag->name] = url::abs_site("rest/tags/" . rawurlencode($tag->name));
+      $tags[$tag->name] = rest::url("tags", $tag);
     }
-    return rest::reply(array("members" => $tags));
+    return array("members" => $tags);
   }
 
   static function post($request) {
@@ -43,6 +43,6 @@ class tags_rest_Core {
       $tag->save();
     }
 
-    return rest::reply(array("url" => url::abs_site("rest/tag/" . rawurlencode($tag->name))));
+    return array("url" => rest::url("tag", $tag));
   }
 }
-- 
cgit v1.2.3