use Moose;
use mro 'c3';
extends 'Catalyst::Model';
-with 'MooseX::Object::Pluggable';
our $VERSION = '0.24';
use Scalar::Util 'reftype';
use MooseX::ClassAttribute;
use Moose::Autobox;
+use Moose::Util ();
use Catalyst::Model::DBIC::Schema::Types
qw/ConnectInfo SchemaClass CursorClass/;
-use MooseX::Types::Moose qw/ArrayRef Str ClassName/;
+use MooseX::Types::Moose qw/ArrayRef Str ClassName Undef/;
use namespace::clean -except => 'meta';
<Model::FilmDB>
schema_class MyApp::Schema::FilmDB
- roles Caching
+ traits Caching
<connect_info>
dsn dbi:Pg:dbname=mypgdb
user postgres
}
]
-=head2 roles
+=head2 traits
-Array of Roles to apply at BUILD time. Roles are relative to the
-C<<MyApp::Model::DB::Role::> then C<<Catalyst::Model::DBIC::Schema::Role::>>
-namespaces, unless prefixed with C<+> in which case they are taken to be a
-fully qualified name. E.g.:
+Array of Traits to apply to the instance. Traits are L<Moose::Role>s.
- roles Caching
- roles +MyApp::DB::Role::Foo
+They are relative to the C<< MyApp::Model::DB::Trait:: >>, then the C<<
+Catalyst::Model::DBIC::Schema::Trait:: >> namespaces, unless prefixed with C<+>
+in which case they are taken to be a fully qualified name. E.g.:
-This is done using L<MooseX::Object::Pluggable>.
+ traits Caching
+ traits +MyApp::DB::Trait::Foo
A new instance is created at application time, so any consumed required
attributes, coercions and modifiers will work.
-Roles are applied before setup, schema and connection are set.
+Traits are applied before setup, schema and connection are set.
-C<ref $self> will be an anon class if any roles are applied.
+C<ref $self> will be an anon class if any traits are applied, C<<
+$self->_original_class_name >> will be the original class.
-You cannot modify C<new> or C<BUILD>, modify C<setup> instead.
+You cannot modify C<BUILD> in a trait, as that is when traits are applied,
+modify L</setup> instead.
-L</ACCEPT_CONTEXT> and L</finalize> can also be modified.
-
-Roles that come with the distribution:
+Traits that come with the distribution:
=over 4
-=item L<Catalyst::Model::DBIC::Schema::Role::Caching>
+=item L<Catalyst::Model::DBIC::Schema::Trait::Caching>
-=item L<Catalyst::Model::DBIC::Schema::Role::Replicated>
+=item L<Catalyst::Model::DBIC::Schema::Trait::Replicated>
=back
=cut
-class_has 'composed_schema' => (is => 'rw', isa => 'DBIx::Class::Schema');
-
-has 'schema' => (is => 'rw', isa => 'DBIx::Class::Schema');
+has schema => (is => 'rw', isa => 'DBIx::Class::Schema');
-has 'schema_class' => (
+has schema_class => (
is => 'ro',
isa => SchemaClass,
coerce => 1,
required => 1
);
-has 'storage_type' => (is => 'rw', isa => Str);
-
-has 'connect_info' => (is => 'ro', isa => ConnectInfo, coerce => 1);
+has storage_type => (is => 'rw', isa => Str);
-# ref $self changes to anon after roles are applied, and _original_class_name is
-# broken in MX::O::P 0.0009
-has '_class_name' => (is => 'ro', isa => ClassName, default => sub {
- ref shift
-});
+has connect_info => (is => 'ro', isa => ConnectInfo, coerce => 1);
-has 'model_name' => (is => 'ro', isa => Str, default => sub {
+has model_name => (is => 'ro', isa => Str, default => sub {
my $self = shift;
my $class = ref $self;
$model_name
});
-has 'roles' => (is => 'ro', isa => ArrayRef|Str);
+has traits => (is => 'ro', isa => ArrayRef|Str);
+
+has _trait_fqns => (is => 'ro', isa => ArrayRef|Undef, lazy_build => 1);
-has '_default_cursor_class' => (
+has _default_cursor_class => (
is => 'ro',
isa => CursorClass,
default => 'DBIx::Class::Storage::DBI::Cursor',
coerce => 1
);
+has _original_class_name => (
+ is => 'ro',
+ required => 1,
+ isa => Str,
+ default => sub { blessed $_[0] },
+);
+
sub BUILD {
my $self = shift;
my $class = ref $self;
. " ".$self->connect_info->{cursor_class}.": $@";
}
- $self->_plugin_ns('Role');
-
- $self->load_plugins($self->roles->flatten) if $self->roles;
+ Moose::Util::apply_all_roles($self, $self->_trait_fqns->flatten)
+ if $self->_trait_fqns;
$self->setup;
sub storage { shift->schema->storage(@_); }
+sub resultset { shift->schema->resultset(@_); }
+
=head2 setup
-Called at C<<BUILD>> time before configuration.
+Called at C<BUILD>> time before configuration.
=cut
=head2 ACCEPT_CONTEXT
-Point of extension for doing things at C<<$c->model>> time, returns the model
+Point of extension for doing things at C<< $c->model >> time, returns the model
instance, see L<Catalyst::Manual::Intro> for more information.
=cut
sub _install_rs_models {
my $self = shift;
- my $class = $self->_class_name;
+ my $class = $self->_original_class_name;
no strict 'refs';
}
}
+{
+ my %COMPOSED_CACHE;
+
+ sub composed_schema {
+ my $self = shift;
+ my $class = $self->_original_class_name;
+ my $store = \$COMPOSED_CACHE{$class}{$self->schema_class};
+
+ $$store = shift if @_;
+
+ return $$store
+ }
+}
+
+sub _build__trait_fqns {
+ my $self = shift;
+ my $class = $self->_original_class_name;
+ my $base = 'Trait';
+
+ my @names = $self->traits->flatten if $self->traits;
+ return unless @names;
+
+ my @search_ns = grep !/^(?:Moose|Class::MOP)::/,
+ $class->meta->class_precedence_list;
+
+ my @traits;
+
+ OUTER: for my $name (@names) {
+ if ($name =~ /^\+(.*)/) {
+ push @traits, $1;
+ next;
+ }
+ for my $ns (@search_ns) {
+ my $full = "${ns}::${base}::${name}";
+ if (eval { Class::MOP::load_class($full) }) {
+ push @traits, $full;
+ next OUTER;
+ }
+ }
+ }
+
+ return @traits ? \@traits : undef;
+}
+
__PACKAGE__->meta->make_immutable;
=head1 SEE ALSO
L<DBIx::Class::Schema::Loader>, L<Catalyst::Helper::Model::DBIC::Schema>,
L<MooseX::Object::Pluggable>
-Roles:
+Traits:
-L<Catalyst::Model::DBIC::Schema::Role::Caching>,
-L<Catalyst::Model::DBIC::Schema::Role::Replicated>
+L<Catalyst::Model::DBIC::Schema::Trait::Caching>,
+L<Catalyst::Model::DBIC::Schema::Trait::Replicated>
=head1 AUTHOR
Contributors:
-Rafael Kitover, C<<rkitover at cpan.org>>
+Rafael Kitover, C<rkitover at cpan.org>
=head1 COPYRIGHT
=cut
1;
+# vim:sts=4 sw=4:
projects / catagits/Catalyst-Model-DBIC-Schema.git / blobdiff