[Templates-cvs] cvs commit: Template2/lib/Template Base.pm Config.pm Constants.pm Context.pm Directive.pm Document.pm Exception.pm FAQ.pod Filters.pm Grammar.pm Map.pm Parser.pm Plugin.pm Plugins.pm Provider.pm Service.pm Stash.pm Test.pm View.pm
cvs@template-toolkit.org
cvs@template-toolkit.org
cvs 06/05/30 17:01:29
Modified: lib/Template Base.pm Config.pm Constants.pm Context.pm
Directive.pm Document.pm Exception.pm FAQ.pod
Filters.pm Grammar.pm Map.pm Parser.pm Plugin.pm
Plugins.pm Provider.pm Service.pm Stash.pm Test.pm
View.pm
Log:
* Fixed all the version numbers
* General code cleanup
* Changed copyright messages, email addresses, etc.
* Released version 2.15b
Revision Changes Path
2.77 +3 -3 Template2/lib/Template/Base.pm
Index: Base.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Base.pm,v
retrieving revision 2.76
retrieving revision 2.77
diff -u -r2.76 -r2.77
--- Base.pm 2006/05/30 15:53:07 2.76
+++ Base.pm 2006/05/30 17:01:27 2.77
@@ -17,7 +17,7 @@
# modify it under the same terms as Perl itself.
#
# REVISION
-# $Id: Base.pm,v 2.76 2006/05/30 15:53:07 abw Exp $
+# $Id: Base.pm,v 2.77 2006/05/30 17:01:27 abw Exp $
#
#========================================================================
@@ -27,7 +27,7 @@
use warnings;
use Template::Constants;
-our $VERSION = sprintf("%d.%02d", q$Revision: 2.76 $ =~ /(\d+)\.(\d+)/);
+our $VERSION = 2.77;
#------------------------------------------------------------------------
@@ -283,7 +283,7 @@
=head1 VERSION
-2.75, distributed as part of the
+2.77, distributed as part of the
Template Toolkit version 2.15b, released on 30 May 2006.
=head1 COPYRIGHT
2.74 +5 -5 Template2/lib/Template/Config.pm
Index: Config.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Config.pm,v
retrieving revision 2.73
retrieving revision 2.74
diff -u -r2.73 -r2.74
--- Config.pm 2006/05/30 15:53:10 2.73
+++ Config.pm 2006/05/30 17:01:28 2.74
@@ -6,7 +6,7 @@
# Template Toolkit configuration module.
#
# AUTHOR
-# Andy Wardley <abw@cpan.org>
+# Andy Wardley <abw@wardley.org>
#
# COPYRIGHT
# Copyright (C) 1996-2006 Andy Wardley. All Rights Reserved.
@@ -15,7 +15,7 @@
# modify it under the same terms as Perl itself.
#
# REVISION
-# $Id: Config.pm,v 2.73 2006/05/30 15:53:10 abw Exp $
+# $Id: Config.pm,v 2.74 2006/05/30 17:01:28 abw Exp $
#
#========================================================================
@@ -23,13 +23,13 @@
use strict;
use warnings;
-use base qw( Template::Base );
+use base 'Template::Base';
use vars qw( $VERSION $DEBUG $ERROR $INSTDIR
$PARSER $PROVIDER $PLUGINS $FILTERS $ITERATOR
$LATEX_PATH $PDFLATEX_PATH $DVIPS_PATH
$STASH $SERVICE $CONTEXT $CONSTANTS @PRELOAD );
-$VERSION = sprintf("%d.%02d", q$Revision: 2.73 $ =~ /(\d+)\.(\d+)/);
+$VERSION = 2.74;
$DEBUG = 0 unless defined $DEBUG;
$ERROR = '';
$CONTEXT = 'Template::Context';
@@ -421,7 +421,7 @@
=head1 VERSION
-2.72, distributed as part of the
+2.74, distributed as part of the
Template Toolkit version 2.15b, released on 30 May 2006.
=head1 COPYRIGHT
2.74 +4 -4 Template2/lib/Template/Constants.pm
Index: Constants.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Constants.pm,v
retrieving revision 2.73
retrieving revision 2.74
diff -u -r2.73 -r2.74
--- Constants.pm 2006/05/30 15:53:11 2.73
+++ Constants.pm 2006/05/30 17:01:28 2.74
@@ -6,7 +6,7 @@
# Definition of constants for the Template Toolkit.
#
# AUTHOR
-# Andy Wardley <abw@kfs.org>
+# Andy Wardley <abw@wardley.org>
#
# COPYRIGHT
# Copyright (C) 1996-2006 Andy Wardley. All Rights Reserved.
@@ -16,7 +16,7 @@
# modify it under the same terms as Perl itself.
#
# REVISION
-# $Id: Constants.pm,v 2.73 2006/05/30 15:53:11 abw Exp $
+# $Id: Constants.pm,v 2.74 2006/05/30 17:01:28 abw Exp $
#
#============================================================================
@@ -31,7 +31,7 @@
use vars qw( @EXPORT_OK %EXPORT_TAGS );
use vars qw( $DEBUG_OPTIONS @STATUS @ERROR @CHOMP @DEBUG);
-our $VERSION = sprintf("%d.%02d", q$Revision: 2.73 $ =~ /(\d+)\.(\d+)/);
+our $VERSION = 2.74;
#========================================================================
@@ -265,7 +265,7 @@
=head1 VERSION
-2.72, distributed as part of the
+2.74, distributed as part of the
Template Toolkit version 2.15b, released on 30 May 2006.
=head1 COPYRIGHT
2.99 +10 -11 Template2/lib/Template/Context.pm
Index: Context.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Context.pm,v
retrieving revision 2.98
retrieving revision 2.99
diff -u -r2.98 -r2.99
--- Context.pm 2006/05/30 15:53:11 2.98
+++ Context.pm 2006/05/30 17:01:28 2.99
@@ -8,36 +8,35 @@
# can access the functionality of the Template Toolkit.
#
# AUTHOR
-# Andy Wardley <abw@kfs.org>
+# Andy Wardley <abw@wardley.org>
#
# COPYRIGHT
-# Copyright (C) 1996-2000 Andy Wardley. All Rights Reserved.
+# Copyright (C) 1996-2006 Andy Wardley. All Rights Reserved.
# Copyright (C) 1998-2000 Canon Research Centre Europe Ltd.
#
# This module is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
#
# REVISION
-# $Id: Context.pm,v 2.98 2006/05/30 15:53:11 abw Exp $
+# $Id: Context.pm,v 2.99 2006/05/30 17:01:28 abw Exp $
#
#============================================================================
package Template::Context;
-require 5.004;
-
use strict;
-use vars qw( $VERSION $DEBUG $AUTOLOAD $DEBUG_FORMAT );
-use base qw( Template::Base );
+use warnings;
+use base 'Template::Base';
use Template::Base;
use Template::Config;
use Template::Constants;
use Template::Exception;
-
-$VERSION = sprintf("%d.%02d", q$Revision: 2.98 $ =~ /(\d+)\.(\d+)/);
-$DEBUG_FORMAT = "\n## \$file line \$line : [% \$text %] ##\n";
+our $VERSION = 2.98;
+our $DEBUG = 0 unless defined $DEBUG;
+our $DEBUG_FORMAT = "\n## \$file line \$line : [% \$text %] ##\n";
+our $AUTOLOAD;
#========================================================================
# ----- PUBLIC METHODS -----
@@ -1551,7 +1550,7 @@
=head1 VERSION
-2.97, distributed as part of the
+2.98, distributed as part of the
Template Toolkit version 2.15b, released on 30 May 2006.
=head1 COPYRIGHT
2.20 +11 -16 Template2/lib/Template/Directive.pm
Index: Directive.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Directive.pm,v
retrieving revision 2.19
retrieving revision 2.20
diff -u -r2.19 -r2.20
--- Directive.pm 2004/05/20 08:46:54 2.19
+++ Directive.pm 2006/05/30 17:01:28 2.20
@@ -6,7 +6,7 @@
# Factory module for constructing templates from Perl code.
#
# AUTHOR
-# Andy Wardley <abw@kfs.org>
+# Andy Wardley <abw@wardley.org>
#
# WARNING
# Much of this module is hairy, even furry in places. It needs
@@ -17,35 +17,30 @@
# debugging.
#
# COPYRIGHT
-# Copyright (C) 1996-2000 Andy Wardley. All Rights Reserved.
+# Copyright (C) 1996-2006 Andy Wardley. All Rights Reserved.
# Copyright (C) 1998-2000 Canon Research Centre Europe Ltd.
#
# This module is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
#
-#----------------------------------------------------------------------------
+# REVISION
+# $Id: Directive.pm,v 2.20 2006/05/30 17:01:28 abw Exp $
#
-# $Id: Directive.pm,v 2.19 2004/05/20 08:46:54 abw Exp $
-#
#============================================================================
package Template::Directive;
-require 5.004;
-
use strict;
-use Template::Base;
+use warnings;
+use base 'Template::Base';
use Template::Constants;
use Template::Exception;
-
-use base qw( Template::Base );
-use vars qw( $VERSION $DEBUG $PRETTY $WHILE_MAX $OUTPUT );
-
-$VERSION = sprintf("%d.%02d", q$Revision: 2.19 $ =~ /(\d+)\.(\d+)/);
-$WHILE_MAX = 1000 unless defined $WHILE_MAX;
-$PRETTY = 0 unless defined $PRETTY;
-$OUTPUT = '$output .= ';
+our $VERSION = 2.20;
+our $DEBUG = 0 unless defined $DEBUG;
+our $WHILE_MAX = 1000 unless defined $WHILE_MAX;
+our $PRETTY = 0 unless defined $PRETTY;
+our $OUTPUT = '$output .= ';
sub _init {
2.79 +9 -9 Template2/lib/Template/Document.pm
Index: Document.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Document.pm,v
retrieving revision 2.78
retrieving revision 2.79
diff -u -r2.78 -r2.79
--- Document.pm 2006/05/30 15:53:11 2.78
+++ Document.pm 2006/05/30 17:01:28 2.79
@@ -17,23 +17,23 @@
#
# This module is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
-#
-#----------------------------------------------------------------------------
#
-# $Id: Document.pm,v 2.78 2006/05/30 15:53:11 abw Exp $
+# REVISION
+# $Id: Document.pm,v 2.79 2006/05/30 17:01:28 abw Exp $
#
#============================================================================
package Template::Document;
-require 5.004;
-
use strict;
-use vars qw( $VERSION $ERROR $COMPERR $DEBUG $AUTOLOAD $UNICODE );
-use base qw( Template::Base );
+use warnings;
+use base 'Template::Base';
use Template::Constants;
-$VERSION = sprintf("%d.%02d", q$Revision: 2.78 $ =~ /(\d+)\.(\d+)/);
+our $VERSION = 2.79;
+our $DEBUG = 0 unless defined $DEBUG;
+our $ERROR = '';
+our ($COMPERR, $AUTOLOAD, $UNICODE);
BEGIN {
# UNICODE is supported in versions of Perl from 5.008 onwards
@@ -487,7 +487,7 @@
=head1 VERSION
-2.77, distributed as part of the
+2.79, distributed as part of the
Template Toolkit version 2.15b, released on 30 May 2006.
=head1 COPYRIGHT
2.69 +5 -11 Template2/lib/Template/Exception.pm
Index: Exception.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Exception.pm,v
retrieving revision 2.68
retrieving revision 2.69
diff -u -r2.68 -r2.69
--- Exception.pm 2006/05/30 15:53:11 2.68
+++ Exception.pm 2006/05/30 17:01:28 2.69
@@ -16,27 +16,21 @@
# This module is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
#
-#------------------------------------------------------------------------
-#
-# $Id: Exception.pm,v 2.68 2006/05/30 15:53:11 abw Exp $
+# REVISION
+# $Id: Exception.pm,v 2.69 2006/05/30 17:01:28 abw Exp $
#
#========================================================================
-
package Template::Exception;
-require 5.005;
-
use strict;
-use vars qw( $VERSION );
-
+use warnings;
use constant TYPE => 0;
use constant INFO => 1;
use constant TEXT => 2;
use overload q|""| => "as_string", fallback => 1;
-
-$VERSION = sprintf("%d.%02d", q$Revision: 2.68 $ =~ /(\d+)\.(\d+)/);
+our $VERSION = 2.69;
#------------------------------------------------------------------------
@@ -228,7 +222,7 @@
=head1 VERSION
-2.67, distributed as part of the
+2.69, distributed as part of the
Template Toolkit version 2.15b, released on 30 May 2006.
=head1 COPYRIGHT
2.68 +2 -2 Template2/lib/Template/FAQ.pod
Index: FAQ.pod
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/FAQ.pod,v
retrieving revision 2.67
retrieving revision 2.68
diff -u -r2.67 -r2.68
--- FAQ.pod 2006/05/30 15:53:11 2.67
+++ FAQ.pod 2006/05/30 17:01:28 2.68
@@ -18,7 +18,7 @@
# modify it under the same terms as Perl itself.
#
# REVISION
-# 2.67
+# 2.68
#
#========================================================================
@@ -367,7 +367,7 @@
=head1 VERSION
-2.67, distributed as part of the
+2.68, distributed as part of the
Template Toolkit version 2.15b, released on 30 May 2006.
=head1 COPYRIGHT
2.86 +2 -8 Template2/lib/Template/Filters.pm
Index: Filters.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Filters.pm,v
retrieving revision 2.85
retrieving revision 2.86
diff -u -r2.85 -r2.86
--- Filters.pm 2006/05/30 15:48:10 2.85
+++ Filters.pm 2006/05/30 17:01:28 2.86
@@ -17,7 +17,7 @@
# modify it under the same terms as Perl itself.
#
# REVISION
-# $Id: Filters.pm,v 2.85 2006/05/30 15:48:10 abw Exp $
+# $Id: Filters.pm,v 2.86 2006/05/30 17:01:28 abw Exp $
#
#============================================================================
@@ -273,13 +273,7 @@
map { ( chr($_), sprintf("%%%02X", $_) ) } (0..255),
};
- if ($] < 5.008) {
- $text =~ s/([^\0-\x7F])/do {
- my $o = ord($1);
- sprintf("%c%c", 0xc0 | ($o >> 6), 0x80 | ($o & 0x3f));
- }/ge;
- }
- else {
+ if ($] >= 5.008) {
utf8::encode($text);
}
2.25 +10 -15 Template2/lib/Template/Grammar.pm
Index: Grammar.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Grammar.pm,v
retrieving revision 2.24
retrieving revision 2.25
diff -u -r2.24 -r2.25
--- Grammar.pm 2005/11/29 07:34:53 2.24
+++ Grammar.pm 2006/05/30 17:01:28 2.25
@@ -16,29 +16,24 @@
# This module is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
#
-#------------------------------------------------------------------------
+# REVISION
+# $Id: Grammar.pm,v 2.25 2006/05/30 17:01:28 abw Exp $
#
-# NOTE: this module is constructed from the parser/Grammar.pm.skel
-# file by running the parser/yc script. You only need to do this if
-# you have modified the grammar in the parser/Parser.yp file and need
-# to-recompile it. See the README in the 'parser' directory for more
-# information (sub-directory of the Template distribution).
+# IMPORTANT NOTE
+# This module is constructed from the parser/Grammar.pm.skel file by
+# running the parser/yc script. You only need to do this if # you
+# have modified the grammar in the parser/Parser.yp file and need #
+# to-recompile it. See the README in the 'parser' directory for
+# more information (sub-directory of the Template distribution).
#
-#------------------------------------------------------------------------
-#
-# $Id: Grammar.pm,v 2.24 2005/11/29 07:34:53 abw Exp $
-#
#========================================================================
package Template::Grammar;
-require 5.004;
-
use strict;
-use vars qw( $VERSION );
-
-$VERSION = sprintf("%d.%02d", q$Revision: 2.24 $ =~ /(\d+)\.(\d+)/);
+use warnings;
+our $VERSION = 2.25;
my (@RESERVED, %CMPOP, $LEXTABLE, $RULES, $STATES);
my ($factory, $rawstart);
2.3 +7 -9 Template2/lib/Template/Map.pm
Index: Map.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Map.pm,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- Map.pm 2003/04/23 13:32:56 2.2
+++ Map.pm 2006/05/30 17:01:28 2.3
@@ -21,27 +21,25 @@
# modify it under the same terms as Perl itself.
#
# REVISION
-# $Id: Map.pm,v 2.2 2003/04/23 13:32:56 abw Exp $
+# $Id: Map.pm,v 2.3 2006/05/30 17:01:28 abw Exp $
#
#============================================================================
package Template::Map;
-require 5.004;
-
use strict;
-use vars qw( $VERSION $DEBUG $AUTOLOAD $MAP $METHOD );
-use base qw( Template::Base );
+use warnings;
+use base 'Template::Base';
-$VERSION = sprintf("%d.%02d", q$Revision: 2.2 $ =~ /(\d+)\.(\d+)/);
-$DEBUG = 0 unless defined $DEBUG;
-$MAP = {
+our $VERSION = 2.30;
+our $DEBUG = 0 unless defined $DEBUG;
+our $MAP = {
HASH => 'hash',
ARRAY => 'list',
TEXT => 'text',
default => '',
};
-$METHOD = 'TT_name';
+our $METHOD = 'TT_name';
#$DEBUG = 1;
2.89 +4 -4 Template2/lib/Template/Parser.pm
Index: Parser.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Parser.pm,v
retrieving revision 2.88
retrieving revision 2.89
diff -u -r2.88 -r2.89
--- Parser.pm 2006/05/30 15:53:11 2.88
+++ Parser.pm 2006/05/30 17:01:28 2.89
@@ -9,7 +9,7 @@
# on Francois Desarmenien's Parse::Yapp module. Kudos to him.
#
# AUTHOR
-# Andy Wardley <abw@cpan.org>
+# Andy Wardley <abw@wardley.org>
#
# COPYRIGHT
# Copyright (C) 1996-2006 Andy Wardley. All Rights Reserved.
@@ -30,7 +30,7 @@
# specified in the Perl README file.
#
# REVISION
-# $Id: Parser.pm,v 2.88 2006/05/30 15:53:11 abw Exp $
+# $Id: Parser.pm,v 2.89 2006/05/30 17:01:28 abw Exp $
#
#============================================================================
@@ -50,7 +50,7 @@
use constant ERROR => 2;
use constant ABORT => 3;
-our $VERSION = sprintf("%d.%02d", q$Revision: 2.88 $ =~ /(\d+)\.(\d+)/);
+our $VERSION = 2.89;
our $DEBUG = 0 unless defined $DEBUG;
our $ERROR = '';
@@ -1466,7 +1466,7 @@
=head1 VERSION
-2.87, distributed as part of the
+2.89, distributed as part of the
Template Toolkit version 2.15b, released on 30 May 2006.
2.70 +11 -14 Template2/lib/Template/Plugin.pm
Index: Plugin.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Plugin.pm,v
retrieving revision 2.69
retrieving revision 2.70
diff -u -r2.69 -r2.70
--- Plugin.pm 2006/05/30 15:53:11 2.69
+++ Plugin.pm 2006/05/30 17:01:29 2.70
@@ -8,33 +8,30 @@
# and instantiated via the USE directive.
#
# AUTHOR
-# Andy Wardley <abw@kfs.org>
+# Andy Wardley <abw@wardley.org>
#
# COPYRIGHT
-# Copyright (C) 1996-2000 Andy Wardley. All Rights Reserved.
+# Copyright (C) 1996-2006 Andy Wardley. All Rights Reserved.
# Copyright (C) 1998-2000 Canon Research Centre Europe Ltd.
#
# This module is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
#
-#----------------------------------------------------------------------------
+# REVISION
+# $Id: Plugin.pm,v 2.70 2006/05/30 17:01:29 abw Exp $
#
-# $Id: Plugin.pm,v 2.69 2006/05/30 15:53:11 abw Exp $
-#
#============================================================================
package Template::Plugin;
-require 5.004;
-
use strict;
-use Template::Base;
-
-use vars qw( $VERSION $DEBUG $ERROR $AUTOLOAD );
-use base qw( Template::Base );
+use warnings;
+use base 'Template::Base';
-$VERSION = sprintf("%d.%02d", q$Revision: 2.69 $ =~ /(\d+)\.(\d+)/);
-$DEBUG = 0;
+our $VERSION = 2.70;
+our $DEBUG = 0 unless defined $DEBUG;
+our $ERROR = '';
+our $AUTOLOAD;
#========================================================================
@@ -383,7 +380,7 @@
=head1 VERSION
-2.68, distributed as part of the
+2.7, distributed as part of the
Template Toolkit version 2.15b, released on 30 May 2006.
=head1 COPYRIGHT
2.77 +6 -7 Template2/lib/Template/Plugins.pm
Index: Plugins.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Plugins.pm,v
retrieving revision 2.76
retrieving revision 2.77
diff -u -r2.76 -r2.77
--- Plugins.pm 2006/05/30 15:53:12 2.76
+++ Plugins.pm 2006/05/30 17:01:29 2.77
@@ -7,19 +7,18 @@
# instantiation of plugin objects.
#
# AUTHORS
-# Andy Wardley <abw@kfs.org>
+# Andy Wardley <abw@wardley.org>
#
# COPYRIGHT
-# Copyright (C) 1996-2000 Andy Wardley. All Rights Reserved.
+# Copyright (C) 1996-2006 Andy Wardley. All Rights Reserved.
# Copyright (C) 1998-2000 Canon Research Centre Europe Ltd.
#
# This module is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
#
-#----------------------------------------------------------------------------
+# REVISION
+# $Id: Plugins.pm,v 2.77 2006/05/30 17:01:29 abw Exp $
#
-# $Id: Plugins.pm,v 2.76 2006/05/30 15:53:12 abw Exp $
-#
#============================================================================
package Template::Plugins;
@@ -29,7 +28,7 @@
use base 'Template::Base';
use Template::Constants;
-our $VERSION = sprintf("%d.%02d", q$Revision: 2.76 $ =~ /(\d+)\.(\d+)/);
+our $VERSION = 2.77;
our $DEBUG = 0 unless defined $DEBUG;
our $PLUGIN_BASE = 'Template::Plugin';
our $STD_PLUGINS = {
@@ -866,7 +865,7 @@
=head1 VERSION
-2.75, distributed as part of the
+2.77, distributed as part of the
Template Toolkit version 2.15b, released on 30 May 2006.
=head1 COPYRIGHT
2.91 +3 -3 Template2/lib/Template/Provider.pm
Index: Provider.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Provider.pm,v
retrieving revision 2.90
retrieving revision 2.91
diff -u -r2.90 -r2.91
--- Provider.pm 2006/05/30 15:53:12 2.90
+++ Provider.pm 2006/05/30 17:01:29 2.91
@@ -26,7 +26,7 @@
# * fold ABSOLUTE and RELATIVE test cases into one regex?
#
# REVISION
-# $Id: Provider.pm,v 2.90 2006/05/30 15:53:12 abw Exp $
+# $Id: Provider.pm,v 2.91 2006/05/30 17:01:29 abw Exp $
#
#============================================================================
@@ -48,7 +48,7 @@
use constant NEXT => 4;
use constant STAT => 5;
-our $VERSION = sprintf("%d.%02d", q$Revision: 2.90 $ =~ /(\d+)\.(\d+)/);
+our $VERSION = 2.91;
our $DEBUG = 0 unless defined $DEBUG;
our $ERROR = '';
@@ -1508,7 +1508,7 @@
=head1 VERSION
-2.89, distributed as part of the
+2.91, distributed as part of the
Template Toolkit version 2.15b, released on 30 May 2006.
=head1 COPYRIGHT
2.82 +47 -47 Template2/lib/Template/Service.pm
Index: Service.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Service.pm,v
retrieving revision 2.81
retrieving revision 2.82
diff -u -r2.81 -r2.82
--- Service.pm 2006/05/30 15:53:12 2.81
+++ Service.pm 2006/05/30 17:01:29 2.82
@@ -18,7 +18,7 @@
# modify it under the same terms as Perl itself.
#
# REVISION
-# $Id: Service.pm,v 2.81 2006/05/30 15:53:12 abw Exp $
+# $Id: Service.pm,v 2.82 2006/05/30 17:01:29 abw Exp $
#
#============================================================================
@@ -305,17 +305,17 @@
use Template::Service;
my $service = Template::Service->new({
- PRE_PROCESS => [ 'config', 'header' ],
- POST_PROCESS => 'footer',
- ERROR => {
- user => 'user/index.html',
- dbi => 'error/database',
- default => 'error/default',
- },
+ PRE_PROCESS => [ 'config', 'header' ],
+ POST_PROCESS => 'footer',
+ ERROR => {
+ user => 'user/index.html',
+ dbi => 'error/database',
+ default => 'error/default',
+ },
});
my $output = $service->process($template_name, \%replace)
- || die $service->error(), "\n";
+ || die $service->error(), "\n";
=head1 DESCRIPTION
@@ -339,8 +339,8 @@
use Template;
my $template = Template->new({
- PRE_PROCESS => 'header',
- POST_PROCESS => 'footer',
+ PRE_PROCESS => 'header',
+ POST_PROCESS => 'footer',
});
Similarly, the Template::Service constructor will forward all configuration
@@ -355,12 +355,12 @@
use Template::Service;
my $service = Template::Service->new({
- PRE_PROCESS => 'header',
- POST_PROCESS => 'footer',
+ PRE_PROCESS => 'header',
+ POST_PROCESS => 'footer',
});
my $template = Template->new({
- SERVICE => $service,
+ SERVICE => $service,
});
The Template::Service module can be sub-classed to create custom service
@@ -370,13 +370,13 @@
use MyOrg::Template::Service;
my $service = MyOrg::Template::Service->new({
- PRE_PROCESS => 'header',
- POST_PROCESS => 'footer',
- COOL_OPTION => 'enabled in spades',
+ PRE_PROCESS => 'header',
+ POST_PROCESS => 'footer',
+ COOL_OPTION => 'enabled in spades',
});
my $template = Template->new({
- SERVICE => $service,
+ SERVICE => $service,
});
The Template module uses the Template::Config service() factory method
@@ -392,9 +392,9 @@
$Template::Config::SERVICE = 'MyOrg::Template::Service';
my $template = Template->new({
- PRE_PROCESS => 'header',
- POST_PROCESS => 'footer',
- COOL_OPTION => 'enabled in spades',
+ PRE_PROCESS => 'header',
+ POST_PROCESS => 'footer',
+ COOL_OPTION => 'enabled in spades',
});
=head1 METHODS
@@ -406,8 +406,8 @@
as a list of (name =E<gt> value) pairs.
my $service1 = Template::Service->new({
- PRE_PROCESS => 'header',
- POST_PROCESS => 'footer',
+ PRE_PROCESS => 'header',
+ POST_PROCESS => 'footer',
});
my $service2 = Template::Service->new( ERROR => 'error.html' );
@@ -418,10 +418,10 @@
$Template::Service::ERROR package variable.
my $service = Template::Service->new(\%config)
- || die Template::Service->error();
+ || die Template::Service->error();
my $service = Template::Service->new(\%config)
- || die $Template::Service::ERROR;
+ || die $Template::Service::ERROR;
The following configuration items may be specified:
@@ -439,16 +439,16 @@
PROCESS, WRAPPER etc.
my $service = Template::Service->new({
- PRE_PROCESS => 'header',
- POST_PROCESS => 'footer',
+ PRE_PROCESS => 'header',
+ POST_PROCESS => 'footer',
};
Multiple templates may be specified as a reference to a list. Each is
processed in the order defined.
my $service = Template::Service->new({
- PRE_PROCESS => [ 'config', 'header' ],
- POST_PROCESS => 'footer',
+ PRE_PROCESS => [ 'config', 'header' ],
+ POST_PROCESS => 'footer',
};
Alternately, multiple template may be specified as a single string,
@@ -456,8 +456,8 @@
DELIMITER option.
my $service = Template::Service->new({
- PRE_PROCESS => 'config:header',
- POST_PROCESS => 'footer',
+ PRE_PROCESS => 'config:header',
+ POST_PROCESS => 'footer',
};
The PRE_PROCESS and POST_PROCESS templates are evaluated in the same
@@ -529,7 +529,7 @@
the use of PRE_PROCESS and POST_PROCESS templates.
my $service = Template::Service->new({
- PROCESS => 'content',
+ PROCESS => 'content',
};
# processes 'content' instead of 'foo.html'
@@ -597,7 +597,7 @@
for all uncaught exceptions.
my $service = Template::Service->new({
- ERROR => 'error.html'
+ ERROR => 'error.html'
});
If the ERROR item is a hash reference the keys are assumed to be
@@ -607,11 +607,11 @@
it more appropriate in this case.
my $service = Template::Service->new({
- ERRORS => {
- user => 'user/index.html',
- dbi => 'error/database',
- default => 'error/default',
- },
+ ERRORS => {
+ user => 'user/index.html',
+ dbi => 'error/database',
+ default => 'error/default',
+ },
});
In this example, any 'user' exceptions thrown will cause the
@@ -627,12 +627,12 @@
string (i.e. C<user.passwd> is parsed as 'user'.'passwd').
my $service = Template::Service->new({
- ERROR => {
- 'user.login' => 'user/login.html',
- 'user.passwd' => 'user/badpasswd.html',
- 'user' => 'user/index.html',
- 'default' => 'error/default',
- },
+ ERROR => {
+ 'user.login' => 'user/login.html',
+ 'user.passwd' => 'user/badpasswd.html',
+ 'user' => 'user/index.html',
+ 'default' => 'error/default',
+ },
});
In this example, any template processed by the $service object, or
@@ -699,7 +699,7 @@
use Template::Constants qw( :debug );
my $template = Template->new({
- DEBUG => DEBUG_SERVICE,
+ DEBUG => DEBUG_SERVICE,
});
@@ -723,7 +723,7 @@
retrieved via the error() method.
$service->process('myfile.html', { title => 'My Test File' })
- || die $service->error();
+ || die $service->error();
=head2 context()
@@ -746,7 +746,7 @@
=head1 VERSION
-2.89, distributed as part of the
+2.91, distributed as part of the
Template Toolkit version 2.15b, released on 30 May 2006.
=head1 COPYRIGHT
2.105 +2 -2 Template2/lib/Template/Stash.pm
Index: Stash.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Stash.pm,v
retrieving revision 2.104
retrieving revision 2.105
diff -u -r2.104 -r2.105
--- Stash.pm 2006/05/30 15:53:12 2.104
+++ Stash.pm 2006/05/30 17:01:29 2.105
@@ -7,7 +7,7 @@
# variables for the Template Toolkit.
#
# AUTHOR
-# Andy Wardley <abw@cpan.org>
+# Andy Wardley <abw@wardley.org>
#
# COPYRIGHT
# Copyright (C) 1996-2006 Andy Wardley. All Rights Reserved.
@@ -17,7 +17,7 @@
# modify it under the same terms as Perl itself.
#
# REVISION
-# $Id: Stash.pm,v 2.104 2006/05/30 15:53:12 abw Exp $
+# $Id: Stash.pm,v 2.105 2006/05/30 17:01:29 abw Exp $
#
#============================================================================
2.75 +17 -20 Template2/lib/Template/Test.pm
Index: Test.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/Test.pm,v
retrieving revision 2.74
retrieving revision 2.75
diff -u -r2.74 -r2.75
--- Test.pm 2006/05/30 15:53:12 2.74
+++ Test.pm 2006/05/30 17:01:29 2.75
@@ -9,7 +9,7 @@
# originally the t/texpect.pl script.
#
# AUTHOR
-# Andy Wardley <abw@cpan.org>
+# Andy Wardley <abw@wardley.org>
#
# COPYRIGHT
# Copyright (C) 1996-2006 Andy Wardley. All Rights Reserved.
@@ -18,37 +18,34 @@
# This module is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
#
-#----------------------------------------------------------------------------
+# REVISION
+# $Id: Test.pm,v 2.75 2006/05/30 17:01:29 abw Exp $
#
-# $Id: Test.pm,v 2.74 2006/05/30 15:53:12 abw Exp $
-#
#============================================================================
package Template::Test;
-require 5.004;
-
use strict;
-use vars qw( @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS
- $VERSION $DEBUG $EXTRA $PRESERVE $REASON $NO_FLUSH
- $loaded %callsign);
+use warnings;
use Template qw( :template );
use Exporter;
-$VERSION = sprintf("%d.%02d", q$Revision: 2.74 $ =~ /(\d+)\.(\d+)/);
-$DEBUG = 0;
-@ISA = qw( Exporter );
-@EXPORT = qw( ntests ok is match flush skip_all test_expect callsign banner );
-@EXPORT_OK = ( 'assert' );
-%EXPORT_TAGS = ( all => [ @EXPORT_OK, @EXPORT ] );
+our $VERSION = 2.75;
+our $DEBUG = 0;
+our @ISA = qw( Exporter );
+our @EXPORT = qw( ntests ok is match flush skip_all test_expect callsign banner );
+our @EXPORT_OK = ( 'assert' );
+our %EXPORT_TAGS = ( all => [ @EXPORT_OK, @EXPORT ] );
$| = 1;
-$REASON = 'not applicable on this platform';
-$NO_FLUSH = 0;
-$EXTRA = 0; # any extra tests to come after test_expect()
-$PRESERVE = 0 # don't mangle newlines in output/expect
+our $REASON = 'not applicable on this platform';
+our $NO_FLUSH = 0;
+our $EXTRA = 0; # any extra tests to come after test_expect()
+our $PRESERVE = 0 # don't mangle newlines in output/expect
unless defined $PRESERVE;
+our ($loaded, %callsign);
+
# always set binmode on Win32 machines so that any output generated
# is true to what we expect
$Template::BINMODE = ($^O eq 'MSWin32') ? 1 : 0;
@@ -685,7 +682,7 @@
=head1 VERSION
-2.73, distributed as part of the
+2.75, distributed as part of the
Template Toolkit version 2.15b, released on 30 May 2006.
=head1 COPYRIGHT
2.10 +8 -14 Template2/lib/Template/View.pm
Index: View.pm
===================================================================
RCS file: /template-toolkit/Template2/lib/Template/View.pm,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -r2.9 -r2.10
--- View.pm 2004/01/30 18:36:11 2.9
+++ View.pm 2006/05/30 17:01:29 2.10
@@ -22,29 +22,27 @@
# view.print(hash3) %] or [% view.print(hash1, hash2, hash3, { }) %]
#
# REVISION
-# $Id: View.pm,v 2.9 2004/01/30 18:36:11 abw Exp $
+# $Id: View.pm,v 2.10 2006/05/30 17:01:29 abw Exp $
#
#============================================================================
package Template::View;
-require 5.004;
-
use strict;
-use vars qw( $VERSION $DEBUG $AUTOLOAD @BASEARGS $MAP );
-use base qw( Template::Base );
+use warnings;
+use base 'Template::Base';
-$VERSION = sprintf("%d.%02d", q$Revision: 2.9 $ =~ /(\d+)\.(\d+)/);
-$DEBUG = 0 unless defined $DEBUG;
-@BASEARGS = qw( context );
-$MAP = {
+our $VERSION = 2.91;
+our $DEBUG = 0 unless defined $DEBUG;
+our @BASEARGS = qw( context );
+our $AUTOLOAD;
+our $MAP = {
HASH => 'hash',
ARRAY => 'list',
TEXT => 'text',
default => '',
};
-$DEBUG = 0;
#------------------------------------------------------------------------
# _init(\%config)
@@ -728,10 +726,6 @@
=head1 AUTHOR
Andy Wardley E<lt>abw@kfs.orgE<gt>
-
-=head1 REVISION
-
-$Revision: 2.9 $
=head1 COPYRIGHT