Changeset 1091

Timestamp:

06/18/07 16:20:16 (16 months ago)

Author:

dom

Message:

Add noheaders option, and use that in preference to black content_type
arg. (fixes #220)

Location:

trunk

Files:

• lib/OpenGuides/Template.pm (modified) (4 diffs)
• t/15_template.t (modified) (2 diffs)
• t/58_navbar_common_locales_categories.t (modified) (1 diff)
• t/59_preferences.t (modified) (1 diff)
• wiki.cgi (modified) (1 diff)

trunk/lib/OpenGuides/Template.pm

@@ -51 +51 @@
                                       content_type => "text/html",
                                       cookies      => $cookie,
-                                      vars         => {foo => "bar"}
+                                      vars         => {foo => "bar"},
+                                      noheaders    => 1
   );
 
@@ -111 +112 @@
 Content-Type: defaults to C<text/html> and is omitted if the
 C<content_type> arg is explicitly set to the blank string.
+
+However, what you more often need is the C<noheaders> option,
+which suppresses all HTTP headers, not just the Content-Type.
 
 The HTTP response code may be explictly set with the C<http_status> arg.
@@ -188 +192 @@
 
     my $header = "";
-    my %cgi_header_args;
-
-    if ( defined $args{content_type} and $args{content_type} eq "" ) {
-        $cgi_header_args{'-type'} = '';
-    } else {
-        if ( $args{content_type} ) {
-            $cgi_header_args{'-type'} = $args{content_type};
+
+    unless ( $args{noheaders} ) {
+        my %cgi_header_args;
+
+        if ( defined $args{content_type} and $args{content_type} eq "" ) {
+            $cgi_header_args{'-type'} = '';
         } else {
-            $cgi_header_args{'-type'} = "text/html";
-        }
+            if ( $args{content_type} ) {
+                $cgi_header_args{'-type'} = $args{content_type};
+            } else {
+                $cgi_header_args{'-type'} = "text/html";
+            }
+        }
+
         if ( $tt_vars->{http_charset} ) {
             $cgi_header_args{'-type'} .= "; charset=".$tt_vars->{http_charset};
         }
-        # XXX should possibly not be inside this block, but retaining
-        # existing functionality for now. See
-        # http://dev.openguides.org/ticket/220
         $cgi_header_args{'-cookie'} = $args{cookies};
-    }
-
-    if ( $args{http_status} ) {
-        $cgi_header_args{'-status'} = $args{http_status};
-    }
-
-    $header = CGI::header( %cgi_header_args );
+
+        if ( $args{http_status} ) {
+            $cgi_header_args{'-status'} = $args{http_status};
+        }
+
+        $header = CGI::header( %cgi_header_args );
+    }
 
     # vile hack
@@ -220 +225 @@
                          metadata => {},
                      );
-                     
+
     $tt_vars = { %field_vars, %$tt_vars };
 

trunk/t/15_template.t

@@ -6 +6 @@
 use OpenGuides::Template;
 use OpenGuides::Test;
-use Test::More tests => 28;
+use Test::More tests => 29;
 
 my $config = OpenGuides::Test->make_basic_config;
@@ -51 +51 @@
 unlike( $output, qr/^Content-Type: text\/html/,
         "Content-Type header omitted if content_type arg explicitly blank" );
+
+$output = OpenGuides::Template->output(
+    wiki          => $wiki,
+    config        => $config,
+    template      => "15_test.tt",
+    noheaders      => 1,
+    http_response => 500
+);
+
+unlike( $output, qr/^Status: /,
+        "Headers omitted if noheaders arg given" );
 
 $output = OpenGuides::Template->output(

trunk/t/58_navbar_common_locales_categories.t

@@ -33 +33 @@
         config       => $guide->config,
         template     => "preferences.tt",
-        content_type => '',
+        noheaders    => 1,
         vars         => {
                           not_editable => 1,

trunk/t/59_preferences.t

@@ -60 +60 @@
         config       => $config,
         template     => "preferences.tt",
-        content_type => '',
+        noheaders    => 1,
         vars         => {
                           not_editable => 1,

trunk/wiki.cgi

@@ -303 +303 @@
             vars     => $vars
     );
-    $output_conf{content_type} = "" if $omit_header; # defaults otherwise
+    $output_conf{noheaders} = 1 if $omit_header; # defaults otherwise
     print OpenGuides::Template->output( %output_conf );
 }