From: Rafael Kitover Date: Wed, 26 Aug 2009 13:15:50 +0000 (+0000) Subject: remove autobox, release X-Git-Tag: v0.27^0 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Model-DBIC-Schema.git;a=commitdiff_plain;h=7dfd616a3bf5e7552ef2544eec096167c6e4308b remove autobox, release --- diff --git a/Changes b/Changes index d591272..a0a4c90 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ Revision history for Perl extension Catalyst::Model::DBIC::Schema - - make schema a delegate for model (caelum) +0.27 Wed Aug 26 09:09:44 EDT 2009 + - remove autobox usage due to reports of strange errors (caelum) + - make schema a delegate for model, config too (caelum) 0.26 Wed Jul 29 16:16:09 PDT 2009 - fix loading connect_info from schema-defined connection diff --git a/Makefile.PL b/Makefile.PL index 1d3cc6d..078482d 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -5,7 +5,7 @@ all_from 'lib/Catalyst/Model/DBIC/Schema.pm'; requires 'DBIx::Class' => '0.08107'; requires 'Catalyst::Runtime' => '5.80005'; -requires 'CatalystX::Component::Traits' => '0.03'; +requires 'CatalystX::Component::Traits' => '0.09'; # XXX remove this once the dep in DBIC is updated, needed for schema # introspection to work. diff --git a/lib/Catalyst/Helper/Model/DBIC/Schema.pm b/lib/Catalyst/Helper/Model/DBIC/Schema.pm index 026e6f4..eac33c4 100644 --- a/lib/Catalyst/Helper/Model/DBIC/Schema.pm +++ b/lib/Catalyst/Helper/Model/DBIC/Schema.pm @@ -4,7 +4,8 @@ use namespace::autoclean; use Moose; no warnings 'uninitialized'; -our $VERSION = '0.26'; +our $VERSION = '0.27'; +$VERSION = eval $VERSION; use Carp; use Tie::IxHash (); @@ -12,7 +13,6 @@ use Data::Dumper (); use List::Util 'first'; use MooseX::Types::Moose qw/Str HashRef Bool ArrayRef/; use Catalyst::Model::DBIC::Schema::Types 'CreateOption'; -use Moose::Autobox; use List::MoreUtils 'firstidx'; use Scalar::Util 'looks_like_number'; @@ -161,7 +161,7 @@ sub mk_compclass { sub BUILD { my $self = shift; my $helper = $self->helper; - my @args = $self->args->flatten if $self->args; + my @args = @{ $self->args || [] }; $helper->{schema_class} = $self->schema_class; @@ -174,7 +174,7 @@ sub BUILD { $self->traits(\@traits); $helper->{traits} = '[' - .(join ',' => map { qq{'$_'} } ($self->traits->flatten)) + .(join ',' => map { qq{'$_'} } @traits) .']'; splice @args, $traits_idx, 1, (); diff --git a/lib/Catalyst/Model/DBIC/Schema.pm b/lib/Catalyst/Model/DBIC/Schema.pm index 0a6799a..d419353 100644 --- a/lib/Catalyst/Model/DBIC/Schema.pm +++ b/lib/Catalyst/Model/DBIC/Schema.pm @@ -5,13 +5,13 @@ use mro 'c3'; extends 'Catalyst::Model'; with 'CatalystX::Component::Traits'; -our $VERSION = '0.26'; +our $VERSION = '0.27'; +$VERSION = eval $VERSION; use namespace::autoclean; use Carp::Clan '^Catalyst::Model::DBIC::Schema'; use Data::Dumper; use DBIx::Class (); -use Moose::Autobox; use Catalyst::Model::DBIC::Schema::Types qw/ConnectInfo LoadedClass/; diff --git a/lib/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm b/lib/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm index e62250a..3984ad3 100644 --- a/lib/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm +++ b/lib/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm @@ -2,7 +2,6 @@ package Catalyst::TraitFor::Model::DBIC::Schema::Replicated; use namespace::autoclean; use Moose::Role; -use Moose::Autobox; use Carp::Clan '^Catalyst::Model::DBIC::Schema'; use Catalyst::Model::DBIC::Schema::Types qw/ConnectInfos LoadedClass/; @@ -118,7 +117,7 @@ sub BUILD {} after BUILD => sub { my $self = shift; - $self->storage->connect_replicants(map [ $_ ], $self->replicants->flatten); + $self->storage->connect_replicants(map [ $_ ], @{ $self->replicants }); }; =head1 SEE ALSO