r53774 - in /trunk/libcatalyst-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/ lib/Catalyst/ t/aggregate/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sun Mar 7 00:16:37 UTC 2010
Author: jawnsy-guest
Date: Sun Mar 7 00:16:26 2010
New Revision: 53774
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53774
Log:
New upstream release
Modified:
trunk/libcatalyst-perl/Changes
trunk/libcatalyst-perl/META.yml
trunk/libcatalyst-perl/Makefile.PL
trunk/libcatalyst-perl/debian/changelog
trunk/libcatalyst-perl/inc/Module/AutoInstall.pm
trunk/libcatalyst-perl/inc/Module/Install.pm
trunk/libcatalyst-perl/inc/Module/Install/AutoInstall.pm
trunk/libcatalyst-perl/inc/Module/Install/Base.pm
trunk/libcatalyst-perl/inc/Module/Install/Can.pm
trunk/libcatalyst-perl/inc/Module/Install/CheckConflicts.pm
trunk/libcatalyst-perl/inc/Module/Install/Fetch.pm
trunk/libcatalyst-perl/inc/Module/Install/Include.pm
trunk/libcatalyst-perl/inc/Module/Install/Makefile.pm
trunk/libcatalyst-perl/inc/Module/Install/Metadata.pm
trunk/libcatalyst-perl/inc/Module/Install/Scripts.pm
trunk/libcatalyst-perl/inc/Module/Install/Win32.pm
trunk/libcatalyst-perl/inc/Module/Install/WriteAll.pm
trunk/libcatalyst-perl/lib/Catalyst.pm
trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm
trunk/libcatalyst-perl/lib/Catalyst/Upgrading.pod
trunk/libcatalyst-perl/t/aggregate/live_component_controller_action_chained.t
trunk/libcatalyst-perl/t/aggregate/unit_core_uri_for_multibytechar.t
Modified: trunk/libcatalyst-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/Changes?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/Changes (original)
+++ trunk/libcatalyst-perl/Changes Sun Mar 7 00:16:26 2010
@@ -1,4 +1,10 @@
# This file documents the revision history for Perl extension Catalyst.
+
+5.80021 2010-03-03 23:02:01
+
+ Bug fixed:
+ - $c->uri_for will now escape unsafe characterss in captures
+ ($c->request->captures) and correctly encode utf8 charracters.
5.80020 2010-02-04 06:51:18
Modified: trunk/libcatalyst-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/META.yml?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/META.yml (original)
+++ trunk/libcatalyst-perl/META.yml Sun Mar 7 00:16:26 2010
@@ -10,7 +10,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.92'
+generated_by: 'Module::Install version 0.910'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -64,4 +64,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.80020
+version: 5.80021
Modified: trunk/libcatalyst-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/Makefile.PL?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/Makefile.PL (original)
+++ trunk/libcatalyst-perl/Makefile.PL Sun Mar 7 00:16:26 2010
@@ -1,14 +1,12 @@
use strict;
use warnings;
use inc::Module::Install 0.91;
-{ # Ensure that these get used - yes, M::I loads them for us, but if you're
- # in author mode and don't have them installed, then the error is tres
- # cryptic.
- no warnings 'redefine';
- use Module::Install::AuthorRequires;
- use Module::Install::CheckConflicts;
- use Module::Install::AuthorTests;
-}
+# Ensure that these get used - yes, M::I loads them for us, but if you're
+# in author mode and don't have them installed, then the error is tres
+# cryptic.
+use Module::Install::AuthorRequires;
+use Module::Install::CheckConflicts;
+use Module::Install::AuthorTests;
perl_version '5.008004';
Modified: trunk/libcatalyst-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/debian/changelog?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/debian/changelog (original)
+++ trunk/libcatalyst-perl/debian/changelog Sun Mar 7 00:16:26 2010
@@ -1,3 +1,9 @@
+libcatalyst-perl (5.80021-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Jonathan Yu <jawnsy at cpan.org> Sat, 06 Mar 2010 17:49:27 -0500
+
libcatalyst-perl (5.80020-1) unstable; urgency=low
[ Krzysztof Krzyżaniak (eloy) ]
Modified: trunk/libcatalyst-perl/inc/Module/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/AutoInstall.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/AutoInstall.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/AutoInstall.pm Sun Mar 7 00:16:26 2010
@@ -672,20 +672,7 @@
sub _load_cpan {
return if $CPAN::VERSION and $CPAN::Config and not @_;
require CPAN;
-
- # CPAN-1.82+ adds CPAN::Config::AUTOLOAD to redirect to
- # CPAN::HandleConfig->load. CPAN reports that the redirection
- # is deprecated in a warning printed at the user.
-
- # CPAN-1.81 expects CPAN::HandleConfig->load, does not have
- # $CPAN::HandleConfig::VERSION but cannot handle
- # CPAN::Config->load
-
- # Which "versions expect CPAN::Config->load?
-
- if ( $CPAN::HandleConfig::VERSION
- || CPAN::HandleConfig->can('load')
- ) {
+ if ( $CPAN::HandleConfig::VERSION ) {
# Newer versions of CPAN have a HandleConfig module
CPAN::HandleConfig->load;
} else {
@@ -815,4 +802,4 @@
__END__
-#line 1069
+#line 1056
Modified: trunk/libcatalyst-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install.pm Sun Mar 7 00:16:26 2010
@@ -28,7 +28,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 = '0.92';
+ $VERSION = '0.91';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -348,24 +348,17 @@
return $call;
}
-# Done in evals to avoid confusing Perl::MinimumVersion
-eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
sub _read {
local *FH;
- open( FH, '<', $_[0] ) or die "open($_[0]): $!";
+ if ( $] >= 5.006 ) {
+ open( FH, '<', $_[0] ) or die "open($_[0]): $!";
+ } else {
+ open( FH, "< $_[0]" ) or die "open($_[0]): $!";
+ }
my $string = do { local $/; <FH> };
close FH or die "close($_[0]): $!";
return $string;
}
-END_NEW
-sub _read {
- local *FH;
- open( FH, "< $_[0]" ) or die "open($_[0]): $!";
- my $string = do { local $/; <FH> };
- close FH or die "close($_[0]): $!";
- return $string;
-}
-END_OLD
sub _readperl {
my $string = Module::Install::_read($_[0]);
@@ -386,26 +379,18 @@
return $string;
}
-# Done in evals to avoid confusing Perl::MinimumVersion
-eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
sub _write {
local *FH;
- open( FH, '>', $_[0] ) or die "open($_[0]): $!";
+ if ( $] >= 5.006 ) {
+ open( FH, '>', $_[0] ) or die "open($_[0]): $!";
+ } else {
+ open( FH, "> $_[0]" ) or die "open($_[0]): $!";
+ }
foreach ( 1 .. $#_ ) {
print FH $_[$_] or die "print($_[0]): $!";
}
close FH or die "close($_[0]): $!";
}
-END_NEW
-sub _write {
- local *FH;
- open( FH, "> $_[0]" ) or die "open($_[0]): $!";
- foreach ( 1 .. $#_ ) {
- print FH $_[$_] or die "print($_[0]): $!";
- }
- close FH or die "close($_[0]): $!";
-}
-END_OLD
# _version is for processing module versions (eg, 1.03_05) not
# Perl versions (eg, 5.8.1).
@@ -442,4 +427,4 @@
1;
-# Copyright 2008 - 2010 Adam Kennedy.
+# Copyright 2008 - 2009 Adam Kennedy.
Modified: trunk/libcatalyst-perl/inc/Module/Install/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/AutoInstall.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/AutoInstall.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/AutoInstall.pm Sun Mar 7 00:16:26 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.91';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Base.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Base.pm Sun Mar 7 00:16:26 2010
@@ -4,13 +4,13 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.91';
}
# Suspend handler for "redefined" warnings
BEGIN {
- my $w = $SIG{__WARN__};
- $SIG{__WARN__} = sub { $w };
+# my $w = $SIG{__WARN__};
+# $SIG{__WARN__} = sub { $w };
}
#line 42
@@ -70,7 +70,7 @@
# Restore warning handler
BEGIN {
- $SIG{__WARN__} = $SIG{__WARN__}->();
+# $SIG{__WARN__} = $SIG{__WARN__}->();
}
1;
Modified: trunk/libcatalyst-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Can.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Can.pm Sun Mar 7 00:16:26 2010
@@ -9,7 +9,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.91';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/CheckConflicts.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/CheckConflicts.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/CheckConflicts.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/CheckConflicts.pm Sun Mar 7 00:16:26 2010
@@ -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: trunk/libcatalyst-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Fetch.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Fetch.pm Sun Mar 7 00:16:26 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.91';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Include.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Include.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Include.pm Sun Mar 7 00:16:26 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.91';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Makefile.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Makefile.pm Sun Mar 7 00:16:26 2010
@@ -7,7 +7,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.91';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -34,17 +34,6 @@
}
}
-# Store a cleaned up version of the MakeMaker version,
-# since we need to behave differently in a variety of
-# ways based on the MM version.
-my $makemaker = eval $ExtUtils::MakeMaker::VERSION;
-
-# If we are passed a param, do a "newer than" comparison.
-# Otherwise, just return the MakeMaker version.
-sub makemaker {
- ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0
-}
-
sub makemaker_args {
my $self = shift;
my $args = ( $self->{makemaker_args} ||= {} );
@@ -55,7 +44,7 @@
# For mm args that take multiple space-seperated args,
# append an argument to the current list.
sub makemaker_append {
- my $self = shift;
+ my $self = sShift;
my $name = shift;
my $args = $self->makemaker_args;
$args->{name} = defined $args->{$name}
@@ -141,13 +130,12 @@
# an underscore, even though its own version may contain one!
# Hence the funny regexp to get rid of it. See RT #35800
# for details.
- my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
- $self->build_requires( 'ExtUtils::MakeMaker' => $v );
- $self->configure_requires( 'ExtUtils::MakeMaker' => $v );
+ $self->build_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
+ $self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
} else {
# Allow legacy-compatibility with 5.005 by depending on the
# most recent EU:MM that supported 5.005.
- $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 );
+ $self->build_requires( 'ExtUtils::MakeMaker' => 6.42 );
$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
}
@@ -164,62 +152,42 @@
$args->{ABSTRACT} = $self->abstract;
$args->{AUTHOR} = $self->author;
}
- if ( $self->makemaker(6.10) ) {
+ if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
$args->{NO_META} = 1;
}
- if ( $self->makemaker(6.17) and $self->sign ) {
+ if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) {
$args->{SIGN} = 1;
}
unless ( $self->is_admin ) {
delete $args->{SIGN};
}
+ # Merge both kinds of requires into prereq_pm
my $prereq = ($args->{PREREQ_PM} ||= {});
%$prereq = ( %$prereq,
- map { @$_ } # flatten [module => version]
+ map { @$_ }
map { @$_ }
grep $_,
- ($self->requires)
+ ($self->configure_requires, $self->build_requires, $self->requires)
);
# Remove any reference to perl, PREREQ_PM doesn't support it
delete $args->{PREREQ_PM}->{perl};
- # Merge both kinds of requires into BUILD_REQUIRES
- my $build_prereq = ($args->{BUILD_REQUIRES} ||= {});
- %$build_prereq = ( %$build_prereq,
- map { @$_ } # flatten [module => version]
- map { @$_ }
- grep $_,
- ($self->configure_requires, $self->build_requires)
- );
-
- # Remove any reference to perl, BUILD_REQUIRES doesn't support it
- delete $args->{BUILD_REQUIRES}->{perl};
-
- # Delete bundled dists from prereq_pm
+ # merge both kinds of requires into prereq_pm
my $subdirs = ($args->{DIR} ||= []);
if ($self->bundles) {
foreach my $bundle (@{ $self->bundles }) {
my ($file, $dir) = @$bundle;
push @$subdirs, $dir if -d $dir;
- delete $build_prereq->{$file}; #Delete from build prereqs only
+ delete $prereq->{$file};
}
- }
-
- unless ( $self->makemaker('6.55_03') ) {
- %$prereq = (%$prereq,%$build_prereq);
- delete $args->{BUILD_REQUIRES};
}
if ( my $perl_version = $self->perl_version ) {
eval "use $perl_version; 1"
or die "ERROR: perl: Version $] is installed, "
. "but we need version >= $perl_version";
-
- if ( $self->makemaker(6.48) ) {
- $args->{MIN_PERL_VERSION} = $perl_version;
- }
}
$args->{INSTALLDIRS} = $self->installdirs;
@@ -297,4 +265,4 @@
__END__
-#line 426
+#line 394
Modified: trunk/libcatalyst-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Metadata.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Metadata.pm Sun Mar 7 00:16:26 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.91';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -230,8 +230,6 @@
die("The path '$file' does not exist, or is not a file");
}
- $self->{values}{all_from} = $file;
-
# Some methods pull from POD instead of code.
# If there is a matching .pod, use that instead
my $pod = $file;
@@ -387,10 +385,11 @@
}
}
-sub _extract_perl_version {
+sub perl_version_from {
+ my $self = shift;
if (
- $_[0] =~ m/
- ^\s*
+ Module::Install::_read($_[0]) =~ m/
+ ^
(?:use|require) \s*
v?
([\d_\.]+)
@@ -399,16 +398,6 @@
) {
my $perl_version = $1;
$perl_version =~ s{_}{}g;
- return $perl_version;
- } else {
- return;
- }
-}
-
-sub perl_version_from {
- my $self = shift;
- my $perl_version=_extract_perl_version(Module::Install::_read($_[0]));
- if ($perl_version) {
$self->perl_version($perl_version);
} else {
warn "Cannot determine perl version info from $_[0]\n";
@@ -436,12 +425,13 @@
}
}
-sub _extract_license {
+sub license_from {
+ my $self = shift;
if (
- $_[0] =~ m/
+ Module::Install::_read($_[0]) =~ m/
(
=head \d \s+
- (?:licen[cs]e|licensing|copyrights?|legal)\b
+ (?:licen[cs]e|licensing|copyright|legal)\b
.*?
)
(=head\\d.*|=cut.*|)
@@ -449,8 +439,7 @@
/ixms ) {
my $license_text = $1;
my @phrases = (
- 'under the same (?:terms|license) as (?:perl|the perl programming language)' => 'perl', 1,
- 'under the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
+ 'under the same (?:terms|license) as (?:perl|the perl programming language) itself' => 'perl', 1,
'GNU general public license' => 'gpl', 1,
'GNU public license' => 'gpl', 1,
'GNU lesser general public license' => 'lgpl', 1,
@@ -467,32 +456,20 @@
'proprietary' => 'proprietary', 0,
);
while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
- $pattern =~ s#\s+#\\s+#gs;
+ $pattern =~ s{\s+}{\\s+}g;
if ( $license_text =~ /\b$pattern\b/i ) {
- return $license;
+ $self->license($license);
+ return 1;
}
}
- } else {
- return;
- }
-}
-
-sub license_from {
- my $self = shift;
- if (my $license=_extract_license(Module::Install::_read($_[0]))) {
- $self->license($license);
- } else {
- warn "Cannot determine license info from $_[0]\n";
- return 'unknown';
- }
+ }
+
+ warn "Cannot determine license info from $_[0]\n";
+ return 'unknown';
}
sub _extract_bugtracker {
- my @links = $_[0] =~ m#L<(
- \Qhttp://rt.cpan.org/\E[^>]+|
- \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
- \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
- )>#gx;
+ my @links = $_[0] =~ m#L<(\Qhttp://rt.cpan.org/\E[^>]+)>#g;
my %links;
@links{@links}=();
@links=keys %links;
@@ -508,7 +485,7 @@
return 0;
}
if ( @links > 1 ) {
- warn "Found more than one bugtracker link in $_[0]\n";
+ warn "Found more than on rt.cpan.org link in $_[0]\n";
return 0;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/Scripts.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Scripts.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Scripts.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Scripts.pm Sun Mar 7 00:16:26 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.91';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Win32.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Win32.pm Sun Mar 7 00:16:26 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';
+ $VERSION = '0.91';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/WriteAll.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/WriteAll.pm Sun Mar 7 00:16:26 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.92';;
+ $VERSION = '0.91';;
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/lib/Catalyst.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/lib/Catalyst.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/lib/Catalyst.pm (original)
+++ trunk/libcatalyst-perl/lib/Catalyst.pm Sun Mar 7 00:16:26 2010
@@ -78,7 +78,9 @@
# Remember to update this in Catalyst::Runtime as well!
-our $VERSION = '5.80020';
+our $VERSION = '5.80021';
+our $PRETTY_VERSION = $VERSION;
+
$VERSION = eval $VERSION;
sub import {
@@ -1144,7 +1146,7 @@
if ( $class->debug ) {
my $name = $class->config->{name} || 'Application';
- $class->log->info("$name powered by Catalyst $Catalyst::VERSION");
+ $class->log->info("$name powered by Catalyst $Catalyst::PRETTY_VERSION");
}
# Make sure that the application class becomes immutable at this point,
@@ -1182,23 +1184,20 @@
return 1; # Explicit return true as people have __PACKAGE__->setup as the last thing in their class. HATE.
}
-
=head2 $app->setup_finalize
-A hook to attach modifiers to.
-Using C<< after setup => sub{}; >> doesn't work, because of quirky things done for plugin setup.
-Also better than C< setup_finished(); >, as that is a getter method.
-
- sub setup_finalize {
-
+A hook to attach modifiers to. This method does not do anything except set the
+C<setup_finished> accessor.
+
+Applying method modifiers to the C<setup> method doesn't work, because of quirky thingsdone for plugin setup.
+
+Example:
+
+ after setup_finalize => sub {
my $app = shift;
- ## do stuff, i.e., determine a primary key column for sessions stored in a DB
-
- $app->next::method(@_);
-
-
- }
+ ## do stuff here..
+ };
=cut
@@ -1265,6 +1264,9 @@
( scalar @args && ref $args[$#args] eq 'HASH' ? pop @args : {} );
carp "uri_for called with undef argument" if grep { ! defined $_ } @args;
+ foreach my $arg (@args) {
+ utf8::encode($arg) if utf8::is_utf8($arg);
+ }
s/([^$URI::uric])/$URI::Escape::escapes{$1}/go for @args;
if (blessed $path) { # Action object only.
s|/|%2F|g for @args;
@@ -1275,6 +1277,12 @@
( scalar @args && ref $args[0] eq 'ARRAY'
? @{ shift(@args) }
: ()) ];
+
+ foreach my $capture (@$captures) {
+ utf8::encode($capture) if utf8::is_utf8($capture);
+ $capture =~ s/([^$URI::uric])/$URI::Escape::escapes{$1}/go;
+ }
+
my $action = $path;
$path = $c->dispatcher->uri_for_action($action, $captures);
if (not defined $path) {
@@ -1284,6 +1292,8 @@
}
$path = '/' if $path eq '';
}
+
+ undef($path) if (defined $path && $path eq '');
unshift(@args, $path);
Modified: trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm (original)
+++ trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm Sun Mar 7 00:16:26 2010
@@ -7,7 +7,7 @@
# Remember to update this in Catalyst as well!
-our $VERSION='5.80020';
+our $VERSION='5.80021';
$VERSION = eval $VERSION;
Modified: trunk/libcatalyst-perl/lib/Catalyst/Upgrading.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/lib/Catalyst/Upgrading.pod?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/lib/Catalyst/Upgrading.pod (original)
+++ trunk/libcatalyst-perl/lib/Catalyst/Upgrading.pod Sun Mar 7 00:16:26 2010
@@ -217,7 +217,7 @@
Using this now causes infinite recursion between MyApp::setup and
Catalyst::setup, due to other backwards compatibility issues related to how
-plugin setup works. Moose method modifiers like C<< before|after|around 'setup
+plugin setup works. Moose method modifiers like C<< before|after|around setup
=> sub { ... }; >> also will not operate correctly on the setup method.
The right way to do it is this:
Modified: trunk/libcatalyst-perl/t/aggregate/live_component_controller_action_chained.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/t/aggregate/live_component_controller_action_chained.t?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/t/aggregate/live_component_controller_action_chained.t (original)
+++ trunk/libcatalyst-perl/t/aggregate/live_component_controller_action_chained.t Sun Mar 7 00:16:26 2010
@@ -1074,6 +1074,7 @@
['foo%2Fbar', 'baz%2Fquux'],
['foo%2Fbar', 'baz%2Fquux', { foo => 'bar', 'baz' => 'quux%2Ffrood'}],
['foo%2Fbar', 'baz%2Fquux', { foo => 'bar', 'baz%2Ffnoo' => 'quux%2Ffrood'}],
+ ['h%C3%BCtte', 'h%C3%BCtte', { test => 'h%C3%BCtte' } ],
) {
my $path = '/chained/roundtrip_urifor/' .
$thing->[0] . '/' . $thing->[1];
Modified: trunk/libcatalyst-perl/t/aggregate/unit_core_uri_for_multibytechar.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/t/aggregate/unit_core_uri_for_multibytechar.t?rev=53774&op=diff
==============================================================================
--- trunk/libcatalyst-perl/t/aggregate/unit_core_uri_for_multibytechar.t (original)
+++ trunk/libcatalyst-perl/t/aggregate/unit_core_uri_for_multibytechar.t Sun Mar 7 00:16:26 2010
@@ -1,10 +1,9 @@
use strict;
use warnings;
-
use FindBin;
use lib "$FindBin::Bin/../lib";
-use Test::More tests => 5;
+use Test::More;
use_ok('TestApp');
@@ -33,3 +32,19 @@
# multibyte with utf8 string
is($context->uri_for('/', { name => "\x{6751}\x{702c}\x{5927}\x{8f14}" }), $uri_with_multibyte, 'uri_for with utf8 string query');
is($context->req->uri_with({ name => "\x{6751}\x{702c}\x{5927}\x{8f14}" }), $uri_with_multibyte, 'uri_with with utf8 string query');
+
+# multibyte captures and args
+my $action = $context->controller('Action::Chained')
+ ->action_for('roundtrip_urifor_end');
+
+{
+use utf8;
+
+is($context->uri_for($action, ['hütte'], 'hütte', {
+ test => 'hütte'
+}),
+'http://127.0.0.1/chained/roundtrip_urifor/h%C3%BCtte/h%C3%BCtte?test=h%C3%BCtte',
+'uri_for with utf8 captures and args');
+}
+
+done_testing;
More information about the Pkg-perl-cvs-commits
mailing list