Skip to content

Commit b8ddba3

Browse files
mhanbergmhanberg
authored
refactor: move dev server into its own namespace and folder (#106)
1 parent 9585d16 commit b8ddba3

File tree

11 files changed

+41
-58
lines changed

11 files changed

+41
-58
lines changed

‎lib/strung.ex

-7
This file was deleted.

‎lib/tableau/application.ex

-15
This file was deleted.

‎lib/tableau_dev_server/application.ex

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
defmodule TableauDevServer.Application do
2+
@moduledoc false
3+
4+
use Application
5+
6+
require Logger
7+
8+
@impl true
9+
def start(_type, _args) do
10+
children = [TableauDevServer.ServerSupervisor]
11+
12+
opts = [strategy: :one_for_one, name: TableauDevServer.Supervisor]
13+
Supervisor.start_link(children, opts)
14+
end
15+
end

‎lib/tableau/index_html.ex ‎lib/tableau_dev_server/index_html.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule Tableau.IndexHtml do
1+
defmodule TableauDevServer.IndexHtml do
22
@moduledoc false
33

44
@behaviour Plug

‎lib/tableau/router.ex ‎lib/tableau_dev_server/router.ex

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
defmodule Tableau.Router do
1+
defmodule TableauDevServer.Router do
22
@moduledoc false
33
use Plug.Router, init_mode: :runtime
44

5-
import Tableau.Strung
6-
75
require Logger
86

97
@base_path Path.join("/", Application.compile_env(:tableau, [:config, :base_path], ""))
108

11-
@not_found ~g'''
9+
@not_found ~s'''
1210
<!DOCTYPE html><html lang="en"><head></head><body>Not Found</body></html>
13-
'''html
11+
'''
1412

1513
plug :recompile
1614
plug :rerender
1715

18-
plug Tableau.IndexHtml
16+
plug TableauDevServer.IndexHtml
1917
plug Plug.Static, at: @base_path, from: "_site", cache_control_for_etags: "no-cache"
2018

2119
plug :match

‎lib/tableau/server.ex ‎lib/tableau_dev_server/server.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule Tableau.Server do
1+
defmodule TableauDevServer.Server do
22
@moduledoc false
33
def child_spec(_) do
44
Supervisor.child_spec(

‎lib/tableau/server_supervisor.ex ‎lib/tableau_dev_server/server_supervisor.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule Tableau.ServerSupervisor do
1+
defmodule TableauDevServer.ServerSupervisor do
22
@moduledoc false
33
use Supervisor
44

‎lib/tableau/websocket.ex ‎lib/tableau_dev_server/websocket.ex

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
defmodule Tableau.Websocket do
1+
defmodule TableauDevServer.Websocket do
22
@moduledoc false
33
require Logger
44

‎mix.exs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ defmodule Tableau.MixProject do
2222
def application do
2323
[
2424
extra_applications: [:logger, :inets],
25-
mod: {Tableau.Application, []}
25+
mod: {TableauDevServer.Application, []}
2626
]
2727
end
2828

‎test/mix/tasks/tableau.build_test.exs

+8-13
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ end
3434

3535
defmodule Mix.Tasks.Tableau.BuildTest.About do
3636
@moduledoc false
37-
import Tableau.Strung
38-
3937
alias Mix.Tasks.Tableau.BuildTest.InnerLayout
4038

4139
require EEx
@@ -48,18 +46,17 @@ defmodule Mix.Tasks.Tableau.BuildTest.About do
4846
EEx.function_from_string(
4947
:def,
5048
:template,
51-
~g'''
49+
~s'''
5250
<div>
5351
hi
5452
</div>
55-
'''html,
53+
''',
5654
[:_assigns]
5755
)
5856
end
5957

6058
defmodule Mix.Tasks.Tableau.BuildTest.Index do
6159
@moduledoc false
62-
import Tableau.Strung
6360

6461
alias Mix.Tasks.Tableau.BuildTest.InnerLayout
6562

@@ -73,19 +70,18 @@ defmodule Mix.Tasks.Tableau.BuildTest.Index do
7370
EEx.function_from_string(
7471
:def,
7572
:template,
76-
~g'''
73+
~s'''
7774
<div id="home">
7875
Home page!
7976
</div>
80-
'''html,
77+
''',
8178
[:_assigns]
8279
)
8380
end
8481

8582
defmodule Mix.Tasks.Tableau.BuildTest.InnerLayout do
8683
@moduledoc false
8784
import Tableau.Document.Helper, only: [render: 1]
88-
import Tableau.Strung
8985

9086
alias Mix.Tasks.Tableau.BuildTest.RootLayout
9187

@@ -97,19 +93,18 @@ defmodule Mix.Tasks.Tableau.BuildTest.InnerLayout do
9793
EEx.function_from_string(
9894
:def,
9995
:template,
100-
~g'''
96+
~s'''
10197
<div id="inner-layout">
10298
<%= render(@inner_content) %>
10399
</div>
104-
'''html,
100+
''',
105101
[:assigns]
106102
)
107103
end
108104

109105
defmodule Mix.Tasks.Tableau.BuildTest.RootLayout do
110106
@moduledoc false
111107
import Tableau.Document.Helper, only: [render: 1]
112-
import Tableau.Strung
113108

114109
require EEx
115110

@@ -118,14 +113,14 @@ defmodule Mix.Tasks.Tableau.BuildTest.RootLayout do
118113
EEx.function_from_string(
119114
:def,
120115
:template,
121-
~g'''
116+
~s'''
122117
<html>
123118
<head></head>
124119
<body>
125120
<%= render @inner_content %>
126121
</body>
127122
</html>
128-
'''html,
123+
''',
129124
[:assigns]
130125
)
131126
end

‎test/tableau/document_test.exs

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
defmodule Tableau.DocumentTest.About do
22
@moduledoc false
3-
import Tableau.Strung
3+
44
import Tableau.TestHelpers
55

66
alias Tableau.DocumentTest.InnerLayout
@@ -15,18 +15,17 @@ defmodule Tableau.DocumentTest.About do
1515
EEx.function_from_string(
1616
:def,
1717
:template,
18-
~g'''
18+
~s'''
1919
<div id="<%= @page.yo %>" class="<%= @page.foo %>">
2020
hi
2121
</div>
22-
'''html,
22+
''',
2323
[:assigns]
2424
)
2525
end
2626

2727
defmodule Tableau.DocumentTest.Index do
2828
@moduledoc false
29-
import Tableau.Strung
3029

3130
alias Tableau.DocumentTest.InnerLayout
3231

@@ -40,19 +39,18 @@ defmodule Tableau.DocumentTest.Index do
4039
EEx.function_from_string(
4140
:def,
4241
:template,
43-
~g'''
42+
~s'''
4443
<div id="home">
4544
Home page!
4645
</div>
47-
'''html,
46+
''',
4847
[:_assigns]
4948
)
5049
end
5150

5251
defmodule Tableau.DocumentTest.InnerLayout do
5352
@moduledoc false
5453
import Tableau.Document.Helper, only: [render: 1]
55-
import Tableau.Strung
5654

5755
alias Tableau.DocumentTest.RootLayout
5856

@@ -64,19 +62,18 @@ defmodule Tableau.DocumentTest.InnerLayout do
6462
EEx.function_from_string(
6563
:def,
6664
:template,
67-
~g'''
65+
~s'''
6866
<div id="inner-layout">
6967
<%= render(@inner_content) %>
7068
</div>
71-
'''html,
69+
''',
7270
[:assigns]
7371
)
7472
end
7573

7674
defmodule Tableau.DocumentTest.RootLayout do
7775
@moduledoc false
7876
import Tableau.Document.Helper, only: [render: 1]
79-
import Tableau.Strung
8077

8178
require EEx
8279

@@ -85,14 +82,14 @@ defmodule Tableau.DocumentTest.RootLayout do
8582
EEx.function_from_string(
8683
:def,
8784
:template,
88-
~g'''
85+
~s'''
8986
<html>
9087
<head></head>
9188
<body>
9289
<%= render @inner_content %>
9390
</body>
9491
</html>
95-
'''html,
92+
''',
9693
[:assigns]
9794
)
9895
end

0 commit comments

Comments
 (0)