cleanups, deps on mx::traits which is not released yet

diff --git a/Makefile.PL b/Makefile.PL
index e68d0d8..d44f1bb 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -5,11 +5,11 @@ all_from 'lib/Catalyst/Model/DBIC/Schema.pm';
 
 requires 'DBIx::Class'           => '0.08103';
 requires 'Catalyst::Runtime'     => '5.80003';
-requires 'MooseX::Traits'        => '0.05';
+requires 'MooseX::Traits'        => '0.06';
 requires 'Moose';
 requires 'Moose::Autobox';
 requires 'MooseX::Types';
-requires 'namespace::clean';
+requires 'namespace::autoclean';
 requires 'Carp::Clan';
 requires 'List::MoreUtils';
 

diff --git a/lib/Catalyst/Helper/Model/DBIC/Schema.pm b/lib/Catalyst/Helper/Model/DBIC/Schema.pm
index 3567c9f..049ff7e 100644 (file)
--- a/lib/Catalyst/Helper/Model/DBIC/Schema.pm
+++ b/lib/Catalyst/Helper/Model/DBIC/Schema.pm
@@ -1,5 +1,6 @@
 package Catalyst::Helper::Model::DBIC::Schema;
 
+use namespace::autoclean;
 use Moose;
 no warnings 'uninitialized';
 
@@ -15,8 +16,6 @@ use Moose::Autobox;
 use List::MoreUtils 'firstidx';
 use Scalar::Util 'looks_like_number';
 
-use namespace::clean -except => 'meta';
-
 =head1 NAME
 
 Catalyst::Helper::Model::DBIC::Schema - Helper for DBIC Schema Models

diff --git a/lib/Catalyst/Model/DBIC/Schema.pm b/lib/Catalyst/Model/DBIC/Schema.pm
index d1efc70..d3807bc 100644 (file)
--- a/lib/Catalyst/Model/DBIC/Schema.pm
+++ b/lib/Catalyst/Model/DBIC/Schema.pm
@@ -7,6 +7,7 @@ extends 'Catalyst::Model';
 
 our $VERSION = '0.24';
 
+use namespace::autoclean;
 use Carp::Clan '^Catalyst::Model::DBIC::Schema';
 use Data::Dumper;
 use DBIx::Class ();
@@ -17,8 +18,6 @@ use Catalyst::Model::DBIC::Schema::Types
 
 use MooseX::Types::Moose qw/ArrayRef Str ClassName Undef/;
 
-use namespace::clean -except => 'meta';
-
 =head1 NAME
 
 Catalyst::Model::DBIC::Schema - DBIx::Class::Schema Model Class
@@ -458,23 +457,16 @@ sub COMPONENT {
 
     if (my $traits = delete $args->{traits}) {
         my @traits = $class->_resolve_traits($traits->flatten);
-       return $class->new_with_traits(
+       return $class->new_with_traits({
            traits => \@traits,
            _original_class_name => $class,
             _traits => $traits,
             _resolved_traits => \@traits,
            %$args
-       );
+       });
     }
 
-    return $class->new(%$args);
-}
-
-# we override Catalyst::Component::BUILDARGS, which merges configs, because we
-# merge configs ourselves in COMPONENT. We also don't pass $app to ->new, so
-# Moose::Object::BUILDARGS works perfectly.
-sub BUILDARGS {
-    goto &Moose::Object::BUILDARGS;
+    return $class->new($args);
 }
 
 sub BUILD {
@@ -533,8 +525,9 @@ sub setup { 1 }
 
 =head2 ACCEPT_CONTEXT
 
-Point of extension for doing things at C<< $c->model >> time, returns the model
-instance, see L<Catalyst::Manual::Intro> for more information.
+Point of extension for doing things at C<< $c->model >> time with context,
+returns the model instance, see L<Catalyst::Manual::Intro/ACCEPT_CONTEXT> for
+more information.
 
 =cut
 

diff --git a/lib/Catalyst/Model/DBIC/Schema/Trait/Caching.pm b/lib/Catalyst/Model/DBIC/Schema/Trait/Caching.pm
index 0733662..7156d53 100644 (file)
--- a/lib/Catalyst/Model/DBIC/Schema/Trait/Caching.pm
+++ b/lib/Catalyst/Model/DBIC/Schema/Trait/Caching.pm
@@ -1,12 +1,11 @@
 package Catalyst::Model::DBIC::Schema::Trait::Caching;
 
+use namespace::autoclean;
 use Moose::Role;
 use Carp::Clan '^Catalyst::Model::DBIC::Schema';
 use Catalyst::Model::DBIC::Schema::Types 'CursorClass';
 use MooseX::Types::Moose qw/Int Str/;
 
-use namespace::clean -except => 'meta';
-
 =head1 NAME
 
 Catalyst::Model::DBIC::Schema::Trait::Caching - Query caching support for

diff --git a/lib/Catalyst/Model/DBIC/Schema/Trait/Replicated.pm b/lib/Catalyst/Model/DBIC/Schema/Trait/Replicated.pm
index 6826a4c..cc89741 100644 (file)
--- a/lib/Catalyst/Model/DBIC/Schema/Trait/Replicated.pm
+++ b/lib/Catalyst/Model/DBIC/Schema/Trait/Replicated.pm
@@ -1,13 +1,12 @@
 package Catalyst::Model::DBIC::Schema::Trait::Replicated;
 
+use namespace::autoclean;
 use Moose::Role;
 use Moose::Autobox;
 use Carp::Clan '^Catalyst::Model::DBIC::Schema';
 
 use Catalyst::Model::DBIC::Schema::Types 'ConnectInfos';
 
-use namespace::clean -except => 'meta';
-
 =head1 NAME
 
 Catalyst::Model::DBIC::Schema::Trait::Replicated - Replicated storage support for
@@ -79,13 +78,12 @@ after setup => sub {
     }
 };
 
-my $build = sub {
+sub BUILD {}
+after BUILD => sub {
     my $self = shift;
 
     $self->storage->connect_replicants(map [ $_ ], $self->replicants->flatten);
 };
-after BUILD => $build;
-sub BUILD { goto $build }
 
 =head1 SEE ALSO