[Catalyst-commits] r8581 - in CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk: . lib/CatalystX/CRUD/Model lib/CatalystX/CRUD/Object t/lib/MyApp/Model

[karpet at dev.catalyst.perl.org]

Author: karpet
Date: 2008-11-07 19:48:28 +0000 (Fri, 07 Nov 2008)
New Revision: 8581

Modified:
   CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes
   CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Model/RDBO.pm
   CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Object/RDBO.pm
   CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/t/lib/MyApp/Model/Foo.pm
Log:
release 0.15

Modified: CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes
===================================================================
--- CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes	2008-11-04 21:34:01 UTC (rev 8580)
+++ CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/Changes	2008-11-07 19:48:28 UTC (rev 8581)
@@ -53,4 +53,6 @@
         * fix query for _related methods.
         * update tests to support new make_sql_query() format in core API
 
+0.15    7 Nov 2008
+        * (finally) fix load_with to be a real ro_accessor and only used in _get_objects()
 

Modified: CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Model/RDBO.pm
===================================================================
--- CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Model/RDBO.pm	2008-11-04 21:34:01 UTC (rev 8580)
+++ CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Model/RDBO.pm	2008-11-07 19:48:28 UTC (rev 8581)
@@ -7,9 +7,9 @@
 use Carp;
 use Data::Dump qw( dump );
 
-our $VERSION = '0.14';
+our $VERSION = '0.15';
 
-__PACKAGE__->mk_ro_accessors(qw( name manager treat_like_int ));
+__PACKAGE__->mk_ro_accessors(qw( name manager treat_like_int load_with ));
 __PACKAGE__->config( object_class => 'CatalystX::CRUD::Object::RDBO' );
 
 =head1 NAME
@@ -173,9 +173,6 @@
         my $ret;
         my $name = $self->name;
         my @arg  = ();
-        if ( $self->config->{load_with} ) {
-            push( @arg, with => $self->config->{load_with} );
-        }
         eval { $ret = $obj->read(@arg); };
         if ( $@ or !$ret ) {
             return
@@ -497,9 +494,9 @@
 
     push(
         @params,
-        with_objects  => $self->config->{load_with},
+        with_objects  => $self->load_with,
         multi_many_ok => 1
-    ) if $self->config->{load_with};
+    ) if $self->load_with;
 
     return $manager->$method(@params);
 }

Modified: CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Object/RDBO.pm
===================================================================
--- CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Object/RDBO.pm	2008-11-04 21:34:01 UTC (rev 8580)
+++ CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/lib/CatalystX/CRUD/Object/RDBO.pm	2008-11-07 19:48:28 UTC (rev 8581)
@@ -3,7 +3,7 @@
 use warnings;
 use base qw( CatalystX::CRUD::Object );
 
-our $VERSION = '0.14';
+our $VERSION = '0.15';
 
 =head1 NAME
 

Modified: CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/t/lib/MyApp/Model/Foo.pm
===================================================================
--- CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/t/lib/MyApp/Model/Foo.pm	2008-11-04 21:34:01 UTC (rev 8580)
+++ CatalystX-CRUD/CatalystX-CRUD-Model-RDBO/trunk/t/lib/MyApp/Model/Foo.pm	2008-11-07 19:48:28 UTC (rev 8581)
@@ -1,6 +1,9 @@
 package MyApp::Model::Foo;
 use base qw( CatalystX::CRUD::Model::RDBO );
-__PACKAGE__->config->{object_class} = 'MyApp::Object';
-__PACKAGE__->config->{name}         = 'My::Foo';
+__PACKAGE__->config(
+    object_class => 'MyApp::Object',
+    name         => My::Foo,
+    load_with    => [qw( bar bars )]
+);
 
 1;