diff --git a/examples/simple_server/lib/simple_server/endpoint.ex b/examples/simple_server/lib/simple_server/endpoint.ex index 2b984c0..e050fa5 100644 --- a/examples/simple_server/lib/simple_server/endpoint.ex +++ b/examples/simple_server/lib/simple_server/endpoint.ex @@ -1,37 +1,3 @@ defmodule SimpleServer.Endpoint do use Phoenix.Endpoint, otp_app: :simple_server - - socket "/socket", SimpleServer.UserSocket - - # Serve at "/" the static files from "priv/static" directory. - # - # You should set gzip to true if you are running phoenix.digest - # when deploying your static files in production. - plug Plug.Static, - at: "/", from: :simple_server, gzip: false, - only: ~w(css fonts images js favicon.ico robots.txt) - - # Code reloading can be explicitly enabled under the - # :code_reloader configuration of your endpoint. - if code_reloading? do - plug Phoenix.CodeReloader - end - - plug Plug.RequestId - plug Plug.Logger - - plug Plug.Parsers, - parsers: [:urlencoded, :multipart, :json], - pass: ["*/*"], - json_decoder: Poison - - plug Plug.MethodOverride - plug Plug.Head - - plug Plug.Session, - store: :cookie, - key: "_simple_server_key", - signing_salt: "rg7udXF+" - - plug SimpleServer.Router end diff --git a/examples/simple_server/test/support/conn_case.ex b/examples/simple_server/test/support/conn_case.ex index e645f04..ba92df2 100644 --- a/examples/simple_server/test/support/conn_case.ex +++ b/examples/simple_server/test/support/conn_case.ex @@ -20,8 +20,6 @@ defmodule SimpleServer.ConnCase do # Import conveniences for testing with connections use Phoenix.ConnTest - import SimpleServer.Router.Helpers - # The default endpoint for testing @endpoint SimpleServer.Endpoint end diff --git a/examples/simple_server/web/channels/user_socket.ex b/examples/simple_server/web/channels/user_socket.ex deleted file mode 100644 index 3a3f2cd..0000000 --- a/examples/simple_server/web/channels/user_socket.ex +++ /dev/null @@ -1,37 +0,0 @@ -defmodule SimpleServer.UserSocket do - use Phoenix.Socket - - ## Channels - # channel "rooms:*", SimpleServer.RoomChannel - - ## Transports - transport :websocket, Phoenix.Transports.WebSocket - # transport :longpoll, Phoenix.Transports.LongPoll - - # Socket params are passed from the client and can - # be used to verify and authenticate a user. After - # verification, you can put default assigns into - # the socket that will be set for all channels, ie - # - # {:ok, assign(socket, :user_id, verified_user_id)} - # - # To deny connection, return `:error`. - # - # See `Phoenix.Token` documentation for examples in - # performing token verification on connect. - def connect(_params, socket) do - {:ok, socket} - end - - # Socket id's are topics that allow you to identify all sockets for a given user: - # - # def id(socket), do: "users_socket:#{socket.assigns.user_id}" - # - # Would allow you to broadcast a "disconnect" event and terminate - # all active sockets and channels for a given user: - # - # SimpleServer.Endpoint.broadcast("users_socket:#{user.id}", "disconnect", %{}) - # - # Returning `nil` makes this socket anonymous. - def id(_socket), do: nil -end diff --git a/examples/simple_server/web/router.ex b/examples/simple_server/web/router.ex deleted file mode 100644 index 8765af0..0000000 --- a/examples/simple_server/web/router.ex +++ /dev/null @@ -1,11 +0,0 @@ -defmodule SimpleServer.Router do - use SimpleServer.Web, :router - - pipeline :api do - plug :accepts, ["json"] - end - - scope "/api", SimpleServer do - pipe_through :api - end -end diff --git a/examples/simple_server/web/web.ex b/examples/simple_server/web/web.ex index c314789..b82ab0d 100644 --- a/examples/simple_server/web/web.ex +++ b/examples/simple_server/web/web.ex @@ -16,21 +16,6 @@ defmodule SimpleServer.Web do below. """ - def model do - quote do - # Define common model functionality - end - end - - def controller do - quote do - use Phoenix.Controller - - import SimpleServer.Router.Helpers - import SimpleServer.Gettext - end - end - def view do quote do use Phoenix.View, root: "web/templates" @@ -38,25 +23,11 @@ defmodule SimpleServer.Web do # Import convenience functions from controllers import Phoenix.Controller, only: [get_csrf_token: 0, get_flash: 2, view_module: 1] - import SimpleServer.Router.Helpers import SimpleServer.ErrorHelpers import SimpleServer.Gettext end end - def router do - quote do - use Phoenix.Router - end - end - - def channel do - quote do - use Phoenix.Channel - import SimpleServer.Gettext - end - end - @doc """ When used, dispatch to the appropriate controller/view/etc. """