oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rewrite macro parser, improving speed and making parameter parsing more sane

Browse source
This commit is contained in:
Graham Knop 2008-09-16 02:09:37 +00:00
parent e2942b450e
commit f0e6a30d75
9 changed files with 293 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

113
t/Macro.t
View file

@ -17,6 +17,9 @@ use WebGUI::Session;
use WebGUI::Macro;
use WebGUI::Asset;
use WebGUI::Macro;
use WebGUI::HTML;
use Tie::IxHash;
use Test::More; # increment this value for each test you create
@ -32,17 +35,21 @@ $session->user({user => $registeredUser});
my %originalMacros = %{ $session->config->get('macros') };
##Overwrite any local configuration so that we know how to call it.
foreach my $macro (qw/GroupText LoginToggle PageTitle/) {
foreach my $macro (qw/GroupText LoginToggle PageTitle MacroStart MacroEnd MacroNest ReverseParams InfiniteMacro VisualMacro/) {
$session->config->addToHash('macros', $macro, $macro);
}
$session->config->addToHash('macros', "Ex'tras", "Extras");
plan tests => 10;
plan 'no_plan'; #tests => 10;
my $macroText = "CompanyName: ^c;";
my $companyName = $session->setting->get('companyName');
WebGUI::HTML::makeParameterSafe( \$companyName );
WebGUI::Macro::process($session, \$macroText),
is(
$macroText,
"CompanyName: ".$session->setting->get('companyName'),
"CompanyName: $companyName",
"c_companyName Macro in text processed okay"
);
@ -66,7 +73,7 @@ my $macroText = q|GroupText(Registered Users, example: c/CompanyName Macro) : ^G
WebGUI::Macro::process($session, \$macroText),
is(
$macroText,
"GroupText(Registered Users, example: c/CompanyName Macro) : example: ".$session->setting->get('companyName'),
"GroupText(Registered Users, example: c/CompanyName Macro) : example: $companyName",
"GroupText Macro with nested c_companyName macro"
);
@ -136,8 +143,102 @@ my $macroText = <<'EOF'
EOF
;
WebGUI::Macro::process($session, \$macroText);
is ($macroText, $macroText, "Impossibly ugly, invalid macro fails to process and fails to kill WebGUI");
my $macroTextOut = $macroText;
WebGUI::Macro::process($session, \$macroTextOut);
is ($macroTextOut, $macroText, "Impossibly ugly, invalid macro fails to process and fails to kill WebGUI");
my $macroText = q|^GroupText("Registered Users","Commas ',' work?");|;
WebGUI::Macro::process($session, \$macroText),
is(
$macroText,
"Commas ',' work?",
"GroupText Macro with quoted comma"
);
my $macroText = qq|^ReverseParams(1,"here's a quote: \\"",2);|;
WebGUI::Macro::process($session, \$macroText),
is(
$macroText,
"2here's a quote: \"1",
"Escaped double quotes work properly"
);
my $macroText = q|^MacroNest();|;
WebGUI::Macro::process($session, \$macroText),
is(
$macroText,
"/extras/",
"Nested macro evaluates results to extras",
);
my $macroText = q|^MacroStart;^MacroEnd;|;
WebGUI::Macro::process($session, \$macroText),
is(
$macroText,
"^MacroNest();",
"Combined macro calls don't get evaluated",
);
my $macroText = q|^InfiniteMacro;|;
WebGUI::Macro::process($session, \$macroText),
is(
$macroText,
"Too many levels of macro recursion. Stopping.",
"Infinite recursion gets broken",
);
my $macroText = qq|^ReverseParams(1,"carriage returns\npass through as needed",2);|;
WebGUI::Macro::process($session, \$macroText),
is(
$macroText,
"2carriage returns\npass through as needed1",
"Carriage returns pass through as needed."
);
tie my %quotingEdges, 'Tie::IxHash';
%quotingEdges = (
'^VisualMacro(text);' => '@MacroCall[`text`]:',
'^VisualMacro(^VisualMacro("something);");' => '@MacroCall[`@MacroCall[`"something`]:"`]:',
'^VisualMacro("^VisualMacro("something););' => '@MacroCall[`"@MacroCall[`"something`]:`]:',
'^VisualMacro("^VisualMacro(something"););' => '@MacroCall[`"@MacroCall[`something"`]:`]:',
'^VisualMacro^VisualMacro(this);;' => '^VisualMacro@MacroCall[`this`]:;',
'^VisualMacro(^VisualMacro);' => '@MacroCall[`^VisualMacro`]:',
'^VisualMacro(^VisualMacro(this));' => '@MacroCall[`^VisualMacro(this)`]:',
);
my $index = 0;
while (my ($inText, $outText) = each %quotingEdges) {
my $procText = $inText;
WebGUI::Macro::process($session, \$procText),
is(
$procText,
$outText,
"Nesting edge case: $inText",
);
}
tie my %invalidCalls, 'Tie::IxHash';
%invalidCalls = (
'^;' => '^;',
'^();' => '^();',
'^MacroThatDoesntExist;' => '^MacroThatDoesntExist;',
"^Ex'tras;" => "^Ex'tras;",
'^Extras(;' => '^Extras(;',
'^Extras);' => '^Extras);',
'^Extras(;)' => '^Extras(;)',
);
my $index = 0;
while (my ($inText, $outText) = each %invalidCalls) {
my $procText = $inText;
WebGUI::Macro::process($session, \$procText),
is(
$procText,
$outText,
"Invalid macro call: $inText",
);
}
END {
$session->config->set('macros', \%originalMacros);