[Catalyst-commits] r11245 - in Catalyst-Model-DBIC-Schema/trunk: . lib/Catalyst/Helper/Model/DBIC lib/Catalyst/Model/DBIC lib/Catalyst/TraitFor/Model/DBIC/Schema

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2009-08-26 13:15:50 +0000 (Wed, 26 Aug 2009)
New Revision: 11245

Modified:
   Catalyst-Model-DBIC-Schema/trunk/Changes
   Catalyst-Model-DBIC-Schema/trunk/Makefile.PL
   Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Helper/Model/DBIC/Schema.pm
   Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Model/DBIC/Schema.pm
   Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm
Log:
remove autobox, release

Modified: Catalyst-Model-DBIC-Schema/trunk/Changes
===================================================================
--- Catalyst-Model-DBIC-Schema/trunk/Changes	2009-08-26 10:24:05 UTC (rev 11244)
+++ Catalyst-Model-DBIC-Schema/trunk/Changes	2009-08-26 13:15:50 UTC (rev 11245)
@@ -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

Modified: Catalyst-Model-DBIC-Schema/trunk/Makefile.PL
===================================================================
--- Catalyst-Model-DBIC-Schema/trunk/Makefile.PL	2009-08-26 10:24:05 UTC (rev 11244)
+++ Catalyst-Model-DBIC-Schema/trunk/Makefile.PL	2009-08-26 13:15:50 UTC (rev 11245)
@@ -5,7 +5,7 @@
 
 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.

Modified: Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Helper/Model/DBIC/Schema.pm
===================================================================
--- Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Helper/Model/DBIC/Schema.pm	2009-08-26 10:24:05 UTC (rev 11244)
+++ Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Helper/Model/DBIC/Schema.pm	2009-08-26 13:15:50 UTC (rev 11245)
@@ -4,7 +4,8 @@
 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 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 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 @@
         $self->traits(\@traits);
 
         $helper->{traits} = '['
-            .(join ',' => map { qq{'$_'} } ($self->traits->flatten))
+            .(join ',' => map { qq{'$_'} } @traits)
             .']';
 
         splice @args, $traits_idx, 1, ();

Modified: Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Model/DBIC/Schema.pm
===================================================================
--- Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Model/DBIC/Schema.pm	2009-08-26 10:24:05 UTC (rev 11244)
+++ Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Model/DBIC/Schema.pm	2009-08-26 13:15:50 UTC (rev 11245)
@@ -5,13 +5,13 @@
 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/;

Modified: Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm
===================================================================
--- Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm	2009-08-26 10:24:05 UTC (rev 11244)
+++ Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/TraitFor/Model/DBIC/Schema/Replicated.pm	2009-08-26 13:15:50 UTC (rev 11245)
@@ -2,7 +2,6 @@
 
 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 @@
 after BUILD => sub {
     my $self = shift;
 
-    $self->storage->connect_replicants(map [ $_ ], $self->replicants->flatten);
+    $self->storage->connect_replicants(map [ $_ ], @{ $self->replicants });
 };
 
 =head1 SEE ALSO