[Catalyst-commits] r6866 - in trunk: . Catalyst-Plugin-Unicode
Catalyst-Plugin-Unicode/t Catalyst-Plugin-Unicode/t/lib
Catalyst-Plugin-Unicode/t/lib/TestApp
Catalyst-Plugin-Unicode/t/lib/TestApp/Controller
Catalyst-Plugin-Unicode/t/lib/script
jrockway at dev.catalyst.perl.org
jrockway at dev.catalyst.perl.org
Wed Sep 12 11:36:58 GMT 2007
Author: jrockway
Date: 2007-09-12 11:36:58 +0100 (Wed, 12 Sep 2007)
New Revision: 6866
Added:
trunk/Catalyst-Plugin-Unicode/t/lib/
trunk/Catalyst-Plugin-Unicode/t/lib/Makefile.PL
trunk/Catalyst-Plugin-Unicode/t/lib/TestApp.pm
trunk/Catalyst-Plugin-Unicode/t/lib/TestApp/
trunk/Catalyst-Plugin-Unicode/t/lib/TestApp/Controller/
trunk/Catalyst-Plugin-Unicode/t/lib/TestApp/Controller/Root.pm
trunk/Catalyst-Plugin-Unicode/t/lib/script/
trunk/Catalyst-Plugin-Unicode/t/lib/script/testapp_server.pl
trunk/Catalyst-Plugin-Unicode/t/lib/script/testapp_test.pl
trunk/Catalyst-Plugin-Unicode/t/live-test.t
Modified:
trunk/
trunk/Catalyst-Plugin-Unicode/Changes
trunk/Catalyst-Plugin-Unicode/Makefile.PL
Log:
r28665 at foo: jon | 2007-09-12 04:56:29 -0500
add some live tests
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 6d2a1d83-d666-409f-9dbf-d3bfcf4e9009:/local_branches/Catalyst-bad-mst/trunk:40156
6d2a1d83-d666-409f-9dbf-d3bfcf4e9009:/local_branches/Catalyst-broken-net/trunk:19004
6d2a1d83-d666-409f-9dbf-d3bfcf4e9009:/local_branches/Catalyst_acl_in_conf/trunk:3134
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst-trunk:28664
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/trunk:7830
dd8ad9ea-0304-0410-a433-df5f223e7bc0:/local/Catalyst/trunk:7023
+ 6d2a1d83-d666-409f-9dbf-d3bfcf4e9009:/local_branches/Catalyst-bad-mst/trunk:40156
6d2a1d83-d666-409f-9dbf-d3bfcf4e9009:/local_branches/Catalyst-broken-net/trunk:19004
6d2a1d83-d666-409f-9dbf-d3bfcf4e9009:/local_branches/Catalyst_acl_in_conf/trunk:3134
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst-trunk:28665
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/trunk:7830
dd8ad9ea-0304-0410-a433-df5f223e7bc0:/local/Catalyst/trunk:7023
Modified: trunk/Catalyst-Plugin-Unicode/Changes
===================================================================
--- trunk/Catalyst-Plugin-Unicode/Changes 2007-09-12 10:36:49 UTC (rev 6865)
+++ trunk/Catalyst-Plugin-Unicode/Changes 2007-09-12 10:36:58 UTC (rev 6866)
@@ -1,5 +1,8 @@
Revision history for Perl extension Catalyst::Plugin::Unicode
+0.6 Wed Sep 12 04:08:29 CDT 2007
+ - Properly encode bodies that aren't text/* (like XML)
+
0.4 Tue Jul 18 18:21:00 2007
- Fix release fuckup
Modified: trunk/Catalyst-Plugin-Unicode/Makefile.PL
===================================================================
--- trunk/Catalyst-Plugin-Unicode/Makefile.PL 2007-09-12 10:36:49 UTC (rev 6865)
+++ trunk/Catalyst-Plugin-Unicode/Makefile.PL 2007-09-12 10:36:58 UTC (rev 6866)
@@ -6,5 +6,8 @@
requires 'Catalyst::Runtime' => '5.70';
requires 'Test::More';
+build_requires 'Test::WWW::Mechanize::Catalyst';
+build_requires 'IO::Scalar';
+
auto_install;
WriteAll;
Added: trunk/Catalyst-Plugin-Unicode/t/lib/Makefile.PL
===================================================================
Added: trunk/Catalyst-Plugin-Unicode/t/lib/TestApp/Controller/Root.pm
===================================================================
--- trunk/Catalyst-Plugin-Unicode/t/lib/TestApp/Controller/Root.pm (rev 0)
+++ trunk/Catalyst-Plugin-Unicode/t/lib/TestApp/Controller/Root.pm 2007-09-12 10:36:58 UTC (rev 6866)
@@ -0,0 +1,34 @@
+package TestApp::Controller::Root;
+use strict;
+use warnings;
+use utf8;
+
+__PACKAGE__->config(namespace => q{});
+
+use base 'Catalyst::Controller';
+
+# your actions replace this one
+sub main :Path {
+ $_[1]->res->body('<h1>It works</h1>')
+}
+
+sub unicode :Local {
+ my ($self, $c) = @_;
+ my $data = "ほげ"; # hoge!
+ $c->response->body($data); # should be decoded
+}
+
+sub not_unicode :Local {
+ my ($self, $c) = @_;
+ my $data = "\x{1234}\x{5678}";
+ utf8::encode($data); # DO NOT WANT unicode
+ $c->response->body($data); # just some octets
+}
+
+sub file :Local {
+ my ($self, $c) = @_;
+ close *STDERR; # i am evil.
+ $c->response->body($main::TEST_FILE); # filehandle from test file
+}
+
+1;
Added: trunk/Catalyst-Plugin-Unicode/t/lib/TestApp.pm
===================================================================
--- trunk/Catalyst-Plugin-Unicode/t/lib/TestApp.pm (rev 0)
+++ trunk/Catalyst-Plugin-Unicode/t/lib/TestApp.pm 2007-09-12 10:36:58 UTC (rev 6866)
@@ -0,0 +1,9 @@
+package TestApp;
+use strict;
+use warnings;
+
+use Catalyst qw/Unicode/;
+
+__PACKAGE__->setup;
+
+1;
Added: trunk/Catalyst-Plugin-Unicode/t/lib/script/testapp_server.pl
===================================================================
--- trunk/Catalyst-Plugin-Unicode/t/lib/script/testapp_server.pl (rev 0)
+++ trunk/Catalyst-Plugin-Unicode/t/lib/script/testapp_server.pl 2007-09-12 10:36:58 UTC (rev 6866)
@@ -0,0 +1,121 @@
+#!/usr/bin/env perl
+
+BEGIN {
+ $ENV{CATALYST_ENGINE} ||= 'HTTP';
+ $ENV{CATALYST_SCRIPT_GEN} = 31;
+ require Catalyst::Engine::HTTP;
+}
+
+use strict;
+use warnings;
+use Getopt::Long;
+use Pod::Usage;
+use FindBin;
+use lib "$FindBin::Bin/..";
+
+my $debug = 0;
+my $fork = 0;
+my $help = 0;
+my $host = undef;
+my $port = 3000;
+my $keepalive = 0;
+my $restart = 0;
+my $restart_delay = 1;
+my $restart_regex = '\.yml$|\.yaml$|\.pm$';
+my $restart_directory = undef;
+my $background = 0;
+my $pidfile = "/tmp/testapp.pid";
+
+my @argv = @ARGV;
+
+GetOptions(
+ 'debug|d' => \$debug,
+ 'fork' => \$fork,
+ 'help|?' => \$help,
+ 'host=s' => \$host,
+ 'port=s' => \$port,
+ 'keepalive|k' => \$keepalive,
+ 'restart|r' => \$restart,
+ 'restartdelay|rd=s' => \$restart_delay,
+ 'restartregex|rr=s' => \$restart_regex,
+ 'restartdirectory=s' => \$restart_directory,
+ 'daemon' => \$background,
+ 'pidfile=s' => \$pidfile,
+);
+
+pod2usage(1) if $help;
+
+if ( $restart ) {
+ $ENV{CATALYST_ENGINE} = 'HTTP::Restarter';
+}
+if ( $debug ) {
+ $ENV{CATALYST_DEBUG} = 1;
+}
+
+# This is require instead of use so that the above environment
+# variables can be set at runtime.
+require TestApp;
+
+TestApp->run( $port, $host, {
+ argv => \@argv,
+ 'fork' => $fork,
+ keepalive => $keepalive,
+ restart => $restart,
+ restart_delay => $restart_delay,
+ restart_regex => qr/$restart_regex/,
+ restart_directory => $restart_directory,
+ background => $background,
+ pidfile => $pidfile,
+} );
+
+1;
+
+=head1 NAME
+
+testapp_server.pl - Catalyst Testserver
+
+=head1 SYNOPSIS
+
+testapp_server.pl [options]
+
+ Options:
+ -d -debug force debug mode
+ -f -fork handle each request in a new process
+ (defaults to false)
+ -? -help display this help and exits
+ -host host (defaults to all)
+ -p -port port (defaults to 3000)
+ -k -keepalive enable keep-alive connections
+ -r -restart restart when files get modified
+ (defaults to false)
+ -rd -restartdelay delay between file checks
+ -rr -restartregex regex match files that trigger
+ a restart when modified
+ (defaults to '\.yml$|\.yaml$|\.pm$')
+ -restartdirectory the directory to search for
+ modified files
+ (defaults to '../')
+
+ -daemon background the server
+ -pidfile=filename store the pid if the server in filename, if
+ daemonizing
+
+ See also:
+ perldoc Catalyst::Manual
+ perldoc Catalyst::Manual::Intro
+
+=head1 DESCRIPTION
+
+Run a Catalyst Testserver for this application.
+
+=head1 AUTHOR
+
+Sebastian Riedel, C<sri at oook.de>
+Maintained by the Catalyst Core Team.
+
+=head1 COPYRIGHT
+
+This library is free software, you can redistribute it and/or modify
+it under the same terms as Perl itself.
+
+=cut
Added: trunk/Catalyst-Plugin-Unicode/t/lib/script/testapp_test.pl
===================================================================
--- trunk/Catalyst-Plugin-Unicode/t/lib/script/testapp_test.pl (rev 0)
+++ trunk/Catalyst-Plugin-Unicode/t/lib/script/testapp_test.pl 2007-09-12 10:36:58 UTC (rev 6866)
@@ -0,0 +1,12 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use FindBin;
+use lib "$FindBin::Bin/..";
+use Catalyst::Test 'TestApp';
+
+print request($ARGV[0])->content . "\n";
+
+1;
Added: trunk/Catalyst-Plugin-Unicode/t/live-test.t
===================================================================
--- trunk/Catalyst-Plugin-Unicode/t/live-test.t (rev 0)
+++ trunk/Catalyst-Plugin-Unicode/t/live-test.t 2007-09-12 10:36:58 UTC (rev 6866)
@@ -0,0 +1,46 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use Test::More tests => 12;
+use utf8;
+use IO::Scalar;
+
+# setup library path
+use FindBin qw($Bin);
+use lib "$Bin/lib";
+
+# make sure testapp works
+use ok 'TestApp';
+
+our $TEST_FILE = IO::Scalar->new(\"this is a test");
+sub IO::Scalar::FILENO { -1 }; # needed?
+
+# a live test against TestApp, the test application
+use Test::WWW::Mechanize::Catalyst 'TestApp';
+my $mech = Test::WWW::Mechanize::Catalyst->new;
+$mech->get_ok('http://localhost/', 'get main page');
+$mech->content_like(qr/it works/i, 'see if it has our text');
+
+{
+ $mech->get_ok('http://localhost/unicode', 'get unicode');
+ my $content = $mech->content;
+ ok(!utf8::is_utf8($content), 'not utf8');
+ utf8::decode($content);
+ ok(utf8::is_utf8($content), 'now its utf8');
+ like $content, qr/ほげ/, 'content contains hoge';
+}
+
+{
+ $mech->get_ok('http://localhost/not_unicode', 'get bytes');
+ my $content = $mech->content;
+ ok(!utf8::is_utf8($content), 'not utf8');
+ my $regex = "\x{1234}\x{5678}";
+ utf8::encode($regex);
+ like $content, qr/$regex/, 'got 1234 5678';
+}
+
+{
+ $mech->get_ok('http://localhost/file', 'get file');
+ $mech->content_like(qr/this is a test/, 'got filehandle contents');
+}
More information about the Catalyst-commits
mailing list