X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=lib%2FCGI%2FEx%2FApp.pm;h=9b4f8c4bbda4c8ba3121321a9e6d4eb600c5146c;hb=HEAD;hp=da5904f55a0f5a3705bc4bc4c7186ac0dcceafa0;hpb=a2f50b1efd2bc986617e1de5f5a0bfd8a2953b0e;p=chaz%2Fp5-CGI-Ex
diff --git a/lib/CGI/Ex/App.pm b/lib/CGI/Ex/App.pm
index da5904f..9b4f8c4 100644
--- a/lib/CGI/Ex/App.pm
+++ b/lib/CGI/Ex/App.pm
@@ -1,10 +1,9 @@
package CGI::Ex::App;
-###----------------------------------------------------------------###
+###---------------------###
# See the perldoc in CGI/Ex/App.pod
-# Copyright 2007 - Paul Seamons
+# Copyright 2004-2012 - Paul Seamons
# Distributed under the Perl Artistic License without warranty
-###----------------------------------------------------------------###
use strict;
use Carp qw(croak);
@@ -12,8 +11,7 @@ BEGIN {
eval { use Time::HiRes qw(time) };
eval { use Scalar::Util };
}
-
-our $VERSION = '2.19';
+our $VERSION = '2.37';
sub new {
my $class = shift || croak "Usage: ".__PACKAGE__."->new";
@@ -26,6 +24,7 @@ sub new {
return $self;
}
+sub init {}
sub init_from_conf {
my $self = shift;
return if ! $self->load_conf;
@@ -34,6 +33,15 @@ sub init_from_conf {
return;
}
+sub import { # only ever called with explicit use CGI::Ex::App qw() - not with use base
+ my $class = shift;
+ if (@_ = grep { /^:?App($|__)/ } @_) {
+ require CGI::Ex::App::Constants;
+ unshift @_, 'CGI::Ex::App::Constants';
+ goto &CGI::Ex::App::Constants::import;
+ }
+}
+
###---------------------###
sub navigate {
@@ -43,26 +51,25 @@ sub navigate {
$self->{'_time'} = time;
eval {
return $self if ! $self->{'_no_pre_navigate'} && $self->pre_navigate;
-
- eval {
- local $self->{'_morph_lineage_start_index'} = $#{$self->{'_morph_lineage'} || []};
- $self->nav_loop;
- };
- croak $@ if $@ && $@ ne "Long Jump\n";
-
- $self->post_navigate if ! $self->{'_no_post_navigate'};
+ local $self->{'_morph_lineage_start_index'} = $#{$self->{'_morph_lineage'} || []};
+ $self->nav_loop;
};
- $self->handle_error($@) if $@ && $@ ne "Long Jump\n"; # catch any errors
+ my $err = $@;
+ if ($err && (ref($err) || $err ne "Long Jump\n")) { # catch any errors
+ die $err if ! $self->can('handle_error');
+ if (! eval { $self->handle_error($err); 1 }) {
+ die "$err\nAdditionally, the following happened while calling handle_error: $@";
+ }
+ }
+ $self->handle_error($@) if ! $self->{'_no_post_navigate'} && ! eval { $self->post_navigate; 1 } && $@ && $@ ne "Long Jump\n";
$self->destroy;
-
return $self;
}
sub nav_loop {
my $self = shift;
- ### keep from an infinate nesting
local $self->{'_recurse'} = $self->{'_recurse'} || 0;
if ($self->{'_recurse'}++ >= $self->recurse_limit) {
my $err = "recurse_limit (".$self->recurse_limit.") reached";
@@ -71,68 +78,39 @@ sub nav_loop {
}
my $path = $self->path;
+ return if $self->pre_loop($path);
- ### allow for an early return
- return if $self->pre_loop($path); # a true value means to abort the navigate
-
- ### iterate on each step of the path
- foreach ($self->{'path_i'} ||= 0;
- $self->{'path_i'} <= $#$path;
- $self->{'path_i'} ++) {
+ foreach ($self->{'path_i'} ||= 0; $self->{'path_i'} <= $#$path; $self->{'path_i'}++) {
my $step = $path->[$self->{'path_i'}];
- if ($step !~ /^([^\W0-9]\w*)$/) { # don't process the step if it contains odd characters
+ if ($step !~ /^([^\W0-9]\w*)$/) {
$self->stash->{'forbidden_step'} = $step;
- $self->replace_path($self->forbidden_step);
- next;
+ $self->goto_step($self->forbidden_step);
}
$step = $1; # untaint
- ### allow for per-step authentication
if (! $self->is_authed) {
my $req = $self->run_hook('require_auth', $step, 1);
- if (ref($req) ? $req->{$step} : $req) { # in the hash - or true
- return if ! $self->run_hook('get_valid_auth', $step);
- }
+ return if (ref($req) ? $req->{$step} : $req) && ! $self->run_hook('get_valid_auth', $step);
}
- ### allow for becoming another package (allows for some steps in external files)
- $self->morph($step);
-
- ### allow for mapping path_info pieces to form elements
- if (my $info = $self->path_info) {
- my $maps = $self->run_hook('path_info_map', $step) || [];
- croak 'Usage: sub path_info_map { [] }' if ! UNIVERSAL::isa($maps, 'ARRAY');
- foreach my $map (@$maps) {
- croak 'Usage: sub path_info_map { [[qr{/path_info/(\w+)}, "keyname"]] }' if ! UNIVERSAL::isa($map, 'ARRAY');
- my @match = $info =~ $map->[0];
- next if ! @match;
- $self->form->{$map->[$_]} = $match[$_ - 1] foreach grep {! defined $self->form->{$map->[$_]}} 1 .. $#$map;
- last;
- }
- }
+ $self->run_hook('morph', $step); # let steps be in external modules
- ### run the guts of the step
- my $handled = $self->run_hook('run_step', $step);
+ # allow for mapping path_info pieces to form elements
+ $self->parse_path_info('path_info_map', $self->run_hook('path_info_map', $step));
- ### Allow for the run_step to intercept.
- ### A true status means the run_step took over navigation.
- if ($handled) {
- $self->unmorph($step);
+ if ($self->run_hook('run_step', $step)) {
+ $self->run_hook('unmorph', $step);
return;
}
- ### if there are no future steps - allow for this step to designate one to follow
my $is_at_end = $self->{'path_i'} >= $#$path ? 1 : 0;
- $self->run_hook('refine_path', $step, $is_at_end);
-
- $self->unmorph($step);
+ $self->run_hook('refine_path', $step, $is_at_end); # no more steps - allow for this step to designate one to follow
+ $self->run_hook('unmorph', $step);
}
- ### allow for one exit point after the loop
- return if $self->post_loop($path); # a true value means to abort the navigate
+ return if $self->post_loop($path);
- ### run the default step as a last resort
- $self->insert_path($self->default_step);
+ $self->insert_path($self->default_step); # run the default step as a last resort
$self->nav_loop; # go recursive
return;
@@ -140,25 +118,13 @@ sub nav_loop {
sub path {
my $self = shift;
- if (! $self->{'path'}) {
- my $path = $self->{'path'} = []; # empty path
-
- ### add initial items to the form hash from path_info5B
- if (my $info = $self->path_info) {
- my $maps = $self->path_info_map_base || [];
- croak 'Usage: sub path_info_map_base { [] }' if ! UNIVERSAL::isa($maps, 'ARRAY');
- foreach my $map (@$maps) {
- croak 'Usage: sub path_info_map_base { [[qr{/path_info/(\w+)}, "keyname"]] }' if ! UNIVERSAL::isa($map, 'ARRAY');
- my @match = $info =~ $map->[0];
- next if ! @match;
- $self->form->{$map->[$_]} = $match[$_ - 1] foreach grep {! defined $self->form->{$map->[$_]}} 1 .. $#$map;
- last;
- }
- }
+ return $self->{'path'} ||= do {
+ my $path = [];
- ### make sure the step is valid
- my $step = $self->form->{$self->step_key};
+ $self->parse_path_info('path_info_map_base', $self->path_info_map_base); # add initial items to the form hash from path_info
+ my $step = $self->form->{$self->step_key}; # make sure the step is valid
if (defined $step) {
+ $step =~ s|^/+||; $step =~ s|/|__|g;
if ($step =~ /^_/) { # can't begin with _
$self->stash->{'forbidden_step'} = $step;
push @$path, $self->forbidden_step;
@@ -172,94 +138,105 @@ sub path {
push @$path, $step;
}
}
- }
+ $path;
+ };
+}
- return $self->{'path'};
+sub parse_path_info {
+ my ($self, $type, $maps, $info, $form) = @_;
+ $info ||= $self->path_info || return;
+ $form ||= $self->form;
+ return if ! $maps;
+ croak "Usage: sub $type { [] }" if ! UNIVERSAL::isa($maps, 'ARRAY');
+ foreach my $map (@$maps) {
+ croak "Usage: sub $type { [[qr{/path_info/(\\w+)}, 'keyname']] }" if ! UNIVERSAL::isa($map, 'ARRAY');
+ my @match = $info =~ $map->[0];
+ next if ! @match;
+ if (UNIVERSAL::isa($map->[1], 'CODE')) {
+ $map->[1]->($form, @match);
+ } else {
+ $form->{$map->[$_]} = $match[$_ - 1] foreach grep {! defined $form->{$map->[$_]}} 1 .. $#$map;
+ }
+ last;
+ }
}
sub run_hook {
- my $self = shift;
- my $hook = shift;
- my $step = shift;
- my ($code, $found) = @{ $self->find_hook($hook, $step) };
+ my ($self, $hook, $step, @args) = @_;
+ my ($code, $found);
+ if (ref $hook eq 'CODE') {
+ $code = $hook;
+ $hook = $found = 'coderef';
+ } else {
+ ($code, $found) = @{ $self->find_hook($hook, $step) };
+ }
croak "Could not find a method named ${step}_${hook} or ${hook}" if ! $code;
croak "Value for $hook ($found) is not a code ref ($code)" if ! UNIVERSAL::isa($code, 'CODE');
my $hist;
if (! $self->{'no_history'}) {
- $hist = {
- step => $step,
- meth => $hook,
- found => $found,
- time => time,
- };
- push @{ $self->history }, $hist;
- $hist->{'level'} = $self->{'_level'};
- $hist->{'elapsed'} = time - $hist->{'time'};
+ push @{ $self->history }, ($hist = {step => $step, meth => $hook, found => $found, time => time, level => $self->{'_level'}});
+ $hist->{'elapsed'} = time - $hist->{'time'};
}
local $self->{'_level'} = 1 + ($self->{'_level'} || 0);
- my $resp = $self->$code($step, @_);
+ my $resp = $self->$code($step, @args);
if (! $self->{'no_history'}) {
- $hist->{'elapsed'} = time - $hist->{'time'};
+ $hist->{'elapsed'} = time - $hist->{'time'};
$hist->{'response'} = $resp;
}
return $resp;
}
+sub run_hook_as {
+ my ($self, $hook, $step, $pkg, @args) = @_;
+ croak "Missing hook" if ! $hook;
+ croak "Missing step" if ! $step;
+ croak "Missing package" if ! $pkg;
+ $self->morph($step, 2, $pkg);
+ my $resp = $self->run_hook($hook, $step, @args);
+ $self->unmorph;
+ return $resp;
+}
+
sub run_step {
my $self = shift;
my $step = shift;
- ### if the pre_step exists and returns true, exit the nav_loop
- return 1 if $self->run_hook('pre_step', $step);
+ return 1 if $self->run_hook('pre_step', $step); # if true exit the nav_loop
+ return 0 if $self->run_hook('skip', $step); # if true skip this step
- ### allow for skipping this step (but stay in the nav_loop)
- return 0 if $self->run_hook('skip', $step);
-
- ### see if we have complete valid information for this step
- ### if so, do the next step
- ### if not, get necessary info and print it out
+ # check for complete valid information for this step
if ( ! $self->run_hook('prepare', $step)
|| ! $self->run_hook('info_complete', $step)
|| ! $self->run_hook('finalize', $step)) {
- ### show the page requesting the information
- $self->run_hook('prepared_print', $step);
-
- ### a hook after the printing process
- $self->run_hook('post_print', $step);
+ $self->run_hook('prepared_print', $step); # show the page requesting the information
+ $self->run_hook('post_print', $step); # a hook after the printing process
return 1;
}
- ### a hook before end of loop
- ### if the post_step exists and returns true, exit the nav_loop
- return 1 if $self->run_hook('post_step', $step);
-
- ### let the nav_loop continue searching the path
- return 0;
+ return 1 if $self->run_hook('post_step', $step); # if true exit the nav_loop
+ return 0; # let the nav_loop continue searching the path
}
sub prepared_print {
my $self = shift;
my $step = shift;
-
+ my $hash_form = $self->run_hook('hash_form', $step) || {};
my $hash_base = $self->run_hook('hash_base', $step) || {};
my $hash_comm = $self->run_hook('hash_common', $step) || {};
- my $hash_form = $self->run_hook('hash_form', $step) || {};
- my $hash_fill = $self->run_hook('hash_fill', $step) || {};
my $hash_swap = $self->run_hook('hash_swap', $step) || {};
+ my $hash_fill = $self->run_hook('hash_fill', $step) || {};
my $hash_errs = $self->run_hook('hash_errors', $step) || {};
-
$hash_errs->{$_} = $self->format_error($hash_errs->{$_}) foreach keys %$hash_errs;
$hash_errs->{'has_errors'} = 1 if scalar keys %$hash_errs;
- my $fill = {%$hash_form, %$hash_base, %$hash_comm, %$hash_fill};
my $swap = {%$hash_form, %$hash_base, %$hash_comm, %$hash_swap, %$hash_errs};
-
+ my $fill = {%$hash_form, %$hash_base, %$hash_comm, %$hash_fill};
$self->run_hook('print', $step, $swap, $fill);
}
@@ -273,49 +250,47 @@ sub print {
sub handle_error {
my ($self, $err) = @_;
-
die $err if $self->{'_handling_error'};
- local $self->{'_handling_error'} = 1;
- local $self->{'_recurse'} = 0; # allow for this next step - even if we hit a recurse error
-
+ local @{ $self }{'_handling_error', '_recurse' } = (1, 0); # allow for this next step - even if we hit a recurse error
$self->stash->{'error_step'} = $self->current_step;
$self->stash->{'error'} = $err;
- $self->replace_path($self->error_step);
-
- eval { $self->jump };
+ eval {
+ my $step = $self->error_step;
+ $self->morph($step); # let steps be in external modules
+ $self->run_hook('run_step', $step) && $self->unmorph($step);
+ };
die $@ if $@ && $@ ne "Long Jump\n";
}
###---------------------###
# read only accessors
-sub allow_morph { $_[0]->{'allow_morph'} }
-sub allow_nested_morph { $_[0]->{'allow_nested_morph'} }
-sub auth_args { $_[0]->{'auth_args'} }
-sub charset { $_[0]->{'charset'} || '' }
-sub conf_args { $_[0]->{'conf_args'} }
-sub conf_die_on_fail { $_[0]->{'conf_die_on_fail'} || ! defined $_[0]->{'conf_die_on_fail'} }
-sub conf_path { $_[0]->{'conf_path'} || $_[0]->base_dir_abs }
-sub conf_validation { $_[0]->{'conf_validation'} }
-sub default_step { $_[0]->{'default_step'} || 'main' }
-sub error_step { $_[0]->{'error_step'} || '__error' }
-sub fill_args { $_[0]->{'fill_args'} }
-sub forbidden_step { $_[0]->{'forbidden_step'} || '__forbidden' }
-sub form_name { $_[0]->{'form_name'} || 'theform' }
-sub history { $_[0]->{'history'} ||= [] }
-sub js_step { $_[0]->{'js_step'} || 'js' }
-sub login_step { $_[0]->{'login_step'} || '__login' }
-sub mimetype { $_[0]->{'mimetype'} || 'text/html' }
-sub path_info { $_[0]->{'path_info'} || $ENV{'PATH_INFO'} || '' }
-sub path_info_map_base { $_[0]->{'path_info_map_base'} ||[[qr{/(\w+)}, $_[0]->step_key]] }
-sub recurse_limit { $_[0]->{'recurse_limit'} || 15 }
-sub script_name { $_[0]->{'script_name'} || $ENV{'SCRIPT_NAME'} || $0 }
-sub stash { $_[0]->{'stash'} ||= {} }
-sub step_key { $_[0]->{'step_key'} || 'step' }
-sub template_args { $_[0]->{'template_args'} }
-sub template_path { $_[0]->{'template_path'} || $_[0]->base_dir_abs }
-sub val_args { $_[0]->{'val_args'} }
-sub val_path { $_[0]->{'val_path'} || $_[0]->template_path }
+sub allow_morph { $_[0]->{'allow_morph'} }
+sub auth_args { $_[0]->{'auth_args'} }
+sub charset { $_[0]->{'charset'} || '' }
+sub conf_args { $_[0]->{'conf_args'} }
+sub conf_die_on_fail { $_[0]->{'conf_die_on_fail'} || ! defined $_[0]->{'conf_die_on_fail'} }
+sub conf_path { $_[0]->{'conf_path'} || $_[0]->base_dir_abs }
+sub conf_validation { $_[0]->{'conf_validation'} }
+sub default_step { $_[0]->{'default_step'} || 'main' }
+sub error_step { $_[0]->{'error_step'} || '__error' }
+sub fill_args { $_[0]->{'fill_args'} }
+sub forbidden_step { $_[0]->{'forbidden_step'} || '__forbidden' }
+sub form_name { $_[0]->{'form_name'} || 'theform' }
+sub history { $_[0]->{'history'} ||= [] }
+sub js_step { $_[0]->{'js_step'} || 'js' }
+sub login_step { $_[0]->{'login_step'} || '__login' }
+sub mimetype { $_[0]->{'mimetype'} || 'text/html' }
+sub path_info { defined $_[0]->{'path_info'} ? $_[0]->{'path_info'} : $_[0]->cgix->env->{'PATH_INFO'} || '' }
+sub path_info_map_base { $_[0]->{'path_info_map_base'} ||[[qr{/(\w+)}, $_[0]->step_key]] }
+sub recurse_limit { $_[0]->{'recurse_limit'} || 15 }
+sub script_name { defined $_[0]->{'script_name'} ? $_[0]->{'script_name'} : $_[0]->cgix->env->{'SCRIPT_NAME'} || $0 }
+sub stash { $_[0]->{'stash'} ||= {} }
+sub step_key { $_[0]->{'step_key'} || 'step' }
+sub template_args { $_[0]->{'template_args'} }
+sub template_path { $_[0]->{'template_path'} || $_[0]->base_dir_abs }
+sub val_args { $_[0]->{'val_args'} }
+sub val_path { $_[0]->{'val_path'} || $_[0]->template_path }
sub conf_obj {
my $self = shift;
@@ -374,12 +349,12 @@ sub conf {
return $self->{'conf'} ||= do {
my $conf = $self->conf_file;
if (! ref $conf) {
- $conf = $self->conf_obj->read($conf, {no_warn_on_fail => 1}) || $self->conf_die_on_fail ? croak $@ : {};
+ $conf = $self->conf_obj->read($conf, {no_warn_on_fail => 1}) || ($self->conf_die_on_fail ? croak $@ : {});
}
my $hash = $self->conf_validation;
if ($hash && scalar keys %$hash) {
my $err_obj = $self->val_obj->validate($conf, $hash);
- die $err_obj if $err_obj;
+ croak "$err_obj" if $err_obj;
}
$conf;
}
@@ -404,6 +379,7 @@ sub add_to_fill { my $self = shift; $self->add_to_hash($self->hash_fill
sub add_to_form { my $self = shift; $self->add_to_hash($self->hash_form, @_) }
sub add_to_path { shift->append_path(@_) } # legacy
sub add_to_swap { my $self = shift; $self->add_to_hash($self->hash_swap, @_) }
+sub append_path { my $self = shift; push @{ $self->path }, @_ }
sub cleanup_user { my ($self, $user) = @_; $user }
sub current_step { $_[0]->step_by_path_index($_[0]->{'path_i'} || 0) }
sub destroy {}
@@ -413,7 +389,6 @@ sub fixup_before_unmorph {}
sub format_error { my ($self, $error) = @_; $error }
sub get_pass_by_user { croak "get_pass_by_user is a virtual method and needs to be overridden for authentication to work" }
sub has_errors { scalar keys %{ $_[0]->hash_errors } }
-sub init {}
sub last_step { $_[0]->step_by_path_index($#{ $_[0]->path }) }
sub path_info_map {}
sub post_loop { 0 } # true value means to abort the nav_loop - don't recurse
@@ -447,8 +422,6 @@ sub add_to_hash {
$old->{$_} = $new->{$_} foreach keys %$new;
}
-sub append_path { my $self = shift; push @{ $self->path }, @_ }
-
sub clear_app {
my $self = shift;
delete @{ $self }{qw(cgix cookies form hash_common hash_errors hash_fill hash_swap history
@@ -470,22 +443,18 @@ sub dump_history {
my $note = (' ' x ($row->{'level'} || 0))
. join(' - ', $row->{'step'}, $row->{'meth'}, $row->{'found'}, sprintf('%.5f', $row->{'elapsed'}));
my $resp = $row->{'response'};
- if (ref($resp) eq 'HASH' && ! scalar keys %$resp) {
- $note .= ' - {}';
- } elsif (ref($resp) eq 'ARRAY' && ! @$resp) {
- $note .= ' - []';
- } elsif (! defined $resp) {
- $note .= ' - undef';
- } elsif (! ref $resp || ! $all) {
- my $max = $self->{'history_max'} || 30;
- if (length($resp) > $max) {
- $resp = substr($resp, 0, $max);
- $resp =~ s/\n.+//s;
- $resp = "$resp ...";
- }
- $note .= " - $resp";
- } else {
+ if ($all) {
$note = [$note, $resp];
+ } else {
+ $note .= ' - '
+ .(! defined $resp ? 'undef'
+ : ref($resp) eq 'ARRAY' && ! @$resp ? '[]'
+ : ref($resp) eq 'HASH' && ! scalar keys %$resp ? '{}'
+ : do {
+ $resp = $1 if $resp =~ /^(.+)\n/;
+ length($resp) > 30 ? substr($resp, 0, 30)." ..." : $resp;
+ });
+ $note .= ' - '.$row->{'info'} if defined $row->{'info'};
}
push @$dump, $note;
}
@@ -495,15 +464,11 @@ sub dump_history {
sub exit_nav_loop {
my $self = shift;
-
- ### undo morphs
- if (my $ref = $self->{'_morph_lineage'}) {
- ### use the saved index - this allows for early "morphers" to only get rolled back so far
- my $index = $self->{'_morph_lineage_start_index'};
+ if (my $ref = $self->{'_morph_lineage'}) { # undo morphs
+ my $index = $self->{'_morph_lineage_start_index'}; # allow for early "morphers" to only get rolled back so far
$index = -1 if ! defined $index;
$self->unmorph while $#$ref != $index;
}
-
die "Long Jump\n";
}
@@ -514,57 +479,59 @@ sub find_hook {
return [$code, "${step}_${hook}"],
} elsif ($code = $self->can($hook)) {
return [$code, $hook];
- } else {
- return [];
}
+ return [];
}
sub insert_path {
my $self = shift;
my $ref = $self->path;
my $i = $self->{'path_i'} || 0;
- if ($i + 1 > $#$ref) {
- push @$ref, @_;
- } else {
- splice(@$ref, $i + 1, 0, @_); # insert a path at the current location
- }
+ if ($i + 1 > $#$ref) { push @$ref, @_ }
+ else { splice(@$ref, $i + 1, 0, @_) } # insert a path at the current location
}
-sub jump {
+sub jump { shift->goto_step(@_) }
+
+sub goto_step {
my $self = shift;
my $i = @_ == 1 ? shift : 1;
my $path = $self->path;
- my $path_i = $self->{'path_i'};
- croak "Can't jump if nav_loop not started" if ! defined $path_i;
-
- if ($i =~ /^\w+$/) {
- if ( $i eq 'FIRST' ) { $i = - $path_i - 1 }
- elsif ($i eq 'LAST' ) { $i = $#$path - $path_i }
- elsif ($i eq 'NEXT' ) { $i = 1 }
- elsif ($i eq 'CURRENT' ) { $i = 0 }
- elsif ($i eq 'PREVIOUS') { $i = -1 }
- else { # look for a step by that name
- for (my $j = $#$path; $j >= 0; $j --) {
- if ($path->[$j] eq $i) {
- $i = $j - $path_i;
- last;
- }
+ my $path_i = $self->{'path_i'} || 0;
+
+ if ( $i eq 'FIRST' ) { $i = - $path_i - 1 }
+ elsif ($i eq 'LAST' ) { $i = $#$path - $path_i }
+ elsif ($i eq 'NEXT' ) { $i = 1 }
+ elsif ($i eq 'CURRENT' ) { $i = 0 }
+ elsif ($i eq 'PREVIOUS') { $i = -1 }
+ elsif ($i !~ /^-?\d+/) { # look for a step by that name in the current remaining path
+ my $found;
+ for (my $j = $path_i; $j < @$path; $j++) {
+ if ($path->[$j] eq $i) {
+ $i = $j - $path_i;
+ $found = 1;
+ last;
}
}
+ if (! $found) {
+ $self->replace_path($i);
+ $i = $#$path;
+ }
}
croak "Invalid jump index ($i)" if $i !~ /^-?\d+$/;
- ### manipulate the path to contain the new jump location
- my $cut_i = $path_i + $i;
+ my $cut_i = $path_i + $i; # manipulate the path to contain the new jump location
my @replace = ($cut_i > $#$path) ? $self->default_step
: ($cut_i < 0) ? @$path
: @$path[$cut_i .. $#$path];
$self->replace_path(@replace);
$self->{'jumps'} = ($self->{'jumps'} || 0) + 1;
-
$self->{'path_i'}++; # move along now that the path is updated
- $self->nav_loop; # recurse on the path
+
+ my $lin = $self->{'_morph_lineage'} || [];
+ $self->unmorph if @$lin;
+ $self->nav_loop; # recurse on the path
$self->exit_nav_loop;
}
@@ -572,70 +539,71 @@ sub js_uri_path {
my $self = shift;
my $script = $self->script_name;
my $js_step = $self->js_step;
- return ($self->can('path') == \&CGI::Ex::App::path)
+ return ($self->can('path') == \&CGI::Ex::App::path
+ && $self->can('path_info_map_base') == \&CGI::Ex::App::path_info_map_base)
? $script .'/'. $js_step # try to use a cache friendly URI (if path is our own)
- : $script . '?'.$self->step_key.'='.$js_step.'&js='; # use one that works with more paths
+ : $script .'?'. $self->step_key .'='. $js_step .'&js='; # use one that works with more paths
}
sub morph {
my $self = shift;
+ my $ref = $self->history->[-1];
+ if (! $ref || ! $ref->{'meth'} || $ref->{'meth'} ne 'morph') {
+ push @{ $self->history }, ($ref = {meth => 'morph', found => 'morph', elapsed => 0, step => 'unknown', level => $self->{'_level'}});
+ }
my $step = shift || return;
- my $allow = $self->run_hook('allow_morph', $step) || return;
+ my $allow = shift || $self->run_hook('allow_morph', $step) || return;
+ my $new = shift; # optionally allow passing in the package to morph to
my $lin = $self->{'_morph_lineage'} ||= [];
- my $cur = ref $self; # what are we currently
- push @$lin, $cur; # store so subsequent unmorph calls can do the right thing
+ my $ok = 0;
+ my $cur = ref $self;
- my $hist = {step => $step, meth => 'morph', found => 'morph', time => time, elapsed => 0, response => 0};
- push @{ $self->history }, $hist if ! $self->{'no_history'};
+ push @$lin, $cur; # store so subsequent unmorph calls can do the right thing
- if (ref($allow) && ! $allow->{$step}) { # hash - but no step - record for unbless
- $hist->{'found'} .= " (not allowed to morph to that step)";
- return 0;
- }
+ # hash - but no step - record for unbless
+ if (ref($allow) && ! ($allow = $allow->{$step})) {
+ $ref->{'info'} = "not allowed to morph to that step";
- ### make sure we haven't already been reblessed
- if ($#$lin != 0 # is this the second morph call
- && (! ($allow = $self->allow_nested_morph($step)) # not true
- || (ref($allow) && ! $allow->{$step}) # hash - but no step
- )) {
- $hist->{'found'} .= $allow ? " (not allowed to nested_morph to that step)" : " (nested_morph disabled)";
- return 0; # just return - don't die so that we can morph early
- }
+ } elsif (! ($new ||= $self->run_hook('morph_package', $step))) {
+ $ref->{'info'} = "Missing morph_package for step $step";
+
+ } elsif ($cur eq $new) {
+ $ref->{'info'} = "already isa $new";
+ $ok = 1;
### if we are not already that package - bless us there
- my $new = $self->run_hook('morph_package', $step);
- if ($cur ne $new) {
+ } else {
(my $file = "$new.pm") =~ s|::|/|g;
- if (UNIVERSAL::can($new, 'can') # check if the package space exists
- || eval { require $file }) { # check for a file that holds this package
- bless $self, $new; # become that package
- $hist->{'found'} .= " (changed $cur to $new)";
+ if (UNIVERSAL::can($new, 'fixup_after_morph') # check if the package space exists
+ || (eval { require $file } # check for a file that holds this package
+ && UNIVERSAL::can($new, 'fixup_after_morph'))) {
+ bless $self, $new; # become that package
$self->fixup_after_morph($step);
+ $ref->{'info'} = "changed $cur to $new";
} elsif ($@) {
- if ($@ =~ /^\s*(Can\'t locate \S+ in \@INC)/) { # let us know what happened
- $hist->{'found'} .= " (failed from $cur to $new: $1)";
+ if ($allow eq '1' && $@ =~ /^\s*(Can\'t locate \S+ in \@INC)/) { # let us know what happened
+ $ref->{'info'} = "failed from $cur to $new: $1";
} else {
- $hist->{'found'} .= " (failed from $cur to $new: $@)";
- my $err = "Trouble while morphing to $file: $@";
- warn $err;
+ $ref->{'info'} = "failed from $cur to $new: $@";
+ die "Trouble while morphing from $cur to $new: $@";
}
+ } elsif ($allow ne '1') {
+ $ref->{'info'} = "package $new doesn't support CGI::Ex::App API";
+ die "Found package $new, but $new doesn't support CGI::Ex::App API";
}
+ $ok = 1;
}
- $hist->{'response'} = 1;
- return 1;
+ return $ok;
}
sub replace_path {
my $self = shift;
my $ref = $self->path;
my $i = $self->{'path_i'} || 0;
- if ($i + 1 > $#$ref) {
- push @$ref, @_;
- } else {
- splice(@$ref, $i + 1, $#$ref - $i, @_); # replace remaining entries
- }
+ if ($i + 1 > $#$ref) { push @$ref, @_; }
+ else { splice(@$ref, $i + 1, $#$ref - $i, @_); } # replace remaining entries
}
sub set_path {
@@ -650,32 +618,30 @@ sub step_by_path_index {
my $i = shift || 0;
my $ref = $self->path;
return '' if $i < 0;
-# return $self->default_step if $i > $#$ref;
return $ref->[$i];
}
sub unmorph {
my $self = shift;
my $step = shift || '_no_step';
+ my $ref = $self->history->[-1] || {};
+ if (! $ref || ! $ref->{'meth'} || $ref->{'meth'} ne 'unmorph') {
+ push @{ $self->history }, ($ref = {meth => 'unmorph', found => 'unmorph', elapsed => 0, step => $step, level => $self->{'_level'}});
+ }
my $lin = $self->{'_morph_lineage'} || return;
my $cur = ref $self;
-
- my $prev = pop(@$lin) || croak "unmorph called more times than morph - current ($cur)";
+ my $prev = pop(@$lin) || croak "unmorph called more times than morph (current: $cur)";
delete $self->{'_morph_lineage'} if ! @$lin;
- my $hist = {step => $step, meth => 'unmorph', found => 'unmorph', time => time, elapsed => 0, response => 0};
- push @{ $self->history }, $hist if ! $self->{'no_history'};
-
if ($cur ne $prev) {
$self->fixup_before_unmorph($step);
bless $self, $prev;
- $hist->{'found'} .= " (changed from $cur to $prev)";
+ $ref->{'info'} = "changed from $cur to $prev";
} else {
- $hist->{'found'} .= " (already isa $cur)";
+ $ref->{'info'} = "already isa $cur";
}
- $hist->{'response'} = 1;
- return $self;
+ return 1;
}
###---------------------###
@@ -683,12 +649,11 @@ sub unmorph {
sub file_print {
my ($self, $step) = @_;
-
my $base_dir = $self->base_dir_rel;
my $module = $self->run_hook('name_module', $step);
my $_step = $self->run_hook('name_step', $step) || croak "Missing name_step";
+ $_step =~ s|\B__+|/|g;
$_step .= '.'. $self->ext_print if $_step !~ /\.\w+$/;
-
foreach ($base_dir, $module) { $_ .= '/' if length($_) && ! m|/$| }
return $base_dir . $module . $_step;
@@ -697,7 +662,6 @@ sub file_print {
sub file_val {
my ($self, $step) = @_;
- ### determine the path to begin looking for files - allow for an arrayref
my $abs = $self->val_path || [];
$abs = $abs->() if UNIVERSAL::isa($abs, 'CODE');
$abs = [$abs] if ! UNIVERSAL::isa($abs, 'ARRAY');
@@ -706,6 +670,7 @@ sub file_val {
my $base_dir = $self->base_dir_rel;
my $module = $self->run_hook('name_module', $step);
my $_step = $self->run_hook('name_step', $step) || croak "Missing name_step";
+ $_step =~ s|\B__+|/|g;
$_step =~ s/\.\w+$//;
$_step .= '.'. $self->ext_val;
@@ -724,32 +689,29 @@ sub file_val {
sub fill_template {
my ($self, $step, $outref, $fill) = @_;
return if ! $fill || ! scalar keys %$fill;
-
my $args = $self->run_hook('fill_args', $step) || {};
- local $args->{'text'} = $outref;
- local $args->{'form'} = $fill;
-
+ local @{ $args }{'text', 'form'} = ($outref, $fill);
require CGI::Ex::Fill;
CGI::Ex::Fill::fill($args);
}
-sub finalize { 1 } # failure means show step
+sub finalize { 1 } # false means show step
sub hash_base {
my ($self, $step) = @_;
- return $self->{'hash_base'} ||= do {
- ### create a weak copy of self to use in closures
- my $copy = $self;
- eval {require Scalar::Util; Scalar::Util::weaken($copy)};
- my $hash = {
- script_name => $self->script_name,
- path_info => $self->path_info,
- js_validation => sub { $copy->run_hook('js_validation', $step, shift) },
- form_name => $self->run_hook('form_name', $step),
- $self->step_key => $step,
- }; # return of the do
+ my $hash = $self->{'hash_base'} ||= {
+ script_name => $self->script_name,
+ path_info => $self->path_info,
};
+
+ my $copy = $self; eval { require Scalar::Util; Scalar::Util::weaken($copy) };
+ $hash->{'js_validation'} = sub { $copy->run_hook('js_validation', $step, shift) };
+ $hash->{'generate_form'} = sub { $copy->run_hook('generate_form', $step, (ref($_[0]) ? (undef, shift) : shift)) };
+ $hash->{'form_name'} = $self->run_hook('form_name', $step);
+ $hash->{$self->step_key} = $step;
+
+ return $hash;
}
sub hash_common { $_[0]->{'hash_common'} ||= {} }
@@ -762,8 +724,7 @@ sub hash_validation {
my ($self, $step) = @_;
return $self->{'hash_validation'}->{$step} ||= do {
my $file = $self->run_hook('file_val', $step);
- my $hash = $file ? $self->val_obj->get_validation($file) : {}; # if the file is not found, errors will be in the webserver logs (all else dies)
- $hash; # return of the do
+ $file ? $self->val_obj->get_validation($file) : {}; # if the file is not found, errors will be in the webserver logs (all else dies)
};
}
@@ -776,21 +737,30 @@ sub info_complete {
sub js_validation {
my ($self, $step) = @_;
- return '' if $self->ext_val =~ /^html?$/; # let htm validation do it itself
-
my $form_name = $_[2] || $self->run_hook('form_name', $step);
my $hash_val = $_[3] || $self->run_hook('hash_validation', $step);
my $js_uri = $self->js_uri_path;
return '' if ! $form_name || ! ref($hash_val) || ! scalar keys %$hash_val;
-
return $self->val_obj->generate_js($hash_val, $form_name, $js_uri);
}
+sub generate_form {
+ my ($self, $step) = @_;
+ my $form_name = $_[2] || $self->run_hook('form_name', $step);
+ my $args = ref($_[3]) eq 'HASH' ? $_[3] : {};
+ my $hash_val = $self->run_hook('hash_validation', $step);
+ return '' if ! $form_name || ! ref($hash_val) || ! scalar keys %$hash_val;
+ local $args->{'js_uri_path'} = $self->js_uri_path;
+ return $self->val_obj->generate_form($hash_val, $form_name, $args);
+}
+
+sub morph_base { my $self = shift; ref($self) }
sub morph_package {
my ($self, $step) = @_;
- my $cur = ref $self; # default to using self as the base for morphed modules
- my $new = $cur .'::'. ($step || croak "Missing step");
- $new =~ s/(\b|_+)(\w)/\u$2/g; # turn Foo::my_step_name into Foo::MyStepName
+ my $cur = $self->morph_base; # default to using self as the base for morphed modules
+ my $new = ($cur ? $cur .'::' : '') . ($step || croak "Missing step");
+ $new =~ s/\B__+/::/g; # turn Foo::my_nested__step info Foo::my_nested::step
+ $new =~ s/(?:_+|\b)(\w)/\u$1/g; # turn Foo::my_step_name into Foo::MyStepName
return $new;
}
@@ -804,18 +774,26 @@ sub name_module {
sub name_step { my ($self, $step) = @_; $step }
sub next_step { $_[0]->step_by_path_index(($_[0]->{'path_i'} || 0) + 1) }
sub post_print { 0 }
-sub post_step { 0 } # success indicates we handled step (don't continue step or loop)
-sub pre_step { 0 } # success indicates we handled step (don't continue step or loop)
-sub prepare { 1 } # failure means show step
+sub post_step { 0 } # true indicates we handled step (exit loop)
+sub pre_step { 0 } # true indicates we handled step (exit loop)
+sub prepare { 1 } # false means show step
sub print_out {
my ($self, $step, $out) = @_;
-
$self->cgix->print_content_type($self->mimetype($step), $self->charset($step));
- print ref($out) eq 'SCALAR' ? $$out : $out;
+ $self->cgix->print_body(ref($out) eq 'SCALAR' ? $$out : $out);
}
-sub ready_validate { ($ENV{'REQUEST_METHOD'} && $ENV{'REQUEST_METHOD'} eq 'POST') ? 1 : 0 }
+sub ready_validate {
+ my ($self, $step) = @_;
+ if ($self->run_hook('validate_when_data', $step)) {
+ if (my @keys = keys %{ $self->run_hook('hash_validation', $step) || {} }) {
+ my $form = $self->form;
+ return (grep { exists $form->{$_} } @keys) ? 1 : 0;
+ }
+ }
+ return ($self->cgix->env->{'REQUEST_METHOD'} && $self->cgix->env->{'REQUEST_METHOD'} eq 'POST') ? 1 : 0;
+}
sub refine_path {
my ($self, $step, $is_at_end) = @_;
@@ -830,7 +808,7 @@ sub refine_path {
sub set_ready_validate { # hook and method
my $self = shift;
my ($step, $is_ready) = (@_ == 2) ? @_ : (undef, shift);
- $ENV{'REQUEST_METHOD'} = ($is_ready) ? 'POST' : 'GET';
+ $self->cgix->env->{'REQUEST_METHOD'} = ($is_ready) ? 'POST' : 'GET';
return $is_ready;
}
@@ -878,18 +856,17 @@ sub validate {
return 1;
}
+sub validate_when_data { $_[0]->{'validate_when_data'} }
+
###---------------------###
# authentication
sub navigate_authenticated {
my ($self, $args) = @_;
$self = $self->new($args) if ! ref $self;
-
- croak "The default navigate_authenticated method was called but the default require_auth method has been overwritten - aborting"
+ croak "Can't call navigate_authenticated method if default require_auth method is overwritten"
if $self->can('require_auth') != \&CGI::Ex::App::require_auth;
-
$self->require_auth(1);
-
return $self->navigate;
}
@@ -899,10 +876,7 @@ sub require_auth {
return $self->{'require_auth'} || 0;
}
-sub is_authed {
- my $data = shift->auth_data;
- return $data && ! $data->{'error'};
-}
+sub is_authed { my $data = shift->auth_data; $data && ! $data->{'error'} }
sub check_valid_auth {
return shift->_do_auth({
@@ -913,23 +887,17 @@ sub check_valid_auth {
sub get_valid_auth {
my $self = shift;
-
return $self->_do_auth({
login_print => sub { # use CGI::Ex::Auth - but use our formatting and printing
my ($auth, $template, $hash) = @_;
- my $step = $self->login_step;
- my $hash_base = $self->run_hook('hash_base', $step) || {};
- my $hash_comm = $self->run_hook('hash_common', $step) || {};
- my $hash_swap = $self->run_hook('hash_swap', $step) || {};
- my $swap = {%$hash_base, %$hash_comm, %$hash_swap, %$hash};
-
- my $out = $self->run_hook('swap_template', $step, $template, $swap);
- $self->run_hook('fill_template', $step, \$out, $hash);
- $self->run_hook('print_out', $step, \$out);
+ local $self->{'__login_file_print'} = $template;
+ local $self->{'__login_hash_common'} = $hash;
+ return $self->goto_step($self->login_step);
}
});
}
+
sub _do_auth {
my ($self, $extra) = @_;
return $self->auth_data if $self->is_authed;
@@ -947,7 +915,6 @@ sub _do_auth {
my $obj = $self->auth_obj($args);
my $resp = $obj->get_valid_auth;
-
my $data = $obj->last_auth_data;
delete $data->{'real_pass'} if defined $data; # data may be defined but false
$self->auth_data($data); # failed authentication may still have auth_data
@@ -958,29 +925,32 @@ sub _do_auth {
###---------------------###
# default steps
-### A simple step that allows for printing javascript libraries that are stored in perls @INC.
-### Which ever step is in js_step should do something similar for js validation to work.
-sub js_run_step {
+sub js_run_step { # step that allows for printing javascript libraries that are stored in perls @INC.
my $self = shift;
-
- ### make sure path info looks like /js/CGI/Ex/foo.js
my $file = $self->form->{'js'} || $self->path_info;
- $file = ($file =~ m!^(?:/js/|/)?(\w+(?:/\w+)*\.js)$!) ? $1 : '';
+ $file = ($file =~ m!^(?:/js/|/)?(\w+(?:/\w+)*\.js)$!) ? $1 : ''; # make sure path info looks like /js/CGI/Ex/foo.js
$self->cgix->print_js($file);
$self->{'_no_post_navigate'} = 1;
return 1;
}
-### A step that will be used the path method determines it is forbidden
-sub __forbidden_info_complete { 0 }
-sub __forbidden_hash_swap { shift->stash }
-sub __forbidden_file_print { \ "Denied
You do not have access to the step \"[% forbidden_step %]\"" }
+sub __forbidden_require_auth { 0 }
+sub __forbidden_allow_morph { shift->allow_morph(@_) && 1 }
+sub __forbidden_info_complete { 0 } # step that will be used the path method determines it is forbidden
+sub __forbidden_hash_common { shift->stash }
+sub __forbidden_file_print { \ "Denied
You do not have access to the step \"[% forbidden_step.html %]\"" }
+
+sub __error_allow_morph { shift->allow_morph(@_) && 1 }
+sub __error_info_complete { 0 } # step that is used by the default handle_error
+sub __error_hash_common { shift->stash }
+sub __error_file_print { \ "A fatal error occurred
Step: \"[% error_step.html %]\"
[% TRY; CONFIG DUMP => {header => 0}; DUMP error; END %]" }
-### A step that is used by the default handle_error
-sub __error_info_complete { 0 }
-sub __error_hash_swap { shift->stash }
-sub __error_file_print { \ "A fatal error occurred
Step: \"[% error_step %]\"
[% TRY; CONFIG DUMP => {header => 0}; DUMP error; END %]" }
+sub __login_require_auth { 0 }
+sub __login_allow_morph { shift->allow_morph(@_) && 1 }
+sub __login_info_complete { 0 } # step used by default authentication
+sub __login_hash_common { shift->{'__login_hash_common'} || {error => "hash_common not set during default __login"} }
+sub __login_file_print { shift->{'__login_file_print'} || \ "file_print not set during default __login
[% login_error %]" }
1;