rename ActionRole::Serialize -> ActionRole::SerializeFormat

diff --git a/lib/Catalyst/Action/Deserialize/Data/Serializer.pm b/lib/Catalyst/Action/Deserialize/Data/Serializer.pm
index 91d829e..a87a015 100644 (file)
--- a/lib/Catalyst/Action/Deserialize/Data/Serializer.pm
+++ b/lib/Catalyst/Action/Deserialize/Data/Serializer.pm
@@ -1,7 +1,7 @@
 package Catalyst::Action::Deserialize::Data::Serializer;
 use Moose;
 extends 'Catalyst::Action';
-with 'Catalyst::ActionRole::Deserialize';
+with 'Catalyst::ActionRole::DeserializeFormat';
 use Data::Serializer;
 use namespace::clean -except => 'meta';
 

diff --git a/lib/Catalyst/Action/Deserialize/JSON.pm b/lib/Catalyst/Action/Deserialize/JSON.pm
index 2993e09..63afb9a 100644 (file)
--- a/lib/Catalyst/Action/Deserialize/JSON.pm
+++ b/lib/Catalyst/Action/Deserialize/JSON.pm
@@ -1,7 +1,7 @@
 package Catalyst::Action::Deserialize::JSON;
 use Moose;
 extends 'Catalyst::Action';
-with 'Catalyst::ActionRole::Deserialize';
+with 'Catalyst::ActionRole::DeserializeFormat';
 use JSON qw(decode_json);
 use namespace::clean -except => 'meta';
 

diff --git a/lib/Catalyst/Action/Deserialize/View.pm b/lib/Catalyst/Action/Deserialize/View.pm
index 4ca2956..42e69b8 100644 (file)
--- a/lib/Catalyst/Action/Deserialize/View.pm
+++ b/lib/Catalyst/Action/Deserialize/View.pm
@@ -1,7 +1,7 @@
 package Catalyst::Action::Deserialize::View;
 use Moose;
 extends 'Catalyst::Action';
-with 'Catalyst::ActionRole::Deserialize';
+with 'Catalyst::ActionRole::DeserializeFormat';
 use namespace::clean -except => 'meta';
 
 sub deserialize { undef };

diff --git a/lib/Catalyst/Action/Deserialize/XML/Simple.pm b/lib/Catalyst/Action/Deserialize/XML/Simple.pm
index 614c8d8..2fac9fa 100644 (file)
--- a/lib/Catalyst/Action/Deserialize/XML/Simple.pm
+++ b/lib/Catalyst/Action/Deserialize/XML/Simple.pm
@@ -1,7 +1,7 @@
 package Catalyst::Action::Deserialize::XML::Simple;
 use Moose;
 extends 'Catalyst::Action';
-with 'Catalyst::ActionRole::Deserialize';
+with 'Catalyst::ActionRole::DeserializeFormat';
 use XML::Simple;
 use namespace::clean -except => 'meta';
 

diff --git a/lib/Catalyst/Action/Deserialize/YAML.pm b/lib/Catalyst/Action/Deserialize/YAML.pm
index 9ac69c6..ec6063d 100644 (file)
--- a/lib/Catalyst/Action/Deserialize/YAML.pm
+++ b/lib/Catalyst/Action/Deserialize/YAML.pm
@@ -1,7 +1,7 @@
 package Catalyst::Action::Deserialize::YAML;
 use Moose;
 extends 'Catalyst::Action';
-with 'Catalyst::ActionRole::Deserialize';
+with 'Catalyst::ActionRole::DeserializeFormat';
 use YAML::Syck;
 use namespace::clean -except => 'meta';
 

diff --git a/lib/Catalyst/Action/Serialize/Data/Serializer.pm b/lib/Catalyst/Action/Serialize/Data/Serializer.pm
index cd885c5..637c245 100644 (file)
--- a/lib/Catalyst/Action/Serialize/Data/Serializer.pm
+++ b/lib/Catalyst/Action/Serialize/Data/Serializer.pm
@@ -1,7 +1,7 @@
 package Catalyst::Action::Serialize::Data::Serializer;
 use Moose;
 extends 'Catalyst::Action';
-with 'Catalyst::ActionRole::Serialize';
+with 'Catalyst::ActionRole::SerializeFormat';
 use Data::Serializer;
 use namespace::clean -except => 'meta';
 

diff --git a/lib/Catalyst/Action/Serialize/JSON.pm b/lib/Catalyst/Action/Serialize/JSON.pm
index 17ca446..1806b98 100644 (file)
--- a/lib/Catalyst/Action/Serialize/JSON.pm
+++ b/lib/Catalyst/Action/Serialize/JSON.pm
@@ -1,7 +1,7 @@
 package Catalyst::Action::Serialize::JSON;
 use Moose;
 extends 'Catalyst::Action';
