try finding module from loaded modules (#120)

* try finding module from loaded modules

* use for-loop instead of findfirst

* replace isnothing for julia 1.0 compat

* add test

* bump version

Author: chengchingwen

Project.toml

@@ -1,6 +1,6 @@
 name = "BSON"
 uuid = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
-version = "0.3.6"
+version = "0.3.7"
 
 [compat]
 julia = "0.7, 1"

src/extensions.jl

@@ -18,7 +18,22 @@ tags[:svec] = d -> Core.svec(d[:data]...)
 
 ref(path::Symbol...) = BSONDict(:tag => "ref", :path => Base.string.([path...]))
 
-resolve(fs, init) = reduce((m, f) -> getfield(m, Symbol(f)), fs; init = init)
+function _find_module(x)
+    for (k, v) in Base.loaded_modules
+        k.name == x && return v
+    end
+    return nothing
+end
+
+function resolve(fs, init)
+    ff = first(fs)
+    m = _find_module(ff)
+    if m !== nothing
+        init = m
+        fs = @view fs[2:end]
+    end
+    return reduce((m, f) -> getfield(m, Symbol(f)), fs; init = init)
+end
 
 tags[:ref] = (d, init) -> resolve(d[:path], init)
 

test/runtests.jl

@@ -31,7 +31,9 @@ end
 module A
   using DataFrames, BSON
   d = DataFrame(a = 1:10, b = rand(10))
+  a = DataFrames.PooledArrays.PooledArray(["a" "b"; "c" "d"])
   bson("test_25_dataframe.bson", Dict(:d=>d))
+  bson("test_26_module_in_module.bson", Dict(:a=>a))
 end
 
 struct NoInit
@@ -156,4 +158,9 @@ end
   rm("test_25_dataframe.bson")
 end
 
+@testset "Module with module import" begin
+  @test BSON.load(joinpath(@__DIR__, "test_26_module_in_module.bson"))[:a] == A.a
+  rm("test_26_module_in_module.bson")
+end
+
 end