Remove our dependency on Catalyst::Action::REST. We were only using it

[catagits/Catalyst-Engine-STOMP.git] / lib / Catalyst / Engine / Stomp.pm

diff --git a/lib/Catalyst/Engine/Stomp.pm b/lib/Catalyst/Engine/Stomp.pm
index f2c3847..b469d83 100644 (file)
--- a/lib/Catalyst/Engine/Stomp.pm
+++ b/lib/Catalyst/Engine/Stomp.pm
@@ -43,14 +43,6 @@ Catalyst::Engine::Stomp - write message handling apps with Catalyst.
       $c->stash->{response} = $response;
   }
 
-  # The default serialization is YAML, but this configuration 
-  # may be overridden in your controller:
-  __PACKAGE__->config(
-                   'default'   => 'text/x-yaml',
-                   'stash_key' => 'rest',
-                   'map'       => { 'text/x-yaml' => 'YAML' },
-                  );
-
 =head1 DESCRIPTION
 
 Write a Catalyst app connected to a Stomp messagebroker, not HTTP. You
@@ -77,44 +69,44 @@ sub run {
         my ($self, $app, $oneshot) = @_;
 
         die 'No Engine::Stomp configuration found'
-            unless ref $app->config->{'Engine::Stomp'} eq 'HASH';
+             unless ref $app->config->{'Engine::Stomp'} eq 'HASH';
 
         # list the path namespaces that will be mapped as queues.
-       #
-       # this is known to use the deprecated
-       # Dispatcher->action_hash() method, but there doesn't appear
-       # to be another way to get the relevant strings out.
-       #
-       # http://github.com/rafl/catalyst-runtime/commit/5de163f4963d9dbb41d7311ca6f17314091b7af3#L2R644
-       #
+        #
+        # this is known to use the deprecated
+        # Dispatcher->action_hash() method, but there doesn't appear
+        # to be another way to get the relevant strings out.
+        #
+        # http://github.com/rafl/catalyst-runtime/commit/5de163f4963d9dbb41d7311ca6f17314091b7af3#L2R644
+        #
         my @queues =
-           uniq
-           grep { length $_ }
-           map  { $_->namespace }
-           values %{$app->dispatcher->action_hash};
+            uniq
+            grep { length $_ }
+            map  { $_->namespace }
+            values %{$app->dispatcher->action_hash};
 
-       # connect up
+        # connect up
         my %template = %{$app->config->{'Engine::Stomp'}};
-       $self->connection(Net::Stomp->new(\%template));
-       $self->connection->connect();
-       $self->conn_desc($template{hostname}.':'.$template{port});
+        $self->connection(Net::Stomp->new(\%template));
+        $self->connection->connect();
+        $self->conn_desc($template{hostname}.':'.$template{port});
 
-       # subscribe, with client ack.
+        # subscribe, with client ack.
         foreach my $queue (@queues) {
-               my $queue_name = "/queue/$queue";
-               $self->connection->subscribe({
-                                             destination => $queue_name, 
-                                             ack         => 'client' 
-                                            });
+                my $queue_name = "/queue/$queue";
+                $self->connection->subscribe({
+                                              destination => $queue_name, 
+                                              ack         => 'client' 
+                                             });
         }
 
-       # enter loop...
-       while (1) {
-               my $frame = $self->connection->receive_frame();
-               $self->handle_stomp_frame($app, $frame);
-               last if $ENV{ENGINE_ONESHOT};
-       }
-       exit 0;
+        # enter loop...
+        while (1) {
+                my $frame = $self->connection->receive_frame();
+                $self->handle_stomp_frame($app, $frame);
+                last if $ENV{ENGINE_ONESHOT};
+        }
+        exit 0;
 }
 
 =head2 prepare_request
@@ -126,9 +118,9 @@ client IP address.
 
 sub prepare_request {
         my ($self, $c, $req, $res_ref) = @_;
-       shift @_;
-       $self->next::method(@_);
-       $c->req->address($self->conn_desc);
+        shift @_;
+        $self->next::method(@_);
+        $c->req->address($self->conn_desc);
 }
 
 =head2 finalize_headers
