sub _parse_spec {
my ($self, $spec, $nested) = @_;
+ return sub { {} } unless length($spec);
for ($_[1]) {
my @match;
PARSE: { do {
# %<param spec>
/\G\%/gc and
return $self->_parse_param_handler($_, 'body');
+
+ # *<param spec>
+ /\G\*/gc and
+ return $self->_parse_param_handler($_, 'uploads');
}
return; # () will trigger the blam in our caller
}
for ($_[1]) {
my @path;
my $end = '';
+ my $keep_dot;
PATH: while (/\G\//gc) {
/\G\.\.\./gc
and do {
};
push @path, $self->_url_path_segment_match($_)
or $self->_blam("Couldn't parse path match segment");
+ /\G\.\*/gc
+ and do {
+ $keep_dot = 1;
+ last PATH;
+ };
}
- if (@path && !$end) {
+ if (@path && !$end && !$keep_dot) {
length and $_ .= '(?:\.\w+)?' for $path[-1];
}
my $re = '^('.join('/','',@path).')'.$end.'$';
sub _parse_param_handler {
my ($self, $spec, $type) = @_;
- require Web::Simple::ParamParser;
- my $unpacker = Web::Simple::ParamParser->can("get_unpacked_${type}_from");
-
for ($_[1]) {
my (@required, @single, %multi, $star, $multistar, %positional, $have_kw);
+ my %spec;
my $pos_idx = 0;
PARAM: { do {
$self->_blam("* is always named; no need to supply :") if $is_kw;
- $multi ? ($multistar = 1) : ($star = 1);
-
- $have_kw = 1;
-
- if ($star && $multistar) {
- $self->_blam("Can't use * and \@* in the same parameter match");
+ if ($star) {
+ $self->_blam("Can only use one * or \@* in a parameter match");
}
+
+ $spec{star} = { multi => $multi };
} else {
# @foo= or foo= or @foo~ or foo~
# check for = or ~ on the end
/\G\=/gc
- ? push(@required, $name)
+ ? push(@{$spec{required}||=[]}, $name)
: (/\G\~/gc or $self->_blam('Expected = or ~ after parameter name'));
- # record the key in the right category depending on the multi (@) flag
-
- $multi ? ($multi{$name} = 1) : (push @single, $name);
-
# record positional or keyword
- $is_kw ? ($have_kw = 1) : ($positional{$name} = $pos_idx++);
+ push @{$spec{$is_kw ? 'named' : 'positional'}||=[]},
+ { name => $name, multi => $multi };
}
} while (/\G\&/gc) }
- return sub {
- my $raw = $unpacker->($_[0]);
- foreach my $name (@required) {
- return unless exists $raw->{$name};
- }
- my (%p, %done);
- my @p = (undef) x $pos_idx;
- foreach my $name (
- @single,
- ($star
- ? (grep { !exists $multi{$_} } keys %$raw)
- : ()
- )
- ) {
- if (exists $raw->{$name}) {
- if (exists $positional{$name}) {
- $p[$positional{$name}] = $raw->{$name}->[-1];
- } else {
- $p{$name} = $raw->{$name}->[-1];
- }
- }
- $done{$name} = 1;
- }
- foreach my $name (
- keys %multi,
- ($multistar
- ? (grep { !exists $done{$_} && !exists $multi{$_} } keys %$raw)
- : ()
- )
- ) {
- if (exists $positional{$name}) {
- $p[$positional{$name}] = $raw->{$name}||[];
- } else {
- $p{$name} = $raw->{$name}||[];
- }
- }
- $p[$pos_idx] = \%p if $have_kw;
- return ({}, @p);
- };
+ return Web::Dispatch::Predicates->can("match_${type}")->(\%spec);
}
}