Merge pull request #29 from JuliaGizmos/fix-scopeid-deprecation

Fix scopeid deprecation.

Author: twavv

.gitignore

@@ -1,3 +1,4 @@
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
+Manifest.toml

Project.toml

@@ -0,0 +1,21 @@
+name = "JSExpr"
+uuid = "97c1335a-c9c5-57fe-bc5d-ec35cebe8660"
+license = "MIT"
+version = "0.5.1"
+
+[deps]
+JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
+Observables = "510215fc-4207-5dde-b226-833fc4488ee2"
+WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29"
+
+[compat]
+julia = "0.7, 1"
+Observables = "0.2.2"
+WebIO = "0.8.5"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]

src/JSExpr.jl

@@ -5,7 +5,7 @@ module JSExpr
 using JSON, MacroTools, WebIO
 export JSString, @js, @js_str, @var, @new
 
-import WebIO: JSString, JSONContext, JSEvalSerialization
+import WebIO: JSString, JSONContext, JSEvalSerialization, scopeid
 using Observables: AbstractObservable
 
 macro js(expr)
@@ -64,7 +64,7 @@ function jsexpr(o::AbstractObservable)
     scope = _scope.value
 
     obsobj = Dict("type" => "observable",
-                  "scope" => scope.id,
+                  "scope" => scopeid(scope),
                   "name" => name,
                   "id" => WebIO.obsid(o))
 

test/runtests.jl

@@ -1,5 +1,6 @@
 using JSExpr
 using WebIO
+import WebIO: scopeid
 using Test
 
 @testset "@js_str" begin
@@ -70,14 +71,14 @@ end
     end) == js"var acc=0; for(var i = 1; i <= 10; i = i + 2){acc+=1}"
 
     @testset "observable interpolation" begin
-        w = Scope("testwidget2")
+        w = Scope()
         ob = Observable(0)
         @test_throws ErrorException @js $ob
 
         ob = Observable{Any}(w, "test", nothing)
-        @test @js($ob) == js"{\"name\":\"test\",\"scope\":\"testwidget2\",\"id\":\"ob_02\",\"type\":\"observable\"}"
+        @test @js($ob) == js"{\"name\":\"test\",\"scope\":$(scopeid(w)),\"id\":\"ob_02\",\"type\":\"observable\"}"
 
-        @test @js($ob[]) == js"WebIO.getval({\"name\":\"test\",\"scope\":\"testwidget2\",\"id\":\"ob_02\",\"type\":\"observable\"})"
-        @test @js($ob[] = 1) == js"WebIO.setval({\"name\":\"test\",\"scope\":\"testwidget2\",\"id\":\"ob_02\",\"type\":\"observable\"},1)"
+        @test @js($ob[]) == js"WebIO.getval({\"name\":\"test\",\"scope\":$(scopeid(w)),\"id\":\"ob_02\",\"type\":\"observable\"})"
+        @test @js($ob[] = 1) == js"WebIO.setval({\"name\":\"test\",\"scope\":$(scopeid(w)),\"id\":\"ob_02\",\"type\":\"observable\"},1)"
     end
 end