Supporting reading dictionaries of specific types (#23)

Author: ancapdev

src/reader.jl

@@ -383,16 +383,16 @@ function read_field_(reader::BSONReader, ::Type{BSONCodeWithScope})
     end
 end
 
-function read_field_(reader::AbstractBSONReader, ::Type{T}) where T <: AbstractDict{String, Any}
+function read_field_(reader::AbstractBSONReader, ::Type{T}) where {X, T <: AbstractDict{String, X}}
     foldxl(reader; init = T()) do state, x
-        state[String(x.first)] = x.second[Any]
+        state[String(x.first)] = x.second[X]
         state
     end
 end
 
-function read_field_(reader::AbstractBSONReader, ::Type{T}) where T <: AbstractDict{Symbol, Any}
+function read_field_(reader::AbstractBSONReader, ::Type{T}) where {X, T <: AbstractDict{Symbol, X}}
     foldxl(reader; init = T()) do state, x
-        state[Symbol(x.first)] = x.second[Any]
+        state[Symbol(x.first)] = x.second[X]
         state
     end
 end

test/dict_tests.jl

@@ -0,0 +1,43 @@
+@testset "dict" begin
+
+@testset "string -> any" begin
+    buf = UInt8[]
+    writer = BSONWriter(buf)
+    x = Dict{String, Any}("a" => 1, "b" => "b")
+    writer[] = x
+    close(writer)
+    reader = BSONReader(buf)
+    @test reader[Dict{String, Any}] == x
+end
+
+@testset "string -> int" begin
+    buf = UInt8[]
+    writer = BSONWriter(buf)
+    x = Dict{String, Int32}("a" => 1, "b" => 2)
+    writer[] = x
+    close(writer)
+    reader = BSONReader(buf)
+    @test reader[Dict{String, Int32}] == x
+end
+
+@testset "symbol -> any" begin
+    buf = UInt8[]
+    writer = BSONWriter(buf)
+    x = Dict{Symbol, Any}(:a => 1, :b => "b")
+    writer[] = x
+    close(writer)
+    reader = BSONReader(buf)
+    @test reader[Dict{Symbol, Any}] == x
+end
+
+@testset "symbol -> int" begin
+    buf = UInt8[]
+    writer = BSONWriter(buf)
+    x = Dict{Symbol, Int32}(:a => 1, :b => 2)
+    writer[] = x
+    close(writer)
+    reader = BSONReader(buf)
+    @test reader[Dict{Symbol, Int32}] == x
+end
+
+end

test/runtests.jl

@@ -17,6 +17,7 @@ struct EmptyStruct end
     include("indexed_reader_tests.jl")
     include("write_buffer_tests.jl")
     include("writer_tests.jl")
+    include("dict_tests.jl")
     include("struct_tests.jl")
     include("corpus_tests.jl")
     include("object_id_tests.jl")