r19753 - in /branches/upstream/libmasonx-interp-withcallbacks-perl/current: Build.PL Changes META.yml README lib/MasonX/Interp/WithCallbacks.pm t/08apache.t t/09cgi.t t/10pod.t t/conf/extra.conf.in t/lib/TestCallbacks.pm
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Fri May 9 12:45:24 UTC 2008
Author: gregoa
Date: Fri May 9 12:45:23 2008
New Revision: 19753
URL: http://svn.debian.org/wsvn/?sc=1&rev=19753
Log:
[svn-upgrade] Integrating new upstream version, libmasonx-interp-withcallbacks-perl (1.18)
Modified:
branches/upstream/libmasonx-interp-withcallbacks-perl/current/Build.PL
branches/upstream/libmasonx-interp-withcallbacks-perl/current/Changes
branches/upstream/libmasonx-interp-withcallbacks-perl/current/META.yml
branches/upstream/libmasonx-interp-withcallbacks-perl/current/README
branches/upstream/libmasonx-interp-withcallbacks-perl/current/lib/MasonX/Interp/WithCallbacks.pm
branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/08apache.t
branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/09cgi.t
branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/10pod.t
branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/conf/extra.conf.in
branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/lib/TestCallbacks.pm
Modified: branches/upstream/libmasonx-interp-withcallbacks-perl/current/Build.PL
URL: http://svn.debian.org/wsvn/branches/upstream/libmasonx-interp-withcallbacks-perl/current/Build.PL?rev=19753&op=diff
==============================================================================
--- branches/upstream/libmasonx-interp-withcallbacks-perl/current/Build.PL (original)
+++ branches/upstream/libmasonx-interp-withcallbacks-perl/current/Build.PL Fri May 9 12:45:23 2008
@@ -6,17 +6,17 @@
$build_pkg->new(
module_name => 'MasonX::Interp::WithCallbacks',
license => 'perl',
+ configure_requires => { 'Module::Build' => '0.2701' },
+ build_requires => { 'Test::More' => '0.17' },
+ recommends => {
+ 'Test::Pod' => '1.20',
+ 'Apache::TestMB' => 0
+ },
requires => {
'HTML::Mason' => '1.23',
'Test::Simple' => '0.17',
'Class::Container' => '0.09',
'Params::CallbackRequest' => '1.15',
},
- build_requires => {
- 'Test::Simple' => '0.17'
- },
- recommends => {
- 'Apache::TestMB' => 0
- },
add_to_cleanup => ['t/mason'],
)->create_build_script;
Modified: branches/upstream/libmasonx-interp-withcallbacks-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libmasonx-interp-withcallbacks-perl/current/Changes?rev=19753&op=diff
==============================================================================
--- branches/upstream/libmasonx-interp-withcallbacks-perl/current/Changes (original)
+++ branches/upstream/libmasonx-interp-withcallbacks-perl/current/Changes Fri May 9 12:45:23 2008
@@ -1,4 +1,16 @@
Revision history for Perl extension MasonX::Interp::WithCallbacks.
+
+1.18 2008-05-03T23:26:42
+ - Added "configure_requires" parameter to Build.PL and added Test::Pod
+ to the "recommends" parameter.
+ - Updated POD test to require Test::Pod 1.20 or later.
+ - Fixed test failures under Perl 5.6. Reported by Slaven Rezic via
+ CPAN-Testers.
+ - Added a link to the Subversion repository.
+ - Fixed the test suite to run properly with Apache::TestMB under
+ mod_perl 2 as well as mod_perl 1.
+ - Fixed failing test with older versions of CGI, such as that
+ distributed with Perl 5.6.2.
1.17 2007-07-24T19:37:47
- Fixed test failures with Mason 1.36. Patch from Niko Tyni.
Modified: branches/upstream/libmasonx-interp-withcallbacks-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libmasonx-interp-withcallbacks-perl/current/META.yml?rev=19753&op=diff
==============================================================================
--- branches/upstream/libmasonx-interp-withcallbacks-perl/current/META.yml (original)
+++ branches/upstream/libmasonx-interp-withcallbacks-perl/current/META.yml Fri May 9 12:45:23 2008
@@ -1,26 +1,29 @@
---
name: MasonX-Interp-WithCallbacks
-version: 1.17
+version: 1.18
author:
- 'David Wheeler <david at kineticode.com>'
abstract: Mason callback support via Params::CallbackRequest.
license: perl
resources:
license: http://dev.perl.org/licenses/
+configure_requires:
+ Module::Build: 0.2701
requires:
Class::Container: 0.09
HTML::Mason: 1.23
Params::CallbackRequest: 1.15
Test::Simple: 0.17
build_requires:
- Test::Simple: 0.17
+ Test::More: 0.17
recommends:
Apache::TestMB: 0
+ Test::Pod: 1.20
provides:
MasonX::Interp::WithCallbacks:
file: lib/MasonX/Interp/WithCallbacks.pm
- version: 1.17
-generated_by: Module::Build version 0.2808
+ version: 1.18
+generated_by: Module::Build version 0.280801
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.2.html
version: 1.2
Modified: branches/upstream/libmasonx-interp-withcallbacks-perl/current/README
URL: http://svn.debian.org/wsvn/branches/upstream/libmasonx-interp-withcallbacks-perl/current/README?rev=19753&op=diff
==============================================================================
--- branches/upstream/libmasonx-interp-withcallbacks-perl/current/README (original)
+++ branches/upstream/libmasonx-interp-withcallbacks-perl/current/README Fri May 9 12:45:23 2008
@@ -1,4 +1,4 @@
-MasonX/Interp/WithCallbacks version 1.17
+MasonX/Interp/WithCallbacks version 1.18
========================================
MasonX::Interp::WithCallbacks subclasses HTML::Mason::Interp in order to
@@ -52,7 +52,7 @@
COPYRIGHT AND LICENCE
-Copyright (C) 2003-2006 David Wheeler
+Copyright (C) 2003-2008 David Wheeler. Some Rights Reserved.
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+This library is free software; you can redistribute it and/or modify it under
+the same terms as Perl itself.
Modified: branches/upstream/libmasonx-interp-withcallbacks-perl/current/lib/MasonX/Interp/WithCallbacks.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmasonx-interp-withcallbacks-perl/current/lib/MasonX/Interp/WithCallbacks.pm?rev=19753&op=diff
==============================================================================
--- branches/upstream/libmasonx-interp-withcallbacks-perl/current/lib/MasonX/Interp/WithCallbacks.pm (original)
+++ branches/upstream/libmasonx-interp-withcallbacks-perl/current/lib/MasonX/Interp/WithCallbacks.pm Fri May 9 12:45:23 2008
@@ -8,7 +8,7 @@
use vars qw($VERSION @ISA);
@ISA = qw(HTML::Mason::Interp);
-$VERSION = '1.17';
+$VERSION = '1.18';
Params::Validate::validation_options
( on_fail => sub { HTML::Mason::Exception::Params->throw( join '', @_ ) } );
@@ -873,9 +873,14 @@
C<< $interp->cb_request->notes >>. Notes will be cleared out at the end of the
request, just as with C<< $r->pnotes >>.
-=head1 BUGS
-
-Please send bug reports to <bug-masonx-interp-withcallbacks at rt.cpan.org>.
+=head1 SUPPORT
+
+This module is stored in an open repository at the following address:
+
+L<https://svn.kineticode.com/MasonX-Interp-WithCallbacks/trunk/>
+
+Patches against SVN::Notify are welcome. Please send bug reports to
+<bug-MasonX-interp-withcallbacks at rt.cpan.org>.
=head1 SEE ALSO
@@ -901,7 +906,7 @@
=head1 COPYRIGHT AND LICENSE
-Copyright 2003-2006 by David Wheeler
+Copyright 2003-2008 by David Wheeler. Some Rights Reserved.
This library is free software; you can redistribute it and/or modify it under
the same terms as Perl itself.
Modified: branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/08apache.t
URL: http://svn.debian.org/wsvn/branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/08apache.t?rev=19753&op=diff
==============================================================================
--- branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/08apache.t (original)
+++ branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/08apache.t Fri May 9 12:45:23 2008
@@ -1,6 +1,6 @@
#!perl -w
-# $Id: 08apache.t 682 2004-09-28 05:59:10Z theory $
+# $Id: 08apache.t 3722 2008-05-03 02:25:47Z david $
use strict;
use Test::More;
@@ -18,13 +18,17 @@
plan tests => 178;
}
-Apache::TestRequest::user_agent(reset => 1,
- requests_redirectable => 0);
+Apache::TestRequest::user_agent(
+ reset => 1,
+ requests_redirectable => 0,
+);
my $key = 'myCallbackTester';
-my @keys = (myCallbackTester => '/test',
- OOCBTester => '/oop',
- OOCBTester => '/ooconf');
+my @keys = (
+ myCallbackTester => '/test',
+ OOCBTester => '/oop',
+ OOCBTester => '/ooconf',
+);
##############################################################################
# Just make sure it works.
Modified: branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/09cgi.t
URL: http://svn.debian.org/wsvn/branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/09cgi.t?rev=19753&op=diff
==============================================================================
--- branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/09cgi.t (original)
+++ branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/09cgi.t Fri May 9 12:45:23 2008
@@ -1,6 +1,6 @@
#!perl -w
-# $Id: 09cgi.t 2865 2006-05-26 22:35:27Z theory $
+# $Id: 09cgi.t 3730 2008-05-03 23:17:25Z david $
use strict;
use FindBin qw($Bin);
@@ -150,8 +150,8 @@
ok( $cgih->handle_request, "Handle redirection request" );
is( $outbuf, '', "Check redirection result" );
ok( my $out = $stdout->read, "Get contents of STDOUT" );
-like( $out, qr/Status: 302 (?:Moved|Found)/, "Check Status header" );
-like( $out, qr/Location: $url/, "Check Location header" );
+like( $out, qr/^Status: 302 (?:Moved|Found)/m, "Check Status header" );
+like( $out, qr/^(?:Moved\s+)?Location: $url/mi, "Check Location header" );
clear_bufs;
##############################################################################
@@ -160,9 +160,9 @@
"&$key|add_header_cb9=1";
ok( $cgih->handle_request, "Handle redirect w/o abort" );
ok( my $res = $stdout->read, "Get response headers" );
-like( $res, qr/Status: 302 (?:Moved|Found)/, "Check for Status header" );
-like( $res, qr/Location: $url/, "Check for Location header" );
-like( $res, qr/Age: 42/, "Check for age header" );
+like( $res, qr/^Status: 302 (?:Moved|Found)/m, "Check for Status header" );
+like( $res, qr/^(?:Moved\s+)?Location: $url/mi, "Check for Location header" );
+like( $res, qr/^Age: 42/mi, "Check for age header" );
clear_bufs;
Modified: branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/10pod.t
URL: http://svn.debian.org/wsvn/branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/10pod.t?rev=19753&op=diff
==============================================================================
--- branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/10pod.t (original)
+++ branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/10pod.t Fri May 9 12:45:23 2008
@@ -1,24 +1,9 @@
#!perl -w
-# $Id: 10pod.t 682 2004-09-28 05:59:10Z theory $
+# $Id: 10pod.t 3504 2008-03-10 18:54:16Z theory $
+use strict;
use Test::More;
-use FindBin qw($Bin);
-use File::Spec;
-use File::Find;
-use strict;
-
-eval "use Test::Pod 0.95";
-
-if ($@) {
- plan skip_all => "Test::Pod v0.95 required for testing POD";
-} else {
- Test::Pod->import;
- my @files;
- my $blib = File::Spec->catfile($Bin, File::Spec->updir, qw(blib lib));
- find( sub {push @files, $File::Find::name if /\.p(l|m|od)$/}, $blib);
- plan tests => scalar @files;
- foreach my $file (@files) {
- pod_file_ok($file);
- }
-}
+eval "use Test::Pod 1.20";
+plan skip_all => "Test::Pod 1.20 required for testing POD" if $@;
+all_pod_files_ok(all_pod_files('bin', 'lib'));
Modified: branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/conf/extra.conf.in
URL: http://svn.debian.org/wsvn/branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/conf/extra.conf.in?rev=19753&op=diff
==============================================================================
--- branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/conf/extra.conf.in (original)
+++ branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/conf/extra.conf.in Fri May 9 12:45:23 2008
@@ -1,11 +1,13 @@
<IfModule mod_perl.c>
PerlSetVar MasonCompRoot @DocumentRoot@
- <Perl>
- use File::Spec::Functions qw(catdir);
- use lib catdir '@ServerRoot@', 'lib';
- use lib catdir '@ServerRoot@', '..', 'blib';
- use lib catdir '@ServerRoot@', '..', 'lib';
- </Perl>
+ <IfDefine !MODPERL2>
+ <Perl>
+ use File::Spec::Functions qw(catdir);
+ use lib catdir '@ServerRoot@', 'lib';
+ use lib catdir '@ServerRoot@', '..', 'blib';
+ use lib catdir '@ServerRoot@', '..', 'lib';
+ </Perl>
+ </IfDefine>
PerlModule TestCallbacks
SetHandler perl-script
PerlHandler TestCallbacks
Modified: branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/lib/TestCallbacks.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/lib/TestCallbacks.pm?rev=19753&op=diff
==============================================================================
--- branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/lib/TestCallbacks.pm (original)
+++ branches/upstream/libmasonx-interp-withcallbacks-perl/current/t/lib/TestCallbacks.pm Fri May 9 12:45:23 2008
@@ -79,20 +79,28 @@
package TestCallbacks;
-# $Id: TestCallbacks.pm 682 2004-09-28 05:59:10Z theory $
+# $Id: TestCallbacks.pm 3722 2008-05-03 02:25:47Z david $
use strict;
use HTML::Mason::ApacheHandler;
use HTML::Mason::Exceptions;
-use Apache;
-use Apache::Constants qw(HTTP_OK);
+use constant HTTP_OK => 200;
use constant KEY => 'myCallbackTester';
-my $server = Apache->server;
+my $server;
+if ($ENV{MOD_PERL_API_VERSION}) {
+ require Apache2::ServerUtil;
+ $server = Apache2::ServerUtil->server;
+} else {
+ require Apache;
+ $server = Apache->server;
+}
+
my $cfg = $server->dir_config;
-my %params = ( comp_root => $cfg->{MasonCompRoot},
- interp_class => 'MasonX::Interp::WithCallbacks',
- );
+my %params = (
+ comp_root => $cfg->{MasonCompRoot},
+ interp_class => 'MasonX::Interp::WithCallbacks',
+);
sub simple {
my $cb = shift;
More information about the Pkg-perl-cvs-commits
mailing list