X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FModel%2FDBIC%2FSchema.pm;h=ab367721c7ffb904817ec285d6af291de0f6e649;hb=46a2eb0ca8128a8a2a6ac06b18d1a33d747d1d33;hp=c7f7c364352d26fe3d1ca3c43aaf285985481b4a;hpb=f248883941b4d21f965a30f64f9be99b06ebeaf1;p=catagits%2FCatalyst-Model-DBIC-Schema.git diff --git a/lib/Catalyst/Model/DBIC/Schema.pm b/lib/Catalyst/Model/DBIC/Schema.pm index c7f7c36..ab36772 100644 --- a/lib/Catalyst/Model/DBIC/Schema.pm +++ b/lib/Catalyst/Model/DBIC/Schema.pm @@ -2,19 +2,20 @@ package Catalyst::Model::DBIC::Schema; use Moose; use mro 'c3'; -with 'MooseX::Traits'; extends 'Catalyst::Model'; +with 'CatalystX::Component::Traits'; -our $VERSION = '0.24'; +our $VERSION = '0.26'; use namespace::autoclean; use Carp::Clan '^Catalyst::Model::DBIC::Schema'; use Data::Dumper; use DBIx::Class (); use Moose::Autobox; +use Class::Inspector (); use Catalyst::Model::DBIC::Schema::Types - qw/ConnectInfo SchemaClass CursorClass/; + qw/ConnectInfo LoadedClass/; use MooseX::Types::Moose qw/ArrayRef Str ClassName Undef/; @@ -308,17 +309,18 @@ supported: Array of Traits to apply to the instance. Traits are Ls. -They are relative to the C<< MyApp::Model::DB::Trait:: >>, then the C<< -Catalyst::Model::DBIC::Schema::Trait:: >> namespaces, unless prefixed with C<+> +They are relative to the C<< MyApp::TraitFor::Model::DBIC::Schema:: >>, then the C<< +Catalyst::TraitFor::Model::DBIC::Schema:: >> namespaces, unless prefixed with C<+> in which case they are taken to be a fully qualified name. E.g.: traits Caching - traits +MyApp::DB::Trait::Foo + traits +MyApp::TraitFor::Model::Foo A new instance is created at application time, so any consumed required attributes, coercions and modifiers will work. -Traits are applied at L time using L. +Traits are applied at L time using +L. C will be an anon class if any traits are applied, C<< $self->_original_class_name >> will be the original class. @@ -330,9 +332,9 @@ Traits that come with the distribution: =over 4 -=item L +=item L -=item L +=item L =back @@ -361,16 +363,18 @@ The model name L uses to resolve this model, the part after C<::Model::> or C<::M::> in your class name. E.g. if your class name is C the L will be C. -=head2 _original_class_name - -The class name of your model before any L are applied. E.g. -C. - =head2 _default_cursor_class What to reset your L to if a custom one doesn't work out. Defaults to L. +=head1 ATTRIBUTES FROM L + +=head2 _original_class_name + +The class name of your model before any L are applied. E.g. +C. + =head2 _traits Unresolved arrayref of traits passed in the config. @@ -381,6 +385,15 @@ Traits you used resolved to full class names. =head1 METHODS +Methods not listed here are delegated to the connected schema used by the model +instance, so the following are equivalent: + + $c->model('DB')->schema->my_accessor('foo'); + # or + $c->model('DB')->my_accessor('foo'); + +Methods on the model take precedence over schema methods. + =head2 new Instantiates the Model based on the above-documented ->config parameters. @@ -428,18 +441,16 @@ Used often for debugging and controlling transactions. =cut -has schema => (is => 'rw', isa => 'DBIx::Class::Schema'); - has schema_class => ( is => 'ro', - isa => SchemaClass, + isa => LoadedClass, coerce => 1, required => 1 ); has storage_type => (is => 'rw', isa => Str); -has connect_info => (is => 'ro', isa => ConnectInfo, coerce => 1); +has connect_info => (is => 'rw', isa => ConnectInfo, coerce => 1); has model_name => ( is => 'ro', @@ -448,42 +459,20 @@ has model_name => ( lazy_build => 1, ); -has _traits => (is => 'ro', isa => ArrayRef); -has _resolved_traits => (is => 'ro', isa => ArrayRef); +# method names delegated to schema +has _delegates => ( + is => 'ro', + isa => ArrayRef, + lazy_build => 1 +); has _default_cursor_class => ( is => 'ro', - isa => CursorClass, + isa => LoadedClass, default => 'DBIx::Class::Storage::DBI::Cursor', coerce => 1 ); -has _original_class_name => ( - is => 'ro', - required => 1, - isa => Str, - default => sub { blessed $_[0] }, -); - -sub COMPONENT { - my ($class, $app, $args) = @_; - - $args = $class->merge_config_hashes($class->config, $args); - - if (my $traits = delete $args->{traits}) { - my @traits = $class->_resolve_traits($traits->flatten); - return $class->new_with_traits( - traits => \@traits, - _original_class_name => $class, - _traits => $traits, - _resolved_traits => \@traits, - %$args - ); - } - - return $class->new($args); -} - sub BUILD { my $self = shift; my $class = $self->_original_class_name; @@ -511,6 +500,12 @@ sub BUILD { $self->composed_schema($schema_class->compose_namespace($class)); + $self->meta->add_attribute('schema', + is => 'rw', + isa => $self->schema_class, + handles => $self->_delegates + ); + $self->schema($self->composed_schema->clone); $self->schema->storage_type($self->storage_type) @@ -525,10 +520,6 @@ sub clone { shift->composed_schema->clone(@_); } sub connect { shift->composed_schema->connect(@_); } -sub storage { shift->schema->storage(@_); } - -sub resultset { shift->schema->resultset(@_); } - =head2 setup Called at C> time before configuration, but after L is @@ -591,32 +582,6 @@ sub _reset_cursor_class { } } -sub _resolve_traits { - my ($class, @names) = @_; - my $base = 'Trait'; - - 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; -} - sub _build_model_name { my $self = shift; my $class = $self->_original_class_name; @@ -625,6 +590,24 @@ sub _build_model_name { return $model_name; } +sub _build__delegates { + my $self = shift; + +# XXX change this to CMOP once CAG is updated + my @schema_methods = @{ Class::Inspector->methods($self->schema_class) }; + + my @my_methods = $self->meta->get_all_method_names; + my %my_methods; + @my_methods{@my_methods} = (); + + my @delegates; + for my $method (@schema_methods) { + push @delegates, $method unless exists $my_methods{$method}; + } + + return \@delegates; +} + __PACKAGE__->meta->make_immutable; =head1 SEE ALSO @@ -642,8 +625,8 @@ L Traits: -L, -L +L, +L =head1 AUTHOR