[Templates-cvs] cvs commit: Template2/t map.t object.t provider.t stash-xs.t stash.t vars.t vmeth.t
cvs@template-toolkit.org
cvs@template-toolkit.org
cvs 06/05/26 13:46:29
Modified: t map.t object.t provider.t stash-xs.t stash.t vars.t
Removed: t vmeth.t
Log:
Version 2.15
Revision Changes Path
2.3 +2 -2 Template2/t/map.t
Index: map.t
===================================================================
RCS file: /template-toolkit/Template2/t/map.t,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- map.t 2003/03/17 22:33:03 2.2
+++ map.t 2006/05/26 13:46:26 2.3
@@ -11,7 +11,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: map.t,v 2.2 2003/03/17 22:33:03 abw Exp $
+# $Id: map.t,v 2.3 2006/05/26 13:46:26 abw Exp $
#
#========================================================================
@@ -29,7 +29,7 @@
#$Template::Test::DEBUG = 0;
#$Template::Parser::DEBUG = 1;
#$Template::Directive::PRETTY = 1;
-$Template::Test::PRESERVE = 1;
+#$Template::Test::PRESERVE = 1;
#------------------------------------------------------------------------
package Some::Kind::Of::Noodle;
2.5 +10 -10 Template2/t/object.t
Index: object.t
===================================================================
RCS file: /template-toolkit/Template2/t/object.t,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -r2.4 -r2.5
--- object.t 2003/07/24 16:16:52 2.4
+++ object.t 2006/05/26 13:46:26 2.5
@@ -11,7 +11,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: object.t,v 2.4 2003/07/24 16:16:52 abw Exp $
+# $Id: object.t,v 2.5 2006/05/26 13:46:26 abw Exp $
#
#========================================================================
@@ -47,13 +47,13 @@
$params ||= {};
bless {
- PARAMS => $params,
- DAYS => [ qw( Monday Tuesday Wednesday Thursday
- Friday Saturday Sunday ) ],
- DAY => 0,
+ PARAMS => $params,
+ DAYS => [ qw( Monday Tuesday Wednesday Thursday
+ Friday Saturday Sunday ) ],
+ DAY => 0,
'public' => 314,
- '.private' => 425,
- '_hidden' => 537,
+ '.private' => 425,
+ '_hidden' => 537,
}, $class;
}
@@ -102,13 +102,13 @@
my $value = $self->{ PARAMS }->{ $name };
if (ref($value) eq 'CODE') {
- return &$value(@params);
+ return &$value(@params);
}
elsif (@params) {
- return $self->{ PARAMS }->{ $name } = shift @params;
+ return $self->{ PARAMS }->{ $name } = shift @params;
}
else {
- return $value;
+ return $value;
}
}
2.9 +21 -13 Template2/t/provider.t
Index: provider.t
===================================================================
RCS file: /template-toolkit/Template2/t/provider.t,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -r2.8 -r2.9
--- provider.t 2002/08/08 12:00:55 2.8
+++ provider.t 2006/05/26 13:46:27 2.9
@@ -12,7 +12,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: provider.t,v 2.8 2002/08/08 12:00:55 abw Exp $
+# $Id: provider.t,v 2.9 2006/05/26 13:46:27 abw Exp $
#
#========================================================================
@@ -81,20 +81,23 @@
|| die $factory->error();
ok( $parser );
-my $provinc = $factory->provider(INCLUDE_PATH => $dir,
- PARSER => $parser,
- TOLERANT => 1)
- || die $factory->error();
+my $provinc = $factory->provider(
+ INCLUDE_PATH => $dir,
+ PARSER => $parser,
+ TOLERANT => 1
+) || die $factory->error();
ok( $provinc );
-my $provabs = $factory->provider({ ABSOLUTE => 1,
- PARSER => $parser, })
- || die $factory->error();
+my $provabs = $factory->provider({
+ ABSOLUTE => 1,
+ PARSER => $parser,
+}) || die $factory->error();
ok( $provabs );
-my $provrel = Template::Provider->new({ RELATIVE => 1,
- PARSER => $parser, })
- || die $Template::Provider::ERROR;
+my $provrel = Template::Provider->new({
+ RELATIVE => 1,
+ PARSER => $parser,
+}) || die $Template::Provider::ERROR;
ok( $provrel );
ok( $provinc->{ PARSER } == $provabs->{ PARSER } );
@@ -211,8 +214,13 @@
ok( $ttd3, 'dynamic path (bad) template object created' );
-my $uselist = [ ttinc => $ttinc, ttabs => $ttabs, ttrel => $ttrel,
- ttd1 => $ttd1, ttd2 => $ttd2, ttdbad => $ttd3 ];
+my $uselist = [
+ ttinc => $ttinc,
+ ttabs => $ttabs,
+ ttrel => $ttrel,
+ ttd1 => $ttd1,
+ ttd2 => $ttd2,
+ ttdbad => $ttd3 ];
test_expect(\*DATA, $uselist, $vars);
2.11 +4 -4 Template2/t/stash-xs.t
Index: stash-xs.t
===================================================================
RCS file: /template-toolkit/Template2/t/stash-xs.t,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -r2.10 -r2.11
--- stash-xs.t 2006/01/30 20:06:54 2.10
+++ stash-xs.t 2006/05/26 13:46:27 2.11
@@ -13,7 +13,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: stash-xs.t,v 2.10 2006/01/30 20:06:54 abw Exp $
+# $Id: stash-xs.t,v 2.11 2006/05/26 13:46:27 abw Exp $
#
#========================================================================
@@ -198,7 +198,7 @@
-- test --
[% "* $item\n"
- FOREACH item IN global.myhash.list.sort -%]
+ FOREACH item IN global.myhash.items.sort -%]
-- expect --
* a
* alpha
@@ -274,13 +274,13 @@
an object
-- test --
-[% obj.list.first %]
+[% obj.items.first %]
-- expect --
name
-- test --
-[% obj.list.1 %]
+[% obj.items.1 %]
-- expect --
an object
2.17 +4 -4 Template2/t/stash.t
Index: stash.t
===================================================================
RCS file: /template-toolkit/Template2/t/stash.t,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -r2.16 -r2.17
--- stash.t 2006/01/30 13:33:57 2.16
+++ stash.t 2006/05/26 13:46:27 2.17
@@ -12,7 +12,7 @@
# This is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: stash.t,v 2.16 2006/01/30 13:33:57 abw Exp $
+# $Id: stash.t,v 2.17 2006/05/26 13:46:27 abw Exp $
#
#========================================================================
@@ -182,7 +182,7 @@
-- test --
[% "* $item\n"
- FOREACH item IN global.myhash.list.sort -%]
+ FOREACH item IN global.myhash.items.sort -%]
-- expect --
* a
* alpha
@@ -235,12 +235,12 @@
an object
-- test --
-[% obj.list.first %]
+[% obj.items.first %]
-- expect --
name
-- test --
-[% obj.list.1 %]
+[% obj.items.1 %]
-- expect --
an object
2.8 +25 -24 Template2/t/vars.t
Index: vars.t
===================================================================
RCS file: /template-toolkit/Template2/t/vars.t,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -r2.7 -r2.8
--- vars.t 2006/05/14 07:05:14 2.7
+++ vars.t 2006/05/26 13:46:27 2.8
@@ -4,23 +4,24 @@
#
# Template script testing variable use.
#
-# Written by Andy Wardley <abw@kfs.org>
+# Written by Andy Wardley <abw@wardley.org>
#
-# 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 is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
#
-# $Id: vars.t,v 2.7 2006/05/14 07:05:14 abw Exp $
+# $Id: vars.t,v 2.8 2006/05/26 13:46:27 abw Exp $
#
#========================================================================
use strict;
+use warnings;
use lib qw( ./lib ../lib );
use Template::Test;
+use Template::Stash;
use Template::Constants qw( :status );
-$^W = 1;
use Template::Parser;
$Template::Test::DEBUG = 0;
@@ -29,9 +30,9 @@
# sample data
my ($a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l, $m,
$n, $o, $p, $q, $r, $s, $t, $u, $v, $w, $x, $y, $z) =
- qw( alpha bravo charlie delta echo foxtrot golf hotel india
- juliet kilo lima mike november oscar papa quebec romeo
- sierra tango umbrella victor whisky x-ray yankee zulu );
+ qw( alpha bravo charlie delta echo foxtrot golf hotel india
+ juliet kilo lima mike november oscar papa quebec romeo
+ sierra tango umbrella victor whisky x-ray yankee zulu );
my @days = qw( Monday Tuesday Wednesday Thursday Friday Saturday Sunday );
my $day = -1;
@@ -43,12 +44,12 @@
'd' => $d,
'e' => $e,
'f' => {
- 'g' => $g,
- 'h' => $h,
- 'i' => {
- 'j' => $j,
- 'k' => $k,
- },
+ 'g' => $g,
+ 'h' => $h,
+ 'i' => {
+ 'j' => $j,
+ 'k' => $k,
+ },
},
'g' => "solo $g",
'l' => $l,
@@ -66,15 +67,15 @@
'halt' => sub { die Template::Exception->new('stop', 'stopped') },
'join' => sub { join(shift, @_) },
'split' => sub { my $s = shift; $s = quotemeta($s);
- my @r = split(/$s/, shift); \@r },
+ my @r = split(/$s/, shift); \@r },
'magic' => {
- 'chant' => 'Hocus Pocus',
- 'spell' => sub { join(" and a bit of ", @_) },
+ 'chant' => 'Hocus Pocus',
+ 'spell' => sub { join(" and a bit of ", @_) },
},
'day' => {
- 'prev' => \&yesterday,
- 'this' => \&today,
- 'next' => \&tomorrow,
+ 'prev' => \&yesterday,
+ 'this' => \&today,
+ 'next' => \&tomorrow,
},
'belief' => \&belief,
'people' => sub { return qw( Tom Dick Larry ) },
@@ -89,7 +90,7 @@
};
my $tt = [ default => Template->new({ INTERPOLATE => 1, ANYCASE => 1 }),
- notcase => Template->new({ INTERPOLATE => 1, ANYCASE => 0 }) ];
+ notcase => Template->new({ INTERPOLATE => 1, ANYCASE => 0 }) ];
test_expect(\*DATA, $tt, $params);
@@ -110,9 +111,9 @@
sub tomorrow {
my $dayno = shift;
unless (defined $dayno) {
- $day++;
- $day %= 7;
- $dayno = $day;
+ $day++;
+ $day %= 7;
+ $dayno = $day;
}
return $days[$dayno];
}
@@ -518,7 +519,7 @@
-- test --
[% mage = { name => 'Gandalf',
- aliases => [ 'Mithrandir', 'Olorin', 'Incanus' ] }
+ aliases => [ 'Mithrandir', 'Olorin', 'Incanus' ] }
-%]
[% import(mage) -%]
[% name %]