-with 'Catalyst::ActionRole::Serialize';
+with 'Catalyst::ActionRole::SerializeFormat';
 use JSON qw(encode_json);
 use namespace::clean -except => 'meta';
 

diff --git a/lib/Catalyst/Action/Serialize/View.pm b/lib/Catalyst/Action/Serialize/View.pm
index 85d9df0..6e6f4b8 100644 (file)
--- a/lib/Catalyst/Action/Serialize/View.pm
+++ b/lib/Catalyst/Action/Serialize/View.pm
@@ -1,7 +1,7 @@
 package Catalyst::Action::Serialize::View;
 use Moose;
 extends 'Catalyst::Action';
-with 'Catalyst::ActionRole::Serialize';
+with 'Catalyst::ActionRole::SerializeFormat';
 use namespace::clean -except => 'meta';
 
 sub serialize {

diff --git a/lib/Catalyst/Action/Serialize/XML/Simple.pm b/lib/Catalyst/Action/Serialize/XML/Simple.pm
index 82377e6..55355a8 100644 (file)
--- a/lib/Catalyst/Action/Serialize/XML/Simple.pm
+++ b/lib/Catalyst/Action/Serialize/XML/Simple.pm
@@ -1,7 +1,7 @@
 package Catalyst::Action::Serialize::XML::Simple;
 use Moose;
 extends 'Catalyst::Action';
-with 'Catalyst::ActionRole::Serialize';
+with 'Catalyst::ActionRole::SerializeFormat';
 use XML::Simple;
 use namespace::clean -except => 'meta';
 

diff --git a/lib/Catalyst/Action/Serialize/YAML.pm b/lib/Catalyst/Action/Serialize/YAML.pm
index 2bbe873..0b3d1a1 100644 (file)
--- a/lib/Catalyst/Action/Serialize/YAML.pm
+++ b/lib/Catalyst/Action/Serialize/YAML.pm
@@ -1,7 +1,7 @@
 package Catalyst::Action::Serialize::YAML;
 use Moose;
 extends 'Catalyst::Action';
-with 'Catalyst::ActionRole::Serialize';
+with 'Catalyst::ActionRole::SerializeFormat';
 use YAML::Syck;
 use namespace::clean -except => 'meta';
 

diff --git a/lib/Catalyst/ActionRole/Deserialize.pm b/lib/Catalyst/ActionRole/DeserializeFormat.pm
similarity index 94%
rename from lib/Catalyst/ActionRole/Deserialize.pm
rename to lib/Catalyst/ActionRole/DeserializeFormat.pm
index 29b6dd0..aecbe3b 100644 (file)
--- a/lib/Catalyst/ActionRole/Deserialize.pm
+++ b/lib/Catalyst/ActionRole/DeserializeFormat.pm
@@ -1,4 +1,4 @@
-package Catalyst::ActionRole::Deserialize;
+package Catalyst::ActionRole::DeserializeFormat;
 use Moose::Role;
 use Moose::Util qw(does_role);
 use Catalyst::RequestRole::Deserialize;

diff --git a/lib/Catalyst/ActionRole/Serialize.pm b/lib/Catalyst/ActionRole/SerializeFormat.pm
similarity index 78%
rename from lib/Catalyst/ActionRole/Serialize.pm
rename to lib/Catalyst/ActionRole/SerializeFormat.pm
index c8e7ce9..bb17619 100644 (file)
--- a/lib/Catalyst/ActionRole/Serialize.pm
+++ b/lib/Catalyst/ActionRole/SerializeFormat.pm
@@ -1,4 +1,4 @@
-package Catalyst::ActionRole::Serialize;
+package Catalyst::ActionRole::SerializeFormat;
 use Moose::Role;
 use Catalyst::ControllerRole::SerializeConfig;
 use Moose::Util qw(does_role);
@@ -6,10 +6,14 @@ use namespace::clean -except => 'meta';
 requires 'serialize';
 
 around execute => sub {
-  # the original Serialize::* actions never executed their body, so this is
-  # ignored.
   my $next = shift;
   my ($self, $controller, $c, $arg) = @_;
+
+  # XXX is ignoring the return value here correct? the original serialize
+  # actions never even called their body.
+  $self->$next($controller, $c, $arg)
+    if blessed $self;
+
   Catalyst::ControllerRole::SerializeConfig->meta->apply($controller)
     unless does_role($controller, 'Catalyst::ControllerRole::SerializeConfig');