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

Code formatting

Browse Source
This commit is contained in:
Garret Alfert 2014-01-09 23:58:20 +01:00
parent 270ac1442e
commit ed4152095b
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/remote_storage/riak.rb
View File

@ -164,14 +164,14 @@ module RemoteStorage
private private
def set_object_response_headers(object) def set_object_response_headers(object)
server.headers["Content-Type"] = object.content_type server.headers["Content-Type"] = object.content_type
server.headers["ETag"] = object.etag server.headers["ETag"] = object.etag
server.headers["Content-Length"] = object_size(object) server.headers["Content-Length"] = object_size(object)
end end
def set_directory_response_headers(directory_object) def set_directory_response_headers(directory_object)
server.headers["Content-Type"] = "application/json" server.headers["Content-Type"] = "application/json"
server.headers["ETag"] = directory_object.etag server.headers["ETag"] = directory_object.etag
end end
def extract_category(directory) def extract_category(directory)
@ -188,7 +188,7 @@ module RemoteStorage
object.content_type = content_type || "text/plain; charset=utf-8" object.content_type = content_type || "text/plain; charset=utf-8"
directory_index = directory == "" ? "/" : directory directory_index = directory == "" ? "/" : directory
object.indexes.merge!({:user_id_bin => [user], object.indexes.merge!({:user_id_bin => [user],
:directory_bin => [directory_index]}) :directory_bin => [directory_index]})
object object
@ -201,8 +201,8 @@ module RemoteStorage
log_entry = opslog_bucket.new log_entry = opslog_bucket.new
log_entry.content_type = "application/json" log_entry.content_type = "application/json"
log_entry.data = { log_entry.data = {
"count" => count, "count" => count,
"size" => size, "size" => size,
"category" => extract_category(directory) "category" => extract_category(directory)
} }
log_entry.indexes.merge!({:user_id_bin => [user]}) log_entry.indexes.merge!({:user_id_bin => [user]})
@ -260,18 +260,24 @@ module RemoteStorage
sub_directories(user, directory).each do |entry| sub_directories(user, directory).each do |entry|
directory_name = entry["name"].split("/").last directory_name = entry["name"].split("/").last
etag = entry["etag"] etag = entry["etag"]
listing["items"].merge!({ "#{directory_name}/" => { "ETag" => etag }}) listing["items"].merge!({ "#{directory_name}/" => { "ETag" => etag }})
end end
directory_entries(user, directory).each do |entry| directory_entries(user, directory).each do |entry|
entry_name = entry["name"] entry_name = entry["name"]
etag = entry["etag"] etag = entry["etag"]
content_type = entry["contentType"] content_type = entry["contentType"]
content_length = entry["contentLength"].to_i content_length = entry["contentLength"].to_i
listing["items"].merge!({ entry_name => { "ETag" => etag, "Content-Type" => content_type, "Content-Length" => content_length }}) listing["items"].merge!({
entry_name => {
"ETag" => etag,
"Content-Type" => content_type,
"Content-Length" => content_length
}
})
end end
listing listing
@ -293,9 +299,9 @@ module RemoteStorage
var contentLength = metadata['X-Riak-Meta']['X-Riak-Meta-Content_length'] || 0; var contentLength = metadata['X-Riak-Meta']['X-Riak-Meta-Content_length'] || 0;
return [{ return [{
name: key_name, name: key_name,
etag: etag, etag: etag,
contentType: contentType, contentType: contentType,
contentLength: contentLength contentLength: contentLength
}]; }];
} }
@ -404,7 +410,7 @@ module RemoteStorage
:content_type => object.content_type :content_type => object.content_type
) )
object.meta["binary_key"] = cs_binary_object.key object.meta["binary_key"] = cs_binary_object.key
object.meta["content_length"] = cs_binary_object.content_length object.meta["content_length"] = cs_binary_object.content_length
object.raw_data = "" object.raw_data = ""
end end