r51201 - in /branches/upstream/libcatalyst-perl/current: ./ inc/Module/Install/ lib/ lib/Catalyst/ lib/Catalyst/Engine/ lib/Catalyst/Script/ t/ t/aggregate/
eloy at users.alioth.debian.org
eloy at users.alioth.debian.org
Mon Jan 18 11:27:00 UTC 2010
Author: eloy
Date: Mon Jan 18 11:26:47 2010
New Revision: 51201
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=51201
Log:
[svn-upgrade] Integrating new upstream version, libcatalyst-perl (5.80018)
Added:
branches/upstream/libcatalyst-perl/current/t/aggregate/deprecated_test_import.t
branches/upstream/libcatalyst-perl/current/t/aggregate/error_page_dump.t
Modified:
branches/upstream/libcatalyst-perl/current/Changes
branches/upstream/libcatalyst-perl/current/MANIFEST
branches/upstream/libcatalyst-perl/current/META.yml
branches/upstream/libcatalyst-perl/current/Makefile.PL
branches/upstream/libcatalyst-perl/current/inc/Module/Install/CheckConflicts.pm
branches/upstream/libcatalyst-perl/current/lib/Catalyst.pm
branches/upstream/libcatalyst-perl/current/lib/Catalyst/Dispatcher.pm
branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine.pm
branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/CGI.pm
branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/HTTP.pm
branches/upstream/libcatalyst-perl/current/lib/Catalyst/Runtime.pm
branches/upstream/libcatalyst-perl/current/lib/Catalyst/Script/FastCGI.pm
branches/upstream/libcatalyst-perl/current/lib/Catalyst/Script/Server.pm
branches/upstream/libcatalyst-perl/current/lib/Catalyst/Test.pm
branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_engine_cgi-prepare_path.t
branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_script_fastcgi.t
branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_script_server.t
branches/upstream/libcatalyst-perl/current/t/aggregate/unit_load_catalyst_test.t
branches/upstream/libcatalyst-perl/current/t/deprecated.t
Modified: branches/upstream/libcatalyst-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/Changes?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/Changes (original)
+++ branches/upstream/libcatalyst-perl/current/Changes Mon Jan 18 11:26:47 2010
@@ -1,4 +1,50 @@
# This file documents the revision history for Perl extension Catalyst.
+
+5.80018 2010-01-12 22:24:20
+
+ Bug fixed:
+ - Call ->canonical on URI derived from $ENV{REQUEST_URI} to get
+ paths correctly decoded. This bug was previously hidden by a bug
+ in HTTP::Request::AsCGI
+
+ Documentation:
+ - Clarify that uri_for_action works on private paths, with example.
+
+ Deprecations:
+ - Saying use Catalyst::Test; (without an application name or () to stop
+ the importer running is now deprecated and will issue a warning.
+ You should be saying use Catalyst::Test ();
+
+5.80017 2010-01-10 02:27:29
+
+ Documentation:
+ - Fix docs for ->forward method when passed a class name - this should
+ be a component name (e.g. View::HTML, not a full class name, like
+ MyApp::View::HTML).
+
+ Bug fixes:
+ - --daemon and -d options to Catalyst::Script::FastCGI are fixed.
+ - Fix the debug dump for applications which use Catalyst::Plugin::Session
+ (RT#52898)
+ - Fix regression in the case where mod_rewrite is being used to rewrite
+ requests into a path below your application base introduced with the
+ %2F related fixes in 5.80014_02.
+ - Do not crash on SIGHUP if Catalyst::Engine::HTTP->run is not passed the
+ argv key in the options hash.
+ - Correctly pass the arguments to Catalyst::Script::Server through to
+ Catalyst::Engine::HTTP->run so that the server can restart itself
+ with the correct options on SIGHUP.
+ - Require new MooseX::MethodAttributes to be compatible with Moose
+ versions >= 0.93_01
+ - Require new MooseX::Role::WithOverloading to be compatible with Moose
+ versions >= 0.93_01
+
+ Cleanups:
+ - Stop suppressing warnings from Class::C3::Adopt::NEXT now that most plugins
+ have been updated to not use NEXT. If you get warnings then please upgrade
+ your components or log a bug with the component author if an upgrade is
+ not available. The Class::C3::Adopt::NEXT documentation contains information
+ about how to suppress the warnings in your application if you need to.
5.80016 2009-12-11 23:23:33
Modified: branches/upstream/libcatalyst-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/MANIFEST?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/MANIFEST (original)
+++ branches/upstream/libcatalyst-perl/current/MANIFEST Mon Jan 18 11:26:47 2010
@@ -71,6 +71,8 @@
t/aggregate/caf_backcompat.t
t/aggregate/custom_live_component_controller_action_auto_doublebug.t
t/aggregate/custom_live_path_bug.t
+t/aggregate/deprecated_test_import.t
+t/aggregate/error_page_dump.t
t/aggregate/live_component_controller_action_action.t
t/aggregate/live_component_controller_action_auto.t
t/aggregate/live_component_controller_action_begin.t
Modified: branches/upstream/libcatalyst-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/META.yml?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/META.yml (original)
+++ branches/upstream/libcatalyst-perl/current/META.yml Mon Jan 18 11:26:47 2010
@@ -10,7 +10,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.910'
+generated_by: 'Module::Install version 0.91'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -40,8 +40,8 @@
Moose: 0.93
MooseX::Emulate::Class::Accessor::Fast: 0.00903
MooseX::Getopt: 0.25
- MooseX::MethodAttributes::Inheritable: 0.17
- MooseX::Role::WithOverloading: 0.03
+ MooseX::MethodAttributes::Inheritable: 0.19
+ MooseX::Role::WithOverloading: 0.05
MooseX::Types: 0
MooseX::Types::Common::Numeric: 0
Path::Class: 0.09
@@ -55,7 +55,7 @@
Tree::Simple: 1.15
Tree::Simple::Visitor::FindByPath: 0
URI: 1.35
- namespace::autoclean: 0
+ namespace::autoclean: 0.09
namespace::clean: 0
perl: 5.8.4
resources:
@@ -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.80016
+version: 5.80018
Modified: branches/upstream/libcatalyst-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/Makefile.PL?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/Makefile.PL (original)
+++ branches/upstream/libcatalyst-perl/current/Makefile.PL Mon Jan 18 11:26:47 2010
@@ -18,13 +18,12 @@
requires 'List::MoreUtils';
requires 'namespace::autoclean' => '0.09';
requires 'namespace::clean';
-requires 'namespace::autoclean';
requires 'B::Hooks::EndOfScope' => '0.08';
requires 'MooseX::Emulate::Class::Accessor::Fast' => '0.00903';
requires 'Class::MOP' => '0.95';
requires 'Moose' => '0.93';
-requires 'MooseX::MethodAttributes::Inheritable' => '0.17';
-requires 'MooseX::Role::WithOverloading' => '0.03';
+requires 'MooseX::MethodAttributes::Inheritable' => '0.19';
+requires 'MooseX::Role::WithOverloading' => '0.05';
requires 'Carp';
requires 'Class::C3::Adopt::NEXT' => '0.07';
requires 'CGI::Simple::Cookie';
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=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/inc/Module/Install/CheckConflicts.pm (original)
+++ branches/upstream/libcatalyst-perl/current/inc/Module/Install/CheckConflicts.pm Mon Jan 18 11:26:47 2010
@@ -12,10 +12,8 @@
}
sub check_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 ($self, %conflicts) = @_;
+
my %conflicts_found;
for my $mod (sort keys %conflicts) {
next unless $self->can_use($mod);
@@ -64,4 +62,4 @@
__END__
-#line 124
+#line 122
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=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/lib/Catalyst.pm (original)
+++ branches/upstream/libcatalyst-perl/current/lib/Catalyst.pm Mon Jan 18 11:26:47 2010
@@ -78,13 +78,7 @@
# Remember to update this in Catalyst::Runtime as well!
-our $VERSION = '5.80016';
-
-{
- my $dev_version = $VERSION =~ /_\d{2}$/;
- *_IS_DEVELOPMENT_VERSION = sub () { $dev_version };
-}
-
+our $VERSION = '5.80018';
$VERSION = eval $VERSION;
sub import {
@@ -96,11 +90,6 @@
my $caller = caller();
return if $caller eq 'main';
-
- # Kill Adopt::NEXT warnings if we're a non-RC version
- unless (_IS_DEVELOPMENT_VERSION()) {
- Class::C3::Adopt::NEXT->unimport(qr/^Catalyst::/);
- }
my $meta = Moose::Meta::Class->initialize($caller);
unless ( $caller->isa('Catalyst') ) {
@@ -332,8 +321,8 @@
my $foodata = $c->forward('/foo');
$c->forward('index');
- $c->forward(qw/MyApp::Model::DBIC::Foo do_stuff/);
- $c->forward('MyApp::View::TT');
+ $c->forward(qw/Model::DBIC::Foo do_stuff/);
+ $c->forward('View::TT');
Note that L<< forward|/"$c->forward( $action [, \@arguments ] )" >> implies
an C<< eval { } >> around the call (actually
@@ -348,16 +337,16 @@
your code like this:
$c->forward('foo') || return;
-
+
Another note is that C<< $c->forward >> always returns a scalar because it
actually returns $c->state which operates in a scalar context.
Thus, something like:
return @array;
-
-in an action that is forwarded to is going to return a scalar,
+
+in an action that is forwarded to is going to return a scalar,
i.e. how many items are in that array, which is probably not what you want.
-If you need to return an array then return a reference to it,
+If you need to return an array then return a reference to it,
or stash it like so:
$c->stash->{array} = \@array;
@@ -417,9 +406,9 @@
=head2 $c->go( $class, $method, [, \@captures, \@arguments ] )
-The relationship between C<go> and
+The relationship between C<go> and
L<< visit|/"$c->visit( $action [, \@captures, \@arguments ] )" >> is the same as
-the relationship between
+the relationship between
L<< forward|/"$c->forward( $class, $method, [, \@arguments ] )" >> and
L<< detach|/"$c->detach( $action [, \@arguments ] )" >>. Like C<< $c->visit >>,
C<< $c->go >> will perform a full dispatch on the specified action or method,
@@ -504,7 +493,7 @@
=head2 $c->state
-Contains the return value of the last executed action.
+Contains the return value of the last executed action.
Note that << $c->state >> operates in a scalar context which means that all
values it returns are scalar.
@@ -802,7 +791,7 @@
If Catalyst can't find a component by name, it will fallback to regex
matching by default. To disable this behaviour set
disable_component_resolution_regex_fallback to a true value.
-
+
__PACKAGE__->config( disable_component_resolution_regex_fallback => 1 );
=cut
@@ -1215,7 +1204,7 @@
If no arguments are provided, the URI for the current action is returned.
To return the current action and also provide @args, use
-C<< $c->uri_for( $c->action, @args ) >>.
+C<< $c->uri_for( $c->action, @args ) >>.
If the first argument is a string, it is taken as a public URI path relative
to C<< $c->namespace >> (if it doesn't begin with a forward slash) or
@@ -1339,6 +1328,20 @@
You can also pass in a Catalyst::Action object, in which case it is passed to
C<< $c->uri_for >>.
+
+Note that although the path looks like a URI that dispatches to the wanted action, it is not a URI, but an internal path to that action.
+
+For example, if the action looks like:
+
+ package MyApp::Controller::Users;
+
+ sub lst : Path('the-list') {}
+
+You can use:
+
+ $c->uri_for_action('/users/lst')
+
+and it will create the URI /users/the-list.
=back
@@ -2955,6 +2958,8 @@
obra: Jesse Vincent
+Octavian Rasnita
+
omega: Andreas Marienborg
Oleg Kostyuk <cub.uanic at gmail.com>
Modified: branches/upstream/libcatalyst-perl/current/lib/Catalyst/Dispatcher.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/lib/Catalyst/Dispatcher.pm?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/lib/Catalyst/Dispatcher.pm (original)
+++ branches/upstream/libcatalyst-perl/current/lib/Catalyst/Dispatcher.pm Mon Jan 18 11:26:47 2010
@@ -153,7 +153,7 @@
$action = $self->_invoke_as_path( $c, "$command", \@args );
}
- # go to a component ( "MyApp::*::Foo" or $c->component("...")
+ # go to a component ( "View::Foo" or $c->component("...")
# - a path or an object)
unless ($action) {
my $method = @extra_params ? $extra_params[0] : "process";
Modified: branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine.pm?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine.pm (original)
+++ branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine.pm Mon Jan 18 11:26:47 2010
@@ -115,7 +115,7 @@
# This is fugly, but the metaclass is _HUGE_ and demands waaay too much
# scrolling. Suggestions for more pleasant ways to do this welcome.
local $val->{'__MOP__'} = "Stringified: "
- . $val->{'__MOP__'} if exists $val->{'__MOP__'};
+ . $val->{'__MOP__'} if ref $val eq 'HASH' && exists $val->{'__MOP__'};
my $text = encode_entities( dump( $val ));
sprintf <<"EOF", $name, $text;
@@ -280,7 +280,8 @@
</html>
- # Trick IE
+ # Trick IE. Old versions of IE would display their own error page instead
+ # of ours if we'd give it less than 512 bytes.
$c->res->{body} .= ( ' ' x 512 );
# Return 500
Modified: branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/CGI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/CGI.pm?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/CGI.pm (original)
+++ branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/CGI.pm Mon Jan 18 11:26:47 2010
@@ -157,7 +157,21 @@
if (my $req_uri = $ENV{REQUEST_URI}) {
$req_uri =~ s/^\Q$base_path\E//;
$req_uri =~ s/\?.*$//;
- $path_info = $req_uri if $req_uri;
+ if ($req_uri) {
+ # Note that if REQUEST_URI doesn't start with a /, then the user
+ # is probably using mod_rewrite or something to rewrite requests
+ # into a sub-path of their application..
+ # This means that REQUEST_URI needs information from PATH_INFO
+ # prepending to it to be useful, otherwise the sub path which is
+ # being redirected to becomes the app base address which is
+ # incorrect.
+ if (substr($req_uri, 0, 1) ne '/') {
+ my ($match) = $req_uri =~ m|^([^/]+)|;
+ my ($path_info_part) = $path_info =~ m|^(.*?\Q$match\E)|;
+ substr($req_uri, 0, length($match), $path_info_part);
+ }
+ $path_info = $req_uri;
+ }
}
# set the request URI
@@ -181,7 +195,7 @@
my $query = $ENV{QUERY_STRING} ? '?' . $ENV{QUERY_STRING} : '';
my $uri = $scheme . '://' . $host . '/' . $path . $query;
- $c->request->uri( bless \$uri, $uri_class );
+ $c->request->uri( bless(\$uri, $uri_class)->canonical );
# set the base URI
# base must end in a slash
Modified: branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/HTTP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/HTTP.pm?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/HTTP.pm (original)
+++ branches/upstream/libcatalyst-perl/current/lib/Catalyst/Engine/HTTP.pm Mon Jan 18 11:26:47 2010
@@ -339,7 +339,7 @@
use Config;
$ENV{PERL5LIB} .= join $Config{path_sep}, @INC;
- exec $^X, $0, @{ $options->{argv} };
+ exec $^X, $0, @{ $options->{argv} || [] };
}
exit;
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=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/lib/Catalyst/Runtime.pm (original)
+++ branches/upstream/libcatalyst-perl/current/lib/Catalyst/Runtime.pm Mon Jan 18 11:26:47 2010
@@ -7,7 +7,7 @@
# Remember to update this in Catalyst as well!
-our $VERSION='5.80016';
+our $VERSION='5.80018';
$VERSION = eval $VERSION;
Modified: branches/upstream/libcatalyst-perl/current/lib/Catalyst/Script/FastCGI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/lib/Catalyst/Script/FastCGI.pm?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/lib/Catalyst/Script/FastCGI.pm (original)
+++ branches/upstream/libcatalyst-perl/current/lib/Catalyst/Script/FastCGI.pm Mon Jan 18 11:26:47 2010
@@ -27,7 +27,7 @@
traits => [qw(Getopt)],
isa => Bool,
is => 'ro',
- cmd_aliases => 'd',
+ cmd_aliases => [qw/d detach/], # Eww, detach is here as we fucked it up.. Deliberately not documented
documentation => 'Daemonize (go into the background)',
);
@@ -55,14 +55,6 @@
documentation => 'Specify a number of child processes',
);
-has detach => (
- traits => [qw(Getopt)],
- cmd_aliases => 'det',
- isa => Bool,
- is => 'ro',
- documentation => 'Detach this FastCGI process',
-);
-
sub _application_args {
my ($self) = shift;
return (
@@ -71,7 +63,7 @@
nproc => $self->nproc,
pidfile => $self->pidfile,
manager => $self->manager,
- detach => $self->detach,
+ detach => $self->daemon,
keep_stderr => $self->keeperr,
}
);
Modified: branches/upstream/libcatalyst-perl/current/lib/Catalyst/Script/Server.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/lib/Catalyst/Script/Server.pm?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/lib/Catalyst/Script/Server.pm (original)
+++ branches/upstream/libcatalyst-perl/current/lib/Catalyst/Script/Server.pm Mon Jan 18 11:26:47 2010
@@ -190,6 +190,7 @@
$self->port,
$self->host,
{
+ argv => $self->ARGV,
map { $_ => $self->$_ } qw/
fork
keepalive
Modified: branches/upstream/libcatalyst-perl/current/lib/Catalyst/Test.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/lib/Catalyst/Test.pm?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/lib/Catalyst/Test.pm (original)
+++ branches/upstream/libcatalyst-perl/current/lib/Catalyst/Test.pm Mon Jan 18 11:26:47 2010
@@ -103,6 +103,12 @@
sub import {
my ($self, $class, $opts) = @_;
+ Carp::carp(
+qq{Importing Catalyst::Test without an application name is deprecated:\n
+Instead of saying: use Catalyst::Test;
+say: use Catalyst::Test (); # If you don't want to import a test app right now.
+or say: use Catalyst::Test 'MyApp'; # If you do want to import a test app.\n\n})
+ unless $class;
$import->($self, '-all' => { class => $class });
$opts = {} unless ref $opts eq 'HASH';
$default_host = $opts->{default_host} if exists $opts->{default_host};
Added: branches/upstream/libcatalyst-perl/current/t/aggregate/deprecated_test_import.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/t/aggregate/deprecated_test_import.t?rev=51201&op=file
==============================================================================
--- branches/upstream/libcatalyst-perl/current/t/aggregate/deprecated_test_import.t (added)
+++ branches/upstream/libcatalyst-perl/current/t/aggregate/deprecated_test_import.t Mon Jan 18 11:26:47 2010
@@ -1,0 +1,16 @@
+use strict;
+use warnings;
+
+use Test::More;
+use Catalyst::Test ();
+
+my $warn;
+{
+ local $SIG{__WARN__} = sub { $warn = shift; };
+ Catalyst::Test->import();
+}
+ok $warn;
+like $warn, qr/deprecated/;
+
+done_testing;
+
Added: branches/upstream/libcatalyst-perl/current/t/aggregate/error_page_dump.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/t/aggregate/error_page_dump.t?rev=51201&op=file
==============================================================================
--- branches/upstream/libcatalyst-perl/current/t/aggregate/error_page_dump.t (added)
+++ branches/upstream/libcatalyst-perl/current/t/aggregate/error_page_dump.t Mon Jan 18 11:26:47 2010
@@ -1,0 +1,15 @@
+use strict;
+use warnings;
+use Test::More;
+use Test::Exception;
+
+use Catalyst::Engine;
+
+my $m = sub { Catalyst::Engine->_dump_error_page_element(@_) };
+
+lives_ok { $m->('Scalar' => ['foo' => 'bar']) };
+lives_ok { $m->('Array' => ['foo' => []]) };
+lives_ok { $m->('Hash' => ['foo' => {}]) };
+
+done_testing;
+
Modified: branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_engine_cgi-prepare_path.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_engine_cgi-prepare_path.t?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_engine_cgi-prepare_path.t (original)
+++ branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_engine_cgi-prepare_path.t Mon Jan 18 11:26:47 2010
@@ -50,6 +50,20 @@
is ''.$r->base, 'http://www.foo.com/~bobtfish/Gitalist/script/gitalist.cgi/';
}
+# Using rewrite rules to ask for a sub-path in your app.
+# E.g. RewriteRule ^(.*)$ /path/to/fastcgi/domainprofi.fcgi/iframeredirect$1 [L,NS]
+{
+ my $r = get_req (
+ PATH_INFO => '/iframeredirect/info',
+ SCRIPT_NAME => '',
+ REQUEST_URI => '/info',
+ );
+ is ''.$r->uri, 'http://www.foo.com/iframeredirect/info';
+ is ''.$r->base, 'http://www.foo.com/';
+}
+
+
+
# FIXME - Test proxy logic
# - Test query string
# - Test non standard port numbers
Modified: branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_script_fastcgi.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_script_fastcgi.t?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_script_fastcgi.t (original)
+++ branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_script_fastcgi.t Mon Jan 18 11:26:47 2010
@@ -19,8 +19,8 @@
testOption( [ qw/-l 127.0.0.1:3000/ ], ['127.0.0.1:3000', opthash()] );
#daemonize -d --daemon
-testOption( [ qw/-d/ ], [undef, opthash()] );
-testOption( [ qw/--daemon/ ], [undef, opthash()] );
+testOption( [ qw/-d/ ], [undef, opthash(detach => 1)] );
+testOption( [ qw/--daemon/ ], [undef, opthash(detach => 1)] );
# pidfile -pidfile -p --pid --pidfile
testOption( [ qw/--pidfile cat.pid/ ], [undef, opthash(pidfile => 'cat.pid')] );
@@ -38,10 +38,6 @@
# nproc
testOption( [ qw/--nproc 6/ ], [undef, opthash(nproc => 6)] );
testOption( [ qw/--n 6/ ], [undef, opthash(nproc => 6)] );
-
-# detach
-testOption( [ qw/--detach/ ], [undef, opthash(detach => 1)] );
-testOption( [ qw/--det/ ], [undef, opthash(detach => 1)] );
done_testing;
Modified: branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_script_server.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_script_server.t?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_script_server.t (original)
+++ branches/upstream/libcatalyst-perl/current/t/aggregate/unit_core_script_server.t Mon Jan 18 11:26:47 2010
@@ -89,6 +89,8 @@
};
# First element of RUN_ARGS will be the script name, which we don't care about
shift @TestAppToTestScripts::RUN_ARGS;
+ # Mangle argv into the options..
+ $resultarray->[-1]->{argv} = $argstring;
is_deeply \@TestAppToTestScripts::RUN_ARGS, $resultarray, "is_deeply comparison " . join(' ', @$argstring);
}
Modified: branches/upstream/libcatalyst-perl/current/t/aggregate/unit_load_catalyst_test.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/t/aggregate/unit_load_catalyst_test.t?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/t/aggregate/unit_load_catalyst_test.t (original)
+++ branches/upstream/libcatalyst-perl/current/t/aggregate/unit_load_catalyst_test.t Mon Jan 18 11:26:47 2010
@@ -3,9 +3,7 @@
use strict;
use warnings;
-use FindBin;
-use lib "$FindBin::Bin/../lib";
-use Test::More tests => 61;
+use Test::More;
use FindBin qw/$Bin/;
use lib "$Bin/../lib";
use Catalyst::Utils;
@@ -26,7 +24,7 @@
### make sure we're not trying to connect to a remote host -- these are local tests
local $ENV{CATALYST_SERVER};
-use_ok( $Class );
+use Catalyst::Test ();
### check available methods
{ ### turn of redefine warnings, we'll get new subs exported
@@ -155,3 +153,4 @@
request(GET('/dummy'), []);
} 'array additional param to request method ignored';
+done_testing;
Modified: branches/upstream/libcatalyst-perl/current/t/deprecated.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-perl/current/t/deprecated.t?rev=51201&op=diff
==============================================================================
--- branches/upstream/libcatalyst-perl/current/t/deprecated.t (original)
+++ branches/upstream/libcatalyst-perl/current/t/deprecated.t Mon Jan 18 11:26:47 2010
@@ -39,7 +39,4 @@
ok( my $response = request('http://localhost/'), 'Request' );
is( $response->header('X-Catalyst-Plugin-Deprecated'), '1', 'NEXT plugin ran correctly' );
-SKIP: {
- skip 'non-dev release', 1 unless Catalyst::_IS_DEVELOPMENT_VERSION();
- is( $warnings, 1, 'Got one and only one Adopt::NEXT warning');
-}
+is( $warnings, 1, 'Got one and only one Adopt::NEXT warning');
More information about the Pkg-perl-cvs-commits
mailing list