r63228 - in /trunk/libcatalyst-perl: ./ debian/ lib/ lib/Catalyst/ t/aggregate/ t/lib/ t/lib/TestApp/Controller/ t/lib/TestAppViewWarnings/

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Sun Oct 3 17:47:43 UTC 2010 

Author: jawnsy-guest
Date: Sun Oct  3 17:47:33 2010
New Revision: 63228

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=63228
Log:
* New upstream release
  + Fixes warnings with Moose >= 1.15

Added:
    trunk/libcatalyst-perl/t/aggregate/live_view_warnings.t
      - copied unchanged from r63227, branches/upstream/libcatalyst-perl/current/t/aggregate/live_view_warnings.t
    trunk/libcatalyst-perl/t/lib/TestAppViewWarnings/
      - copied from r63227, branches/upstream/libcatalyst-perl/current/t/lib/TestAppViewWarnings/
    trunk/libcatalyst-perl/t/lib/TestAppViewWarnings.pm
      - copied unchanged from r63227, branches/upstream/libcatalyst-perl/current/t/lib/TestAppViewWarnings.pm
Modified:
    trunk/libcatalyst-perl/Changes
    trunk/libcatalyst-perl/MANIFEST
    trunk/libcatalyst-perl/META.yml
    trunk/libcatalyst-perl/debian/changelog
    trunk/libcatalyst-perl/lib/Catalyst.pm
    trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm
    trunk/libcatalyst-perl/t/aggregate/unit_core_setup.t
    trunk/libcatalyst-perl/t/aggregate/unit_core_setup_stats.t
    trunk/libcatalyst-perl/t/lib/TestApp/Controller/Anon.pm

Modified: trunk/libcatalyst-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/Changes?rev=63228&op=diff
==============================================================================
--- trunk/libcatalyst-perl/Changes (original)
+++ trunk/libcatalyst-perl/Changes Sun Oct  3 17:47:33 2010
@@ -1,4 +1,15 @@
 # This file documents the revision history for Perl extension Catalyst.
+
+5.80029 2010-10-03 16:39:00
+
+ New features:
+  - Add a warning when $c->view is called and cannot locate a default_view
+    or current_view. This clarifies the logging when ::RenderView gets
+    confused.
+
+ Warning fixes:
+  - Deal warning in with Moose >= 1.15 if you add a method called 'meta' to a
+    class which already has one by using _add_meta_method.
 
 5.80028 2010-09-28 20:49:00
 

Modified: trunk/libcatalyst-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/MANIFEST?rev=63228&op=diff
==============================================================================
--- trunk/libcatalyst-perl/MANIFEST (original)
+++ trunk/libcatalyst-perl/MANIFEST Sun Oct  3 17:47:33 2010
@@ -125,6 +125,7 @@
 t/aggregate/live_plugin_loaded.t
 t/aggregate/live_priorities.t
 t/aggregate/live_recursion.t
+t/aggregate/live_view_warnings.t
 t/aggregate/meta_method_unneeded.t
 t/aggregate/unit_controller_actions.t
 t/aggregate/unit_controller_config.t
@@ -334,6 +335,8 @@
 t/lib/TestAppStats/Controller/Root.pm
 t/lib/TestAppToTestScripts.pm
 t/lib/TestAppUnknownError.pm
+t/lib/TestAppViewWarnings.pm
+t/lib/TestAppViewWarnings/Controller/Root.pm
 t/lib/TestAppWithMeta.pm
 t/lib/TestAppWithMeta/Controller/Root.pm
 t/lib/TestPluginWithConstructor.pm

Modified: trunk/libcatalyst-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/META.yml?rev=63228&op=diff
==============================================================================
--- trunk/libcatalyst-perl/META.yml (original)
+++ trunk/libcatalyst-perl/META.yml Sun Oct  3 17:47:33 2010
@@ -69,4 +69,4 @@
   homepage: http://dev.catalyst.perl.org/
   license: http://dev.perl.org/licenses/
   repository: http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/
-version: 5.80028
+version: 5.80029

