no need to keep list of headers

mojolicious · Feb 19, 2014 · dfdb30f · dfdb30f
1 parent 67de86a
commit dfdb30f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/Changes b/Changes
@@ -2,8 +2,8 @@
 4.82  2014-02-19
   - Added decode_json and encode_json functions to Mojo::JSON.
   - Added data attribute to Mojo::JSON::Pointer.
-  - Fixed small decoding error bug in Mojo::JSON.
   - Fixed bug in "user_agent_online.t".
+  - Fixed small decoding bug in Mojo::JSON.
 
 4.81  2014-02-15
   - Added direct array access for child nodes to Mojo::DOM.

diff --git a/lib/Mojo/DOM/HTML.pm b/lib/Mojo/DOM/HTML.pm
@@ -49,12 +49,6 @@ my $TOKEN_RE = qr/
   )??
 /xis;
 
-# HTML elements that break paragraphs
-my @PARAGRAPH = (
-  qw(address article aside blockquote dir div dl fieldset footer form h1 h2),
-  qw(h3 h4 h5 h6 header hr main menu nav ol p pre section table ul)
-);
-
 # HTML elements with optional end tags
 my %END = (
   body => ['head'],
@@ -63,8 +57,13 @@ my %END = (
   rp   => [qw(rt rp)],
   rt   => [qw(rt rp)]
 );
-$END{$_} = [$_]  for qw(optgroup option);
-$END{$_} = ['p'] for @PARAGRAPH;
+$END{$_} = [$_] for qw(optgroup option);
+
+# HTML elements that break paragraphs
+map { $END{$_} = ['p'] } (
+  qw(address article aside blockquote dir div dl fieldset footer form h1 h2),
+  qw(h3 h4 h5 h6 header hr main menu nav ol p pre section table ul)
+);
 
 # HTML table elements with optional end tags
 my %TABLE = map { $_ => 1 } qw(colgroup tbody td tfoot th thead tr);

diff --git a/lib/Mojo/Headers.pm b/lib/Mojo/Headers.pm
@@ -6,7 +6,7 @@ use Mojo::Util 'monkey_patch';
 has max_line_size => sub { $ENV{MOJO_MAX_LINE_SIZE} || 10240 };
 
 # Common headers
-my @HEADERS = (
+my %NORMALCASE = map { lc($_) => $_ } (
   qw(Accept Accept-Charset Accept-Encoding Accept-Language Accept-Ranges),
   qw(Allow Authorization Cache-Control Connection Content-Disposition),
   qw(Content-Encoding Content-Length Content-Range Content-Type Cookie DNT),
@@ -16,15 +16,12 @@ my @HEADERS = (
   qw(Sec-WebSocket-Protocol Sec-WebSocket-Version Server Set-Cookie Status),
   qw(TE Trailer Transfer-Encoding Upgrade User-Agent Vary WWW-Authenticate)
 );
-for my $header (@HEADERS) {
+for my $header (values %NORMALCASE) {
   my $name = lc $header;
   $name =~ s/-/_/g;
   monkey_patch __PACKAGE__, $name, sub { scalar shift->header($header => @_) };
 }
 
-# Lowercase headers
-my %NORMALCASE = map { lc($_) => $_ } @HEADERS;
-
 sub add {
   my ($self, $name) = (shift, shift);
 

diff --git a/lib/Mojo/Message/Response.pm b/lib/Mojo/Message/Response.pm
@@ -47,7 +47,7 @@ my %MESSAGES = (
   415 => 'Unsupported Media Type',
   416 => 'Request Range Not Satisfiable',
   417 => 'Expectation Failed',
-  418 => "I'm a teapot",                       # :)
+  418 => "I'm a teapot",                       # RFC 2324 :)
   422 => 'Unprocessable Entity',               # RFC 2518 (WebDAV)
   423 => 'Locked',                             # RFC 2518 (WebDAV)
   424 => 'Failed Dependency',                  # RFC 2518 (WebDAV)