@@ -10,5 +10,6 @@ ]}, {registered, []}, {mod, {erlurl_app, []}}, - {env, []}, + {env, [{"host", "localhost"}, + {"doc_root", "."}]}, {applications, [kernel, stdlib, crypto]}]}. erlurl/src/erlurl.app @@ -5,9 +5,13 @@ -include_lib("webmachine/include/webmachine.hrl"). +-record(state, + {docroot, + mimetype, + data=""}). -init(_) -> - {ok, []}. +init(DocRoot) -> + {ok, #state{docroot=DocRoot}}. resource_exists(ReqProps, Context) -> Path = ?PATH(ReqProps), @@ -15,8 +19,8 @@ resource_exists(ReqProps, Context) -> case find_file(Req:get_app_root(), Path) of {error, enoent} -> {false, Context}; - Contents -> - {true, Contents} + {MimeType, Contents} -> + {true, Context#state{data=Contents, mimetype=MimeType}} end. content_types_provided(_ReqProps, Context) -> @@ -27,14 +31,14 @@ content_types_provided(_ReqProps, Context) -> allowed_methods(_ReqProps, Context) -> {['GET'], Context}. -generate_etag(_ReqProps, {MimeType, Contents}) -> - Checksum = erlang:md5(Contents), - {hexify(binary_to_list(Checksum)), {MimeType, Contents}}. +generate_etag(_ReqProps, Context) -> + Checksum = erlang:md5(Context#state.data), + {hexify(binary_to_list(Checksum)), Context}. -provide_file(ReqProps, {MimeType, Contents}) -> +provide_file(ReqProps, Context) -> Req = ?REQ(ReqProps), - Req:add_response_header("Content-Type", MimeType), - {Contents, []}. + Req:add_response_header("Content-Type", Context#state.mimetype), + {Context#state.data, []}. %% Internal functions find_file(AppRoot, Path) -> erlurl/src/erlurl_root_resource.erl @@ -17,43 +17,45 @@ %% @spec start_link() -> ServerRet %% @doc API for starting the supervisor. start_link() -> - supervisor:start_link({local, ?MODULE}, ?MODULE, []). + supervisor:start_link({local, ?MODULE}, ?MODULE, []). %% @spec upgrade() -> ok %% @doc Add processes if necessary. upgrade() -> - {ok, {_, Specs}} = init([]), + {ok, {_, Specs}} = init([]), - Old = sets:from_list( - [Name || {Name, _, _, _} <- supervisor:which_children(?MODULE)]), - New = sets:from_list([Name || {Name, _, _, _, _, _} <- Specs]), - Kill = sets:subtract(Old, New), + Old = sets:from_list( + [Name || {Name, _, _, _} <- supervisor:which_children(?MODULE)]), + New = sets:from_list([Name || {Name, _, _, _, _, _} <- Specs]), + Kill = sets:subtract(Old, New), - sets:fold(fun (Id, ok) -> - supervisor:terminate_child(?MODULE, Id), - supervisor:delete_child(?MODULE, Id), - ok - end, ok, Kill), + sets:fold(fun (Id, ok) -> + supervisor:terminate_child(?MODULE, Id), + supervisor:delete_child(?MODULE, Id), + ok + end, ok, Kill), - [supervisor:start_child(?MODULE, Spec) || Spec <- Specs], - ok. + [supervisor:start_child(?MODULE, Spec) || Spec <- Specs], + ok. %% @spec init([]) -> SupervisorTree %% @doc supervisor callback. init([]) -> - Ip = case os:getenv("WEBMACHINE_IP") of false -> "0.0.0.0"; Any -> Any end, - Dispatch = [{["s", '*'], erlurl_resource, ["http://localhost:8000"]}, - {['*'], erlurl_root_resource, []}], - WebConfig = [ - {ip, Ip}, - {port, 8000}, - {log_dir, "priv/log"}, - {dispatch, Dispatch}], - Web = {webmachine_mochiweb, - {webmachine_mochiweb, start, [WebConfig]}, - permanent, 5000, worker, dynamic}, - Store = {erlurl_store, + Ip = case os:getenv("WEBMACHINE_IP") of false -> "0.0.0.0"; Any -> Any end, + Host = application:get_env("host"), + DocRoot = application:get_env("doc_root"), + Dispatch = [{["s", '*'], erlurl_resource, [Host]}, + {['*'], erlurl_root_resource, [DocRoot]}], + WebConfig = [ + {ip, Ip}, + {port, 8000}, + {log_dir, "priv/log"}, + {dispatch, Dispatch}], + Web = {webmachine_mochiweb, + {webmachine_mochiweb, start, [WebConfig]}, + permanent, 5000, worker, dynamic}, + Store = {erlurl_store, {erlurl_store, start_link, []}, permanent, 5000, worker, dynamic}, - Processes = [Store, Web], - {ok, {{one_for_one, 10, 10}, Processes}}. + Processes = [Store, Web], + {ok, {{one_for_one, 10, 10}, Processes}}. erlurl/src/erlurl_sup.erl herml/.gitignore herml/Makefile herml/ebin/.gitignore herml/ebin_tests/.gitignore herml/src/Emakefile herml/src/herml_html_render.erl herml/src/herml_reader.erl herml/src/herml_tags.erl herml/src/herml_tree_consolidator.erl herml/tests/Emakefile herml/tests/examples/bad_indent.herml herml/tests/examples/bad_list1.herml herml/tests/examples/basic_html.herml herml/tests/examples/consolidate_nested_peers.herml herml/tests/examples/consolidate_peers.herml herml/tests/examples/div_snippet.herml herml/tests/examples/div_snippet1.herml herml/tests/examples/div_snippet2.herml herml/tests/examples/div_snippet3.herml herml/tests/examples/gentag_snippet1.herml herml/tests/examples/simple_file.herml herml/tests/examples/simple_nesting.herml herml/tests/test_herml_reader.erl herml/tests/test_suite.erl twoply/Emakefile twoply/Makefile twoply/src/twoply.hrl twoply/src/twoply_http_dispatcher.erl twoply/src/twoply_supervisor.erl 86711409fbc0452f22a264fb527f69f31046dd33 kevsmith kevin@hypotheticalabs.com http://github.com/kevsmith/hypotheticalabs/commit/ccde98ff57c928d50c8f6609562aa8458d6136e0 ccde98ff57c928d50c8f6609562aa8458d6136e0 2009-03-21T09:03:35-07:00 2009-03-21T09:03:35-07:00 * Removing dead projects 6d703d980b30d796f1d5fd18fe593fd7a74b2f36 kevsmith kevin@hypotheticalabs.com