From: Tomas Doran (t0m) Date: Mon, 17 Aug 2009 13:04:00 +0000 (+0100) Subject: Fix failing test. Normalize method names X-Git-Tag: 0.75~1 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Action-REST.git;a=commitdiff_plain;h=485b516094b4ebb5254bf389760c5aba594343a7 Fix failing test. Normalize method names --- diff --git a/lib/Catalyst/Action/Serialize/JSON.pm b/lib/Catalyst/Action/Serialize/JSON.pm index 3b8e511..7423e9e 100644 --- a/lib/Catalyst/Action/Serialize/JSON.pm +++ b/lib/Catalyst/Action/Serialize/JSON.pm @@ -24,7 +24,7 @@ sub execute { ) || 'rest'; my $output; eval { - $output = $self->encode( $c->stash->{$stash_key} ); + $output = $self->serialize( $c->stash->{$stash_key} ); }; if ($@) { return $@; @@ -33,7 +33,7 @@ sub execute { return 1; } -sub encode { +sub serialize { my $self = shift; encode_json( shift ); } diff --git a/lib/Catalyst/Action/Serialize/JSON/XS.pm b/lib/Catalyst/Action/Serialize/JSON/XS.pm index bac66de..b1f4850 100644 --- a/lib/Catalyst/Action/Serialize/JSON/XS.pm +++ b/lib/Catalyst/Action/Serialize/JSON/XS.pm @@ -6,7 +6,7 @@ use warnings; use base 'Catalyst::Action::Serialize::JSON'; use JSON::XS qw(encode_json); -sub encode { +sub serialize { my $self = shift; encode_json( shift ); } diff --git a/lib/Catalyst/Action/Serialize/YAML.pm b/lib/Catalyst/Action/Serialize/YAML.pm index c943569..4879af9 100644 --- a/lib/Catalyst/Action/Serialize/YAML.pm +++ b/lib/Catalyst/Action/Serialize/YAML.pm @@ -24,7 +24,7 @@ sub execute { ) || 'rest'; my $output; eval { - $output = Dump($c->stash->{$stash_key}); + $output = $self->serialize($c->stash->{$stash_key}); }; if ($@) { return $@; @@ -33,4 +33,10 @@ sub execute { return 1; } +sub serialize { + my $self = shift; + my $data = shift; + Dump($data); +} + 1;