X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FModel%2FDBIC%2FSchema.pm;h=38a5e523880562f47b2f287f3a74effc23771747;hb=078c5263726fc9c8b798b79f5cb8e54e860b7d36;hp=d3807bc34bcb0d8d9474eede692bee378fde01d5;hpb=73f72d2824f088091e1974dce03453d47311af78;p=catagits%2FCatalyst-Model-DBIC-Schema.git diff --git a/lib/Catalyst/Model/DBIC/Schema.pm b/lib/Catalyst/Model/DBIC/Schema.pm index d3807bc..38a5e52 100644 --- a/lib/Catalyst/Model/DBIC/Schema.pm +++ b/lib/Catalyst/Model/DBIC/Schema.pm @@ -2,10 +2,10 @@ 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'; @@ -14,7 +14,7 @@ use DBIx::Class (); use Moose::Autobox; use Catalyst::Model::DBIC::Schema::Types - qw/ConnectInfo SchemaClass CursorClass/; + qw/ConnectInfo LoadedClass/; use MooseX::Types::Moose qw/ArrayRef Str ClassName Undef/; @@ -90,19 +90,34 @@ be used/accessed in the normal Catalyst manner, via $c->model(): my $actor = $c->model('FilmDB::Actor')->find(1); You can also use it to set up DBIC authentication with -Authentication::Store::DBIC in MyApp.pm: +L in MyApp.pm: package MyApp; - use Catalyst qw/... Authentication::Store::DBIC/; + use Catalyst qw/... Authentication .../; ... - __PACKAGE__->config->{authentication}{dbic} = { - user_class => 'FilmDB::Actor', - user_field => 'name', - password_field => 'password' - } + __PACKAGE__->config->{authentication} = + { + default_realm => 'members', + realms => { + members => { + credential => { + class => 'Password', + password_field => 'password', + password_type => 'hashed' + password_hash_type => 'SHA-256' + }, + store => { + class => 'DBIx::Class', + user_model => 'DB::User', + role_relation => 'roles', + role_field => 'rolename', + } + } + } + }; C<< $c->model('Schema::Source') >> returns a L for the source name parameter passed. To find out more about which methods can @@ -293,17 +308,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. @@ -315,9 +331,9 @@ Traits that come with the distribution: =over 4 -=item L +=item L -=item L +=item L =back @@ -346,19 +362,21 @@ 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 _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 _default_cursor_class - -What to rest your L if a custom one -doesn't work out. Defaults to L. - =head2 _traits -Unresolved arrayref of traits passed at C time. +Unresolved arrayref of traits passed in the config. =head2 _resolved_traits @@ -417,14 +435,14 @@ 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', @@ -433,45 +451,16 @@ has model_name => ( lazy_build => 1, ); -has _traits => (is => 'ro', isa => ArrayRef); -has _resolved_traits => (is => 'ro', isa => ArrayRef); - 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 = ref $self; + my $class = $self->_original_class_name; my $schema_class = $self->schema_class; if( !$self->connect_info ) { @@ -576,32 +565,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; @@ -627,8 +590,8 @@ L Traits: -L, -L +L, +L =head1 AUTHOR