Changeset 9129

Timestamp:

04/08/08 18:15:58 (5 years ago)

Author:

takemaru

Message:

lang/perl/Catalyst-Controller-Atompub, refactoring around make_edit_uri, v0.4.4 rc3

Location:

lang/perl/Catalyst-Controller-Atompub/trunk

Files:

• lib/Catalyst/Controller/Atompub/Collection.pm (modified) (5 diffs)
• samples/MyBlog/t/01.t (modified) (1 diff)

lang/perl/Catalyst-Controller-Atompub/trunk/lib/Catalyst/Controller/Atompub/Collection.pm

@@ -195 +195 @@
 
         my ($uri) = $self->make_edit_uri($c) or return $self->error($c);
-        $entry = $self->_assign_link_and_id($uri, $entry) or return $self->error($c);
+        $entry = $self->_assign_uri_for_entry($c, $entry, $uri) or return $self->error($c);
 
         $self->entry_resource->uri($uri);
     }
     else {
-        my($entry_uri, $media_uri) = $self->make_edit_uri($c, $media_type);
-
-        return $self->error($c, RC_BAD_REQUEST, 'No body') unless $c->req->body;
-
-        my $entry = $self->_create_media_link_entry($c, $entry_uri, $media_uri)
-            or return $self->error($c);
+        my $entry = $self->_create_media_link_entry($c) or return $self->error($c);
         my $media = read_file($c->req->body, binmode => ':raw');
 
         $self->media_link_entry( Catalyst::Controller::Atompub::Collection::Resource->new({
-            uri => $entry_uri,
             body => $entry,
         }) );
 
         $self->media_resource( Catalyst::Controller::Atompub::Collection::Resource->new({
-            uri => $media_uri,
             body => $media,
             type => $media_type,
         }) );
+
+        my($entry_uri, $media_uri) = $self->make_edit_uri($c, $media_type) or return $self->error($c);
+        $entry = $self->_assign_uri_for_entry($c, $entry, $entry_uri, $media_uri) or return $self->error($c);
+
+        $self->media_link_entry->uri($entry_uri);
+        $self->media_resource->uri($media_uri);
+
+        return $self->error($c, RC_BAD_REQUEST, 'No body') unless $c->req->body;
     }
 
@@ -301 +302 @@
         $media_type = media_type('entry');
         $body = $self->_fixup_entry($c) or return $self->error($c);
-        $body = $self->_assign_link_and_id($uri, $body) or return $self->error($c);
+        $body = $self->_assign_uri_for_entry($c, $body, $uri) or return $self->error($c);
     }
     else {
@@ -390 +391 @@
     $entry->updated($self->edited->w3c) unless $entry->updated;
 
-    # $entry->id(_make_id($uri)) unless $entry->id;
-    # $entry->edit_link($uri);
-    # XXX check edit-media link
-
     if (!$entry->author) {
         my $author = XML::Atom::Person->new;
@@ -408 +405 @@
 }
 
-sub _assign_link_and_id {
-    my($self, $uri, $entry) = @_;
-    $entry->id(_make_id($uri)) unless $entry->id;
-    $entry->edit_link($uri);
-    # XXX check edit-media link
+sub _assign_uri_for_entry {
+    my($self, $c, $entry, $entry_uri, $media_uri) = @_;
+    $entry->id(_make_id($entry_uri)) unless $entry->id;
+    $entry->edit_link($entry_uri);
+    if ($media_uri) {
+        $entry->edit_media_link($media_uri);
+        unless ($entry->content) {
+            my $content = XML::Atom::Content->new;
+            $content->src($media_uri);
+            $content->type($c->req->content_type);
+            $entry->content($content);
+        }
+    }
     $entry;
 }
@@ -426 +431 @@
 
 sub _create_media_link_entry {
-    my($self, $c, $entry_uri, $media_uri) = @_;
-
+    my($self, $c) = @_;
     my $entry = XML::Atom::Entry->new;
-
     $entry->edited($self->edited->w3c);
     $entry->updated($self->edited->w3c) unless $entry->updated;
-
-    my $link = XML::Atom::Link->new;
-    $link->rel('edit-media');
-    $link->href($media_uri);
-    $entry->add_link($link);
-
-    $link = XML::Atom::Link->new;
-    $link->rel('edit');
-    $link->href($entry_uri);
-    $entry->add_link($link);
-
-    $entry->id($entry_uri);
-
     $entry->title(uri_unescape $c->req->slug || '');
-
-    my $content = XML::Atom::Content->new;
-    $content->src($media_uri);
-    $content->type($c->req->content_type);
-    $entry->content($content);
-
     $entry->summary('');
-
     $entry;
 }

lang/perl/Catalyst-Controller-Atompub/trunk/samples/MyBlog/t/01.t

@@ -138 +138 @@
 ok $entry->edited;
 ok $entry->updated;
-is $entry->id, 'http://localhost:3000/mediacollection/media_1.atom';
+like $entry->id, qr{tag:localhost:3000,\d{4}-\d\d-\d\d:/mediacollection/media_1.atom};
 
 is $entry->edit_link, 'http://localhost:3000/mediacollection/media_1.atom';