diff --git a/docs/make.jl b/docs/make.jl index 3402bf5..166a527 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,9 +1,9 @@ using Documenter, ExcelFiles makedocs(modules=[ExcelFiles], - sitename="ExcelFiles.jl", - analytics="UA-132838790-1", - pages=[ + sitename="ExcelFiles.jl", + analytics="UA-132838790-1", + pages=[ "Introduction" => "index.md" ]) diff --git a/src/ExcelFiles.jl b/src/ExcelFiles.jl index 9b7eb6a..0217653 100644 --- a/src/ExcelFiles.jl +++ b/src/ExcelFiles.jl @@ -62,7 +62,7 @@ function _readxl(file::ExcelReaders.ExcelFile, sheetname::AbstractString, startr # This somewhat complicated conditional makes sure that column names # that are integer numbers end up without an extra ".0" as their name - colnames = [isa(i, AbstractFloat) ? ( modf(i)[1] == 0.0 ? Symbol(Int(i)) : Symbol(string(i)) ) : Symbol(i) for i in vec(headervec)] + colnames = [isa(i, AbstractFloat) ? (modf(i)[1] == 0.0 ? Symbol(Int(i)) : Symbol(string(i))) : Symbol(i) for i in vec(headervec)] else colnames = gennames(ncol) end @@ -74,9 +74,9 @@ function _readxl(file::ExcelReaders.ExcelFile, sheetname::AbstractString, startr for i = 1:ncol if header - vals = data[2:end,i] + vals = data[2:end, i] else - vals = data[:,i] + vals = data[:, i] end # Check whether all non-NA values in this column diff --git a/test/runtests.jl b/test/runtests.jl index d1d0372..ba9ec48 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -51,7 +51,7 @@ using Test end df, names = create_columns_from_iterabletable(load(filename, "Sheet1!C4:O7", header=false)) - @test names == [:x1,:x2,:x3,:x4,:x5,:x6,:x7,:x8,:x9,:x10,:x11,:x12,:x13] + @test names == [:x1, :x2, :x3, :x4, :x5, :x6, :x7, :x8, :x9, :x10, :x11, :x12, :x13] @test length(df[1]) == 4 @test length(df) == 13 @test df[1] == [1., 1.5, 2., 2.5] @@ -100,15 +100,15 @@ using Test @test DataValues.isna(df[12][4]) @test df[13] == [NA, 3.4, "HKEJW", NA] -# Test for saving DataFrame to XLSX - input = (Day = ["Nov. 27","Nov. 28","Nov. 29"], Highest = [78,79,75]) |> DataFrame + # Test for saving DataFrame to XLSX + input = (Day=["Nov. 27", "Nov. 28", "Nov. 29"], Highest=[78, 79, 75]) |> DataFrame file = save("file.xlsx", input) output = load("file.xlsx", "Sheet1") |> DataFrame @test input == output rm("file.xlsx") -# Test for saving DataFrame to XLSX with sheetname keyword - input = (Day = ["Nov. 27","Nov. 28","Nov. 29"], Highest = [78,79,75]) |> DataFrame + # Test for saving DataFrame to XLSX with sheetname keyword + input = (Day=["Nov. 27", "Nov. 28", "Nov. 29"], Highest=[78, 79, 75]) |> DataFrame file = save("file.xlsx", input, sheetname="SheetName") output = load("file.xlsx", "SheetName") |> DataFrame @test input == output @@ -138,10 +138,10 @@ using Test @test DataValues.isna(df[12][4]) @test df[13] == [NA, 3.4, "HKEJW", NA] -# Too few colnames + # Too few colnames @test_throws ErrorException create_columns_from_iterabletable(load(filename, "Sheet1!C4:O7", header=true, colnames=[:c1, :c2, :c3, :c4])) -# Test for constructing DataFrame with empty header cell + # Test for constructing DataFrame with empty header cell data, names = create_columns_from_iterabletable(load(filename, "Sheet2!C5:E7")) @test names == [:Col1, :x1, :Col3]