lib/fog/openstack/requests/storage/get_object.rb in fog-maestrodev-1.15.0.20130829165835 vs lib/fog/openstack/requests/storage/get_object.rb in fog-maestrodev-1.15.0.20130927082724

- old
+ new

@@ -8,20 +8,20 @@ # ==== Parameters # * container<~String> - Name of container to look in # * object<~String> - Name of object to look for # def get_object(container, object, &block) - params = {} + params = { + :expects => 200, + :method => 'GET', + :path => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" + } if block_given? - params[:response_block] = Proc.new + params[:response_block] = block end - request(params.merge!({ - :expects => 200, - :method => 'GET', - :path => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" - }), false) + request(params, false) end end end end