[libcatalyst-modules-perl] 05/12: update Catalyst::Model::DBIC::Schema to 0.63
Damyan Ivanov
dmn at moszumanska.debian.org
Thu May 8 14:59:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
dmn pushed a commit to branch dam-bundle-2.0
in repository libcatalyst-modules-perl.
commit a6a99f90ced390d85ff23d74940f6f017277aff1
Author: Damyan Ivanov <dmn at debian.org>
Date: Thu May 8 11:06:48 2014 +0000
update Catalyst::Model::DBIC::Schema to 0.63
Closes: #745805 -- request for library update
add libmodule-runtime-perl and libmoosex-types-loadableclass-perl to
(build-)dependencies and make libmoosex-markasmethods-perl
(build-)dependency at least 0.13
---
debian/control | 8 ++++++--
sources/Catalyst-Model-DBIC-Schema/.gitignore | 8 +++++++-
sources/Catalyst-Model-DBIC-Schema/Changes | 10 +++++++++-
sources/Catalyst-Model-DBIC-Schema/MANIFEST | 2 --
sources/Catalyst-Model-DBIC-Schema/Makefile.PL | 5 ++++-
.../lib/Catalyst/Helper/Model/DBIC/Schema.pm | 11 ++++++-----
.../lib/Catalyst/Model/DBIC/Schema.pm | 14 +++++++-------
.../lib/Catalyst/Model/DBIC/Schema/Types.pm | 14 +++-----------
.../lib/Catalyst/TraitFor/Model/DBIC/Schema/Caching.pm | 3 ++-
.../lib/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm | 8 +++++---
sources/Catalyst-Model-DBIC-Schema/t/08helper.t | 6 ++++--
11 files changed, 53 insertions(+), 36 deletions(-)
diff --git a/debian/control b/debian/control
index d907164..6449a91 100644
--- a/debian/control
+++ b/debian/control
@@ -45,13 +45,15 @@ Build-Depends-Indep: perl,
libjson-perl,
liblocale-maketext-lexicon-perl,
liblog-log4perl-perl,
+ libmodule-runtime-perl (>= 0.012),
libmoose-autobox-perl,
libmoose-perl (>= 1.12),
libmoosex-attribute-chained-perl,
libmoosex-emulate-class-accessor-fast-perl,
- libmoosex-markasmethods-perl,
+ libmoosex-markasmethods-perl (>= 0.13),
libmoosex-nonmoose-perl,
libmoosex-traits-pluggable-perl,
+ libmoosex-types-loadableclass-perl (>= 0.009),
libnamespace-autoclean-perl,
libobject-signature-perl,
libparams-validate-perl,
@@ -117,12 +119,14 @@ Depends: ${misc:Depends},
libjson-perl,
liblocale-maketext-lexicon-perl,
liblog-log4perl-perl,
+ libmodule-runtime-perl (>= 0.012),
libmoose-perl (>= 1.12),
libmoosex-attribute-chained-perl,
libmoosex-emulate-class-accessor-fast-perl,
- libmoosex-markasmethods-perl,
+ libmoosex-markasmethods-perl (>= 0.13),
libmoosex-nonmoose-perl,
libmoosex-traits-pluggable-perl,
+ libmoosex-types-loadableclass-perl (>= 0.009),
libnamespace-autoclean-perl,
libobject-signature-perl,
libparams-validate-perl,
diff --git a/sources/Catalyst-Model-DBIC-Schema/.gitignore b/sources/Catalyst-Model-DBIC-Schema/.gitignore
index 48f7d68..7c3c520 100644
--- a/sources/Catalyst-Model-DBIC-Schema/.gitignore
+++ b/sources/Catalyst-Model-DBIC-Schema/.gitignore
@@ -5,4 +5,10 @@ Makefile
README
blib/
inc/
-
+MANIFEST
+MANIFEST.bak
+pm_to_blib
+Catalyst-Model-DBIC-Schema-*
+*~
+.#*
+*#
diff --git a/sources/Catalyst-Model-DBIC-Schema/Changes b/sources/Catalyst-Model-DBIC-Schema/Changes
index e3b338e..1dc2bea 100644
--- a/sources/Catalyst-Model-DBIC-Schema/Changes
+++ b/sources/Catalyst-Model-DBIC-Schema/Changes
@@ -1,6 +1,14 @@
Revision history for Perl extension Catalyst::Model::DBIC::Schema
-0.61 2013-06-19 12:48:34
+0.63 2014-05-05 22:56:43
+ - Make MooseX::MarkAsMethods a hard prerequisite (RT#94923)
+ - Fix t/08helper.t with Data::Dumper >= 2.151 (RT#94599)
+
+0.62 2014-01-06 12:32:27
+ - Don't ship MYMETA.* files (RT#91808)
+ - Stop using deprecated Class::MOP::load_module
+
+0.61 2013-06-19 12:48:34
- Fix test failure caused by hash randomisation in perl 5.17 (RT#82917)
0.60 2012-06-12 16:27:00
diff --git a/sources/Catalyst-Model-DBIC-Schema/MANIFEST b/sources/Catalyst-Model-DBIC-Schema/MANIFEST
index 5c8bbb4..d40abf1 100644
--- a/sources/Catalyst-Model-DBIC-Schema/MANIFEST
+++ b/sources/Catalyst-Model-DBIC-Schema/MANIFEST
@@ -21,8 +21,6 @@ lib/Catalyst/TraitFor/Model/DBIC/Schema/SchemaProxy.pm
Makefile.PL
MANIFEST This list of files
META.yml
-MYMETA.json
-MYMETA.yml
README
t/01use.t
t/02pod.t
diff --git a/sources/Catalyst-Model-DBIC-Schema/Makefile.PL b/sources/Catalyst-Model-DBIC-Schema/Makefile.PL
index ee07a89..b635505 100644
--- a/sources/Catalyst-Model-DBIC-Schema/Makefile.PL
+++ b/sources/Catalyst-Model-DBIC-Schema/Makefile.PL
@@ -9,7 +9,10 @@ requires 'Catalyst::Runtime' => '5.80005';
requires 'CatalystX::Component::Traits' => '0.14';
requires 'Moose' => '1.12';
+requires 'MooseX::MarkAsMethods' => '0.13';
requires 'MooseX::Types';
+requires 'MooseX::Types::LoadableClass' => 0.009;
+requires 'Module::Runtime' => '0.012';
requires 'namespace::autoclean' => 0.09;
requires 'Carp::Clan';
requires 'List::MoreUtils';
@@ -17,6 +20,7 @@ requires 'Tie::IxHash';
requires 'Try::Tiny';
requires 'Catalyst::Component::InstancePerContext';
+
test_requires 'Test::More' => '0.94';
test_requires 'Test::Exception';
test_requires 'Storable';
@@ -28,7 +32,6 @@ feature 'Catalyst::Helper support',
'Catalyst::Devel' => '1.0',
'DBIx::Class::Schema::Loader' => '0.04005',
'MooseX::NonMoose' => '0.16',
- 'MooseX::MarkAsMethods' => '0.13'
;
feature 'Caching support',
diff --git a/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/Helper/Model/DBIC/Schema.pm b/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/Helper/Model/DBIC/Schema.pm
index 99fba19..f0178d0 100644
--- a/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/Helper/Model/DBIC/Schema.pm
+++ b/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/Helper/Model/DBIC/Schema.pm
@@ -4,7 +4,7 @@ use namespace::autoclean;
use Moose;
no warnings 'uninitialized';
-our $VERSION = '0.61';
+our $VERSION = '0.63';
$VERSION = eval $VERSION;
use Carp;
@@ -18,6 +18,7 @@ use Scalar::Util 'looks_like_number';
use File::Find 'finddepth';
use Try::Tiny;
use Cwd 'getcwd';
+use Module::Runtime 'use_module';
=head1 NAME
@@ -312,7 +313,7 @@ sub _read_loader_args {
}
my $have_loader = try {
- Class::MOP::load_class('DBIx::Class::Schema::Loader::Base');
+ use_module('DBIx::Class::Schema::Loader::Base');
1;
};
@@ -477,7 +478,7 @@ sub _build_result_namespace {
File::Spec->catfile($self->helper->{base}, 'lib', @schema_parts) . '.pm';
if (not -f $schema_pm) {
- eval { Class::MOP::load_class('DBIx::Class::Schema::Loader') };
+ eval { use_module('DBIx::Class::Schema::Loader') };
return 'Result' if $@;
@@ -623,7 +624,7 @@ sub _gen_static_schema {
my $schema_dir = File::Spec->catfile($helper->{base}, 'lib');
try {
- Class::MOP::load_class('DBIx::Class::Schema::Loader')
+ use_module('DBIx::Class::Schema::Loader')
}
catch {
die "Cannot load DBIx::Class::Schema::Loader: $_";
@@ -642,7 +643,7 @@ sub _gen_static_schema {
require lib;
lib->import($schema_dir);
- Class::MOP::load_class($self->schema_class);
+ use_module($self->schema_class);
my @sources = $self->schema_class->sources;
diff --git a/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema.pm b/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema.pm
index 62ab882..bafab6e 100644
--- a/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema.pm
+++ b/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema.pm
@@ -5,18 +5,20 @@ use mro 'c3';
extends 'Catalyst::Model';
with 'CatalystX::Component::Traits';
-our $VERSION = '0.61';
+our $VERSION = '0.63';
$VERSION = eval $VERSION;
use namespace::autoclean;
use Carp::Clan '^Catalyst::Model::DBIC::Schema';
use Data::Dumper;
use DBIx::Class ();
+use Module::Runtime qw/use_module/;
use Catalyst::Model::DBIC::Schema::Types
- qw/ConnectInfo LoadedClass SchemaClass Schema/;
+ qw/ConnectInfo SchemaClass Schema/;
-use MooseX::Types::Moose qw/ArrayRef Str ClassName Undef/;
+use MooseX::Types::Moose qw/Str/;
+use MooseX::Types::LoadableClass qw/LoadableClass/;
=head1 NAME
@@ -417,7 +419,6 @@ See L<DBIx::Class::Storage> and L<DBIx::Class::Storage::DBI>.
has schema_class => (
is => 'ro',
isa => SchemaClass,
- coerce => 1,
required => 1
);
@@ -434,9 +435,8 @@ has model_name => (
has _default_cursor_class => (
is => 'ro',
- isa => LoadedClass,
+ isa => LoadableClass,
default => 'DBIx::Class::Storage::DBI::Cursor',
- coerce => 1
);
has schema => (is => 'rw', isa => Schema);
@@ -467,7 +467,7 @@ sub BUILD {
}
if (exists $self->connect_info->{cursor_class}) {
- eval { Class::MOP::load_class($self->connect_info->{cursor_class}) }
+ eval { use_module($self->connect_info->{cursor_class}) }
or croak "invalid connect_info: Cannot load your cursor_class"
. " ".$self->connect_info->{cursor_class}.": $@";
}
diff --git a/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/Types.pm b/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/Types.pm
index 44aee6b..0356482 100644
--- a/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/Types.pm
+++ b/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/Model/DBIC/Schema/Types.pm
@@ -2,30 +2,22 @@ package # hide from PAUSE
Catalyst::Model::DBIC::Schema::Types;
use MooseX::Types -declare => [qw/
- ConnectInfo ConnectInfos Replicants SchemaClass LoadedClass CreateOption
+ ConnectInfo ConnectInfos Replicants SchemaClass CreateOption
Schema
/];
use Carp::Clan '^Catalyst::Model::DBIC::Schema';
use MooseX::Types::Moose qw/ArrayRef HashRef CodeRef Str ClassName/;
+use MooseX::Types::LoadableClass qw/LoadableClass/;
use Scalar::Util 'reftype';
use List::MoreUtils 'all';
use namespace::clean -except => 'meta';
-subtype LoadedClass,
- as ClassName;
-
-coerce LoadedClass,
- from Str, # N.B. deliberate paranoia against $_ clobbering below
- via { my $classname = $_; Class::MOP::load_class($classname); $classname };
-
subtype SchemaClass,
- as ClassName,
+ as LoadableClass,
where { $_->isa('DBIx::Class::Schema') };
-SchemaClass->coercion(LoadedClass->coercion);
-
class_type Schema, { class => 'DBIx::Class::Schema' };
subtype ConnectInfo,
diff --git a/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/TraitFor/Model/DBIC/Schema/Caching.pm b/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/TraitFor/Model/DBIC/Schema/Caching.pm
index e70de3f..f1d5162 100644
--- a/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/TraitFor/Model/DBIC/Schema/Caching.pm
+++ b/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/TraitFor/Model/DBIC/Schema/Caching.pm
@@ -4,6 +4,7 @@ use namespace::autoclean;
use Moose::Role;
use Carp::Clan '^Catalyst::Model::DBIC::Schema';
use MooseX::Types::Moose 'Int';
+use Module::Runtime 'use_module';
=head1 NAME
@@ -63,7 +64,7 @@ after setup => sub {
my $cursor_class = $self->connect_info->{cursor_class}
|| 'DBIx::Class::Cursor::Cached';
- unless (eval { Class::MOP::load_class($cursor_class) }) {
+ unless (eval { use_module($cursor_class) }) {
carp "Caching disabled, cannot load cursor class"
. " $cursor_class: $@";
return;
diff --git a/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm b/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm
index 73317d8..a978d1d 100644
--- a/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm
+++ b/sources/Catalyst-Model-DBIC-Schema/lib/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm
@@ -4,9 +4,11 @@ use namespace::autoclean;
use Moose::Role;
use Carp::Clan '^Catalyst::Model::DBIC::Schema';
-use Catalyst::Model::DBIC::Schema::Types qw/ConnectInfos LoadedClass/;
+use Catalyst::Model::DBIC::Schema::Types qw/ConnectInfos LoadableClass/;
use MooseX::Types::Moose qw/Str HashRef/;
+use Module::Runtime qw/use_module/;
+
=head1 NAME
Catalyst::TraitFor::Model::DBIC::Schema::Replicated - Replicated storage support for
@@ -74,7 +76,7 @@ has replicants => (
is => 'ro', isa => ConnectInfos, coerce => 1, required => 1
);
-has pool_type => (is => 'ro', isa => LoadedClass);
+has pool_type => (is => 'ro', isa => LoadableClass);
has pool_args => (is => 'ro', isa => HashRef);
has balancer_type => (is => 'ro', isa => Str);
has balancer_args => (is => 'ro', isa => HashRef);
@@ -88,7 +90,7 @@ after setup => sub {
"DBIx::Class::Storage$storage_type"
: $storage_type;
- Class::MOP::load_class($class);
+ use_module($class);
croak "This storage_type cannot be used with replication"
unless $class->isa('DBIx::Class::Storage::DBI::Replicated');
diff --git a/sources/Catalyst-Model-DBIC-Schema/t/08helper.t b/sources/Catalyst-Model-DBIC-Schema/t/08helper.t
index 09ae5eb..0a08aae 100644
--- a/sources/Catalyst-Model-DBIC-Schema/t/08helper.t
+++ b/sources/Catalyst-Model-DBIC-Schema/t/08helper.t
@@ -8,6 +8,7 @@ use Test::More;
use Test::Exception;
use Catalyst::Helper::Model::DBIC::Schema;
use Storable 'dclone';
+use Data::Dumper;
use Test::Requires qw(Catalyst::Helper DBIx::Class::Schema::Loader);
my $helper = Catalyst::Helper->new;
@@ -72,12 +73,13 @@ $i = instance(args => [$static, q{components=TimeStamp,Foo}]);
is_deeply $i->components, ['InflateColumn::DateTime', 'TimeStamp', 'Foo'],
'two extra components';
-my $flags = qr// =~ /\^/ ? '^' : "-xism";
+# Different versions of perl and Data::Dumper serialise regexes differently
+my ($flagstart, $flagend, $postflag) = Dumper(qr//) =~ m{qr/(.*?)(\)?)/([a-z]*)};
$i = instance(args => [$static, q{constraint=^(foo|bar)$}]);
is $i->loader_args->{constraint}, qr/^(foo|bar)$/,
'constraint loader arg';
is $i->helper->{loader_args}{constraint},
- qq{qr/(?$flags:^(foo|bar)\$)/},
+ qq{qr/$flagstart^(foo|bar)\$$flagend/$postflag},
'constraint loader arg as string';
$i = instance(args => [$static, q{exclude=^(foo|bar)$}]);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcatalyst-modules-perl.git
More information about the Pkg-perl-cvs-commits
mailing list