Merge branch 'master' of https://github.com/GenieFramework/Stipple.jl

.github/workflows/ci.yml

@@ -5,14 +5,15 @@ on:
 jobs:
   test:
     name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
+    continue-on-error: ${{ matrix.version == 'nightly'}}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         version:
           - '1.6'
-          - '1.7'
-          - '1.10'
+          - '1'
+          - 'nightly'
         os:
           - ubuntu-latest
           - macOS-latest
@@ -33,7 +34,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@latest
         with:
-          version: '1.7'
+          version: '1'
       - name: Install dependencies
         run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
       - name: Build and deploy

Project.toml

@@ -1,7 +1,7 @@
 name = "Stipple"
 uuid = "4acbeb90-81a0-11ea-1966-bdaff8155998"
 authors = ["Adrian <[email protected]>"]
-version = "0.28.4"
+version = "0.28.5"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

src/Pages.jl

@@ -42,9 +42,9 @@ function Page(  route::Union{Route,String};
             Core.eval(context, model)
           elseif isa(model, Module)
             context = model
-            @eval(context, Stipple.ReactiveTools.@init(debounce = $debounce, transport = $transport, core_theme = $core_theme))
+            () -> @eval(context, Stipple.ReactiveTools.@init(debounce = $debounce, transport = $transport, core_theme = $core_theme))
           elseif model isa DataType
-            @eval(context, Stipple.ReactiveTools.@init($model; debounce = $debounce, transport = $transport, core_theme = $core_theme))
+            () -> @eval(context, Stipple.ReactiveTools.@init($model; debounce = $debounce, transport = $transport, core_theme = $core_theme))
           else
             model
           end

src/ReactiveTools.jl

@@ -62,10 +62,14 @@ function DEFAULT_LAYOUT(; title::String = "Genie App",
     <% end %>
     <style>
       ._genie_logo {
-        background:url('https://genieframework.com/logos/genie/logo-simple-with-padding.svg') no-repeat;background-size:40px;
-        padding-top:22px;padding-right:10px;color:transparent;font-size:9pt;
+        background:url('https://genieframework.com/logos/genie/logo-simple-with-padding.svg') no-repeat;
+        background-size:40px;
+        padding-top:22px;
+        padding-right:10px;
+        color:transparent !important;
+        font-size:9pt;
       }
-      ._genie .row .col-12 { width:50%;margin:auto; }
+      ._genie .row .col-12 { width:50%; margin:auto; }
     </style>
     $(join(head_content, "\n    "))
   </head>
@@ -339,12 +343,12 @@ macro debounce(fieldname, ms)
 end
 
 """
-    @clear_debounce 
+    @clear_debounce
 
     @clear_debounce fieldname
-    
+
     @clear_debounce App
-    
+
     @clear_debounce App fieldname
 
 Clear field-specific debounce time, for setting see `@debounce`.
@@ -1145,7 +1149,7 @@ Registers a new page with source in `view` to be rendered at the route `url`.
 ```julia
 @page("/", "view.html")
 
-@page("/", ui; model = MyApp) # for specifying an explicit app 
+@page("/", ui; model = MyApp) # for specifying an explicit app
 ```
 """
 macro page(expressions...)

test/runtests.jl

@@ -180,6 +180,56 @@ end
     @test model.s3[] == "20"
 end
 
+module App1
+
+using Stipple, Stipple.ReactiveTools
+@app begin
+    @in i1 = 101
+end
+
+@app MyApp begin
+    @in i1 = 101
+end
+
+end
+
+module App2
+using Stipple, Stipple.ReactiveTools
+
+@app begin
+    @in i2 = 102
+end
+
+@app MyApp begin
+    @in i2 = 102
+end
+
+end
+
+@testset "Multipage Reactive API (implicit)" begin
+    @eval p1 = @page("/app1", "hello", model = App1)
+    @eval p2 = @page("/app2", "world", model = App2)
+    channel1a = get_channel(String(p1.route.action().body))
+    channel1b = get_channel(String(p1.route.action().body))
+    channel2a = get_channel(String(p2.route.action().body))
+    channel2b = get_channel(String(p2.route.action().body))
+
+    # channels have to be different
+    @test channel1a != channel1b != channel2a != channel2b
+end
+
+@testset "Multipage Reactive API (explicit)" begin
+    @eval p1 = @page("/app1", "hello", model = App1.MyApp)
+    @eval p2 = @page("/app2", "world", model = App2.MyApp)
+    channel1a = get_channel(String(p1.route.action().body))
+    channel1b = get_channel(String(p1.route.action().body))
+    channel2a = get_channel(String(p2.route.action().body))
+    channel2b = get_channel(String(p2.route.action().body))
+
+    # channels have to be different
+    @test channel1a != channel1b != channel2a != channel2b
+end
+
 using DataFrames
 @testset "Extensions" begin
     d = Dict(:a => [1, 2, 3], :b => ["a", "b", "c"])