[Catalyst-commits] r12646 - in Catalyst-Controller-DBIC-API: . 1.004/trunk 1.004/trunk/lib/Catalyst/Controller/DBIC 1.004/trunk/lib/Catalyst/Controller/DBIC/API

nperez at dev.catalyst.perl.org nperez at dev.catalyst.perl.org
Thu Jan 14 10:01:19 GMT 2010 

Author: nperez
Date: 2010-01-14 10:01:19 +0000 (Thu, 14 Jan 2010)
New Revision: 12646

Modified:
   Catalyst-Controller-DBIC-API/
   Catalyst-Controller-DBIC-API/1.004/trunk/Changes
   Catalyst-Controller-DBIC-API/1.004/trunk/Makefile.PL
   Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API.pm
   Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Base.pm
   Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/REST.pm
   Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RPC.pm
   Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Request.pm
   Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm
   Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StaticArguments.pm
   Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StoredResultSource.pm
   Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Types.pm
   Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Validator.pm
Log:
 r5313 at nicklaptop:  nicholas | 2010-01-14 03:59:27 -0600
 Update Changes. Update VERSION. One quick bug fix for update/create. Prep for release



Property changes on: Catalyst-Controller-DBIC-API
___________________________________________________________________
Name: svk:merge
   - 992f488a-d630-404b-95f9-f7d0fdf28443:/local/dbic-api:5308
   + 992f488a-d630-404b-95f9-f7d0fdf28443:/local/dbic-api:5313

Modified: Catalyst-Controller-DBIC-API/1.004/trunk/Changes
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/Changes	2010-01-14 09:38:11 UTC (rev 12645)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/Changes	2010-01-14 10:01:19 UTC (rev 12646)
@@ -9,6 +9,7 @@
 - Moved sub object from RPC/REST to Base to DRY
   This will break your code if you subclass from REST
   and had relied on the action name 'object'
+- Check for defined objects before returning them for create/update
 
 1.004001
 - Allow for more complex prefetch_allows (multiple keys in hash)

Modified: Catalyst-Controller-DBIC-API/1.004/trunk/Makefile.PL
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/Makefile.PL	2010-01-14 09:38:11 UTC (rev 12645)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/Makefile.PL	2010-01-14 10:01:19 UTC (rev 12646)
@@ -24,6 +24,6 @@
 
 auto_install;
 
-resources repository => 'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Controller-DBIC-API/1.003/trunk/';
+resources repository => 'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Controller-DBIC-API/';
 
 WriteAll;

Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Base.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Base.pm	2010-01-14 09:38:11 UTC (rev 12645)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Base.pm	2010-01-14 10:01:19 UTC (rev 12646)
@@ -1,6 +1,6 @@
 package        # hide from PAUSE
     Catalyst::Controller::DBIC::API::Base;
-our $VERSION = '1.004001';
+our $VERSION = '1.004002';
 
 use Moose;
 
@@ -307,7 +307,7 @@
     my $empty_object = $c->stash->{$self->rs_stash_key}->new_result({});
     $c->stash->{created_object} = $self->validate_and_save_object($c, $empty_object);
     %{$c->stash->{response}->{$self->data_root}} = $c->stash->{created_object}->get_inflated_columns
-        if $self->return_object;
+        if defined($c->stash->{created_object}) && $self->return_object;
 }
 
 sub update :Private {
@@ -326,7 +326,7 @@
     my $object = $c->stash->{$self->object_stash_key};
     $object = $self->validate_and_save_object($c, $object);
     %{$c->stash->{response}->{$self->data_root}} = $object->get_inflated_columns
-        if $self->return_object;
+        if defined($object) && $self->return_object;
 
 }
 

Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/REST.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/REST.pm	2010-01-14 09:38:11 UTC (rev 12645)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/REST.pm	2010-01-14 10:01:19 UTC (rev 12646)
@@ -1,5 +1,5 @@
 package Catalyst::Controller::DBIC::API::REST;
