Change all classes to Moose

diff --git a/Makefile.PL b/Makefile.PL
index 8012cd2..dc2b9e5 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -15,7 +15,8 @@ requires('Class::Inspector'          => '1.13');
 requires('URI::Find'                 => undef);
 requires('MRO::Compat'               => '0.10');
 
-test_requires 'Moose';
+requires 'Moose';
+requires 'namespace::autoclean';
 
 feature 'JSON (application/json) support',
     -default   => 0,

diff --git a/lib/Catalyst/Action/Deserialize.pm b/lib/Catalyst/Action/Deserialize.pm
index 744a02d..3c90466 100644 (file)
--- a/lib/Catalyst/Action/Deserialize.pm
+++ b/lib/Catalyst/Action/Deserialize.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::Deserialize;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action::SerializeBase';
+extends 'Catalyst::Action::SerializeBase';
 use Module::Pluggable::Object;
 use MRO::Compat;
 

diff --git a/lib/Catalyst/Action/Deserialize/Data/Serializer.pm b/lib/Catalyst/Action/Deserialize/Data/Serializer.pm
index 911fb31..1aea6c4 100644 (file)
--- a/lib/Catalyst/Action/Deserialize/Data/Serializer.pm
+++ b/lib/Catalyst/Action/Deserialize/Data/Serializer.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::Deserialize::Data::Serializer;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 use Data::Serializer;
 
 sub execute {

diff --git a/lib/Catalyst/Action/Deserialize/JSON.pm b/lib/Catalyst/Action/Deserialize/JSON.pm
index 01059aa..0c68fdd 100644 (file)
--- a/lib/Catalyst/Action/Deserialize/JSON.pm
+++ b/lib/Catalyst/Action/Deserialize/JSON.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::Deserialize::JSON;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 use JSON qw( decode_json );
 
 sub execute {

diff --git a/lib/Catalyst/Action/Deserialize/View.pm b/lib/Catalyst/Action/Deserialize/View.pm
index e66b6e3..90cfb54 100644 (file)
--- a/lib/Catalyst/Action/Deserialize/View.pm
+++ b/lib/Catalyst/Action/Deserialize/View.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::Deserialize::View;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 
 sub execute {
     return 1;

diff --git a/lib/Catalyst/Action/Deserialize/XML/Simple.pm b/lib/Catalyst/Action/Deserialize/XML/Simple.pm
index c4aad0c..19cd501 100644 (file)
--- a/lib/Catalyst/Action/Deserialize/XML/Simple.pm
+++ b/lib/Catalyst/Action/Deserialize/XML/Simple.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::Deserialize::XML::Simple;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 
 sub execute {
     my $self = shift;

diff --git a/lib/Catalyst/Action/Deserialize/YAML.pm b/lib/Catalyst/Action/Deserialize/YAML.pm
index 6a7781f..a2a116e 100644 (file)
--- a/lib/Catalyst/Action/Deserialize/YAML.pm
+++ b/lib/Catalyst/Action/Deserialize/YAML.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::Deserialize::YAML;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 use YAML::Syck;
 
 sub execute {

diff --git a/lib/Catalyst/Action/REST.pm b/lib/Catalyst/Action/REST.pm
index 6862f71..27705fc 100644 (file)
--- a/lib/Catalyst/Action/REST.pm
+++ b/lib/Catalyst/Action/REST.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::REST;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 use Class::Inspector;
 use Catalyst::Request::REST;
 use Catalyst::Controller::REST;

diff --git a/lib/Catalyst/Action/Serialize.pm b/lib/Catalyst/Action/Serialize.pm
index 376344e..d47f97c 100644 (file)
--- a/lib/Catalyst/Action/Serialize.pm
+++ b/lib/Catalyst/Action/Serialize.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::Serialize;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action::SerializeBase';
+extends 'Catalyst::Action::SerializeBase';
 use Module::Pluggable::Object;
 use MRO::Compat;
 

diff --git a/lib/Catalyst/Action/Serialize/Data/Serializer.pm b/lib/Catalyst/Action/Serialize/Data/Serializer.pm
index 9c6cad6..ca42ce7 100644 (file)
--- a/lib/Catalyst/Action/Serialize/Data/Serializer.pm
+++ b/lib/Catalyst/Action/Serialize/Data/Serializer.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::Serialize::Data::Serializer;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 use Data::Serializer;
 
 sub execute {

diff --git a/lib/Catalyst/Action/Serialize/JSON.pm b/lib/Catalyst/Action/Serialize/JSON.pm
index 8da00ee..d4b12df 100644 (file)
--- a/lib/Catalyst/Action/Serialize/JSON.pm
+++ b/lib/Catalyst/Action/Serialize/JSON.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::Serialize::JSON;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 use JSON qw(encode_json);
 
 sub execute {

diff --git a/lib/Catalyst/Action/Serialize/JSON/XS.pm b/lib/Catalyst/Action/Serialize/JSON/XS.pm
index b1f4850..a69b32e 100644 (file)
--- a/lib/Catalyst/Action/Serialize/JSON/XS.pm
+++ b/lib/Catalyst/Action/Serialize/JSON/XS.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::Serialize::JSON::XS;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action::Serialize::JSON';
+extends 'Catalyst::Action::Serialize::JSON';
 use JSON::XS qw(encode_json);
 
 sub serialize {

diff --git a/lib/Catalyst/Action/Serialize/View.pm b/lib/Catalyst/Action/Serialize/View.pm
index 6379fa3..7aa66df 100644 (file)
--- a/lib/Catalyst/Action/Serialize/View.pm
+++ b/lib/Catalyst/Action/Serialize/View.pm
@@ -1,8 +1,8 @@
 package Catalyst::Action::Serialize::View;
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 
 sub execute {
     my $self = shift;

diff --git a/lib/Catalyst/Action/Serialize/XML/Simple.pm b/lib/Catalyst/Action/Serialize/XML/Simple.pm
index f91da2e..a562078 100644 (file)
--- a/lib/Catalyst/Action/Serialize/XML/Simple.pm
+++ b/lib/Catalyst/Action/Serialize/XML/Simple.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::Serialize::XML::Simple;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 
 sub execute {
     my $self = shift;

diff --git a/lib/Catalyst/Action/Serialize/YAML.pm b/lib/Catalyst/Action/Serialize/YAML.pm
index 81fcc96..911191b 100644 (file)
--- a/lib/Catalyst/Action/Serialize/YAML.pm
+++ b/lib/Catalyst/Action/Serialize/YAML.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::Serialize::YAML;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 use YAML::Syck;
 
 sub execute {

diff --git a/lib/Catalyst/Action/Serialize/YAML/HTML.pm b/lib/Catalyst/Action/Serialize/YAML/HTML.pm
index fddead3..7004b0b 100644 (file)
--- a/lib/Catalyst/Action/Serialize/YAML/HTML.pm
+++ b/lib/Catalyst/Action/Serialize/YAML/HTML.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::Serialize::YAML::HTML;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 use YAML::Syck;
 use URI::Find;
 

diff --git a/lib/Catalyst/Action/SerializeBase.pm b/lib/Catalyst/Action/SerializeBase.pm
index 3f470fb..2ff0f01 100644 (file)
--- a/lib/Catalyst/Action/SerializeBase.pm
+++ b/lib/Catalyst/Action/SerializeBase.pm
@@ -1,9 +1,9 @@
 package Catalyst::Action::SerializeBase;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Action';
+extends 'Catalyst::Action';
 use Module::Pluggable::Object;
 use Catalyst::Request::REST;
 use Catalyst::Utils ();

diff --git a/lib/Catalyst/Controller/REST.pm b/lib/Catalyst/Controller/REST.pm
index 43e781c..f2c6a3f 100644 (file)
--- a/lib/Catalyst/Controller/REST.pm
+++ b/lib/Catalyst/Controller/REST.pm
@@ -1,6 +1,6 @@
 package Catalyst::Controller::REST;
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
 our $VERSION = '0.79';
 $VERSION = eval $VERSION;
@@ -255,7 +255,7 @@ such require you pass the current context ($c) as the first argument.
 
 =cut
 
-use base 'Catalyst::Controller';
+BEGIN { extends 'Catalyst::Controller' }
 use Params::Validate qw(SCALAR OBJECT);
 
 __PACKAGE__->mk_accessors(qw(serialize));

diff --git a/lib/Catalyst/Request/REST.pm b/lib/Catalyst/Request/REST.pm
index 03c3869..0e5311c 100644 (file)
--- a/lib/Catalyst/Request/REST.pm
+++ b/lib/Catalyst/Request/REST.pm
@@ -1,10 +1,10 @@
 package Catalyst::Request::REST;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 use Scalar::Util qw/blessed/;
 
-use base qw/Catalyst::Request Class::Accessor::Fast/;
+extends qw/Catalyst::Request Class::Accessor::Fast/;
 
 use Catalyst::Utils;
 use HTTP::Headers::Util qw(split_header_words);

diff --git a/t/broken/Catalyst/Action/Deserialize/Broken.pm b/t/broken/Catalyst/Action/Deserialize/Broken.pm
index 783aa13..e8aaaea 100644 (file)
--- a/t/broken/Catalyst/Action/Deserialize/Broken.pm
+++ b/t/broken/Catalyst/Action/Deserialize/Broken.pm
@@ -1,7 +1,7 @@
 package Catalyst::Action::Serializer::Broken;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
 use Bilbo::Baggins;
 

diff --git a/t/broken/Catalyst/Action/Serialize/Broken.pm b/t/broken/Catalyst/Action/Serialize/Broken.pm
index 783aa13..e8aaaea 100644 (file)
--- a/t/broken/Catalyst/Action/Serialize/Broken.pm
+++ b/t/broken/Catalyst/Action/Serialize/Broken.pm
@@ -1,7 +1,7 @@
 package Catalyst::Action::Serializer::Broken;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
 use Bilbo::Baggins;
 

diff --git a/t/lib/Test/Catalyst/Action/REST.pm b/t/lib/Test/Catalyst/Action/REST.pm
index dbc6039..2477354 100644 (file)
--- a/t/lib/Test/Catalyst/Action/REST.pm
+++ b/t/lib/Test/Catalyst/Action/REST.pm
@@ -1,7 +1,7 @@
 package Test::Catalyst::Action::REST;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
 use Catalyst::Runtime '5.70';
 

diff --git a/t/lib/Test/Catalyst/Action/REST/Controller/Actions.pm b/t/lib/Test/Catalyst/Action/REST/Controller/Actions.pm
index 596e4e0..33b363a 100644 (file)
--- a/t/lib/Test/Catalyst/Action/REST/Controller/Actions.pm
+++ b/t/lib/Test/Catalyst/Action/REST/Controller/Actions.pm
@@ -1,8 +1,8 @@
 package Test::Catalyst::Action::REST::Controller::Actions;
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base qw/Catalyst::Controller::REST/;
+BEGIN { extends qw/Catalyst::Controller::REST/ }
 
 __PACKAGE__->_action_class('Test::Action::Class');
 

diff --git a/t/lib/Test/Catalyst/Action/REST/Controller/Deserialize.pm b/t/lib/Test/Catalyst/Action/REST/Controller/Deserialize.pm
index 136a9e1..832b51a 100644 (file)
--- a/t/lib/Test/Catalyst/Action/REST/Controller/Deserialize.pm
+++ b/t/lib/Test/Catalyst/Action/REST/Controller/Deserialize.pm
@@ -1,6 +1,8 @@
 package Test::Catalyst::Action::REST::Controller::Deserialize;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Controller';
+BEGIN { extends 'Catalyst::Controller' }
 
 __PACKAGE__->config(
     'stash_key' => 'rest',

diff --git a/t/lib/Test/Catalyst/Action/REST/Controller/REST.pm b/t/lib/Test/Catalyst/Action/REST/Controller/REST.pm
index 49d0cd1..e434159 100644 (file)
--- a/t/lib/Test/Catalyst/Action/REST/Controller/REST.pm
+++ b/t/lib/Test/Catalyst/Action/REST/Controller/REST.pm
@@ -1,9 +1,9 @@
 package Test::Catalyst::Action::REST::Controller::REST;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base 'Catalyst::Controller::REST';
+BEGIN { extends 'Catalyst::Controller::REST' }
 
 sub test : Local {
     my ( $self, $c ) = @_;

diff --git a/t/lib/Test/Catalyst/Action/REST/Controller/Root.pm b/t/lib/Test/Catalyst/Action/REST/Controller/Root.pm
index 1ebbee6..b42ee24 100644 (file)
--- a/t/lib/Test/Catalyst/Action/REST/Controller/Root.pm
+++ b/t/lib/Test/Catalyst/Action/REST/Controller/Root.pm
@@ -1,8 +1,8 @@
 package Test::Catalyst::Action::REST::Controller::Root;
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
-use base qw/Catalyst::Controller::REST/;
+BEGIN { extends qw/Catalyst::Controller::REST/ }
 
 __PACKAGE__->config( namespace => '' );
 

diff --git a/t/lib/Test/Catalyst/Action/REST/Controller/Serialize.pm b/t/lib/Test/Catalyst/Action/REST/Controller/Serialize.pm
index 4894c02..9d358c4 100644 (file)
--- a/t/lib/Test/Catalyst/Action/REST/Controller/Serialize.pm
+++ b/t/lib/Test/Catalyst/Action/REST/Controller/Serialize.pm
@@ -1,8 +1,9 @@
 package Test::Catalyst::Action::REST::Controller::Serialize;
 
-use strict;
-use warnings;
-use base 'Catalyst::Controller';
+use Moose;
+use namespace::autoclean;
+
+BEGIN { extends 'Catalyst::Controller' }
 
 __PACKAGE__->config(
     'default'   => 'text/x-yaml',

diff --git a/t/lib/Test/Rest.pm b/t/lib/Test/Rest.pm
index c8675c2..704cff2 100644 (file)
--- a/t/lib/Test/Rest.pm
+++ b/t/lib/Test/Rest.pm
@@ -1,7 +1,7 @@
 package Test::Rest;
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
 use LWP::UserAgent;
 use Params::Validate qw(:all);

diff --git a/t/lib/Test/Serialize.pm b/t/lib/Test/Serialize.pm
index 923885e..29808b3 100644 (file)
--- a/t/lib/Test/Serialize.pm
+++ b/t/lib/Test/Serialize.pm
@@ -4,8 +4,8 @@ use FindBin;
 
 use lib ("$FindBin::Bin/../lib");
 
-use strict;
-use warnings;
+use Moose;
+use namespace::autoclean;
 
 use Catalyst::Runtime '5.70';
 

diff --git a/t/lib/Test/Serialize/Controller/REST.pm b/t/lib/Test/Serialize/Controller/REST.pm
index dad5483..74b921c 100644 (file)
--- a/t/lib/Test/Serialize/Controller/REST.pm
+++ b/t/lib/Test/Serialize/Controller/REST.pm
@@ -1,9 +1,9 @@
 package Test::Serialize::Controller::REST;
 
-use warnings;
-use strict;
+use namespace::autoclean;
+use Moose;
 
-use base qw/Catalyst::Controller::REST/;
+BEGIN { extends qw/Catalyst::Controller::REST/ };
 
 __PACKAGE__->config(
     'namespace' => '',

diff --git a/t/lib/Test/Serialize/View/Simple.pm b/t/lib/Test/Serialize/View/Simple.pm
index 049152d..7004a73 100644 (file)
--- a/t/lib/Test/Serialize/View/Simple.pm
+++ b/t/lib/Test/Serialize/View/Simple.pm
@@ -1,6 +1,8 @@
 package Test::Serialize::View::Simple;
+use Moose;
+use namespace::autoclean;
 
-use base qw/Catalyst::View/;
+extends qw/Catalyst::View/;
 
 sub process {
     my ($self, $c) = @_;