lib/cfoundry/v1/base.rb in cfoundry-0.3.20 vs lib/cfoundry/v1/base.rb in cfoundry-0.3.21
- old
+ new
@@ -1,6 +1,6 @@
-require "json"
+require "multi_json"
require "cfoundry/baseclient"
require "cfoundry/uaaclient"
require "cfoundry/errors"
@@ -103,11 +103,10 @@
def update_app(name, payload)
put(payload, "apps", name, :json => nil)
end
def delete_app(name)
- # TODO: no JSON response?
delete("apps", name)
true
end
def stats(name)
@@ -119,11 +118,11 @@
end
def upload_app(name, zipfile, resources = [])
payload = {
:_method => "put",
- :resources => resources.to_json,
+ :resources => MultiJson.dump(resources),
:multipart => true,
:application =>
if zipfile.is_a? File
zipfile
elsif zipfile.is_a? String
@@ -183,10 +182,10 @@
raise CFoundry::NotFound
when 411, 500, 504
begin
raise_error(parse_json(response))
- rescue JSON::ParserError
+ rescue MultiJson::DecodeError
raise CFoundry::BadResponse.new(response.code, response)
end
else
raise CFoundry::BadResponse.new(response.code, response)