HOST and PORT enviroment variables (#70)

Author: waralex

src/env.jl

@@ -1,20 +1,22 @@
-dash_env_key(name::String) =  "DASH_" * uppercase(name)
+const DASH_ENV_PREFIX = "DASH_"
 
-dash_env(name::String, default = nothing) = get(ENV, dash_env_key(name), default)
+dash_env_key(name::String; prefix = DASH_ENV_PREFIX) =  prefix * uppercase(name)
 
-function dash_env(t::Type{T}, name::String, default = nothing) where {T<:Number}    
-    key = dash_env_key(name)
-    !haskey(ENV, key) && return default    
+dash_env(name::String, default = nothing; prefix = DASH_ENV_PREFIX) = get(ENV, dash_env_key(name, prefix = prefix), default)
+
+function dash_env(t::Type{T}, name::String, default = nothing; prefix = DASH_ENV_PREFIX) where {T<:Number}
+    key = dash_env_key(name, prefix = prefix)
+    !haskey(ENV, key) && return default
     return parse(T, lowercase(get(ENV, key, "")))
 end
 
-dash_env(t::Type{String}, name::String, default = nothing) = dash_env(name, default)
+dash_env(t::Type{String}, name::String, default = nothing; prefix = DASH_ENV_PREFIX) = dash_env(name, default, prefix = prefix)
 
 
 macro env_default!(name, type = String, default = nothing)
     name_str = string(name)
     return esc(:(
-        $name = isnothing($name) ? 
+        $name = isnothing($name) ?
         dash_env($type, $name_str, $default)
         :
         $name

src/server.jl

@@ -1,4 +1,3 @@
-
 """
     run_server(app::DashApp, host = HTTP.Sockets.localhost, port = 8050; debug::Bool = false)
 
@@ -22,7 +21,9 @@ julia> run_server(handler,  HTTP.Sockets.localhost, 8050)
 ```
 
 """
-function run_server(app::DashApp, host = HTTP.Sockets.localhost, port = 8050;
+function run_server(app::DashApp,
+            host = dash_env("HOST", "127.0.0.1", prefix = ""),
+            port = dash_env(Int64, "PORT", 8050, prefix = "");
             debug = nothing,
             dev_tools_ui = nothing,
             dev_tools_props_check = nothing,

test/env.jl

@@ -10,20 +10,20 @@ using Dash:dash_env, @env_default!
     ENV["DASH_STRING_TEST"] = "test_path"
     @test dash_env("string_test", "aaaa") == "test_path"
     @test_throws ArgumentError dash_env(Int, "string_test", "aaaa") == "test_path"
-    
+
     string_test = nothing
     @env_default! string_test
     @test string_test == "test_path"
     string_test = "aaaa"
     @env_default! string_test
     @test string_test == "aaaa"
 
-    
+
 
     ENV["DASH_INT_TEST"] = "100"
     @test dash_env("int_test", "aaaa") == "100"
     @test dash_env(Int, "int_test", 50) == 100
-    
+
     int_test = nothing
     @env_default! int_test Int
     @test int_test == 100
@@ -34,15 +34,26 @@ using Dash:dash_env, @env_default!
     @env_default! int_test2 Int 40
     @test int_test2 == 40
 
-    ENV["DASH_BOOL_TEST"] = "1"    
-    @test dash_env(Bool, "bool_test", 50) == true    
+    ENV["DASH_BOOL_TEST"] = "1"
+    @test dash_env(Bool, "bool_test", 50) == true
 
-    ENV["DASH_BOOL_TEST"] = "0"    
+    ENV["DASH_BOOL_TEST"] = "0"
     @test dash_env(Bool, "bool_test", 50) == false
 
-    ENV["DASH_BOOL_TEST"] = "TRUE"    
+    ENV["DASH_BOOL_TEST"] = "TRUE"
     @test dash_env(Bool, "bool_test", 50) == true
 
-    ENV["DASH_BOOL_TEST"] = "FALSE"    
+    ENV["DASH_BOOL_TEST"] = "FALSE"
     @test dash_env(Bool, "bool_test", 50) == false
 end
+
+@testset "prefixes" begin
+    ENV["DASH_HOST"] = "localhost"
+    @test dash_env("host") == "localhost"
+    @test isnothing(dash_env("host", prefix = ""))
+
+    @test dash_env(Int64, "port", 8050, prefix = "") == 8050
+    ENV["PORT"] = "2001"
+    @test isnothing(dash_env(Int64, "port"))
+    @test dash_env(Int64, "port", prefix = "") == 2001
+end