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

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2010-12-09 21:15:56 +0000 (Thu, 09 Dec 2010)
New Revision: 13831

Modified:
   Catalyst-Model-DBIC-Schema/trunk/Changes
   Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Helper/Model/DBIC/Schema.pm
   Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Model/DBIC/Schema.pm
Log:
release 0.48

Modified: Catalyst-Model-DBIC-Schema/trunk/Changes
===================================================================
--- Catalyst-Model-DBIC-Schema/trunk/Changes	2010-12-09 21:06:51 UTC (rev 13830)
+++ Catalyst-Model-DBIC-Schema/trunk/Changes	2010-12-09 21:15:56 UTC (rev 13831)
@@ -1,5 +1,6 @@
 Revision history for Perl extension Catalyst::Model::DBIC::Schema
 
+0.48  Thu Dec  9 21:08:33 UTC 2010
         - fix usage of Try::Tiny in helper
 
 0.47  Wed Dec  8 22:21:06 UTC 2010

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	2010-12-09 21:06:51 UTC (rev 13830)
+++ Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Helper/Model/DBIC/Schema.pm	2010-12-09 21:15:56 UTC (rev 13831)
@@ -4,7 +4,7 @@
 use Moose;
 no warnings 'uninitialized';
 
-our $VERSION = '0.47';
+our $VERSION = '0.48';
 $VERSION = eval $VERSION;
 
 use Carp;
@@ -452,16 +452,11 @@
 
     my ($result_namespace) = $code =~ /result_namespace => '([^']+)'/;
 
-    if (not $result_namespace) {
-        if ($code =~ /->load_classes/) {
-            $result_namespace = '';
-        }
-        else {
-            $result_namespace = 'Result';
-        }
-    }
+    return $result_namespace if $result_namespace;
 
-    return $result_namespace;
+    return '' if $code =~ /->load_classes/;
+
+    return 'Result';
 }
 
 sub _data_struct_to_string {

Modified: Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Model/DBIC/Schema.pm
===================================================================
--- Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Model/DBIC/Schema.pm	2010-12-09 21:06:51 UTC (rev 13830)
+++ Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Model/DBIC/Schema.pm	2010-12-09 21:15:56 UTC (rev 13831)
@@ -5,7 +5,7 @@
 extends 'Catalyst::Model';
 with 'CatalystX::Component::Traits';
 
-our $VERSION = '0.47';
+our $VERSION = '0.48';
 $VERSION = eval $VERSION;
 
 use namespace::autoclean;