couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chewbra...@apache.org
Subject couch commit: updated refs/heads/2073-feature-webmachine-http-engine to 223c926
Date Tue, 12 Aug 2014 22:52:04 GMT
Repository: couchdb-couch
Updated Branches:
  refs/heads/2073-feature-webmachine-http-engine [created] 223c92690


WIP: port to webmachine


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/223c9269
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/223c9269
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/223c9269

Branch: refs/heads/2073-feature-webmachine-http-engine
Commit: 223c9269008ee85e267acbb16741fa1a36b56e5c
Parents: 8675de9
Author: Russell Branca <chewbranca@apache.org>
Authored: Mon Jul 21 16:19:36 2014 -0700
Committer: Russell Branca <chewbranca@apache.org>
Committed: Mon Jul 21 16:19:36 2014 -0700

----------------------------------------------------------------------
 src/couch.erl               |  8 ++++++
 src/couch_api.erl           | 49 +++++++++++++++++++++++++++++++
 src/couch_httpr_db.erl      | 62 ++++++++++++++++++++++++++++++++++++++++
 src/couch_httpr_dbs.erl     | 44 ++++++++++++++++++++++++++++
 src/couch_httpr_welcome.erl | 44 ++++++++++++++++++++++++++++
 5 files changed, 207 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/223c9269/src/couch.erl
----------------------------------------------------------------------
diff --git a/src/couch.erl b/src/couch.erl
index 44cea06..9835721 100644
--- a/src/couch.erl
+++ b/src/couch.erl
@@ -63,3 +63,11 @@ start_apps([App|Rest]) ->
     {error, _Reason} ->
        {error, {app_would_not_start, App}}
     end.
+
+
+couch_dispatch() ->
+    [
+        {[], couch_httpr_welcome, []},
+        {["_dbs"], couch_httpr_dbs, []},
+        {["_dbs", db_id], couch_httpr_db, []}
+    ].

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/223c9269/src/couch_api.erl
----------------------------------------------------------------------
diff --git a/src/couch_api.erl b/src/couch_api.erl
new file mode 100644
index 0000000..e7ba81f
--- /dev/null
+++ b/src/couch_api.erl
@@ -0,0 +1,49 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+-module(couch_api).
+
+
+-export([
+    welcome_message/0,
+    welcome_message/1
+]).
+
+
+-include_lib("couch/include/couch_db.hrl").
+
+
+%% api
+
+welcome_message() ->
+    welcome_message(default_welcome_message()).
+
+
+welcome_message(WelcomeMessage) ->
+    Vendor = case config:get("vendor") of
+        [] ->
+            [];
+        Properties ->
+            [{vendor, {[{?l2b(K), ?l2b(V)} || {K, V} <- Properties]}}]
+    end,
+    [
+        {couchdb, WelcomeMessage},
+        {version, list_to_binary(couch_server:get_version())}
+        | Vendor
+    ].
+
+
+%% internal
+
+%% TODO: I18n
+default_welcome_message() ->
+    <<"Welcome">>.

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/223c9269/src/couch_httpr_db.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpr_db.erl b/src/couch_httpr_db.erl
new file mode 100644
index 0000000..5bfd540
--- /dev/null
+++ b/src/couch_httpr_db.erl
@@ -0,0 +1,62 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+-module(couch_httpr_db).
+
+
+-export([
+    init/1,
+    allowed_methods/2,
+    content_types_provided/2,
+    content_types_accepted/2,
+    to_json/2,
+    from_json/2
+]).
+
+
+-include_lib("webmachine/include/webmachine.hrl").
+-include_lib("chttpd2/include/chttpd2.hrl").
+
+
+-spec init(list()) -> {ok, term()}.
+init([]) ->
+    {ok, undefined}.
+
+
+content_types_provided(ReqData, Context) ->
+    {[{"application/json", to_json}], ReqData, Context}.
+
+
+content_types_accepted(ReqData, Context) ->
+    {[{"application/json", from_json}], ReqData, Context}.
+
+
+allowed_methods(ReqData, Context) ->
+    {['GET', 'PUT'], ReqData, Context}.
+
+
+-spec to_json(wrq:reqdata(), term()) -> {iodata(), wrq:reqdata(), term()}.
+to_json(ReqData, State) ->
+    DbId = wrq:path_info(db_id, ReqData),
+    {ok, DbInfo} = fabric:get_db_info(DbId),
+    {?JSON_ENCODE({DbInfo}), ReqData, State}.
+
+
+-spec from_json(wrq:reqdata(), term()) -> {iodata(), wrq:reqdata(), term()}.
+from_json(ReqData, State) ->
+    DbId = wrq:path_info(db_id, ReqData),
+    %% todo: parse options
+    %% Options = chttpd2_util:json_body(ReqData),
+    %% todo: handle pattern mismatch
+    %% ok = fabric:create_db(DbId, Options),
+    %% {true, ReqData, State}.
+    {{halt, 202}, ReqData, State}.

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/223c9269/src/couch_httpr_dbs.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpr_dbs.erl b/src/couch_httpr_dbs.erl
new file mode 100644
index 0000000..2a3c91a
--- /dev/null
+++ b/src/couch_httpr_dbs.erl
@@ -0,0 +1,44 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+-module(couch_httpr_dbs).
+
+
+-export([
+    init/1,
+    allowed_methods/2,
+    content_types_provided/2,
+    to_json/2
+]).
+
+
+-include_lib("webmachine/include/webmachine.hrl").
+-include_lib("chttpd2/include/chttpd2.hrl").
+
+
+-spec init(list()) -> {ok, term()}.
+init([]) ->
+    {ok, undefined}.
+
+
+content_types_provided(ReqData, Context) ->
+    {[{"application/json", to_json}], ReqData, Context}.
+
+
+allowed_methods(ReqData, Context) ->
+    {['GET'], ReqData, Context}.
+
+
+-spec to_json(wrq:reqdata(), term()) -> {iodata(), wrq:reqdata(), term()}.
+to_json(ReqData, State) ->
+    {ok, Dbs} = fabric:all_dbs(),
+    {?JSON_ENCODE({[{<<"dbs">>, Dbs}]}), ReqData, State}.

http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/223c9269/src/couch_httpr_welcome.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpr_welcome.erl b/src/couch_httpr_welcome.erl
new file mode 100644
index 0000000..25d8e4a
--- /dev/null
+++ b/src/couch_httpr_welcome.erl
@@ -0,0 +1,44 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+-module(couch_httpr_welcome).
+
+
+-export([
+    init/1,
+    allowed_methods/2,
+    content_types_provided/2,
+    to_json/2
+]).
+
+
+-include_lib("webmachine/include/webmachine.hrl").
+-include_lib("chttpd2/include/chttpd2.hrl").
+
+
+-spec init(list()) -> {ok, term()}.
+init([]) ->
+    {ok, undefined}.
+
+
+content_types_provided(ReqData, Context) ->
+    {[{"application/json", to_json}], ReqData, Context}.
+
+
+allowed_methods(ReqData, Context) ->
+    {['GET', 'HEAD'], ReqData, Context}.
+
+
+-spec to_json(wrq:reqdata(), term()) -> {iodata(), wrq:reqdata(), term()}.
+to_json(ReqData, State) ->
+    WelcomeMessage = couch_api:welcome_message(),
+    {?JSON_ENCODE({WelcomeMessage}), ReqData, State}.


Mime
View raw message