t/002-server.t t/003-database.t @@ -1,10 +1,17 @@ all: code code: clean - erlc -o ebin src/erlang_couchdb.erl + erlc +debug_info -o ./ebin src/erlang_couchdb.erl clean: rm -rfv ebin/*.beam erl_crash.dump dist-src: clean tar zcvf erlang_couchdb-0.2.3.tgz Makefile src/ + +test: all + prove -v t/*.t + +cover: all + COVER=1 prove t/*.t + erl -noshell -eval 'etap_report:create()' -s init stop Makefile @@ -36,3 +36,9 @@ To create an object and set a number of attributes: erlang_couchdb:fold([erlang_couchdb:set_value(K, V) || {K,V} <- L], erlang_couchdb:empty()) + +# TODO + + * Document attachments + +Your contributions are welcome. README.markdown @@ -168,26 +168,41 @@ decode_json(Body) -> %% @doc Create a new database. create_database({Server, ServerPort}, Database) when is_list(Server), is_integer(ServerPort) -> Url = build_uri(Database), - raw_request("PUT", Server, ServerPort, Url, []). + case raw_request("PUT", Server, ServerPort, Url, []) of + {json, {struct, [{<<"ok">>, true}]}} -> ok; + Other -> {error, Other} + end. %% @doc Create a new database. delete_database({Server, ServerPort}, Database) when is_list(Server), is_integer(ServerPort) -> Url = build_uri(Database), - raw_request("DELETE", Server, ServerPort, Url, []). + case raw_request("DELETE", Server, ServerPort, Url, []) of + {json, {struct, [{<<"ok">>, true}]}} -> ok; + Other -> {error, Other} + end. %% @doc Get info about a database. database_info({Server, ServerPort}, Database) when is_list(Server), is_integer(ServerPort) -> Url = build_uri(Database), - raw_request("GET", Server, ServerPort, Url, []). + case raw_request("GET", Server, ServerPort, Url, []) of + {json, {struct, Props}} -> {ok, Props}; + Other -> {error, Other} + end. %% @doc Get info about a server. server_info({Server, ServerPort}) when is_list(Server), is_integer(ServerPort) -> Url = build_uri(), - raw_request("GET", Server, ServerPort, Url, []). + case raw_request("GET", Server, ServerPort, Url, []) of + {json, {struct, Welcome}} -> {ok, Welcome}; + Other -> {other, Other} + end. %% @edoc Retieve all the databases retrieve_all_dbs({Server, ServerPort}) when is_list(Server), is_integer(ServerPort) -> - raw_request("GET", Server, ServerPort, "/_all_dbs",[]). + case raw_request("GET", Server, ServerPort, "/_all_dbs",[]) of + {json, Database} -> {ok, Database}; + Other -> {error, Other} + end. %% @doc Create a new document. This function will create a document with a %% list of attributes and leaves it up to the server to create an id for it. src/erlang_couchdb.erl @@ -1,8 +1,10 @@ #!/usr/bin/env escript %% -*- erlang -*- +%%! -pa ./ebin main(_) -> - etap:plan(1), + etap:plan(2), etap_can:loaded_ok(erlang_couchdb, "Module 'erlang_couchdb' loaded"), + etap_can:can_ok(erlang_couchdb, server_info), etap:end_tests(), ok. t/001-load.t 94ff8e86a960311848f5bce0524d1a966c4dfca1 Nick Gerakines nick@gerakines.net http://github.com/pib/erlang_couchdb/commit/a3f1f5596b741c1ae7c07b2d3be73e0af675384f a3f1f5596b741c1ae7c07b2d3be73e0af675384f 2009-02-17T23:00:21-08:00 2009-02-17T23:00:21-08:00 Improving test coverage. 4bee2b4ee16350ce476042ccfdbd8f4cfbc27d28 Nick Gerakines nick@gerakines.net