[Jifty-commit] r2353 - in jifty/branches/template-declare: .
lib/Jifty/Script lib/Jifty/Web/Form lib/Jifty/Web/Form/Field
t/TestApp-Plugin-REST/t
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Fri Dec 8 11:23:35 EST 2006
Author: audreyt
Date: Fri Dec 8 11:23:34 2006
New Revision: 2353
Modified:
jifty/branches/template-declare/ (props changed)
jifty/branches/template-declare/lib/Jifty/Dispatcher.pm
jifty/branches/template-declare/lib/Jifty/Script/Server.pm
jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm
jifty/branches/template-declare/lib/Jifty/Web/Form/Field/Select.pm
jifty/branches/template-declare/t/TestApp-Plugin-REST/t/02-basic-use.t
Log:
* Merge down to template-declare branch.
Modified: jifty/branches/template-declare/lib/Jifty/Dispatcher.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Dispatcher.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Dispatcher.pm Fri Dec 8 11:23:34 2006
@@ -1086,7 +1086,7 @@
$glob =~ s{
# Braces denote alternations
\\ \{ ( # opening (not part of expression)
- (?: # one or more characters:
+ (?: # zero or more characters:
\\ \\ \\ \} # ...escaped closing brace
|
\\ [^\}] # ...escaped (but not the closing brace)
@@ -1094,7 +1094,7 @@
[^\\] # ...normal
)+
) \\ \} # closing (not part of expression)
- }{'(?:'.join('|', split(/\\,/, $1)).')'}egx;
+ }{'(?:'.join('|', split(/\\,/, $1, -1)).')'}egx;
$glob;
}
Modified: jifty/branches/template-declare/lib/Jifty/Script/Server.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Script/Server.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Script/Server.pm Fri Dec 8 11:23:34 2006
@@ -77,6 +77,9 @@
if (-d $data_dir) {
File::Path::rmtree(["$data_dir/cache", "$data_dir/obj"]);
}
+ else {
+ File::Path::mkpath([$data_dir]);
+ }
$SIG{TERM} = sub { exit };
open my $fh, '>', PIDFILE or die $!;
Modified: jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Web/Form/Field.pm Fri Dec 8 11:23:34 2006
@@ -460,7 +460,7 @@
$field .= qq! type="@{[ $self->type ]}"!;
$field .= qq! name="@{[ $self->input_name ]}"! if ($self->input_name);
$field .= qq! id="@{[ $self->element_id ]}"!;
- $field .= qq! value="@{[HTML::Entities::encode_entities($self->current_value)]}"! if defined $self->current_value;
+ $field .= qq! value="@{[Jifty->web->escape($self->current_value)]}"! if defined $self->current_value;
$field .= $self->_widget_class;
$field .= qq! size="@{[ $self->length() ]}" maxlength="@{[ $self->length() ]}"! if ($self->length());
$field .= " " .$self->other_widget_properties;
@@ -518,7 +518,7 @@
my $field = '<span';
$field .= qq! class="@{[ $self->classes ]}"> !;
# XXX: force stringify the value because maketext is buggy with overloaded objects.
- $field .= HTML::Entities::encode_entities(_("@{[$self->current_value]}")) if defined $self->current_value;
+ $field .= Jifty->web->escape(_("@{[$self->current_value]}")) if defined $self->current_value;
$field .= qq!</span>\n!;
Jifty->web->out($field);
return '';
Modified: jifty/branches/template-declare/lib/Jifty/Web/Form/Field/Select.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Web/Form/Field/Select.pm (original)
+++ jifty/branches/template-declare/lib/Jifty/Web/Form/Field/Select.pm Fri Dec 8 11:23:34 2006
@@ -26,7 +26,7 @@
$field .= qq! selected="selected"!
if defined $self->current_value and $self->current_value eq $value;
$field .= qq!>!;
- $field .= HTML::Entities::encode_entities(_($display)) if defined $display;
+ $field .= Jifty->web->escape(_($display)) if defined $display;
$field .= qq!</option>\n!;
}
$field .= qq!</select>\n!;
@@ -53,7 +53,7 @@
@{ $self->action->available_values($self->name) };
$value = $value[0]->{display} if scalar @value;
}
- $field .= HTML::Entities::encode_entities(_($value)) if defined $value;
+ $field .= Jifty->web->escape(_($value)) if defined $value;
$field .= qq!</span>\n!;
Jifty->web->out($field);
return '';
Modified: jifty/branches/template-declare/t/TestApp-Plugin-REST/t/02-basic-use.t
==============================================================================
--- jifty/branches/template-declare/t/TestApp-Plugin-REST/t/02-basic-use.t (original)
+++ jifty/branches/template-declare/t/TestApp-Plugin-REST/t/02-basic-use.t Fri Dec 8 11:23:34 2006
@@ -13,7 +13,7 @@
use lib 't/lib';
use Jifty::SubTest;
-use Jifty::Test tests => 66;
+use Jifty::Test tests => 70;
use Jifty::Test::WWW::Mechanize;
my $server = Jifty::Test->make_server;
@@ -94,6 +94,10 @@
TestApp.Plugin.REST.Action.DeleteUser
TestApp.Plugin.REST.Action.SearchUser
TestApp.Plugin.REST.Action.DoSomething
+ TestApp.Plugin.REST.Action.Record.Create
+ TestApp.Plugin.REST.Action.Record.Delete
+ TestApp.Plugin.REST.Action.Record.Search
+ TestApp.Plugin.REST.Action.Record.Update
Jifty.Action.Autocomplete
Jifty.Action.Redirect);
More information about the Jifty-commit
mailing list