pkg/shelf: case-insensitive headers, cleaner Request ctor, a lot more tests

pkg/shelf/lib/src/message.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library shelf.message;
 
 import 'dart:async';
+import 'dart:collection';
 import 'dart:convert';
 
-import 'package:collection/wrappers.dart';
+// TODO(kevmoo): use UnmodifiableMapView from SDK once 1.4 ships
+import 'package:collection/wrappers.dart' as pc show UnmodifiableMapView;

[nweiz, 2014/04/08 20:23:09]

There's never a reason to use "show" and "as" in the same import. I prefer "as"
in general.

[kevmoo, 2014/04/08 21:41:13]

Done.

 import 'package:http_parser/http_parser.dart';
 import 'package:stack_trace/stack_trace.dart';
 
 /// Represents logic shared between [Request] and [Response].
-abstract class Message {
+class Message {
   /// The HTTP headers.
   ///
   /// The value is immutable.
   final Map<String, String> headers;
 
   /// The streaming body of the message.
   ///
   /// This can be read via [read] or [readAsString].
   final Stream<List<int>> _body;
 
-  Message(UnmodifiableMapView<String, String> headers, this._body)
-      : this.headers = headers;
+  Message(Map<String, String> headers, this._body)
+      : this.headers = _getIgnoreCaseMapView(headers);
 
   /// The contents of the content-length field in [headers].
   ///
   /// If not set, `null`.
   int get contentLength {
     if (_contentLengthCache != null) return _contentLengthCache;
     if (!headers.containsKey('content-length')) return null;
     _contentLengthCache = int.parse(headers['content-length']);
     return _contentLengthCache;
   }
@@ skipping 47 matching lines @@
   /// Otherwise the encoding is taken from the Content-Type header. If that
   /// doesn't exist or doesn't have a "charset" parameter, UTF-8 is used.
   ///
   /// This calls [read] internally, which can only be called once.
   Future<String> readAsString([Encoding encoding]) {
     if (encoding == null) encoding = this.encoding;
     if (encoding == null) encoding = UTF8;
     return Chain.track(encoding.decodeStream(read()));
   }
 }
+
+pc.UnmodifiableMapView _getIgnoreCaseMapView(Map headers) {

[nweiz, 2014/04/08 20:23:09]

Document this.

[kevmoo, 2014/04/08 21:41:13]

Done.

+  var map = new LinkedHashMap(
+      equals: (key1, key2) => key1.toLowerCase() == key2.toLowerCase(),
+      hashCode: (key) => key.toLowerCase().hashCode);

[nweiz, 2014/04/08 20:23:09]

Add a TODO to use a canonicalized map once something like that exists.

[kevmoo, 2014/04/08 21:41:13]

Done.

+
+  map.addAll(headers);
+
+  // TODO(kevmoo): use UnmodifiableMapView from SDK once 1.4 ships

[nweiz, 2014/04/08 20:23:09]

You don't need this TODO twice in the same file.

[kevmoo, 2014/04/08 21:41:13]

Done.

+  return new pc.UnmodifiableMapView(map);
+}