convert use Moose to use Moo

jjn1056 · Nov 3, 2014 · e416d30 · e416d30
1 parent 5bbde48
commit e416d30
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/Makefile.PL b/Makefile.PL
@@ -15,6 +15,8 @@ requires 'Hash::Merge' => '0.11';
 requires 'List::MoreUtils' => '0.22';
 requires 'Module::Runtime' => '0.013';
 requires 'Moose' => '1.10';
+requires 'Moo' => '1.006';
+requires 'namespace::clean';
 requires 'Path::Class' => '0.21';
 requires 'SQL::Translator' => '0.11006';
 requires 'Scalar::Util' => '1.23';

diff --git a/lib/Test/DBIx/Class/FixtureCommand/Populate.pm b/lib/Test/DBIx/Class/FixtureCommand/Populate.pm
@@ -1,8 +1,10 @@
 package Test::DBIx::Class::FixtureCommand::Populate; {
 
-	use Moose;
 	use Test::More ();
+
+	use Moo;
 	with 'Test::DBIx::Class::Role::FixtureCommand';
+	use namespace::clean;
 
 	sub install_fixtures {
 		my ($self, $arg, @rest) = @_;

diff --git a/lib/Test/DBIx/Class/FixtureCommand/PopulateMore.pm b/lib/Test/DBIx/Class/FixtureCommand/PopulateMore.pm
@@ -1,9 +1,11 @@
 package Test::DBIx::Class::FixtureCommand::PopulateMore; {
 
-	use Moose;
 	use Test::More ();
 	use DBIx::Class::Schema::PopulateMore::Command;
+
+	use Moo;
 	with 'Test::DBIx::Class::Role::FixtureCommand';
+	use namespace::clean;
 
 	sub install_fixtures {
 		my ($self, $arg, @rest) = @_;

diff --git a/lib/Test/DBIx/Class/SchemaManager.pm b/lib/Test/DBIx/Class/SchemaManager.pm
@@ -1,17 +1,19 @@
 package Test::DBIx::Class::SchemaManager;
 
-use Moose;
 use Moose::Util;
 use Test::More ();
 use List::MoreUtils qw(uniq);
 use Test::DBIx::Class::Types qw( :types :to );
 use Types::Standard qw(Bool HashRef Str);
 
+use Moo;
+use namespace::clean;
+
 has 'force_drop_table' => (
     is=>'rw',
     required=>1,
     isa=>Bool,
-    builder => '_build_force_drop_table',
+    builder=>1,
 );
 sub _build_force_drop_table {
     $ENV{force_drop_table} || $ENV{FORCE_DROP_TABLE} || 0
@@ -21,7 +23,7 @@ has 'keep_db' => (
     is=>'ro',
     isa=>Bool,
     required=>1,
-    builder=>'_build_keep_db',
+    builder=>1,
 );
 sub _build_keep_db {
     $ENV{keep_db} || $ENV{KEEP_DB} || 0
@@ -31,7 +33,7 @@ has 'tdbic_debug' => (
     is=>'ro',
     isa=>Bool,
     required=>1,
-    builder=>'_build_tdbic_debug',
+    builder=>1,
 );
 sub _build_tdbic_debug {
     $ENV{tdbic_debug} || $ENV{TDBIC_DEBUG} || 0
@@ -41,7 +43,7 @@ has 'deploy_db' => (
     is=>'ro',
     required=>1,
     isa=>Bool,
-    builder=>'_build_deploy_db',
+    builder=>1,
 );
 sub _build_deploy_db {
     $ENV{deploy_db} || $ENV{DEPLOY_DB} || 1
@@ -58,7 +60,7 @@ has 'schema_class' => (
     isa => SchemaManagerClass,
     required => 1,
     coerce => 1,
-    builder => '_build_schema_class',
+    builder => 1,
 );
 sub _build_schema_class {
     $ENV{schema_class} || $ENV{SCHEMA_CLASS}
@@ -67,14 +69,16 @@ sub _build_schema_class {
 
 has 'schema' => (
     is => 'ro',
-    lazy_build => 1,
+    lazy => 1,
+    builder => 1,
 );
 
 has 'connect_info' => (
     is => 'ro',
     isa => ConnectInfo,
     coerce => 1,
-    lazy_build => 1,
+    lazy => 1,
+    builder => 1,
 );
 
 has 'connect_opts' => (
@@ -90,16 +94,17 @@ has 'deploy_opts' => (
 
 has 'connect_info_with_opts' => (
     is => 'ro',
-    lazy_build => 1,
     isa => HashRef,
+    lazy => 1,
+    builder => 1,
 );
 
 has 'fixture_class' => (
     is => 'ro',
     isa => FixtureClass,
     required => 1,
     coerce => 1,
-    builder => '_build_fixture_class',
+    builder => 1,
 );
 sub _build_fixture_class {
     $ENV{fixture_class} || $ENV{FIXTURE_CLASS} || '::Populate'
@@ -108,7 +113,8 @@ sub _build_fixture_class {
 has 'fixture_command' => (
     is => 'ro',
     init_arg => undef,
-    lazy_build => 1,
+    lazy => 1,
+    builder => 1,
 );
 
 has 'fixture_sets' => (