return the $sitemap object instead than the XML directly

diff --git a/lib/Catalyst/Plugin/Sitemap.pm b/lib/Catalyst/Plugin/Sitemap.pm
index eb6e92bda093e16f5bd7683a2c38323a37b5edd3..73639508f26c3c2b1fa3034011aa8b9861e4e0d2 100644 (file)
--- a/lib/Catalyst/Plugin/Sitemap.pm
+++ b/lib/Catalyst/Plugin/Sitemap.pm
@@ -61,7 +61,7 @@ sub sitemap {
 
     }
 
-    return $sitemap->xml;
+    return $sitemap;
 }
 
 1;

diff --git a/t/lib/TestApp/Controller/Root.pm b/t/lib/TestApp/Controller/Root.pm
index 01a131d8dc292e3722aa57727cd32dfed2babcfc..0eb3c6e546eb7399551f5f3110f02b61fae0547a 100644 (file)
--- a/t/lib/TestApp/Controller/Root.pm
+++ b/t/lib/TestApp/Controller/Root.pm
@@ -8,20 +8,20 @@ use parent 'Catalyst::Controller';
 sub sitemap : Path('/sitemap') {
     my ( $self, $c ) = @_;
 
-    $c->res->body( $c->sitemap );
+    $c->res->body( $c->sitemap->xml );
 }
 
-sub alone :Path('/alone') :Sitemap { }
+sub alone :Local :Sitemap { }
 
-sub with_priority :Path('/with_priority') :Sitemap(0.75) { }
+sub with_priority :Local :Sitemap(0.75) { }
 
-sub with_function :Path('/with_function') :Sitemap(*) { }
+sub with_function :Local :Sitemap(*) { }
 
 sub with_function_sitemap {
-    $_[2]->add( 'http://localhost/with_function' );
+    $_[2]->add( 'http://localhost/root/with_function' );
 }
 
-sub with_args :Path('/with_args') 
+sub with_args :Local 
     :Sitemap( lastmod => 2010-09-27, changefreq => daily ) 
     {}
 

diff --git a/t/sitemap.t b/t/sitemap.t
index 26f91ab6f3fd062244f00d00954786d8bb1ae800..10f3efe86b0d61e8c53e2a57e0f4a1f1082b2626 100644 (file)
--- a/t/sitemap.t
+++ b/t/sitemap.t
@@ -10,16 +10,18 @@ use Catalyst::Test 'TestApp';
 
 my $xml = request('/sitemap')->content;
 
+diag $xml;
+
 $xml =~ s/\s+//g;
 
-like $xml, qr{<url><loc>http://localhost/alone</loc></url>}, ':Sitemap';
-like $xml, qr{<url><loc>http://localhost/with_function</loc></url>},
+like $xml, qr{<url><loc>http://localhost/root/alone</loc></url>}, ':Sitemap';
+like $xml, qr{<url><loc>http://localhost/root/with_function</loc></url>},
   ':Sitemap(*)';
 like $xml,
-  qr{<url><loc>http://localhost/with_priority</loc><priority>0.75</priority></url>},
+  qr{<url><loc>http://localhost/root/with_priority</loc><priority>0.75</priority></url>},
   ':Sitemap(0.75)';
 
 like $xml,
-  qr{<url><loc>http://localhost/with_args</loc><lastmod>2010-09-27</lastmod><changefreq>daily</changefreq></url>},
+  qr{<url><loc>http://localhost/root/with_args</loc><lastmod>2010-09-27</lastmod><changefreq>daily</changefreq></url>},
   ':Sitemap(lotsa stuff)';