Modified: trunk/libcatalyst-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/debian/changelog?rev=63228&op=diff
==============================================================================
--- trunk/libcatalyst-perl/debian/changelog (original)
+++ trunk/libcatalyst-perl/debian/changelog Sun Oct  3 17:47:33 2010
@@ -1,3 +1,10 @@
+libcatalyst-perl (5.80029-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    + Fixes warnings with Moose >= 1.15
+
+ -- Jonathan Yu <jawnsy at cpan.org>  Sun, 03 Oct 2010 13:57:10 -0400
+
 libcatalyst-perl (5.80028-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libcatalyst-perl/lib/Catalyst.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/lib/Catalyst.pm?rev=63228&op=diff
==============================================================================
--- trunk/libcatalyst-perl/lib/Catalyst.pm (original)
+++ trunk/libcatalyst-perl/lib/Catalyst.pm Sun Oct  3 17:47:33 2010
@@ -79,7 +79,7 @@
 
 # Remember to update this in Catalyst::Runtime as well!
 
-our $VERSION = '5.80028';
+our $VERSION = '5.80029';
 
 sub import {
     my ( $class, @arguments ) = @_;
@@ -100,7 +100,12 @@
     $meta->superclasses(grep { $_ ne 'Moose::Object' } $meta->superclasses);
 
     unless( $meta->has_method('meta') ){
-        $meta->add_method(meta => sub { Moose::Meta::Class->initialize("${caller}") } );
+        if ($Moose::VERSION >= 1.15) {
+            $meta->_add_meta_method('meta');
+        }
+        else {
+            $meta->add_method(meta => sub { Moose::Meta::Class->initialize("${caller}") } );
+        }
     }
 
     $caller->arguments( [@arguments] );
@@ -745,7 +750,12 @@
         unless ( ref($name) ) { # Direct component hash lookup to avoid costly regexps
             my $comps = $c->components;
             my $check = $appclass."::View::".$name;
-            return $c->_filter_component( $comps->{$check}, @args ) if exists $comps->{$check};
+            if( exists $comps->{$check} ) {
+                return $c->_filter_component( $comps->{$check}, @args );
+            }
+            else {
+                $c->log->warn( "Attempted to use view '$check', but does not exist" );
+            }
         }
         my @result = $c->_comp_search_prefixes( $name, qw/View V/ );
         return map { $c->_filter_component( $_, @args ) } @result if ref $name;

Modified: trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm?rev=63228&op=diff
==============================================================================
--- trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm (original)
+++ trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm Sun Oct  3 17:47:33 2010
@@ -7,7 +7,7 @@
 
 # Remember to update this in Catalyst as well!
 
-our $VERSION = '5.80028';
+our $VERSION = '5.80029';
 
 =head1 NAME
 

Modified: trunk/libcatalyst-perl/t/aggregate/unit_core_setup.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/t/aggregate/unit_core_setup.t?rev=63228&op=diff
==============================================================================
--- trunk/libcatalyst-perl/t/aggregate/unit_core_setup.t (original)
+++ trunk/libcatalyst-perl/t/aggregate/unit_core_setup.t Sun Oct  3 17:47:33 2010
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Class::MOP::Class;
+use Class::MOP;
 use Catalyst::Runtime;
 
 use Test::More tests => 29;

Modified: trunk/libcatalyst-perl/t/aggregate/unit_core_setup_stats.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/t/aggregate/unit_core_setup_stats.t?rev=63228&op=diff
==============================================================================
--- trunk/libcatalyst-perl/t/aggregate/unit_core_setup_stats.t (original)
+++ trunk/libcatalyst-perl/t/aggregate/unit_core_setup_stats.t Sun Oct  3 17:47:33 2010
@@ -2,7 +2,7 @@
 use warnings;
 
 use Test::More tests => 5;
-use Class::MOP::Class;
+use Class::MOP;
 
 use Catalyst ();
 

Modified: trunk/libcatalyst-perl/t/lib/TestApp/Controller/Anon.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/t/lib/TestApp/Controller/Anon.pm?rev=63228&op=diff
==============================================================================
--- trunk/libcatalyst-perl/t/lib/TestApp/Controller/Anon.pm (original)
+++ trunk/libcatalyst-perl/t/lib/TestApp/Controller/Anon.pm Sun Oct  3 17:47:33 2010
@@ -25,7 +25,6 @@
     # Special move as the methodattributes trait has changed our metaclass..
     $meta = find_meta($meta->name);
 
-    $meta->add_method('meta' => sub { $meta });
     $class = $meta->name;
     $class->new($app, $args);
 }

More information about the Pkg-perl-cvs-commits mailing list