[Catalyst-commits] r10180 - in
trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst:
Helper/Model/DBIC Model/DBIC Model/DBIC/Schema/Role
caelum at dev.catalyst.perl.org
caelum at dev.catalyst.perl.org
Sat May 16 17:38:27 GMT 2009
Author: caelum
Date: 2009-05-16 17:38:26 +0000 (Sat, 16 May 2009)
New Revision: 10180
Modified:
trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Helper/Model/DBIC/Schema.pm
trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema.pm
trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/Role/Caching.pm
Log:
C::M::DBIC::Schema - minor cleanups
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-05-16 14:07:50 UTC (rev 10179)
+++ trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Helper/Model/DBIC/Schema.pm 2009-05-16 17:38:26 UTC (rev 10180)
@@ -9,6 +9,7 @@
use Tie::IxHash ();
use Data::Dumper ();
use List::Util 'first';
+use MooseX::Types::Moose qw/Str HashRef Bool/;
use namespace::clean -except => 'meta';
@@ -103,27 +104,13 @@
has helper => (is => 'ro', isa => 'Catalyst::Helper', required => 1);
-has schema_class => (is => 'ro', isa => 'Str', required => 1);
+has schema_class => (is => 'ro', isa => Str, required => 1);
-has loader_args => (is => 'rw', isa => 'HashRef');
-has connect_info => (is => 'rw', isa => 'HashRef');
+has loader_args => (is => 'rw', isa => HashRef);
+has connect_info => (is => 'rw', isa => HashRef);
-has old_schema => (is => 'rw', isa => 'Bool', lazy => 1, default => sub {
- my $self = shift;
+has old_schema => (is => 'rw', isa => Bool, lazy_build => 1);
- my @schema_pm = split '::', $self->schema_class;
- $schema_pm[-1] .= '.pm';
- my $schema_file =
- File::Spec->catfile($self->helper->{base}, 'lib', @schema_pm);
-
- if (-f $schema_file) {
- my $schema_code = do { local (@ARGV, $/) = $schema_file; <> };
- return 1 if $schema_code =~ /->load_classes/;
- }
-
- 0;
-});
-
=head1 METHODS
=head2 mk_compclass
@@ -138,8 +125,7 @@
my $self = $package->new(helper => $helper, schema_class => $schema_class);
- $helper->{schema_class} = $schema_class
- or die "Must supply schema class name";
+ $helper->{schema_class} = $schema_class;
@args = $self->_cleanup_args(\@args);
@@ -315,6 +301,22 @@
\%helper_connect_info
}
+sub _build_old_schema {
+ my $self = shift;
+
+ my @schema_pm = split '::', $self->schema_class;
+ $schema_pm[-1] .= '.pm';
+ my $schema_file =
+ File::Spec->catfile($self->helper->{base}, 'lib', @schema_pm);
+
+ if (-f $schema_file) {
+ my $schema_code = do { local (@ARGV, $/) = $schema_file; <> };
+ return 1 if $schema_code =~ /->load_classes/;
+ }
+
+ 0;
+}
+
sub _data_struct_to_string {
my ($self, $data) = @_;
@@ -435,9 +437,7 @@
my ($self, $args) = @_;
# remove blanks, ie. someoned doing foo \ bar
-# my @res = grep !/^\s*\z/, @$args;
-# bad idea.
- my @res = @$args;
+ my @res = grep !/^\s+\z/, @$args;
# remove leading whitespace, ie. foo \ bar
s/^\s*// for @res;
Modified: trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/Role/Caching.pm
===================================================================
--- trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/Role/Caching.pm 2009-05-16 14:07:50 UTC (rev 10179)
+++ trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/Role/Caching.pm 2009-05-16 17:38:26 UTC (rev 10180)
@@ -2,6 +2,8 @@
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';
@@ -13,12 +15,11 @@
=head1 SYNOPSIS
__PACKAGE__->config({
- roles => ['Caching']
- ...
+ roles => ['Caching'],
+ connect_info =>
+ ['dbi:mysql:db', 'user', 'pass'],
});
- ...
-
$c->model('DB::Table')->search({ foo => 'bar' }, { cache_for => 18000 });
=head1 DESCRIPTION
@@ -49,36 +50,33 @@
$c->model('DB')->caching(0);
-to disable caching at runtime.
-
=cut
-has 'caching' => (is => 'rw', isa => 'Int', default => 1);
+has 'caching' => (is => 'rw', isa => Int, default => 1);
after setup => sub {
my $self = shift;
- return if defined $self->caching && !$self->caching;
+ return if !$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';
+ my $cursor_class = $self->connect_info->{cursor_class}
+ || 'DBIx::Class::Cursor::Cached';
- unless (eval { Class::MOP::load_class($cursor_class) }) {
- carp "Caching disabled, cannot load $cursor_class: $@";
- return;
- }
+ unless (eval { Class::MOP::load_class($cursor_class) }) {
+ carp "Caching disabled, cannot load cursor class"
+ . " $cursor_class: $@";
+ return;
+ }
- $self->connect_info->{cursor_class} = $cursor_class;
+ unless ($cursor_class->can('clear_cache')) {
+ carp "Caching disabled, cursor_class $cursor_class does not"
+ . " support it.";
+ return;
}
+ $self->connect_info->{cursor_class} = $cursor_class;
$self->caching(1);
};
@@ -87,7 +85,7 @@
return $self unless
$self->caching;
-
+
unless ($c->can('cache') && ref $c->cache) {
$c->log->warn("DBIx::Class cursor caching disabled, you don't seem to"
. " have a working Cache plugin.");
@@ -106,26 +104,6 @@
}
};
-=head1 METHODS
-
-=head2 _reset_cursor_class
-
-Reset the cursor class to L<DBIx::Class::Storage::DBI::Cursor> if it's set to
-L<DBIx::Class::Cursor::Cached>, if possible.
-
-=cut
-
-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')
- if $self->storage->can('cursor_class');
- }
-
- 1;
-}
-
=head1 SEE ALSO
L<Catalyst::Model::DBIC::Schema>, L<DBIx::Class>, L<Catalyst::Plugin::Cache>,
Modified: trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema.pm
===================================================================
--- trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema.pm 2009-05-16 14:07:50 UTC (rev 10179)
+++ trunk/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema.pm 2009-05-16 17:38:26 UTC (rev 10180)
@@ -14,7 +14,9 @@
use MooseX::ClassAttribute;
use Moose::Autobox;
-use Catalyst::Model::DBIC::Schema::Types qw/ConnectInfo SchemaClass/;
+use Catalyst::Model::DBIC::Schema::Types
+ qw/ConnectInfo SchemaClass CursorClass/;
+
use MooseX::Types::Moose qw/ArrayRef Str ClassName/;
use namespace::clean -except => 'meta';
@@ -409,6 +411,13 @@
has 'roles' => (is => 'ro', isa => ArrayRef|Str);
+has '_default_cursor_class' => (
+ is => 'ro',
+ isa => CursorClass,
+ default => 'DBIx::Class::Storage::DBI::Cursor',
+ coerce => 1
+);
+
sub BUILD {
my $self = shift;
my $class = ref $self;
@@ -503,6 +512,15 @@
}
}
+sub _reset_cursor_class {
+ my $self = shift;
+
+ if ($self->storage->can('cursor_class')) {
+ $self->storage->cursor_class($self->_default_cursor_class)
+ if $self->storage->cursor_class ne $self->_default_cursor_class;
+ }
+}
+
__PACKAGE__->meta->make_immutable;
=head1 SEE ALSO
More information about the Catalyst-commits
mailing list