r69024 - in /branches/upstream/libcatalyst-perl/current: ./ inc/Module/ inc/Module/Install/ lib/ lib/Catalyst/ lib/Catalyst/Engine/ t/aggregate/ t/lib/TestApp/Controller/Action/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sat Feb 19 00:59:55 UTC 2011
Author: jawnsy-guest
Date: Sat Feb 19 00:59:44 2011
New Revision: 69024
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=69024
Log:
[svn-upgrade] new version libcatalyst-perl (5.80031)
Modified:
branches/upstream/libcatalyst-perl/current/Changes
branches/upstream/libcatalyst-perl/current/META.yml
branches/upstream/libcatalyst-perl/current/Makefile.PL
branches/upstream/libcatalyst-perl/current/inc/Module/Install.pm
branches/upstream/libcatalyst-perl/current/inc/Module/Install/AutoInstall.pm
branches/upstream/libcatalyst-perl/current/inc/Module/Install/Base.pm
branches/upstream/libcatalyst-perl/current/inc/Module/Install/Can.pm
branches/upstream/libcatalyst-perl/current/inc/Module/Install/CheckConflicts.pm
branches/upstream/libcatalyst-perl/current/inc/Module/Install/Fetch.pm
branches/upstream/libcatalyst-perl/current/inc/Module/Install/Include.pm
branches/upstream/libcatalyst-perl/current/inc/Module/Install/Makefile.pm
branches/upstream/libcatalyst-perl/current/inc/Module/Install/Metadata.pm
branches/upstream/libcatalyst-perl/current/inc/Module/Install/Scripts.pm
branches/upstream/libcatalyst-perl/current/inc/Module/Install/Win32.pm
branches/upstream/libcatalyst-perl/current/inc/Module/Install/WriteAll.pm
branches/upstream/libcatalyst-perl/current/lib/Catalyst.pm
branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/FastCGI.pm
branches/upstream/libcatalyst-perl/current/lib/Catalyst/Runtime.pm
branches/upstream/libcatalyst-perl/current/t/aggregate/live_component_controller_action_chained.t
branches/upstream/libcatalyst-perl/current/t/lib/TestApp/Controller/Action/Chained.pm
Modified: branches/upstream/libcatalyst-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/Changes?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/Changes (original)
+++ branches/upstream/libcatalyst-perl/current/Changes Sat Feb 19 00:59:44 2011
@@ -1,4 +1,16 @@
# This file documents the revision history for Perl extension Catalyst.
+
+5.80031 2011-01-31 08:13:02
+
+ Bug fixes:
+ - Update dependency on MooseX::Role::WithOverloading to ensure that
+ a version which can deal with / depends on a new Package::Stash
+ is installed. (As if some other dependency is pulled in during upgrading
+ which results in new Package::Stash, then it can leave you with a broken
+ version of MooseX::Role::WithOverloading.
+
+ - Fix undef warning in Catalyst::Engine::FastCGI when writing an empty
+ body (e.g. doing a redirect)
5.80030 2011-01-04 13:13:02
Modified: branches/upstream/libcatalyst-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/META.yml?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/META.yml (original)
+++ branches/upstream/libcatalyst-perl/current/META.yml Sat Feb 19 00:59:44 2011
@@ -10,7 +10,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 1.00'
+generated_by: 'Module::Install version 0.99'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -25,6 +25,7 @@
CGI::Simple::Cookie: 1.109
Carp: 0
Class::C3::Adopt::NEXT: 0.07
+ Class::Data::Inheritable: 0
Class::MOP: 0.95
Data::Dump: 0
Data::OptList: 0
@@ -43,7 +44,7 @@
MooseX::Emulate::Class::Accessor::Fast: 0.00903
MooseX::Getopt: 0.30
MooseX::MethodAttributes::Inheritable: 0.24
- MooseX::Role::WithOverloading: 0.05
+ MooseX::Role::WithOverloading: 0.09
MooseX::Types: 0
MooseX::Types::Common::Numeric: 0
Path::Class: 0.09
@@ -51,6 +52,8 @@
String::RewritePrefix: 0.004
Sub::Exporter: 0
Task::Weaken: 0
+ Test::Exception: 0
+ Test::More: 0.88
Text::Balanced: 0
Text::SimpleTable: 0.03
Time::HiRes: 0
@@ -66,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.80030
+version: 5.80031
Modified: branches/upstream/libcatalyst-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/Makefile.PL?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/Makefile.PL (original)
+++ branches/upstream/libcatalyst-perl/current/Makefile.PL Sat Feb 19 00:59:44 2011
@@ -21,7 +21,7 @@
requires 'Class::MOP' => '0.95';
requires 'Moose' => '1.03';
requires 'MooseX::MethodAttributes::Inheritable' => '0.24';
-requires 'MooseX::Role::WithOverloading' => '0.05';
+requires 'MooseX::Role::WithOverloading' => '0.09';
requires 'Carp';
requires 'Class::C3::Adopt::NEXT' => '0.07';
requires 'CGI::Simple::Cookie' => '1.109';
Modified: branches/upstream/libcatalyst-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/inc/Module/Install.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libcatalyst-perl/current/inc/Module/Install.pm Sat Feb 19 00:59:44 2011
@@ -31,7 +31,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '1.00';
+ $VERSION = '0.99';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -230,12 +230,8 @@
sub new {
my ($class, %args) = @_;
- delete $INC{'FindBin.pm'};
- {
- # to suppress the redefine warning
- local $SIG{__WARN__} = sub {};
- require FindBin;
- }
+ delete $INC{'FindBin.pm'};
+ require FindBin;
# ignore the prefix on extension modules built from top level.
my $base_path = Cwd::abs_path($FindBin::Bin);
Modified: branches/upstream/libcatalyst-perl/current/inc/Module/Install/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/inc/Module/Install/AutoInstall.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/inc/Module/Install/AutoInstall.pm (original)
+++ branches/upstream/libcatalyst-perl/current/inc/Module/Install/AutoInstall.pm Sat Feb 19 00:59:44 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -48,14 +48,6 @@
while (my ($mod, $ver) = splice(@requires, 0, 2)) {
$seen{$mod}{$ver}++;
}
- my @build_requires = map @$_, map @$_, grep ref, $self->build_requires;
- while (my ($mod, $ver) = splice(@build_requires, 0, 2)) {
- $seen{$mod}{$ver}++;
- }
- my @configure_requires = map @$_, map @$_, grep ref, $self->configure_requires;
- while (my ($mod, $ver) = splice(@configure_requires, 0, 2)) {
- $seen{$mod}{$ver}++;
- }
my @deduped;
while (my ($mod, $ver) = splice(@features_require, 0, 2)) {
Modified: branches/upstream/libcatalyst-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/inc/Module/Install/Base.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libcatalyst-perl/current/inc/Module/Install/Base.pm Sat Feb 19 00:59:44 2011
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
}
# Suspend handler for "redefined" warnings
Modified: branches/upstream/libcatalyst-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/inc/Module/Install/Can.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libcatalyst-perl/current/inc/Module/Install/Can.pm Sat Feb 19 00:59:44 2011
@@ -9,7 +9,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: branches/upstream/libcatalyst-perl/current/inc/Module/Install/CheckConflicts.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/inc/Module/Install/CheckConflicts.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/inc/Module/Install/CheckConflicts.pm (original)
+++ branches/upstream/libcatalyst-perl/current/inc/Module/Install/CheckConflicts.pm Sat Feb 19 00:59:44 2011
@@ -12,8 +12,10 @@
}
sub check_conflicts {
- my ($self, %conflicts) = @_;
-
+ my $self = shift;
+ # Deal with the fact that prompt_script calls us with just the script
+ # name by totally ignoring it. HACK!
+ my %conflicts = @_ unless scalar(@_) == 1;
my %conflicts_found;
for my $mod (sort keys %conflicts) {
next unless $self->can_use($mod);
@@ -62,4 +64,4 @@
__END__
-#line 122
+#line 124
Modified: branches/upstream/libcatalyst-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/inc/Module/Install/Fetch.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libcatalyst-perl/current/inc/Module/Install/Fetch.pm Sat Feb 19 00:59:44 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: branches/upstream/libcatalyst-perl/current/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/inc/Module/Install/Include.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/inc/Module/Install/Include.pm (original)
+++ branches/upstream/libcatalyst-perl/current/inc/Module/Install/Include.pm Sat Feb 19 00:59:44 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: branches/upstream/libcatalyst-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/inc/Module/Install/Makefile.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libcatalyst-perl/current/inc/Module/Install/Makefile.pm Sat Feb 19 00:59:44 2011
@@ -8,7 +8,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: branches/upstream/libcatalyst-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/inc/Module/Install/Metadata.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libcatalyst-perl/current/inc/Module/Install/Metadata.pm Sat Feb 19 00:59:44 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: branches/upstream/libcatalyst-perl/current/inc/Module/Install/Scripts.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/inc/Module/Install/Scripts.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/inc/Module/Install/Scripts.pm (original)
+++ branches/upstream/libcatalyst-perl/current/inc/Module/Install/Scripts.pm Sat Feb 19 00:59:44 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: branches/upstream/libcatalyst-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/inc/Module/Install/Win32.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libcatalyst-perl/current/inc/Module/Install/Win32.pm Sat Feb 19 00:59:44 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: branches/upstream/libcatalyst-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/inc/Module/Install/WriteAll.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libcatalyst-perl/current/inc/Module/Install/WriteAll.pm Sat Feb 19 00:59:44 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libcatalyst-perl/current/lib/Catalyst.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/lib/Catalyst.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/lib/Catalyst.pm (original)
+++ branches/upstream/libcatalyst-perl/current/lib/Catalyst.pm Sat Feb 19 00:59:44 2011
@@ -79,7 +79,7 @@
# Remember to update this in Catalyst::Runtime as well!
-our $VERSION = '5.80030';
+our $VERSION = '5.80031';
sub import {
my ( $class, @arguments ) = @_;
Modified: branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/FastCGI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/FastCGI.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/FastCGI.pm (original)
+++ branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/FastCGI.pm Sat Feb 19 00:59:44 2011
@@ -158,6 +158,10 @@
sub write {
my ( $self, $c, $buffer ) = @_;
+
+ # ->write will be called once with the body, even in a redirect (and
+ # in that case, the body is undef)
+ $buffer = '' if !defined $buffer;
unless ( $self->_prepared_write ) {
$self->prepare_write($c);
Modified: branches/upstream/libcatalyst-perl/current/lib/Catalyst/Runtime.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/lib/Catalyst/Runtime.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/lib/Catalyst/Runtime.pm (original)
+++ branches/upstream/libcatalyst-perl/current/lib/Catalyst/Runtime.pm Sat Feb 19 00:59:44 2011
@@ -7,7 +7,7 @@
# Remember to update this in Catalyst as well!
-our $VERSION = '5.80030';
+our $VERSION = '5.80031';
=head1 NAME
Modified: branches/upstream/libcatalyst-perl/current/t/aggregate/live_component_controller_action_chained.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/t/aggregate/live_component_controller_action_chained.t?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/t/aggregate/live_component_controller_action_chained.t (original)
+++ branches/upstream/libcatalyst-perl/current/t/aggregate/live_component_controller_action_chained.t Sat Feb 19 00:59:44 2011
@@ -844,6 +844,33 @@
is( $response->header('X-Catalyst-Executed'),
$expected, 'Executed actions' );
is( $response->content, '; ', 'Content OK' );
+ }
+
+ #
+ # Complex path with multiple non-capturing pathparts
+ # PathPart('') CaptureArgs(0), PathPart('foo') CaptureArgs(0), PathPart('') Args(0)
+ # should win over PathPart('') CaptureArgs(1), PathPart('') Args(0)
+ #
+ {
+ my @expected = qw[
+ TestApp::Controller::Action::Chained->begin
+ TestApp::Controller::Action::Chained->mult_nopp2_base
+ TestApp::Controller::Action::Chained->mult_nopp2_nocap
+ TestApp::Controller::Action::Chained->mult_nopp2_action
+ TestApp::Controller::Action::Chained->mult_nopp2_action_default
+ TestApp::Controller::Action::Chained->end
+ ];
+
+ my $expected = join( ", ", @expected );
+
+ ok( my $response = request('http://localhost/chained/mult_nopp2/action'),
+ "Complex path with multiple non-capturing pathparts" );
+ TODO: {
+ local $TODO = 'Known bug';
+ is( $response->header('X-Catalyst-Executed'),
+ $expected, 'Executed actions' );
+ is( $response->content, '; ', 'Content OK' );
+ }
}
#
Modified: branches/upstream/libcatalyst-perl/current/t/lib/TestApp/Controller/Action/Chained.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/t/lib/TestApp/Controller/Action/Chained.pm?rev=69024&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/t/lib/TestApp/Controller/Action/Chained.pm (original)
+++ branches/upstream/libcatalyst-perl/current/t/lib/TestApp/Controller/Action/Chained.pm Sat Feb 19 00:59:44 2011
@@ -164,6 +164,14 @@
sub mult_nopp_idall : Chained('mult_nopp_id') PathPart('') Args(0) { }
sub mult_nopp_idnew : Chained('mult_nopp_id') PathPart('new') Args(0) { }
+sub mult_nopp2_base : Chained('/') PathPart('chained/mult_nopp2') CaptureArgs(0) { }
+sub mult_nopp2_nocap : Chained('mult_nopp2_base') PathPart('') CaptureArgs(0) { }
+sub mult_nopp2_action : Chained('mult_nopp2_nocap') PathPart('action') CaptureArgs(0) { }
+sub mult_nopp2_action_default : Chained('mult_nopp2_action') PathPart('') Args(0) { }
+sub mult_nopp2_action_with_arg : Chained('mult_nopp2_action') PathPart('') Args(1) { }
+sub mult_nopp2_load : Chained('mult_nopp2_base') PathPart('') CaptureArgs(1) { }
+sub mult_nopp2_view : Chained('mult_nopp2_load') PathPart('') Args(0) { }
+
#
# Test Choice between branches and early return logic
# Declaration order is important for $children->{$*}, since this is first match best.
More information about the Pkg-perl-cvs-commits
mailing list