@@ -139,12 +131,12 @@ Overridden to dump out any errors encountered, since you won't get a
 =cut
 
 sub finalize_headers {
-       my ($self, $c) = @_;
-       my $error = join "\n", @{$c->error};
-       if ($error) {
-               $c->log->debug($error);
-       }
-       return $self->next::method($c);
+        my ($self, $c) = @_;
+        my $error = join "\n", @{$c->error};
+        if ($error) {
+                $c->log->debug($error);
+        }
+        return $self->next::method($c);
 }
 
 =head2 handle_stomp_frame
@@ -154,18 +146,18 @@ Dispatch according to Stomp frame type.
 =cut
 
 sub handle_stomp_frame {
-       my ($self, $app, $frame) = @_;
-
-       my $command = $frame->command();
-       if ($command eq 'MESSAGE') {
-               $self->handle_stomp_message($app, $frame);
-       }
-       elsif ($command eq 'ERROR') {
-               $self->handle_stomp_error($app, $frame);
-       }
-       else {
-               $app->log->debug("Got unknown Stomp command: $command");
-       }
+        my ($self, $app, $frame) = @_;
+
+        my $command = $frame->command();
+        if ($command eq 'MESSAGE') {
+                $self->handle_stomp_message($app, $frame);
+        }
+        elsif ($command eq 'ERROR') {
+                $self->handle_stomp_error($app, $frame);
+        }
+        else {
+                $app->log->debug("Got unknown Stomp command: $command");
+        }
 }
 
 =head2 handle_stomp_message
@@ -175,29 +167,31 @@ Dispatch a Stomp message into the Catalyst app.
 =cut
 
 sub handle_stomp_message {
-       my ($self, $app, $frame) = @_;
+        my ($self, $app, $frame) = @_;
 
-       # queue -> controller
-       my $queue = $frame->headers->{destination};
-       my ($controller) = $queue =~ m!^/queue/(.*)$!;
+        # queue -> controller
+        my $queue = $frame->headers->{destination};
+        my ($controller) = $queue =~ m!^/queue/(.*)$!;
 
-       # set up request
+        # set up request
         my $config = $app->config->{'Engine::Stomp'};
         my $url = 'stomp://'.$config->{hostname}.':'.$config->{port}.'/'.$controller;
         my $req = HTTP::Request->new(POST => $url);
-        $req->content($frame->body);   
-       $req->content_length(length $frame->body);
+        $req->content($frame->body);
+        $req->content_length(length $frame->body);
 
-       # dispatch
-       my $response;
+        # dispatch
+        my $response;
         $app->handle_request($req, \$response);
 
-       # reply
-       my $reply_queue = '/remote-temp-queue/' . ($response->headers->header('X-Reply-Address'));
-       $self->connection->send({ destination => $reply_queue, body => $response->content });
+        # reply, if header set
+        if (my $reply_to = $response->headers->header('X-Reply-Address')) {
+                my $reply_queue = '/remote-temp-queue/' . $reply_to;
+                $self->connection->send({ destination => $reply_queue, body => $response->content });
+        }
 
-       # ack the message off the queue now we've replied
-       $self->connection->ack( { frame => $frame } );
+        # ack the message off the queue now we've replied / processed
+        $self->connection->ack( { frame => $frame } );
 }
 
 =head2 handle_stomp_error
@@ -207,10 +201,10 @@ Log any Stomp error frames we receive.
 =cut
 
 sub handle_stomp_error {
-       my ($self, $app, $frame) = @_;
-       
-       my $error = $frame->headers->{message};
-       $app->log->debug("Got Stomp error: $error");
+        my ($self, $app, $frame) = @_;
+        
+        my $error = $frame->headers->{message};
+        $app->log->debug("Got Stomp error: $error");
 }
 
 __PACKAGE__->meta->make_immutable;