pkg/shelf: change helper method on Request and Response

pkg/shelf/lib/src/request.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.request;
 
 import 'dart:async';
 
 import 'package:http_parser/http_parser.dart';
 
 import 'message.dart';
+import 'util.dart';
 
 /// Represents an HTTP request to be processed by a Shelf application.
 class Request extends Message {
   /// The remainder of the [requestedUri] path and query designating the virtual
   /// "location" of the request's target within the handler.
   ///
   /// [url] may be an empty, if [requestedUri]targets the handler
   /// root and does not have a trailing slash.
   ///
   /// [url] is never null. If it is not empty, it will start with `/`.
@@ skipping 52 matching lines @@
     Stream<List<int>> body, Map<String, Object> context})
       : this.requestedUri = requestedUri,
         this.protocolVersion = protocolVersion == null ?
             '1.1' : protocolVersion,
         this.url = _computeUrl(requestedUri, url, scriptName),
         this.scriptName = _computeScriptName(requestedUri, url, scriptName),
         super(body == null ? new Stream.fromIterable([]) : body,
             headers: headers, context: context) {
     if (method.isEmpty) throw new ArgumentError('method cannot be empty.');
 
-    // TODO(kevmoo) use isAbsolute property on Uri once Issue 18053 is fixed
-    if (requestedUri.scheme.isEmpty) {
+    if (!requestedUri.isAbsolute) {
       throw new ArgumentError('requstedUri must be an absolute URI.');
     }
 
     if (this.scriptName.isNotEmpty && !this.scriptName.startsWith('/')) {
       throw new ArgumentError('scriptName must be empty or start with "/".');
     }
 
     if (this.scriptName == '/') {
       throw new ArgumentError(
           'scriptName can never be "/". It should be empty instead.');
     }
 
     if (this.scriptName.endsWith('/')) {
       throw new ArgumentError('scriptName must not end with "/".');
     }
 
     if (this.url.path.isNotEmpty && !this.url.path.startsWith('/')) {
       throw new ArgumentError('url must be empty or start with "/".');
     }
 
     if (this.scriptName.isEmpty && this.url.path.isEmpty) {
       throw new ArgumentError('scriptName and url cannot both be empty.');
     }
   }
+
+  /// Creates a new [Request] by copying existing values and applying specified
+  /// changes.
+  ///
+  /// New key-value pairs in [context] and [headers] will be added to the copied
+  /// [Request].
+  ///
+  /// If [context] or [headers] includes a key that already exists, the
+  /// key-value pair will replace the corresponding entry in the copied
+  /// [Request].
+  ///
+  /// All other context and header values from the [Request] will be included
+  /// in the copied [Request] unchanged.
+  Request change({Map<String, String> headers, Map<String, Object> context}) {
+    headers = updateMap(this.headers, headers);
+    context = updateMap(this.context, context);
+
+    return new Request(this.method, this.requestedUri,
+        protocolVersion: this.protocolVersion, headers: headers, url: this.url,
+        scriptName: this.scriptName, body: this.read(), context: context);
+  }
 }
 
 /// Computes `url` from the provided [Request] constructor arguments.
 ///
 /// If [url] and [scriptName] are `null`, infer value from [requestedUrl],
 /// otherwise return [url].
 ///
 /// If [url] is provided, but [scriptName] is omitted, throws an
 /// [ArgumentError].
 Uri _computeUrl(Uri requestedUri, Uri url, String scriptName) {
   if (url == null && scriptName == null) {
     return new Uri(path: requestedUri.path, query: requestedUri.query,
         fragment: requestedUri.fragment);
   }
 
   if (url != null && scriptName != null) {
-    // TODO(kevmoo) use isAbsolute property on Uri once Issue 18053 is fixed
     if (url.scheme.isNotEmpty) throw new ArgumentError('url must be relative.');
     return url;
   }
 
   throw new ArgumentError(
       'url and scriptName must both be null or both be set.');
 }
 
 /// Computes `scriptName` from the provided [Request] constructor arguments.
 ///
 /// If [url] and [scriptName] are `null` it returns an empty string, otherwise
 /// [scriptName] is returned.
 ///
 /// If [script] is provided, but [url] is omitted, throws an
 /// [ArgumentError].
 String _computeScriptName(Uri requstedUri, Uri url, String scriptName) {
   if (url == null && scriptName == null) {
     return '';
   }
 
   if (url != null && scriptName != null) {
     return scriptName;
   }
 
   throw new ArgumentError(
       'url and scriptName must both be null or both be set.');
 }