Changeset 7513

Timestamp:

03/05/08 21:37:14 (5 years ago)

Author:

takemaru

Message:

lang/perl/Catalyst-Controller-Atompub: new branches, delay-reading-media

Location:

lang/perl/Catalyst-Controller-Atompub/branches

Files:

• . (added)
• delay-reading-media (copied) (copied from lang/perl/Catalyst-Controller-Atompub/trunk)
• delay-reading-media/Changes (copied) (copied from lang/perl/Catalyst-Controller-Atompub/trunk/Changes)
• delay-reading-media/META.yml (copied) (copied from lang/perl/Catalyst-Controller-Atompub/trunk/META.yml)
• delay-reading-media/lib/Catalyst/Controller/Atompub.pm (copied) (copied from lang/perl/Catalyst-Controller-Atompub/trunk/lib/Catalyst/Controller/Atompub.pm)
• delay-reading-media/lib/Catalyst/Controller/Atompub/Collection.pm (copied) (copied from lang/perl/Catalyst-Controller-Atompub/trunk/lib/Catalyst/Controller/Atompub/Collection.pm) (6 diffs)
• delay-reading-media/samples/MyBlog/lib/MyBlog/Controller/MediaCollection.pm (modified) (4 diffs)

lang/perl/Catalyst-Controller-Atompub/branches/delay-reading-media/lib/Catalyst/Controller/Atompub/Collection.pm

@@ -8 +8 @@
 use Atompub::Util qw( is_acceptable_media_type is_allowed_category );
 use Catalyst::Utils;
-use File::Slurp;
 use HTTP::Status;
 use NEXT;
@@ -226 +225 @@
             unless $c->req->body;
 
-        my $media
-            = read_file( $c->req->body, binmode => ':raw', err_mode => 'carp' )
-                || return $self->error( $c, RC_BAD_REQUEST, 'No media resource' );
-
         my $entry = XML::Atom::Entry->new;
 
@@ -252 +247 @@
         $rc->edited( $self->edited ); # XXX DEPRECATED
         $rc->uri( $media_uri );
-        $rc->body( $media );
+        $rc->body( $c->req->body );
         $rc->type( $media_type );
         $self->media_resource( $rc );
@@ -398 +393 @@
     }
     else {
-        $content
-            = read_file( $c->req->body, binmode => ':raw', err_mode => 'carp' )
-                || return $self->error( $c, RC_BAD_REQUEST, 'No media' );
+        $content = $c->req->body;
     }
 
@@ -503 +496 @@
 
 use Atompub::MediaType qw( media_type );
+use File::Slurp;
 
 use base qw( Class::Accessor::Fast );
@@ -539 +533 @@
 sub serialize {
     my $self = shift;
-    my $body = $self->body;
-    UNIVERSAL::can( $body, 'as_xml' ) ? $body->as_xml : $body;
+    if (UNIVERSAL::isa( $self->body, 'XML::Atom::Base' )) {
+        return $self->body->as_xml;
+    }
+    elsif (UNIVERSAL::isa( $self->body, 'File::Temp' )) {
+        return $self->body( scalar read_file( $self->body, binmode => ':raw' ) );
+    }
+    else {
+        return $self->body;
+    }
 }
 

lang/perl/Catalyst-Controller-Atompub/branches/delay-reading-media/samples/MyBlog/lib/MyBlog/Controller/MediaCollection.pm

@@ -7 +7 @@
 use Atompub::DateTime qw( datetime );
 use Atompub::MediaType qw( media_type );
-use MIME::Base64;
 use HTTP::Status;
 use POSIX qw( strftime );
@@ -70 +69 @@
         media_uri  => $media_uri,
         media_etag => $self->calculate_new_etag( $c, $media_uri ),
-        media_body => MIME::Base64::encode( $self->media_resource->body ),
+        media_body => $self->media_resource->serialize,
         media_type => $self->media_resource->type,
     };
@@ -96 +95 @@
     }
     else {
-        $self->media_resource->body( MIME::Base64::decode( $rs->media_body ) );
+        $self->media_resource->body( $rs->media_body );
         $self->media_resource->type( $rs->media_type );
     }
@@ -129 +128 @@
 
         $vals->{media_etag} = $self->calculate_new_etag( $c, $rs->media_uri );
-        $vals->{media_body} = MIME::Base64::encode( $self->media_resource->body );
+        $vals->{media_body} = $self->media_resource->serialize;
         $vals->{media_type} = $media_type = $self->media_resource->type;