Merge branch 'master' of https://github.com/ashwanthkumar/scala-csv into ashwanthkumar-master

Author: tototoshi

src/main/scala/com/github/tototoshi/csv/CSVWriter.scala

@@ -102,6 +102,12 @@ object CSVWriter {
 
   def open(file: File, append: Boolean, encoding: String)(implicit format: CSVFormat): CSVWriter = {
     val fos = new FileOutputStream(file, append)
+    open(fos, encoding)(format)
+  }
+
+  def open(fos: OutputStream)(implicit format: CSVFormat): CSVWriter = open(fos, "UTF-8")(format)
+
+  def open(fos: OutputStream, encoding: String)(implicit format: CSVFormat): CSVWriter = {
     try {
       val writer = new OutputStreamWriter(fos, encoding)
       open(writer)(format)

src/test/scala/com/github/tototoshi/csv/CSVWriterSpec.scala

@@ -1,6 +1,6 @@
 package com.github.tototoshi.csv
 
-import java.io.{UnsupportedEncodingException, FileWriter, File}
+import java.io.{FileOutputStream, UnsupportedEncodingException, FileWriter, File}
 
 import org.scalatest.{ FunSpec, BeforeAndAfter }
 import org.scalatest.matchers._
@@ -21,6 +21,19 @@ class CSVWriterSpec extends FunSpec with ShouldMatchers with BeforeAndAfter with
   describe("CSVWriter") {
 
     describe ("#open") {
+
+      it("should be constructed with OutputStream") {
+        using (CSVWriter.open(new FileOutputStream("test.csv"))) { writer =>
+          writer.writeAll(List(List("a", "b", "c"), List("d", "e", "f")))
+        }
+      }
+
+      it("should be constructed with OutputStream and encoding") {
+        using (CSVWriter.open(new FileOutputStream("test.csv"), "UTF-8")) { writer =>
+          writer.writeAll(List(List("a", "b", "c"), List("d", "e", "f")))
+        }
+      }
+
       it("should be constructed with java.io.File") {
         using (CSVWriter.open(new File("test.csv"))) { writer =>
           writer.writeAll(List(List("a", "b", "c"), List("d", "e", "f")))