lib/fog/hp/models/storage/directories.rb in fog-maestrodev-1.7.0.20121114190951 vs lib/fog/hp/models/storage/directories.rb in fog-maestrodev-1.8.0.20130109172219
- old
+ new
@@ -8,18 +8,18 @@
class Directories < Fog::Collection
model Fog::Storage::HP::Directory
def all
- data = connection.get_containers.body
+ data = service.get_containers.body
load(data)
end
def get(key, options = {})
read_header = nil
write_header = nil
- data = connection.get_container(key, options)
+ data = service.get_container(key, options)
directory = new(:key => key)
for key, value in data.headers
if ['X-Container-Bytes-Used', 'X-Container-Object-Count'].include?(key)
directory.merge_attributes(key => value)
end
@@ -29,10 +29,10 @@
write_header = value
end
end
# set the acl on the directory based on the headers
if !(read_header.nil? && write_header.nil?)
- directory.acl = connection.header_to_acl(read_header, write_header)
+ directory.acl = service.header_to_acl(read_header, write_header)
end
directory.files.merge_attributes(options)
directory.files.instance_variable_set(:@loaded, true)
data.body.each do |file|
directory.files << directory.files.new(file)