Changeset 92

Timestamp:

12/21/09 19:57:32 (3 years ago)

Author:

clinton

Message:

Add ability to determine current Mungo file, resolves trac29, tid10892 tid10737

Files:

• trunk/MANIFEST (modified) (2 diffs)
• trunk/lib/Mungo.pm (modified) (2 diffs)
• trunk/lib/Mungo/Response.pm (modified) (4 diffs)
• trunk/t/19-filename.t (added)
• trunk/t/htdocs/19-filename (added)
• trunk/t/htdocs/19-filename/one-level.asp (added)
• trunk/t/htdocs/19-filename/stringy.asp (added)
• trunk/t/htdocs/19-filename/two-level.asp (added)

trunk/MANIFEST

@@ -123 +123 @@
-t/htdocs/13-errors/compile-use.asp
-t/htdocs/13-errors/compile-use-source-dump.asp
-
-t/16-cache-compiled.t
-t/htdocs/16-cache-compiled/echo-compile-time.asp
@@ -137 +136 @@
-t/htdocs/18-quiet/bad-use.asp
-t/htdocs/18-quiet/mungo-error-doc.txt
+t/19-filename.t
+t/htdocs/19-filename/one-level.asp
+t/htdocs/19-filename/two-level.asp
+t/htdocs/19-filename/stringy.asp

trunk/lib/Mungo.pm

@@ -245 +245 @@
-  use Apache2::RequestRec;
-  use Apache2::RequestUtil;
-
+SERVER_ERROR
-";
-if($@) {
@@ -428 +428 @@
-}
-
+sub CurrentFile {
+    my $self = shift;
+    my @file_stack;
+
+    # Unwind the stack.  Each time we hit a package whose name
+    # begins with Mungo::FilePage, demangle the name and push onto our list.
+    my $frame_count = 0;
+    while (my @frame = caller($frame_count)) {
+        $frame_count++;
+        my $package = $frame[0];
+        if ($package =~ /Mungo::(File|Mem)Page/) {
+            my $awkwardly_built_string = $self->demangle_name($package . '::__content');
+            $awkwardly_built_string =~ s{Mungo::(File|Mem)Page\((.+)\)}{$2};
+            push @file_stack, $awkwardly_built_string;
+        }
+    }
+    print STDERR "have file_stack:\n" . Dumper(\@file_stack);
+
+    return wantarray() ? @file_stack : $file_stack[0];
+}
-
-# Private?

trunk/lib/Mungo/Response.pm

@@ -30 +30 @@
-     $Response->AddHeader('header_name' => $value);
-  %>
+
+  <!-- path of the current file (handy for debugging) -->
+  <% my $file = $Response->CurrentFile(); %>
+
-
-  <!-- Halt processing and jump out of the handler -->
@@ -98 +102 @@
-use Mungo::Utils;
-use HTML::Entities;
+use Apache2::Const qw ( OK NOT_FOUND DECLINED SERVER_ERROR);
+
-our $AUTOLOAD;
-
@@ -196 +202 @@
-}
-
+=head2 $file = $Response->CurrentFile();
+
+=head2 @nested_files = $Response->CurrentFile();
+
+Returns the path on the filesystem from which the currently executing Mungo code originated.  In the second form, the call stack is unwound, and all files are returned, with the deepest-nested one first.  
+
+If the Mungo code originated from a string reference rather than a file, the file entry will read 'ANON'.
+
+=cut
+
+sub CurrentFile {
+    my $self = shift;
+    return $self->{Mungo}->CurrentFile();
+}
+
-=head2 $Response->i18nHandler($coderef);
-
@@ -367 +388 @@
-    print '<pre>'.Dumper($@).'</pre>';
-  }
+
+  # Set response code to 500.  Fixes trac16
+  $self->{Mungo}->{data}->{ApacheResponseCode} = SERVER_ERROR;
-}
-