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

Merge branch 'master' into rs_spec_02

Browse Source 
Conflicts:
	lib/remote_storage/riak.rb
	spec/directories_spec.rb
This commit is contained in:
Garret Alfert
2014-09-23 17:58:21 +02:00
parent ed4152095b 7cbef2dee0
commit 1603d3d2ff
6 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/remote_storage/riak.rb
View File

@@ -289,17 +289,19 @@ module RemoteStorage
map_query = <<-EOH
function(v){
var values = v.values[0];
var metadata = values['metadata'];
var keys = v.key.split(':');
keys.splice(0, 2);
var key_name = keys.join(':');
var metadata = v.values[0]['metadata'];
var dir_name = metadata['index']['directory_bin'];
if (dir_name === '/') {
dir_name = '';
}
var name = v.key.match(/^[^:]*:(.*)/)[1]; // strip username from key
name = name.replace(dir_name + ':', ''); // strip directory from key
var etag = metadata['X-Riak-VTag'];
var contentType = metadata['content-type'];
var contentLength = metadata['X-Riak-Meta']['X-Riak-Meta-Content_length'] || 0;
return [{
name: key_name,
name: name,
etag: etag,
contentType: contentType,
contentLength: contentLength
@@ -316,12 +318,11 @@ module RemoteStorage
map_query = <<-EOH
function(v){
var keys = v.key.split(':');
var key_name = keys[keys.length-1];
var name = v.key.match(/^[^:]*:(.*)/)[1]; // strip username from key
var etag = v.values[0]['metadata']['X-Riak-VTag'];
return [{
name: key_name,
name: name,
etag: etag
}];
}