From: Alexander Hartmaier Date: Thu, 13 Jan 2011 17:20:42 +0000 (+0100) Subject: fixed failure because of Data::DPath >=0.41 by not using MooseX::Role::BuildInstanceO... X-Git-Tag: 2.002004~7 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Controller-DBIC-API.git;a=commitdiff_plain;h=28098e5de1724ed64d9908f593ec60e3ab3ebdbb fixed failure because of Data::DPath >=0.41 by not using MooseX::Role::BuildInstanceOf for the validator attributes --- diff --git a/Changes b/Changes index 26ec556..c8aca03 100644 --- a/Changes +++ b/Changes @@ -4,6 +4,8 @@ Revision history for Catalyst-Controller-DBIC-API: {{ $dist->version }} - Renamed Visitor to Validator::Visitor to conform with Data::DPath::Validator and moved it into a separate file. +- Fixed failure because of Data::DPath >=0.41 by not using + MooseX::Role::BuildInstanceOf for the validator attributes 2.002003 2010-09-16 10:44:40 Europe/Vienna diff --git a/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm b/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm index e2b2775..a6939f2 100644 --- a/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm +++ b/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm @@ -6,6 +6,7 @@ use Catalyst::Controller::DBIC::API::Types(':all'); use MooseX::Types::Moose(':all'); use Scalar::Util('reftype'); use Data::Dumper; +use Catalyst::Controller::DBIC::API::Validator; use namespace::autoclean; use Catalyst::Controller::DBIC::API::JoinBuilder; @@ -16,35 +17,28 @@ A Catalyst::Controller::DBIC::API::Validator instance used solely to validate se =cut -with 'MooseX::Role::BuildInstanceOf' => -{ - 'target' => 'Catalyst::Controller::DBIC::API::Validator', - 'prefix' => 'search_validator', -}; - =attribute_private select_validator A Catalyst::Controller::DBIC::API::Validator instance used solely to validate select parameters =cut -with 'MooseX::Role::BuildInstanceOf' => -{ - 'target' => 'Catalyst::Controller::DBIC::API::Validator', - 'prefix' => 'select_validator', -}; - =attribute_private prefetch_validator A Catalyst::Controller::DBIC::API::Validator instance used solely to validate prefetch parameters =cut -with 'MooseX::Role::BuildInstanceOf' => -{ - 'target' => 'Catalyst::Controller::DBIC::API::Validator', - 'prefix' => 'prefetch_validator', -}; +has [qw( search_validator select_validator prefetch_validator )] => ( + is => 'ro', + isa => 'Catalyst::Controller::DBIC::API::Validator', + lazy => 1, + builder => '_build_validator', +); + +sub _build_validator { + return Catalyst::Controller::DBIC::API::Validator->new; +} parameter static => ( isa => Bool, default => 0 );