[Catalyst-commits] r9871 - in trunk/Catalyst-Model-DBIC-Schema: .
lib/Catalyst/Helper/Model/DBIC lib/Catalyst/Model/DBIC
lib/Catalyst/Model/DBIC/Schema
caelum at dev.catalyst.perl.org
caelum at dev.catalyst.perl.org
Mon Apr 27 01:16:17 GMT 2009
Author: caelum
Date: 2009-04-27 02:16:17 +0100 (Mon, 27 Apr 2009)
New Revision: 9871
Added:
trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/
trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/Role/
trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/Types.pm
Modified:
trunk/Catalyst-Model-DBIC-Schema/Makefile.PL
trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Helper/Model/DBIC/Schema.pm
trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema.pm
Log:
M::DBIC::Schema -- Moosification
Modified: trunk/Catalyst-Model-DBIC-Schema/Makefile.PL
===================================================================
--- trunk/Catalyst-Model-DBIC-Schema/Makefile.PL 2009-04-26 23:17:07 UTC (rev 9870)
+++ trunk/Catalyst-Model-DBIC-Schema/Makefile.PL 2009-04-27 01:16:17 UTC (rev 9871)
@@ -3,16 +3,15 @@
name 'Catalyst-Model-DBIC-Schema';
all_from 'lib/Catalyst/Model/DBIC/Schema.pm';
-requires 'DBIx::Class' => '0.08101';
-requires 'DBIx::Class::Cursor::Cached';
-requires 'Catalyst::Runtime' => '5.70';
-requires 'UNIVERSAL::require' => '0.10';
-requires 'Class::Data::Accessor' => '0.02';
-requires 'Class::Accessor::Fast' => '0.22';
-
-requires 'parent';
-requires 'MRO::Compat';
+requires 'DBIx::Class' => '0.08100';
+requires 'Catalyst::Runtime' => '5.80002';
+requires 'Moose';
+requires 'Moose::Autobox';
+requires 'MooseX::ClassAttribute';
+requires 'MooseX::Types';
+requires 'MooseX::Object::Pluggable' => '0.0009';
requires 'namespace::clean';
+requires 'Carp::Clan';
if($] < 5.009_005) {
requires 'Class::C3::XS' => '0.08';
@@ -27,6 +26,9 @@
'Tie::IxHash' => 0,
'DBIx::Class::Schema::Loader' => '0.04005';
+feature 'Caching support',
+ 'DBIx::Class::Cursor::Cached' => 0;
+
if(-e 'MANIFEST.SKIP') {
system("pod2text lib/Catalyst/Model/DBIC/Schema.pm > README");
}
Modified: trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Helper/Model/DBIC/Schema.pm
===================================================================
--- trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Helper/Model/DBIC/Schema.pm 2009-04-26 23:17:07 UTC (rev 9870)
+++ trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Helper/Model/DBIC/Schema.pm 2009-04-27 01:16:17 UTC (rev 9871)
@@ -103,6 +103,9 @@
=head2 mk_compclass
+This is called by L<Catalyst::Helper> with the commandline args to generate the
+files.
+
=cut
sub mk_compclass {
@@ -157,7 +160,7 @@
next if $key =~ /^(?:components|constraint|exclude)\z/;
$loader_args{$key} = eval $val;
- die "syntax error for loader args key '$key' with value '$val': $@"
+ croak "syntax error for loader args key '$key' with value '$val': $@"
if $@;
}
@@ -254,7 +257,7 @@
for (@connect_info) {
if (/^\s*{.*}\s*\z/) {
my $hash = eval $_;
- die "Syntax errorr in connect_info hash: $_: $@" if $@;
+ croak "Syntax errorr in connect_info hash: $_: $@" if $@;
my %hash = %$hash;
for my $key (keys %hash) {
@@ -304,7 +307,7 @@
for (@connect_info) {
if (/^\s*{.*}\s*\z/) {
my $hash = eval $_;
- die "Syntax errorr in connect_info hash: $_: $@" if $@;
+ croak "Syntax errorr in connect_info hash: $_: $@" if $@;
%connect_info = (%connect_info, %$hash);
@@ -314,7 +317,7 @@
my ($key, $val) = split /=/, $_, 2;
$connect_info{$key} = eval $val;
- die "syntax error for connect_info key '$key' with value '$val': $@"
+ croak "syntax error for connect_info key '$key' with value '$val': $@"
if $@;
}
@@ -353,7 +356,7 @@
sub _gen_static_schema {
my $self = shift;
- die "cannot load schema without connect info" unless $self->connect_info;
+ croak "cannot load schema without connect info" unless $self->connect_info;
my $helper = $self->helper;
Added: trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/Types.pm
===================================================================
--- trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/Types.pm (rev 0)
+++ trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/Types.pm 2009-04-27 01:16:17 UTC (rev 9871)
@@ -0,0 +1,59 @@
+package Catalyst::Model::DBIC::Schema::Types;
+
+use MooseX::Types
+ -declare => [qw/ConnectInfo SchemaClass/];
+
+use MooseX::Types::Moose qw/ArrayRef HashRef Str ClassName/;
+use Scalar::Util 'reftype';
+use Carp;
+
+use namespace::clean -except => 'meta';
+
+subtype SchemaClass,
+ as ClassName;
+
+coerce SchemaClass,
+ from Str,
+ via { Class::MOP::load_class($_); $_ };
+
+subtype ConnectInfo,
+ as HashRef,
+ where { exists $_->{dsn} },
+ message { 'Does not look like a valid connect_info' };
+
+coerce ConnectInfo,
+ from Str,
+ via { +{ dsn => $_ } },
+ from ArrayRef,
+ via {
+ my %connect_info;
+
+ if (!ref $_->[0]) { # array style
+ $connect_info{dsn} = shift @$_;
+ $connect_info{user} = shift @$_ if !ref $_->[0];
+ $connect_info{password} = shift @$_ if !ref $_->[0];
+
+ for my $i (0..1) {
+ my $extra = shift @$_;
+ last unless $extra;
+ croak "invalid connect_info" unless reftype $extra eq 'HASH';
+
+ %connect_info = (%connect_info, %$extra);
+ }
+
+ croak "invalid connect_info" if @$_;
+ } elsif (@$_ == 1 && reftype $_->[0] eq 'HASH') {
+ return $_->[0];
+ } else {
+ croak "invalid connect_info";
+ }
+
+ \%connect_info;
+};
+
+# { connect_info => [ ... ] } coercion would be nice, but no chained coercions
+# yet and no coercion from subtype (yet) but in Moose git already.
+# from HashRef,
+# via { $_->{connect_info} },
+
+1;
Modified: trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema.pm
===================================================================
--- trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema.pm 2009-04-26 23:17:07 UTC (rev 9870)
+++ trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema.pm 2009-04-27 01:16:17 UTC (rev 9871)
@@ -1,26 +1,25 @@
package Catalyst::Model::DBIC::Schema;
-use strict;
-use warnings;
+use Moose;
no warnings 'uninitialized';
our $VERSION = '0.24';
-use parent qw/Catalyst::Model Class::Accessor::Fast Class::Data::Accessor/;
-use MRO::Compat;
use mro 'c3';
-use UNIVERSAL::require;
-use Carp;
+extends 'Catalyst::Model';
+with 'MooseX::Object::Pluggable';
+
+use Carp::Clan '^Catalyst::Model::DBIC::Schema';
use Data::Dumper;
use DBIx::Class ();
use Scalar::Util 'reftype';
-use namespace::clean -except => 'meta';
+use MooseX::ClassAttribute;
+use Moose::Autobox;
-__PACKAGE__->mk_classaccessor('composed_schema');
-__PACKAGE__->mk_accessors(qw/
- schema connect_info schema_class storage_type caching model_name
-/);
+use Catalyst::Model::DBIC::Schema::Types qw/ConnectInfo SchemaClass/;
+use namespace::clean -except => 'meta';
+
=head1 NAME
Catalyst::Model::DBIC::Schema - DBIx::Class::Schema Model Class
@@ -283,6 +282,7 @@
pg_enable_utf8 => 1,
},
{
+ auto_savepoint => 1,
on_connect_do => [
'some SQL statement',
'another SQL statement',
@@ -290,26 +290,36 @@
}
]
-=item caching
+=item roles
-Whether or not to enable caching support using L<DBIx::Class::Cursor::Cached>
-and L<Catalyst::Plugin::Cache>. Enabled by default.
+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.:
-In order for this to work, L<Catalyst::Plugin::Cache> must be configured and
-loaded. A possible configuration would look like this:
+ roles Caching
+ roles +MyApp::DB::Role::Foo
- <Plugin::Cache>
- <backend>
- class Cache::FastMmap
- unlink_on_exit 1
- </backend>
- </Plugin::Cache>
+This is done using L<MooseX::Object::Pluggable>.
-Then in your queries, set the C<cache_for> ResultSet attribute to the number of
-seconds you want the query results to be cached for, eg.:
+A new instance is created at application time, so any consumed required
+attributes, coercions and modifiers will work.
- $c->model('DB::Table')->search({ foo => 'bar' }, { cache_for => 18000 });
+Roles are applied before setup, schema and connection are set, and have a chance
+to modify C<connect_info>.
+C<ref $self> will not be what you expect.
+
+WARNING: you cannot modify C<new>, modify C<setup> instead.
+
+Roles that come with the distribution:
+
+=over 4
+
+=item L<Catalyst::Model::DBIC::Schema::Role::Caching>
+
+=back
+
=item storage_type
Allows the use of a different C<storage_type> than what is set in your
@@ -370,21 +380,43 @@
=cut
-sub new {
- my $self = shift->next::method(@_);
-
+class_has 'composed_schema' => (is => 'rw');
+
+has 'schema' => (is => 'rw');
+
+has 'schema_class' => (
+ is => 'ro',
+ isa => SchemaClass,
+ coerce => 1,
+ required => 1
+);
+
+has 'storage_type' => (is => 'ro');
+
+has 'connect_info' => (is => 'ro', isa => ConnectInfo, coerce => 1);
+
+# ref $self changes to anon after roles are applied, and _original_class_name is
+# broken in MX::O::P
+has '_class_name' => (is => 'ro', isa => 'ClassName', default => sub {
+ ref shift
+});
+
+has 'model_name' => (is => 'ro', default => sub {
+ my $self = shift;
+
my $class = ref $self;
+ (my $model_name = $class) =~ s/^[\w:]+::(?:Model|M):://;
- $self->_build_model_name;
+ $model_name
+});
- croak "->config->{schema_class} must be defined for this model"
- unless $self->schema_class;
+has 'roles' => (is => 'ro', isa => 'ArrayRef|Str');
+sub BUILD {
+ my $self = shift;
+ my $class = ref $self;
my $schema_class = $self->schema_class;
- $schema_class->require
- or croak "Cannot load schema class '$schema_class': $@";
-
if( !$self->connect_info ) {
if($schema_class->storage && $schema_class->storage->connect_info) {
$self->connect_info($schema_class->storage->connect_info);
@@ -397,6 +429,18 @@
}
}
+ if (exists $self->connect_info->{cursor_class}) {
+ eval { Class::MOP::load_class($self->connect_info->{cursor_class}) }
+ or croak "invalid connect_info: Cannot load your cursor_class"
+ . " ".$self->connect_info->{cursor_class}.": $@";
+ }
+
+ $self->_plugin_ns('Role');
+
+ $self->load_plugins($self->roles->flatten) if $self->roles;
+
+ $self->setup;
+
$self->composed_schema($schema_class->compose_namespace($class));
$self->schema($self->composed_schema->clone);
@@ -404,15 +448,9 @@
$self->schema->storage_type($self->storage_type)
if $self->storage_type;
- $self->_normalize_connect_info;
-
- $self->_setup_caching;
-
$self->schema->connection($self->connect_info);
$self->_install_rs_models;
-
- return $self;
}
sub clone { shift->composed_schema->clone(@_); }
@@ -421,81 +459,26 @@
sub storage { shift->schema->storage(@_); }
-=item ACCEPT_CONTEXT
+=item setup
-Sets up runtime cache support on $c->model invocation.
+Called at C<<BUILD>> time, for modifying in roles/subclasses.
=cut
-sub ACCEPT_CONTEXT {
- my ($self, $c) = @_;
+sub setup { 1 }
- return $self unless
- $self->caching;
-
- unless ($c->can('cache') && ref $c->cache) {
- $c->log->debug("DBIx::Class cursor caching disabled, you don't seem to"
- . " have a working Cache plugin.");
- $self->caching(0);
- $self->_reset_cursor_class;
- return $self;
- }
+=item ACCEPT_CONTEXT
- if (ref $self->schema->default_resultset_attributes) {
- $self->schema->default_resultset_attributes->{cache_object} =
- $c->cache;
- } else {
- $self->schema->default_resultset_attributes({
- cache_object => $c->cache
- });
- }
+Point of extension for doing things at C<<$c->model>> time, returns the model
+instance, see L<Catalyst::Manual::Intro> for more information.
- $self;
-}
+=cut
-sub _normalize_connect_info {
- my $self = shift;
+sub ACCEPT_CONTEXT { shift }
- my $connect_info = $self->connect_info;
-
- my @connect_info = reftype $connect_info eq 'ARRAY' ?
- @$connect_info : $connect_info;
-
- my %connect_info;
-
- if (!ref $connect_info[0]) { # array style
- @connect_info{qw/dsn user password/} =
- splice @connect_info, 0, 3;
-
- for my $i (0..1) {
- my $extra = shift @connect_info;
- last unless $extra;
- croak "invalid connect_info" unless reftype $extra eq 'HASH';
-
- %connect_info = (%connect_info, %$extra);
- }
-
- croak "invalid connect_info" if @connect_info;
- } elsif (@connect_info == 1 && reftype $connect_info[0] eq 'HASH') {
- %connect_info = %{ $connect_info[0] };
- } elsif (reftype $connect_info eq 'HASH') {
- %connect_info = %$connect_info;
- } else {
- croak "invalid connect_info";
- }
-
- if (exists $connect_info{cursor_class}) {
- $connect_info{cursor_class}->require
- or croak "invalid connect_info: Cannot load your cursor_class"
- . " $connect_info{cursor_class}: $@";
- }
-
- $self->connect_info(\%connect_info);
-}
-
sub _install_rs_models {
my $self = shift;
- my $class = ref $self;
+ my $class = $self->_class_name;
no strict 'refs';
foreach my $moniker ($self->schema->sources) {
@@ -507,55 +490,8 @@
}
}
-sub _build_model_name {
- my $self = shift;
+__PACKAGE__->meta->make_immutable;
- my $class = ref $self;
- my $model_name = $class;
- $model_name =~ s/^[\w:]+::(?:Model|M):://;
-
- $self->model_name($model_name);
-}
-
-sub _setup_caching {
- my $self = shift;
-
- return if defined $self->caching && !$self->caching;
-
- $self->caching(0);
-
- if (my $cursor_class = $self->connect_info->{cursor_class}) {
- unless ($cursor_class->can('clear_cache')) {
- carp "Caching disabled, cursor_class $cursor_class does not"
- . " support it.";
- return;
- }
- } else {
- my $cursor_class = 'DBIx::Class::Cursor::Cached';
-
- unless ($cursor_class->require) {
- carp "Caching disabled, cannot load $cursor_class: $@";
- return;
- }
-
- $self->connect_info->{cursor_class} = $cursor_class;
- }
-
- $self->caching(1);
-
- 1;
-}
-
-sub _reset_cursor_class {
- my $self = shift;
-
- if ($self->connect_info->{cursor_class} eq 'DBIx::Class::Cursor::Cached') {
- $self->storage->cursor_class('DBIx::Class::Storage::DBI::Cursor');
- }
-
- 1;
-}
-
=back
=head1 SEE ALSO
More information about the Catalyst-commits
mailing list