From ad1267a7ee83a99756ff95052d23a3178614eb4b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2020 21:41:45 +0000
Subject: [PATCH] Format files using DocumentFormat

---
 docs/make.jl      |  2 +-
 src/CSVFiles.jl   | 36 +++++++++++++-------------
 src/csv_writer.jl | 64 +++++++++++++++++++++++------------------------
 test/runtests.jl  | 64 +++++++++++++++++++++++------------------------
 4 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/docs/make.jl b/docs/make.jl
index d5b2f51..51dbf53 100644
--- a/docs/make.jl
+++ b/docs/make.jl
@@ -3,7 +3,7 @@ using Documenter, CSVFiles
 makedocs(
 	modules = [CSVFiles],
 	sitename = "CSVFiles.jl",
-	analytics="UA-132838790-1",
+	analytics = "UA-132838790-1",
 	pages = [
         "Introduction" => "index.md"
     ]
diff --git a/src/CSVFiles.jl b/src/CSVFiles.jl
index 7be4e06..40eb183 100644
--- a/src/CSVFiles.jl
+++ b/src/CSVFiles.jl
@@ -50,36 +50,36 @@ end
 
 Base.showable(::MIME"application/vnd.dataresource+json", source::CSVStream) = true
 
-function fileio_load(f::FileIO.File{FileIO.format"CSV"}, deprecated_delim=nothing; delim=deprecated_delim===nothing ? ',' : deprecated_delim, args...)   
-    if deprecated_delim!==nothing
-        deprecated_delim!=delim && error("deprecated_delim and delim can not both be used at the same time.")
+function fileio_load(f::FileIO.File{FileIO.format"CSV"}, deprecated_delim = nothing; delim = deprecated_delim === nothing ? ',' : deprecated_delim, args...)
+    if deprecated_delim !== nothing
+        deprecated_delim != delim && error("deprecated_delim and delim can not both be used at the same time.")
         Base.depwarn("The positional `delim` keyword in the `load` function is deprecated. Instead use the keyword argument `delim`.", :CSVFiles)
     end
 
     return CSVFile(f.filename, delim, args)
 end
 
-function fileio_load(f::FileIO.File{FileIO.format"TSV"}, deprecated_delim=nothing; delim=deprecated_delim===nothing ? '\t' : deprecated_delim, args...)
-    if deprecated_delim!==nothing
-        deprecated_delim!=delim && error("deprecated_delim and delim can not both be used at the same time.")
+function fileio_load(f::FileIO.File{FileIO.format"TSV"}, deprecated_delim = nothing; delim = deprecated_delim === nothing ? '\t' : deprecated_delim, args...)
+    if deprecated_delim !== nothing
+        deprecated_delim != delim && error("deprecated_delim and delim can not both be used at the same time.")
         Base.depwarn("The positional `delim` keyword in the `load` function is deprecated. Instead use the keyword argument `delim`.", :CSVFiles)
     end
 
     return CSVFile(f.filename, delim, args)
 end
 
-function fileio_load(s::FileIO.Stream{FileIO.format"CSV"}, deprecated_delim=nothing; delim=deprecated_delim===nothing ? ',' : deprecated_delim, args...)
-    if deprecated_delim!==nothing
-        deprecated_delim!=delim && error("deprecated_delim and delim can not both be used at the same time.")
+function fileio_load(s::FileIO.Stream{FileIO.format"CSV"}, deprecated_delim = nothing; delim = deprecated_delim === nothing ? ',' : deprecated_delim, args...)
+    if deprecated_delim !== nothing
+        deprecated_delim != delim && error("deprecated_delim and delim can not both be used at the same time.")
         Base.depwarn("The positional `delim` keyword in the `load` function is deprecated. Instead use the keyword argument `delim`.", :CSVFiles)
     end
 
     return CSVStream(s.io, delim, args)
 end
 
-function fileio_load(s::FileIO.Stream{FileIO.format"TSV"}, deprecated_delim=nothing; delim=deprecated_delim===nothing ? '\t' : deprecated_delim, args...)
-    if deprecated_delim!==nothing
-        deprecated_delim!=delim && error("deprecated_delim and delim can not both be used at the same time.")
+function fileio_load(s::FileIO.Stream{FileIO.format"TSV"}, deprecated_delim = nothing; delim = deprecated_delim === nothing ? '\t' : deprecated_delim, args...)
+    if deprecated_delim !== nothing
+        deprecated_delim != delim && error("deprecated_delim and delim can not both be used at the same time.")
         Base.depwarn("The positional `delim` keyword in the `load` function is deprecated. Instead use the keyword argument `delim`.", :CSVFiles)
     end
 
@@ -98,9 +98,9 @@ function _loaddata(file)
     if startswith(file.filename, "https://") || startswith(file.filename, "http://")
         response = HTTP.get(file.filename)
         data = String(response.body)
-        return TextParse._csvread(data, file.delim; stringarraytype=Array, file.keywords...)
+        return TextParse._csvread(data, file.delim; stringarraytype = Array, file.keywords...)
     else
-        return csvread(file.filename, file.delim; stringarraytype=Array, file.keywords...)
+        return csvread(file.filename, file.delim; stringarraytype = Array, file.keywords...)
     end
 end
 
@@ -114,11 +114,11 @@ end
 
 function TableTraits.get_columns_copy_using_missing(file::CSVFile)
     columns, colnames = _loaddata(file)
-     return NamedTuple{(Symbol.(colnames)...,), Tuple{typeof.(columns)...}}((columns...,))
+    return NamedTuple{(Symbol.(colnames)...,),Tuple{typeof.(columns)...}}((columns...,))
 end
 
 function IteratorInterfaceExtensions.getiterator(s::CSVStream)
-    res = TextParse.csvread(s.io, s.delim; stringarraytype=Array, s.keywords...)
+    res = TextParse.csvread(s.io, s.delim; stringarraytype = Array, s.keywords...)
 
     it = TableTraitsUtils.create_tableiterator([i for i in res[1]], [Symbol(i) for i in res[2]])
 
@@ -126,8 +126,8 @@ function IteratorInterfaceExtensions.getiterator(s::CSVStream)
 end
 
 function TableTraits.get_columns_copy_using_missing(s::CSVStream)
-    columns, colnames = TextParse.csvread(s.io, s.delim; stringarraytype=Array, s.keywords...)
-    return NamedTuple{(Symbol.(colnames)...,), Tuple{typeof.(columns)...}}((columns...,))
+    columns, colnames = TextParse.csvread(s.io, s.delim; stringarraytype = Array, s.keywords...)
+    return NamedTuple{(Symbol.(colnames)...,),Tuple{typeof.(columns)...}}((columns...,))
 end
 
 function Base.collect(x::CSVFile)
diff --git a/src/csv_writer.jl b/src/csv_writer.jl
index c439490..07fa56f 100644
--- a/src/csv_writer.jl
+++ b/src/csv_writer.jl
@@ -5,7 +5,7 @@ end
 function _writevalue(io::IO, value::AbstractString, delim, quotechar, escapechar, nastring)
     print(io, quotechar)
     for c in value
-        if c==quotechar || c==escapechar
+        if c == quotechar || c == escapechar
             print(io, escapechar)
         end
         print(io, c)
@@ -32,8 +32,8 @@ end
     push_exprs = Expr(:block)
     for i in 1:n
         push!(push_exprs.args, :( _writevalue(io, i.$(col_names[i]), delim, quotechar, escapechar, nastring) ))
-        if i<n
-            push!(push_exprs.args, :( print(io, delim ) ))
+        if i < n
+            push!(push_exprs.args, :( print(io, delim) ))
         end
     end
     push!(push_exprs.args, :( println(io) ))
@@ -45,61 +45,61 @@ end
     end
 end
 
-function _save(io, data; delim=',', quotechar='"', escapechar='"', nastring="NA", header=true)
+function _save(io, data; delim = ',', quotechar = '"', escapechar = '"', nastring = "NA", header = true)
     isiterabletable(data) || error("Can't write this data to a CSV file.")
 
     it = getiterator(data)
     colnames = collect(eltype(it).parameters[1])
 
     if header
-        if quotechar===nothing
-            join(io,[string(colname) for colname in colnames],delim)
+        if quotechar === nothing
+            join(io, [string(colname) for colname in colnames], delim)
         else
-            join(io,["$(quotechar)" * replace(string(colname), quotechar => "$(escapechar)$(quotechar)") * "$(quotechar)" for colname in colnames],delim)
+            join(io, ["$(quotechar)" * replace(string(colname), quotechar => "$(escapechar)$(quotechar)") * "$(quotechar)" for colname in colnames], delim)
         end
         println(io)
     end
     _writecsv(io, it, eltype(it), delim, quotechar, escapechar, nastring)
 end
 
-function _save(filename::AbstractString, data; delim=',', quotechar='"', escapechar='"', nastring="NA", header=true)
+function _save(filename::AbstractString, data; delim = ',', quotechar = '"', escapechar = '"', nastring = "NA", header = true)
     isiterabletable(data) || error("Can't write this data to a CSV file.")
 
     ext = last(split(filename, '.'))
 
     if ext == "gz" # Gzipped
         open(GzipCompressorStream, filename, "w") do io
-            _save(io, data, delim=delim, quotechar=quotechar, escapechar=escapechar, nastring=nastring,  header=header)
+            _save(io, data, delim = delim, quotechar = quotechar, escapechar = escapechar, nastring = nastring,  header = header)
         end
     else
         open(filename, "w") do io
-            _save(io, data, delim=delim, quotechar=quotechar, escapechar=escapechar, nastring=nastring,  header=header)
+            _save(io, data, delim = delim, quotechar = quotechar, escapechar = escapechar, nastring = nastring,  header = header)
         end
     end
 end
 
 
 
-function fileio_save(f::FileIO.File{FileIO.format"CSV"}, data; delim=',', quotechar='"', escapechar='"', nastring="NA", header=true)
-    return _save(f.filename, data, delim=delim, quotechar=quotechar, escapechar=escapechar, nastring=nastring, header=header)
+function fileio_save(f::FileIO.File{FileIO.format"CSV"}, data; delim = ',', quotechar = '"', escapechar = '"', nastring = "NA", header = true)
+    return _save(f.filename, data, delim = delim, quotechar = quotechar, escapechar = escapechar, nastring = nastring, header = header)
 end
 
-function fileio_save(f::FileIO.File{FileIO.format"TSV"}, data; delim='\t', quotechar='"', escapechar='"', nastring="NA", header=true)
-    return _save(f.filename, data, delim=delim, quotechar=quotechar, escapechar=escapechar, nastring=nastring, header=header)
+function fileio_save(f::FileIO.File{FileIO.format"TSV"}, data; delim = '\t', quotechar = '"', escapechar = '"', nastring = "NA", header = true)
+    return _save(f.filename, data, delim = delim, quotechar = quotechar, escapechar = escapechar, nastring = nastring, header = header)
 end
 
-function fileio_save(s::FileIO.Stream{FileIO.format"CSV"}, data; delim=',', quotechar='"', escapechar='"', nastring="NA", header=true)
-    return _save(s.io, data, delim=delim, quotechar=quotechar, escapechar=escapechar, nastring=nastring, header=header)
+function fileio_save(s::FileIO.Stream{FileIO.format"CSV"}, data; delim = ',', quotechar = '"', escapechar = '"', nastring = "NA", header = true)
+    return _save(s.io, data, delim = delim, quotechar = quotechar, escapechar = escapechar, nastring = nastring, header = header)
 end
 
-function fileio_save(s::FileIO.Stream{FileIO.format"TSV"}, data; delim='\t', quotechar='"', escapechar='"', nastring="NA", header=true)
-    return _save(s.io, data, delim=delim, quotechar=quotechar, escapechar=escapechar, nastring=nastring, header=header)
+function fileio_save(s::FileIO.Stream{FileIO.format"TSV"}, data; delim = '\t', quotechar = '"', escapechar = '"', nastring = "NA", header = true)
+    return _save(s.io, data, delim = delim, quotechar = quotechar, escapechar = escapechar, nastring = nastring, header = header)
 end
 
 #
 # Streaming version writes header (if any) on first call, then appends on subsequent calls.
 #
-const CSV_or_TSV = Union{FileIO.format"CSV", FileIO.format"TSV"}
+const CSV_or_TSV = Union{FileIO.format"CSV",FileIO.format"TSV"}
 
 _delim(T) = T <: FileIO.format"CSV" ? ',' : '\t'
 
@@ -112,30 +112,30 @@ mutable struct CSVFileSaveStream{T}
     nastring::AbstractString
     header::Bool
 end
-                            
-function fileio_savestreaming(f::FileIO.File{T}, data=nothing; delim=_delim(T), quotechar='"', escapechar='"', nastring="NA", 
-                              header=true) where T <: CSV_or_TSV
+
+function fileio_savestreaming(f::FileIO.File{T}, data = nothing; delim = _delim(T), quotechar = '"', escapechar = '"', nastring = "NA",
+                              header = true) where T <: CSV_or_TSV
     io = open(f.filename, "w")
 
-    if data!==nothing
-        _save(io, data; delim=delim, quotechar=quotechar, escapechar=escapechar, nastring=nastring, header=header)
+    if data !== nothing
+        _save(io, data; delim = delim, quotechar = quotechar, escapechar = escapechar, nastring = nastring, header = header)
     end
 
-    return CSVFileSaveStream(io, data!==nothing, delim, quotechar, escapechar, nastring, header)
+    return CSVFileSaveStream(io, data !== nothing, delim, quotechar, escapechar, nastring, header)
 end
 
-function fileio_savestreaming(s::FileIO.Stream{T}, data=nothing; delim=_delim(T), quotechar='"', escapechar='"', nastring="NA", 
-                              header=false) where T <: CSV_or_TSV
+function fileio_savestreaming(s::FileIO.Stream{T}, data = nothing; delim = _delim(T), quotechar = '"', escapechar = '"', nastring = "NA",
+                              header = false) where T <: CSV_or_TSV
 
-    if data!==nothing
-        _save(s.io, data; delim=delim, quotechar=quotechar, escapechar=escapechar, nastring=nastring, header=header)
+    if data !== nothing
+        _save(s.io, data; delim = delim, quotechar = quotechar, escapechar = escapechar, nastring = nastring, header = header)
     end
-                        
-    return CSVFileSaveStream(s.io, data!==nothing, delim, quotechar, escapechar, nastring, header)
+
+    return CSVFileSaveStream(s.io, data !== nothing, delim, quotechar, escapechar, nastring, header)
 end
 
 function Base.write(s::CSVFileSaveStream, data)
-    _save(s.io, data; delim=s.delim, quotechar=s.quotechar, escapechar=s.escapechar, nastring=s.nastring, header=s.first_data_written ? false : header)
+    _save(s.io, data; delim = s.delim, quotechar = s.quotechar, escapechar = s.escapechar, nastring = s.nastring, header = s.first_data_written ? false : header)
 end
 
 function Base.close(s::CSVFileSaveStream)
diff --git a/test/runtests.jl b/test/runtests.jl
index f1a3c2c..af5c7a9 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -7,20 +7,20 @@ using Test
 
 @testset "CSVFiles" begin
 
-@testset "basic" begin
-    array = collect(load(joinpath(@__DIR__, "data.csv")))
-    @test length(array) == 3
-    @test array == [(Name="John",Age=34.,Children=2),(Name="Sally",Age=54.,Children=1),(Name="Jim",Age=23.,Children=0)]
+    @testset "basic" begin
+        array = collect(load(joinpath(@__DIR__, "data.csv")))
+        @test length(array) == 3
+        @test array == [(Name = "John", Age = 34., Children = 2),(Name = "Sally", Age = 54., Children = 1),(Name = "Jim", Age = 23., Children = 0)]
 
-    output_filename = tempname() * ".csv"
+        output_filename = tempname() * ".csv"
 
-    try
-        array |> save(output_filename)
+        try
+            array |> save(output_filename)
 
-        array2 = collect(load(output_filename))
+            array2 = collect(load(output_filename))
 
-        @test array == array2
-    finally
+            @test array == array2
+            finally
         GC.gc()
         rm(output_filename)
     end
@@ -35,7 +35,7 @@ end
 end
 
 @testset "missing values" begin
-    array3 = [(a=DataValue(3),b="df\"e"),(a=DataValue{Int}(),b="something")]
+    array3 = [(a = DataValue(3), b = "df\"e"),(a = DataValue{Int}(), b = "something")]
 
     @testset "default" begin
         output_filename2 = tempname() * ".csv"
@@ -48,10 +48,10 @@ end
     end
 
     @testset "alternate" begin
-        output_filename2 = tempname() * ".csv"
+            output_filename2 = tempname() * ".csv"
 
         try
-            array3 |> save(output_filename2, nastring="")
+            array3 |> save(output_filename2, nastring = "")
         finally
             rm(output_filename2)
         end
@@ -62,11 +62,11 @@ end
     csvf2 = load(joinpath(@__DIR__, "data.csv"))
     @test TableTraits.supports_get_columns_copy_using_missing(csvf2) == true
     data = TableTraits.get_columns_copy_using_missing(csvf2)
-    @test data == (Name=["John", "Sally", "Jim"], Age=[34.,54.,23.], Children=[2,1,0])
+    @test data == (Name = ["John", "Sally", "Jim"], Age = [34.,54.,23.], Children = [2,1,0])
 end
 
 @testset "Less Basic" begin
-    array = [(Name="John",Age=34.,Children=2),(Name="Sally",Age=54.,Children=1),(Name="Jim",Age=23.,Children=0)]
+    array = [(Name = "John", Age = 34., Children = 2),(Name = "Sally", Age = 54., Children = 1),(Name = "Jim", Age = 23., Children = 0)]
     @testset "remote loading" begin
         rem_array = collect(load("https://raw.githubusercontent.com/queryverse/CSVFiles.jl/v0.2.0/test/data.csv"))
         @test length(rem_array) == 3
@@ -78,7 +78,7 @@ end
         
         try
             array |> save(output_filename3)
-            
+
             array4 = collect(load(output_filename3))
             @test length(array4) == 3
             @test array4 == array
@@ -87,12 +87,12 @@ end
             rm(output_filename3)
         end
     end
-    
+
     @testset "no quote" begin
         output_filename4 = tempname() * ".csv"
 
         try
-            array |> save(output_filename4, quotechar=nothing)
+            array |> save(output_filename4, quotechar = nothing)
 
         finally
             GC.gc()
@@ -102,7 +102,7 @@ end
 end
 
 @testset "Streams" begin
-    data = [(Name="John",Age=34.,Children=2),(Name="Sally",Age=54.,Children=1),(Name="Jim",Age=23.,Children=0)]
+    data = [(Name = "John", Age = 34., Children = 2),(Name = "Sally", Age = 54., Children = 1),(Name = "Jim", Age = 23., Children = 0)]
 
     @testset "CSV"  begin
         stream = IOBuffer()
@@ -113,7 +113,7 @@ end
         mark(stream)
         csvstream = load(fileiostream)
         reloaded_data = collect(csvstream)
-        @test IteratorInterfaceExtensions.isiterable(csvstream)        
+        @test IteratorInterfaceExtensions.isiterable(csvstream)
         @test TableTraits.isiterabletable(csvstream)
         @test TableTraits.supports_get_columns_copy_using_missing(csvstream)
         @test reloaded_data == data
@@ -121,7 +121,7 @@ end
         reset(stream)
         csvstream = load(fileiostream)
         reloaded_data2 = TableTraits.get_columns_copy_using_missing(csvstream)
-        @test reloaded_data2 == (Name=["John", "Sally", "Jim"], Age=[34., 54., 23.], Children=[2, 1, 0])
+        @test reloaded_data2 == (Name = ["John", "Sally", "Jim"], Age = [34., 54., 23.], Children = [2, 1, 0])
     end
 
     @testset "TSV" begin
@@ -141,12 +141,12 @@ end
         reset(stream)
         csvstream = load(fileiostream)
         reloaded_data2 = TableTraits.get_columns_copy_using_missing(csvstream)
-        @test reloaded_data2 == (Name=["John", "Sally", "Jim"], Age=[34., 54., 23.], Children=[2, 1, 0])
+        @test reloaded_data2 == (Name = ["John", "Sally", "Jim"], Age = [34., 54., 23.], Children = [2, 1, 0])
     end
 end
 
 @testset "Compression" begin
-    data = [(Name="John",Age=34.,Children=2),(Name="Sally",Age=54.,Children=1),(Name="Jim",Age=23.,Children=0)]
+    data = [(Name = "John", Age = 34., Children = 2),(Name = "Sally", Age = 54., Children = 1),(Name = "Jim", Age = 23., Children = 0)]
 
     @testset "CSV" begin
         output_filename = "output.csv.gz"
@@ -182,10 +182,10 @@ end
     Sally │ 54.0 │ 1       
     Jim   │ 23.0 │ 0       """
 
-    @test sprint((stream,data)->show(stream, "text/html", data), x) ==
+    @test sprint((stream, data)->show(stream, "text/html", data), x) ==
         "<table><thead><tr><th>Name</th><th>Age</th><th>Children</th></tr></thead><tbody><tr><td>&quot;John&quot;</td><td>34.0</td><td>2</td></tr><tr><td>&quot;Sally&quot;</td><td>54.0</td><td>1</td></tr><tr><td>&quot;Jim&quot;</td><td>23.0</td><td>0</td></tr></tbody></table>"
 
-    @test sprint((stream,data)->show(stream, "application/vnd.dataresource+json", data), x) ==
+    @test sprint((stream, data)->show(stream, "application/vnd.dataresource+json", data), x) ==
         "{\"schema\":{\"fields\":[{\"name\":\"Name\",\"type\":\"string\"},{\"name\":\"Age\",\"type\":\"number\"},{\"name\":\"Children\",\"type\":\"integer\"}]},\"data\":[{\"Name\":\"John\",\"Age\":34.0,\"Children\":2},{\"Name\":\"Sally\",\"Age\":54.0,\"Children\":1},{\"Name\":\"Jim\",\"Age\":23.0,\"Children\":0}]}"
 
     @test showable("text/html", x) == true
@@ -202,22 +202,22 @@ end
     Sally │ 54.0 │ 1       
     Jim   │ 23.0 │ 0       """
 
-        @test sprint((stream,data)->show(stream, "text/html", data), x2) ==
+        @test sprint((stream, data)->show(stream, "text/html", data), x2) ==
             "<table><thead><tr><th>Name</th><th>Age</th><th>Children</th></tr></thead><tbody><tr><td>&quot;John&quot;</td><td>34.0</td><td>2</td></tr><tr><td>&quot;Sally&quot;</td><td>54.0</td><td>1</td></tr><tr><td>&quot;Jim&quot;</td><td>23.0</td><td>0</td></tr></tbody></table>"
     
-        @test sprint((stream,data)->show(stream, "application/vnd.dataresource+json", data), x2) ==
+        @test sprint((stream, data)->show(stream, "application/vnd.dataresource+json", data), x2) ==
             "{\"schema\":{\"fields\":[{\"name\":\"Name\",\"type\":\"string\"},{\"name\":\"Age\",\"type\":\"number\"},{\"name\":\"Children\",\"type\":\"integer\"}]},\"data\":[{\"Name\":\"John\",\"Age\":34.0,\"Children\":2},{\"Name\":\"Sally\",\"Age\":54.0,\"Children\":1},{\"Name\":\"Jim\",\"Age\":23.0,\"Children\":0}]}"
 
         @test showable("text/html", x2) == true
-        @test showable("application/vnd.dataresource+json", x2) == true        
+        @test showable("application/vnd.dataresource+json", x2) == true
     end
-    
+
 end
 
 @testset "savestreaming" begin
     using DataFrames
 
-    df = DataFrame(A = 1:2:1000, B = repeat(1:10, inner=50), C = 1:500)
+            df = DataFrame(A = 1:2:1000, B = repeat(1:10, inner = 50), C = 1:500)
     df1 = df[1:5, :]
     df2 = df[6:10, :]
 
@@ -227,8 +227,8 @@ end
         s = savestreaming(fname, df1)
         write(s, df2)
         write(s, df2)   # add this slice twice
-        close(s)
-    
+    close(s)
+
         new_df = DataFrame(load(fname))
         @test new_df[1:5,:]   == df1
         @test new_df[6:10,:]  == df2