X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine%2FStomp.pm;h=2752b5e2da992a69fc4cd456b950124ca003642f;hb=b9aa486179cff4fdc2e83ca34c39b83f4c5a246f;hp=21b275d27b3496820851fc0235c467cf08fbf7d0;hpb=bd1954f9fb32631d0c9d3130aec292c5577abe4b;p=catagits%2FCatalyst-Engine-STOMP.git

diff --git a/lib/Catalyst/Engine/Stomp.pm b/lib/Catalyst/Engine/Stomp.pm
index 21b275d..2752b5e 100644
--- a/lib/Catalyst/Engine/Stomp.pm
+++ b/lib/Catalyst/Engine/Stomp.pm
@@ -1,12 +1,13 @@
 package Catalyst::Engine::Stomp;
 use Moose;
-extends 'Catalyst::Engine::Embeddable';
-
-our $VERSION = '0.03';
-
 use List::MoreUtils qw/ uniq /;
 use HTTP::Request;
 use Net::Stomp;
+use namespace::autoclean;
+
+extends 'Catalyst::Engine::Embeddable';
+
+our $VERSION = '0.05';
 
 has connection => (is => 'rw', isa => 'Net::Stomp');
 has conn_desc => (is => 'rw', isa => 'Str');
@@ -43,14 +44,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 +70,33 @@ sub run {
         my ($self, $app, $oneshot) = @_;
 
         die 'No Engine::Stomp configuration found'
-         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
-    #
-        my @queues =
-        uniq
-        grep { length $_ }
-        map  { $_->namespace }
-        values %{$app->dispatcher->action_hash};
-
-    # connect up
+             unless ref $app->config->{'Engine::Stomp'} eq 'HASH';
+
+        my @queues = grep { length $_ }
+	             map  { $app->controller($_)->action_namespace } $app->controllers;
+
+        # 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
@@ -125,7 +107,7 @@ client IP address.
 =cut
 
 sub prepare_request {
-        my ($self, $c, $req, $res_ref) = @_;
+    my ($self, $c, $req, $res_ref) = @_;
     shift @_;
     $self->next::method(@_);
     $c->req->address($self->conn_desc);
@@ -179,24 +161,26 @@ sub handle_stomp_message {
 
     # queue -> controller
     my $queue = $frame->headers->{destination};
-    my ($controller) = $queue =~ m!^/queue/(.*)$!;
+    my ($controller) = $queue =~ m|^/queue/(.*)$|;
 
     # 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);
+    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);
 
     # dispatch
     my $response;
-        $app->handle_request($req, \$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
+    # ack the message off the queue now we've replied / processed
     $self->connection->ack( { frame => $frame } );
 }
 
@@ -215,5 +199,3 @@ sub handle_stomp_error {
 
 __PACKAGE__->meta->make_immutable;
 
-1;
-