5apps/liquor-cabinet
5apps/liquor-cabinet
4
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Activity

Use content type "application/ld+json" for directory listings

Browse Source
This commit is contained in:
Garret Alfert 2016-06-02 14:09:00 +02:00
parent 7aaf3f80f7
commit ed8061b594
2 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/remote_storage/swift.rb
View File

@ -67,7 +67,7 @@ module RemoteStorage
def get_directory_listing(user, directory) def get_directory_listing(user, directory)
etag = redis.hget "rs:m:#{user}:#{directory}/", "e" etag = redis.hget "rs:m:#{user}:#{directory}/", "e"
server.headers["Content-Type"] = "application/json" server.headers["Content-Type"] = "application/ld+json"
none_match = (server.env["HTTP_IF_NONE_MATCH"] || "").split(",").map(&:strip) none_match = (server.env["HTTP_IF_NONE_MATCH"] || "").split(",").map(&:strip)

45
spec/swift/app_spec.rb
View File

@ -90,7 +90,7 @@ describe "App" do
get "phil/" get "phil/"
last_response.status.must_equal 200 last_response.status.must_equal 200
last_response.content_type.must_equal "application/json" last_response.content_type.must_equal "application/ld+json"
content = JSON.parse(last_response.body) content = JSON.parse(last_response.body)
content["items"]["bamboo.txt"].wont_be_nil content["items"]["bamboo.txt"].wont_be_nil
@ -286,7 +286,7 @@ describe "App" do
get "/phil/food/" get "/phil/food/"
last_response.status.must_equal 200 last_response.status.must_equal 200
last_response.content_type.must_equal "application/json" last_response.content_type.must_equal "application/ld+json"
content = JSON.parse(last_response.body) content = JSON.parse(last_response.body)
content["@context"].must_equal "http://remotestorage.io/spec/folder-description" content["@context"].must_equal "http://remotestorage.io/spec/folder-description"
@ -306,7 +306,7 @@ describe "App" do
get "phil/" get "phil/"
last_response.status.must_equal 200 last_response.status.must_equal 200
last_response.content_type.must_equal "application/json" last_response.content_type.must_equal "application/ld+json"
content = JSON.parse(last_response.body) content = JSON.parse(last_response.body)
content["items"]["food/"].wont_be_nil content["items"]["food/"].wont_be_nil
@ -317,5 +317,44 @@ describe "App" do
end end
end end
describe "HEAD requests" do
before do
purge_redis
end
context "authorized" do
before do
redis.sadd "authorizations:phil:amarillo", [":rw"]
header "Authorization", "Bearer amarillo"
put_stub = OpenStruct.new(headers: {
etag: "bla",
last_modified: "Fri, 04 Mar 2016 12:20:18 GMT"
})
RestClient.stub :put, put_stub do
put "/phil/food/aguacate", "si"
put "/phil/food/camaron", "yummi"
put "/phil/food/desayunos/bolon", "wow"
end
end
describe "directory listings" do
it "has the header information" do
get "/phil/food/"
last_response.status.must_equal 200
last_response.content_type.must_equal "application/ld+json"
last_response.headers["ETag"].must_equal "\"f9f85fbf5aa1fa378fd79ac8aa0a457d\""
end
end
end
end
end end