X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Engine-STOMP.git;a=blobdiff_plain;f=lib%2FCatalyst%2FController%2FMessageDriven.pm;h=678e34bd676b91cb367875de8b6e744096a5bf98;hp=4e87cb2a79d29a3cf20713e8682e186b426086b8;hb=03c90167fd57396abe0062240d6df97eded60124;hpb=bd1954f9fb32631d0c9d3130aec292c5577abe4b

diff --git a/lib/Catalyst/Controller/MessageDriven.pm b/lib/Catalyst/Controller/MessageDriven.pm
index 4e87cb2..678e34b 100644
--- a/lib/Catalyst/Controller/MessageDriven.pm
+++ b/lib/Catalyst/Controller/MessageDriven.pm
@@ -1,5 +1,7 @@
 package Catalyst::Controller::MessageDriven;
 use Moose;
+use Data::Serializer;
+use namespace::autoclean;
 
 BEGIN { extends 'Catalyst::Controller' }
 
@@ -14,7 +16,10 @@ Catalyst::Controller::MessageDriven
   BEGIN { extends 'Catalyst::Controller::MessageDriven' }
 
   sub some_action : Local {
-      my ($self, $c) = @_;
+      my ($self, $c, $message) = @_;
+
+      # Handle message
+
       # Reply with a minimal response message
       my $response = { type => 'testaction_response' };
       $c->stash->{response} = $response;
@@ -28,27 +33,64 @@ YAML determines the action dispatched to.
 
 =cut
 
-__PACKAGE__->config(
-            'default'   => 'text/x-yaml',
-            'stash_key' => 'response',
-            'map'       => { 'text/x-yaml' => 'YAML' },
-           );
+__PACKAGE__->config( serializer => 'YAML' );
 
-sub begin :ActionClass('Deserialize') { }
+sub begin : Private {
+    my ($self, $c) = @_;
+
+    # Deserialize the request message
+        my $message;
+    my $serializer = $self->config->{serializer};
+    my $s = Data::Serializer->new( serializer => $serializer );
+    eval {
+        my $body = $c->request->body;
+        open my $IN, "$body" or die "can't open temp file $body";
+        $message = $s->raw_deserialize(do { local $/; <$IN> });
+    };
+    if ($@) {
+        # can't reply - reply_to is embedded in the message
+        $c->error("exception in deserialize: $@");
+    }
+    else {
+        $c->stash->{request} = $message;
+    }
+}
 
-sub end :ActionClass('Serialize') {
+sub end : Private {
     my ($self, $c) = @_;
 
     # Engine will send our reply based on the value of this header.
-    $c->response->headers->header( 'X-Reply-Address' => $c->req->data->{reply_to} );
+    $c->response->headers->header( 'X-Reply-Address' => $c->stash->{request}->{reply_to} );
+
+    # The wire response
+    my $output;
+
+    # Load a serializer
+    my $serializer = $self->config->{serializer};
+    my $s = Data::Serializer->new( serializer => $serializer );
 
     # Custom error handler - steal errors from catalyst and dump them into
     # the stash, to get them serialized out as the reply.
      if (scalar @{$c->error}) {
          my $error = join "\n", @{$c->error};
          $c->stash->{response} = { status => 'ERROR', error => $error };
-         $c->error(0); # clear errors, so our response isn't clobbered
+        $output = $s->serialize( $c->stash->{response} );
+        $c->clear_errors;
+        $c->response->status(400);
      }
+
+    # Serialize the response
+    eval {
+        $output = $s->raw_serialize( $c->stash->{response} );
+    };
+    if ($@) {
+         my $error = "exception in serialize: $@";
+         $c->stash->{response} = { status => 'ERROR', error => $error };
+         $output = $s->serialize( $c->stash->{response} );
+        $c->response->status(400);
+    }
+
+    $c->response->output( $output );
 }
 
 sub default : Private {
@@ -56,10 +98,14 @@ sub default : Private {
 
     # Forward the request to the appropriate action, based on the
     # message type.
-    my $action = $c->req->data->{type};
-    $c->forward($action, [$c->req->data]);
+    my $action = $c->stash->{request}->{type};
+    if (defined $action) {
+        $c->forward($action, [$c->stash->{request}]);
+    }
+    else {
+         $c->error('no message type specified');
+    }
 }
 
 __PACKAGE__->meta->make_immutable;
 
-1;