Merge pull request #12 from JuliaData/jq/tables1

Add support for Tables.jl 1.0

Author: quinnj

.travis.yml

@@ -5,22 +5,29 @@ sudo: false
 os:
   - linux
   - osx
+  - windows
+
+arch:
+  - x64
+  - x86
 
 julia:
   - 1.0
-  - 1.1
+  - 1.3
   - nightly
 
 env:
   - JULIA_PROJECT="@."
 
 matrix:
+  exclude:
+    - os: osx
+      arch: x86
   allow_failures:
   - julia: nightly
 
 notifications:
   email: false
 
 after_success:
-   - julia -e 'ENV["TRAVIS_JULIA_VERSION"] != "1.1" && ENV["TRAVIS_OS_NAME"] != "linux" && exit(); using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
-
+   - julia -e 'ENV["TRAVIS_JULIA_VERSION"] == "1.3" && ENV["TRAVIS_OS_NAME"] != "linux" && exit(); using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

Project.toml

@@ -1,15 +1,17 @@
 name = "JSONTables"
 uuid = "b9914132-a727-11e9-1322-f18e41205b0b"
 authors = ["Jacob Quinn <quinn.jacobd@gmail.com>"]
-version = "0.1.3"
+version = "1.0.0"
 
 [deps]
 JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
+StructTypes = "856f2bd8-1eba-4b0a-8007-ebc267875bd4"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 
 [compat]
-JSON3 = "0.1"
-Tables = "0.2"
+JSON3 = "1"
+StructTypes = "1"
+Tables = "1"
 julia = "1"
 
 [extras]

README.md

@@ -1,8 +1,8 @@
 # JSONTables.jl
 
-A package that provides a JSON integration with the [Tables.jl](https://github.com/JuliaData/Tables.jl) interface, that is, it provides the `jsontable` function as a way to treat a JSON object of arrays, or a JSON array of objects, as a Tables.jl-compatible source. This allows, among other things, loading JSON "tabular" data into a DataFrame, or a JuliaDB table, or written out directly as a csv file.
+A package that provides a JSON integration with the [Tables.jl](https://github.com/JuliaData/Tables.jl) interface, that is, it provides the `jsontable` function as a way to treat a JSON object of arrays, or a JSON array of objects, as a Tables.jl-compatible source. This allows, among other things, loading JSON "tabular" data into a `DataFrame`, or a JuliaDB.jl table, or written out directly as a csv file.
 
-JSONTables.jl also provides two "write" functions, `objecttable` and `arraytable`, for taking any Tables.jl-comptabile source (e.g. DataFrame, ODBC.Query, etc.) and writing the table out either as a JSON object of arrays, or array of objects, respectively.
+JSONTables.jl also provides two "write" functions, `objecttable` and `arraytable`, for taking any Tables.jl-comptabile source (e.g. `DataFrame`, `CSV.File`, etc.) and writing the table out either as a JSON object of arrays, or array of objects, respectively.
 
 So in short:
 ```julia

appveyor.yml

@@ -1,6 +1,6 @@
 module JSONTables
 
-using JSON3, Tables
+using StructTypes, JSON3, Tables
 
 export jsontable, arraytable, objecttable
 
@@ -42,6 +42,10 @@ Base.copy(x::MissingVector) = map(y->y isa JSON3.Object || y isa JSON3.Array ? c
 Base.propertynames(x::Table{true}) = Tuple(keys(getfield(x, :source)))
 Base.getproperty(x::Table{true}, nm::Symbol) = MissingVector(getproperty(getfield(x, :source), nm))
 
+Tables.columnnames(x::Table{true}) = propertynames(x)
+Tables.getcolumn(x::Table{true}, i::Int) = getproperty(x, propertynames(x)[i])
+Tables.getcolumn(x::Table{true}, nm::Symbol) = getproperty(x, nm)
+
 # row source
 Tables.rowaccess(::Type{Table{false, T}}) where {T} = true
 Tables.rows(x::Table{false}) = x
@@ -51,11 +55,13 @@ Base.length(x::Table{false}) = length(x.source)
 Base.IteratorEltype(::Type{Table{false, T}}) where {T} = Base.HasEltype()
 Base.eltype(x::Table{false, JSON3.Array{T}}) where {T} = T
 
-struct MissingRow{T}
+struct MissingRow{T} <: Tables.AbstractRow
     x::T
 end
-Base.propertynames(x::MissingRow) = propertynames(getfield(x, :x))
-Base.getproperty(x::MissingRow, nm::Symbol) = miss(getproperty(getfield(x, :x), nm))
+
+Tables.columnnames(x::MissingRow) = propertynames(getfield(x, :x))
+Tables.getcolumn(x::MissingRow, nm::Symbol) = miss(getproperty(getfield(x, :x), nm))
+Tables.getcolumn(x::MissingRow, i::Int) = getproperty(x, propertynames(x)[i])
 
 @inline function Base.iterate(x::Table{false})
     st = iterate(x.source)
@@ -76,21 +82,21 @@ struct ObjectTable{T}
     x::T
 end
 
-JSON3.StructType(::Type{<:ObjectTable}) = JSON3.ObjectType()
-Base.pairs(x::ObjectTable) = zip(propertynames(x.x), Tables.eachcolumn(x.x))
+StructTypes.StructType(::Type{<:ObjectTable}) = StructTypes.DictType()
+Base.pairs(x::ObjectTable) = zip(Tables.columnnames(x.x), Tables.Columns(x.x))
 
 struct ArrayTable{T}
     x::T
 end
 
-JSON3.StructType(::Type{<:ArrayTable}) = JSON3.ArrayType()
+StructTypes.StructType(::Type{<:ArrayTable}) = StructTypes.ArrayType()
 
 struct ArrayRow{T}
     x::T
 end
 
-JSON3.StructType(::Type{<:ArrayRow}) = JSON3.ObjectType()
-Base.pairs(x::ArrayRow) = zip(propertynames(x.x), Tables.eachcolumn(x.x))
+StructTypes.StructType(::Type{<:ArrayRow}) = StructTypes.DictType()
+Base.pairs(x::ArrayRow) = zip(Tables.columnnames(x.x), Tables.Columns(x.x))
 
 Base.IteratorSize(::Type{ArrayTable{T}}) where {T} = IteratorSize(T)
 Base.length(x::ArrayTable) = length(x.x)