[Jifty-commit] r6185 - in Template-Declare/branches/markapl-syntax: . lib/Template/Declare
Jifty commits
jifty-commit at lists.jifty.org
Thu Dec 25 15:14:40 EST 2008
Author: gugod
Date: Thu Dec 25 15:14:37 2008
New Revision: 6185
Added:
Template-Declare/branches/markapl-syntax/t/markapl-syntax-alternate-spelling.t
Modified:
Template-Declare/branches/markapl-syntax/ (props changed)
Template-Declare/branches/markapl-syntax/lib/Template/Declare/Tags.pm
Template-Declare/branches/markapl-syntax/t/markapl-syntax.t
Log:
r9518 at yra: gugod | 2008-12-26 01:05:06 +0800
Integrate alternative spelling of tags according to the definition in
TagSet::* modules.
Modified: Template-Declare/branches/markapl-syntax/lib/Template/Declare/Tags.pm
==============================================================================
--- Template-Declare/branches/markapl-syntax/lib/Template/Declare/Tags.pm (original)
+++ Template-Declare/branches/markapl-syntax/lib/Template/Declare/Tags.pm Thu Dec 25 15:14:37 2008
@@ -73,14 +73,10 @@
my $config = {};
my $code_str = "package $opts->{package};";
foreach my $tag (@$tag_list) {
+ my $alternative = $tagset->get_alternate_spelling($tag) || $tag;
- my $alternative = $tagset->get_alternate_spelling($tag);
- if ( defined $alternative ) {
- $tag = $alternative;
- }
-
- $code_str .= qq{sub $tag (&);};
- $config->{$tag} = {
+ $code_str .= qq{sub $alternative (&);};
+ $config->{$alternative} = {
const => tag_parser_for($tag, $tagset)
}
}
@@ -179,18 +175,6 @@
};
}
-my %alt = (
- 'cell' => 'td',
- 'row' => 'tr',
- 'html_base' => 'base',
- 'html_link' => 'link',
- 'html_map' => 'map',
- 'html_q' => 'q',
- 'html_s' => 's',
- 'html_sub' => 'sub',
- 'html_tr' => 'tr',
-);
-
sub _tag_builder_for {
my ($tag, $tagset) = @_;
@@ -219,7 +203,6 @@
sub tag_parser_for {
my ($tag, $tagset) = @_;
- $tag = $alt{$tag} if defined($alt{$tag});
return sub {
local ($Declarator, $Offset) = @_;
@@ -242,7 +225,6 @@
else {
inject_before_block("sub");
}
-
shadow(_tag_builder_for($tag, $tagset));
}
}
Added: Template-Declare/branches/markapl-syntax/t/markapl-syntax-alternate-spelling.t
==============================================================================
--- (empty file)
+++ Template-Declare/branches/markapl-syntax/t/markapl-syntax-alternate-spelling.t Thu Dec 25 15:14:37 2008
@@ -0,0 +1,30 @@
+#!/usr/bin/env perl -w
+use strict;
+use Test::More tests => 3;
+
+package View;
+use base 'Template::Declare';
+use Template::Declare::Tags;
+
+template table => sub {
+ table {
+ row {
+ cell {"One"};
+ cell {"Two"};
+ cell {"Three"}
+ }
+ }
+};
+
+package main;
+use Template::Declare;
+
+Template::Declare->init(roots => ['View']);
+
+my $out = Template::Declare->show("table");
+
+# diag $out;
+
+like $out, qr/<td>.*?<\/td>/s;
+like $out, qr/<tr>.*?<\/tr>/s;
+like $out, qr/<table>.*?<\/table>/s;
Modified: Template-Declare/branches/markapl-syntax/t/markapl-syntax.t
==============================================================================
--- Template-Declare/branches/markapl-syntax/t/markapl-syntax.t (original)
+++ Template-Declare/branches/markapl-syntax/t/markapl-syntax.t Thu Dec 25 15:14:37 2008
@@ -34,12 +34,6 @@
for(1..3) {
my $out = (Template::Declare->show("t$_"));
- diag $out;
+ # diag $out;
like($out, qr{<div(\s+id="id")?>\s*<p>.+?</p>\s*</div>});
}
-
-
-
-
-
-
More information about the Jifty-commit
mailing list