Add use_moo option

diff --git a/lib/DBIx/Class/Schema/Loader/Base.pm b/lib/DBIx/Class/Schema/Loader/Base.pm
index 9103faf..eddf6f3 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/Base.pm
+++ b/lib/DBIx/Class/Schema/Loader/Base.pm
@@ -60,6 +60,7 @@ __PACKAGE__->mk_group_ro_accessors('simple', qw/
                                 result_base_class
                                 result_roles
                                 use_moose
+                                use_moo
                                 only_autoclean
                                 overwrite_modifications
                                 dry_run
@@ -980,6 +981,13 @@ content after the md5 sum also makes the classes immutable.
 
 It is safe to upgrade your existing Schema to this option.
 
+=head2 use_moo
+
+Creates Schema and Result classes that use L<Moo> and
+L<namespace::autoclean>.
+
+It is safe to upgrade your existing Schema to this option.
+
 =head2 only_autoclean
 
 By default, we use L<MooseX::MarkAsMethods> to remove imported functions from
@@ -1134,8 +1142,11 @@ sub new {
         $self->result_roles_map($self->{result_role_map})
     }
 
-    croak "the result_roles and result_roles_map options may only be used in conjunction with use_moose=1"
-        if ((not defined $self->use_moose) || (not $self->use_moose))
+    croak "Specify only one of use_moose or use_moo"
+        if $self->use_moose and $self->use_moo;
+
+    croak "the result_roles and result_roles_map options may only be used in conjunction with use_moose=1 or use_moo=1"
+        if ((not $self->use_moose) && (not $self->use_moo))
             && ((defined $self->result_roles) || (defined $self->result_roles_map));
 
     $self->_ensure_arrayref(qw/schema_components
@@ -1179,10 +1190,12 @@ sub new {
     }
     $self->_validate_result_roles_map;
 
-    if ($self->use_moose) {
-        if (not DBIx::Class::Schema::Loader::Optional::Dependencies->req_ok_for('use_moose')) {
-            die sprintf "You must install the following CPAN modules to enable the use_moose option: %s.\n",
-                DBIx::Class::Schema::Loader::Optional::Dependencies->req_missing_for('use_moose');
+    for my $use_oo (qw(use_moose use_moo)) {
+        if ($self->$use_oo) {
+            if (not DBIx::Class::Schema::Loader::Optional::Dependencies->req_ok_for($use_oo)) {
+                die sprintf "You must install the following CPAN modules to enable the $use_oo option: %s.\n",
+                    DBIx::Class::Schema::Loader::Optional::Dependencies->req_missing_for($use_oo);
+            }
         }
     }
 
@@ -1389,9 +1402,12 @@ EOF
 
     return unless $old_ver;
 
-    # determine if the existing schema was dumped with use_moose => 1
-    if (! defined $self->use_moose) {
-        $self->{use_moose} = 1 if $old_gen =~ /^ (?!\s*\#) use \s+ Moose/xm;
+    # determine if the existing schema was dumped with use_moo(se) => 1
+    for my $oo (qw(Moose Moo)) {
+        my $use_oo = "use_".lc($oo);
+        if (! defined $self->$use_oo) {
+            $self->{$use_oo} = 1 if $old_gen =~ /^ (?!\s*\#) use \s+ \Q$oo\E\b/xm;
+        }
     }
 
     my $load_classes = ($old_gen =~ /^__PACKAGE__->load_classes;/m) ? 1 : 0;
@@ -1992,9 +2008,11 @@ sub _dump_to_dir {
         ;
 
     if ($self->use_moose) {
-
         $schema_text.= qq|use Moose;\nuse $autoclean;\nextends '$schema_base_class';\n\n|;
     }
+    elsif ($self->use_moo) {
+        $schema_text .= qq|use Moo;\nuse namespace::autoclean;\nextends '$schema_base_class';\n\n|;
+    }
     else {
         $schema_text .= qq|use strict;\nuse warnings;\n\nuse base '$schema_base_class';\n\n|;
     }
@@ -2051,8 +2069,11 @@ sub _dump_to_dir {
         $src_text .= $self->_base_class_pod($result_base_class)
             unless $result_base_class eq 'DBIx::Class::Core';
 
-        if ($self->use_moose) {
-            $src_text.= qq|use Moose;\nuse MooseX::NonMoose;\nuse $autoclean;|;
+        if ($self->use_moose || $self->use_moo) {
+            $src_text.= $self->use_moose
+                ? qq|use Moose;\nuse MooseX::NonMoose;\nuse $autoclean;|
+                : qq|use Moo;\nuse namespace::autoclean;|
+                ;
 
             # these options 'use base' which is compile time
             if (@{ $self->left_base_classes } || @{ $self->additional_base_classes }) {
@@ -2475,6 +2496,7 @@ sub _is_result_class_method {
         for my $class (
             $base, @components, @roles,
             ($self->use_moose ? 'Moose::Object' : ()),
+            ($self->use_moo ? 'Moo::Object' : ()),
         ) {
             $self->ensure_class_loaded($class);
 
@@ -2905,7 +2927,8 @@ sub _load_roles {
         if exists $self->result_roles_map->{$table_moniker};
 
     if (@roles) {
-        $self->_pod_class_list($table_class, 'L<Moose> ROLES APPLIED', @roles);
+        my $class = $self->use_moose ? 'Moose' : 'Moo';
+        $self->_pod_class_list($table_class, "L<$class> ROLES APPLIED", @roles);
 
         $self->_with($table_class, @roles);
     }

diff --git a/lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pm b/lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pm
index 6c886dd..e5e9dc6 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pm
@@ -36,6 +36,17 @@ my $dbic_reqs = {
     },
   },
 
+  use_moo => {
+    req => {
+      'Moo' => '2',
+      'namespace::autoclean' => '0.16',
+    },
+    pod => {
+      title => 'use_moo',
+      desc  => 'Modules required for the use_moo option',
+    },
+  },
+
   dbicdump_config => {
     req => {
       'Config::Any' => '0',

diff --git a/t/28dump_use_moo.t b/t/28dump_use_moo.t
new file mode 100644 (file)
index 0000000..d1479d8
--- /dev/null
+++ b/t/28dump_use_moo.t
@@ -0,0 +1,89 @@
+use DBIx::Class::Schema::Loader::Optional::Dependencies
+    -skip_all_without => 'use_moo';
+
+use strict;
+use warnings;
+
+use Test::More;
+
+use lib qw(t/lib);
+use dbixcsl_dumper_tests;
+my $t = 'dbixcsl_dumper_tests';
+
+$t->cleanup;
+
+# first dump a fresh use_moo=1 schema
+$t->dump_test(
+    classname => 'DBICTest::DumpMore::1',
+    options => {
+        use_moo => 1,
+        result_base_class => 'My::ResultBaseClass',
+        schema_base_class => 'My::SchemaBaseClass',
+        result_roles => ['TestRole', 'TestRole2'],
+    },
+    regexes => {
+        schema => [
+            qr/\nuse Moo;\nuse namespace::autoclean;\nextends 'My::SchemaBaseClass';\n\n/,
+        ],
+        Foo => [
+            qr/\nuse Moo;\nuse namespace::autoclean;\nextends 'My::ResultBaseClass';\n\n/,
+            qr/=head1 L<Moo> ROLES APPLIED\n\n=over 4\n\n=item \* L<TestRole>\n\n=item \* L<TestRole2>\n\n=back\n\n=cut\n\n/,
+            qr/\nwith 'TestRole', 'TestRole2';\n\n/,
+        ],
+        Bar => [
+            qr/\nuse Moo;\nuse namespace::autoclean;\nextends 'My::ResultBaseClass';\n\n/,
+            qr/=head1 L<Moo> ROLES APPLIED\n\n=over 4\n\n=item \* L<TestRole>\n\n=item \* L<TestRole2>\n\n=back\n\n=cut\n\n/,
+            qr/\nwith 'TestRole', 'TestRole2';\n\n/,
+        ],
+    },
+);
+
+$t->cleanup;
+
+# now upgrade a fresh non-moo schema to use_moo=1
+$t->dump_test(
+    classname => 'DBICTest::DumpMore::1',
+    options => {
+        use_moo => 0,
+        result_base_class => 'My::ResultBaseClass',
+        schema_base_class => 'My::SchemaBaseClass',
+    },
+    regexes => {
+        schema => [
+            qr/\nuse base 'My::SchemaBaseClass';\n/,
+        ],
+        Foo => [
+            qr/\nuse base 'My::ResultBaseClass';\n/,
+        ],
+        Bar => [
+            qr/\nuse base 'My::ResultBaseClass';\n/,
+        ],
+    },
+);
+
+# check that changed custom content is upgraded for Moo bits
+$t->append_to_class('DBICTest::DumpMore::1::Foo', q{# XXX This is my custom content XXX});
+
+$t->dump_test(
+    classname => 'DBICTest::DumpMore::1',
+    options => {
+        use_moo => 1,
+        result_base_class => 'My::ResultBaseClass',
+        schema_base_class => 'My::SchemaBaseClass',
+    },
+    regexes => {
+        schema => [
+            qr/\nuse Moo;\nuse namespace::autoclean;\nextends 'My::SchemaBaseClass';\n\n/,
+        ],
+        Foo => [
+            qr/\nuse Moo;\nuse namespace::autoclean;\nextends 'My::ResultBaseClass';\n\n/,
+            qr/# XXX This is my custom content XXX/,
+        ],
+        Bar => [
+            qr/\nuse Moo;\nuse namespace::autoclean;\nextends 'My::ResultBaseClass';\n\n/,
+        ],
+    },
+);
+
+done_testing();
+