[Jifty-commit] r5157 - in jifty/trunk: lib/Jifty lib/Jifty/Plugin

[Jifty commits]

Author: sartak
Date: Thu Feb 21 16:20:28 2008
New Revision: 5157

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Plugin/REST.pm
   jifty/trunk/lib/Jifty/Util.pm

Log:
 r51992 at onn:  sartak | 2008-02-21 16:20:12 -0500
 REST: Include a REST URL in Jifty::Record links. The HTTP_ACCEPT logic should be made smarter


Modified: jifty/trunk/lib/Jifty/Plugin/REST.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/REST.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/REST.pm	Thu Feb 21 16:20:28 2008
@@ -4,7 +4,7 @@
 package Jifty::Plugin::REST;
 use base qw/Jifty::Plugin/;
 
-our $VERSION = '1.00';
+our $VERSION = '1.01';
 
 =head1 NAME
 

Modified: jifty/trunk/lib/Jifty/Util.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Util.pm	(original)
+++ jifty/trunk/lib/Jifty/Util.pm	Thu Feb 21 16:20:28 2008
@@ -345,7 +345,17 @@
 sub reference_to_data {
     my ($self, $obj) = @_;
     (my $model = ref($obj)) =~ s/::/./g;
-    return { jifty_model_reference => 1, id => $obj->id, model => $model };
+    my $id = $obj->id;
+
+    # probably a file extension, from the REST rewrite
+    my $extension = $ENV{HTTP_ACCEPT} =~ /^\w+$/ ? ".$ENV{HTTP_ACCEPT}" : '';
+
+    return {
+        jifty_model_reference => 1,
+        id                    => $obj->id,
+        model                 => $model,
+        url                   => Jifty->web->url(path => "/=/model/$model/id/$id$extension"),
+    };
 }
 
 =head2 stringify LIST