-our $VERSION = '1.004001';
+our $VERSION = '1.004002';
 use Moose;
 BEGIN { extends 'Catalyst::Controller::DBIC::API::Base'; }
 

Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RPC.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RPC.pm	2010-01-14 09:38:11 UTC (rev 12645)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RPC.pm	2010-01-14 10:01:19 UTC (rev 12646)
@@ -1,5 +1,5 @@
 package Catalyst::Controller::DBIC::API::RPC;
-our $VERSION = '1.004001';
+our $VERSION = '1.004002';
 use Moose;
 BEGIN { extends 'Catalyst::Controller::DBIC::API::Base'; }
 

Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Request.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Request.pm	2010-01-14 09:38:11 UTC (rev 12645)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Request.pm	2010-01-14 10:01:19 UTC (rev 12646)
@@ -1,5 +1,5 @@
 package Catalyst::Controller::DBIC::API::Request;
-our $VERSION = '1.004001';
+our $VERSION = '1.004002';
 use Moose::Role;
 use MooseX::Aliases;
 use MooseX::Types::Moose('Object');

Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm	2010-01-14 09:38:11 UTC (rev 12645)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/RequestArguments.pm	2010-01-14 10:01:19 UTC (rev 12646)
@@ -1,5 +1,5 @@
 package Catalyst::Controller::DBIC::API::RequestArguments;
-our $VERSION = '1.004001';
+our $VERSION = '1.004002';
 use MooseX::Role::Parameterized;
 use Catalyst::Controller::DBIC::API::Types(':all');
 use MooseX::Types::Moose(':all');

Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StaticArguments.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StaticArguments.pm	2010-01-14 09:38:11 UTC (rev 12645)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StaticArguments.pm	2010-01-14 10:01:19 UTC (rev 12646)
@@ -1,5 +1,5 @@
 package Catalyst::Controller::DBIC::API::StaticArguments;
-our $VERSION = '1.004001';
+our $VERSION = '1.004002';
 use Moose::Role;
 use MooseX::Types::Moose(':all');
 use namespace::autoclean;

Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StoredResultSource.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StoredResultSource.pm	2010-01-14 09:38:11 UTC (rev 12645)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/StoredResultSource.pm	2010-01-14 10:01:19 UTC (rev 12646)
@@ -1,5 +1,5 @@
 package Catalyst::Controller::DBIC::API::StoredResultSource;
-our $VERSION = '1.004001';
+our $VERSION = '1.004002';
 use Moose::Role;
 use Moose::Util::TypeConstraints;
 use MooseX::Types::Moose(':all');

Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Types.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Types.pm	2010-01-14 09:38:11 UTC (rev 12645)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Types.pm	2010-01-14 10:01:19 UTC (rev 12646)
@@ -1,5 +1,5 @@
 package Catalyst::Controller::DBIC::API::Types;
-our $VERSION = '1.004001';
+our $VERSION = '1.004002';
 
 use warnings;
 use strict;

Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Validator.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Validator.pm	2010-01-14 09:38:11 UTC (rev 12645)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API/Validator.pm	2010-01-14 10:01:19 UTC (rev 12646)
@@ -1,5 +1,5 @@
 package Catalyst::Controller::DBIC::API::Visitor;
-our $VERSION = '1.004001';
+our $VERSION = '1.004002';
 use Moose;
 use namespace::autoclean;
 
@@ -93,7 +93,7 @@
 Catalyst::Controller::DBIC::API::Visitor->meta->make_immutable;
 
 package Catalyst::Controller::DBIC::API::Validator;
-our $VERSION = '1.004001';
+our $VERSION = '1.004002';
 use Moose;
 use namespace::autoclean;
 

Modified: Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API.pm
===================================================================
--- Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API.pm	2010-01-14 09:38:11 UTC (rev 12645)
+++ Catalyst-Controller-DBIC-API/1.004/trunk/lib/Catalyst/Controller/DBIC/API.pm	2010-01-14 10:01:19 UTC (rev 12646)
@@ -9,7 +9,7 @@
 
 =cut
 
-our $VERSION = '1.004001';
+our $VERSION = '1.004002';
 
 =head1 NAME

More information about the Catalyst-commits mailing list