Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/ohmforce/erls3
Browse files Browse the repository at this point in the history
  • Loading branch information
cstar committed Jul 7, 2010
2 parents d12db02 + 1ab74ca commit 2161224
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ ebin/erls3.beam
ebin/erls3server.beam
ebin/erls3sup.beam
ebin/erls3util.beam
ebin/file_events.beam
ebin/file_events.beam
.eunit
4 changes: 0 additions & 4 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ Requirements

- An Amazon Web Services account - see http://www.amazonaws.com

- ibrowse (http://github.com/cstar/ibrowse/tree/master)

- rake and ruby

- optionally : merle and ketama for caching
merle is available here : http://github.com/cstar/merle/tree/master
libketama is available here : http://www.audioscrobbler.net/development/ketama/
Expand Down
2 changes: 1 addition & 1 deletion rebar.config
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{deps, [
{ibrowse, ".*", {git, "git://github.com/cstar/ibrowse.git", "master"}}
{ibrowse, ".*", {git, "git://github.com/cmullaparthi/ibrowse.git", "master"}}
]}.
2 changes: 1 addition & 1 deletion src/erls3.erl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

-compile(export_all).
-export([
read_term/2, write_term/3,
read_term/2, write_term/3,
list_buckets/0, create_bucket/1,
delete_bucket/1, link_to/3,
head/2, policy/1, get_objects/2, get_objects/3,
Expand Down
16 changes: 16 additions & 0 deletions test/erls3_tests.erl
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
-module(erls3_tests).

-include_lib("eunit/include/eunit.hrl").

-include("erls3.hrl").
-define(BUCKET, "test.s3.erl").

start() ->
erls3:start(),
{ok, ok} = erls3:create_bucket(?BUCKET).

connection_test() ->
erls3:head(?BUCKET, "").

write_test() ->
erls3:write_object(?BUCKET, "test.txt", "hello world", "plain/text", [{"x-amz-beuha", "aussi"}]).

0 comments on commit 2161224

Please sign in to comment.