Clean up after content lib

Author: donny-dont

lib/src/multipart_body.dart

@@ -7,7 +7,6 @@ import 'dart:convert';
 
 import 'body.dart';
 import 'multipart_file.dart';
-import 'utils.dart';
 
 class MultipartBody implements Body {
   /// The contents of the message body.
@@ -26,21 +25,25 @@ class MultipartBody implements Body {
   /// Creates a [MultipartBody] from the given [fields] and [files].
   ///
   /// The [boundary] is used to
-  factory MultipartBody(Map<String, String> fields,
-      List<MultipartFile> files,
-      String boundary,) {
+  factory MultipartBody(
+    Map<String, String> fields,
+    List<MultipartFile> files,
+    String boundary,
+  ) {
     var controller = new StreamController<List<int>>(sync: true);
     var contentLength = 0;
 
     void writeAscii(String string) {
       controller.add(string.codeUnits);
       contentLength += string.length;
     }
+
     void writeUtf8(String string) {
       var encoded = UTF8.encode(string);
       controller.add(encoded);
       contentLength += encoded.length;
     }
+
     void writeLine() {
       controller.add([13, 10]); // \r\n
       contentLength += 2;
@@ -81,8 +84,8 @@ class MultipartBody implements Body {
     Future.forEach(files, (file) {
       assert(files[i] == file);
       controller.add(fileHeaders[i++]);
-      return writeStreamToSink(file.read(), controller).then((_) =>
-          controller.add([13, 10]));
+      return _writeStreamToSink(file.read(), controller)
+          .then((_) => controller.add([13, 10]));
     }).then((_) {
       // TODO(nweiz): pass any errors propagated through this future on to
       // the stream. See issue 3657.
@@ -112,7 +115,7 @@ class MultipartBody implements Body {
   static String _headerForField(String name, String value) {
     var header =
         'content-disposition: form-data; name="${_browserEncode(name)}"';
-    if (!isPlainAscii(value)) {
+    if (!_asciiOnly.hasMatch(value)) {
       header = '$header\r\n'
           'content-type: text/plain; charset=utf-8\r\n'
           'content-transfer-encoding: binary';
@@ -133,7 +136,8 @@ class MultipartBody implements Body {
     return '$header\r\n\r\n';
   }
 
-  static final _newlineRegExp = new RegExp(r"\r\n|\r|\n");
+  static final _newlineRegExp = new RegExp(r'\r\n|\r|\n');
+  static final _asciiOnly = new RegExp(r'^[\x00-\x7F]+$');
 
   /// Encode [value] in the same way browsers do.
   static String _browserEncode(String value) {
@@ -144,4 +148,14 @@ class MultipartBody implements Body {
     // characters). We follow their behavior.
     return value.replaceAll(_newlineRegExp, "%0D%0A").replaceAll('"', "%22");
   }
+
+  /// Pipes all data and errors from [stream] into [sink]. Completes [Future] once
+  /// [stream] is done. Unlike [store], [sink] remains open after [stream] is
+  /// done.
+  static Future _writeStreamToSink(Stream stream, EventSink sink) {
+    var completer = new Completer();
+    stream.listen(sink.add,
+        onError: sink.addError, onDone: () => completer.complete());
+    return completer.future;
+  }
 }

lib/src/multipart_file.dart

@@ -11,7 +11,7 @@ import 'package:collection/collection.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:path/path.dart' as path;
 
-import 'utils.dart';
+import 'content_type.dart';
 
 /// A file to be uploaded as part of a [MultipartRequest]. This doesn't need to
 /// correspond to a physical file.
@@ -71,7 +71,7 @@ class MultipartFile {
       {String filename, MediaType contentType}) {
     contentType =
         contentType == null ? new MediaType("text", "plain") : contentType;
-    var encoding = encodingForCharset(contentType.parameters['charset'], UTF8);
+    var encoding = encodingForCharset(contentType.parameters['charset']) ?? UTF8;
     contentType = contentType.change(parameters: {'charset': encoding.name});
 
     return new MultipartFile.fromBytes(field, encoding.encode(value),