lib/heroku/api.rb in heroku-api-0.3.15 vs lib/heroku/api.rb in heroku-api-0.3.16
- old
+ new
@@ -1,18 +1,18 @@
require "base64"
+require "cgi"
require "excon"
+require "multi_json"
require "securerandom"
require "uri"
require "zlib"
__LIB_DIR__ = File.expand_path(File.join(File.dirname(__FILE__), ".."))
unless $LOAD_PATH.include?(__LIB_DIR__)
$LOAD_PATH.unshift(__LIB_DIR__)
end
-require "heroku/api/vendor/okjson"
-
require "heroku/api/errors"
require "heroku/api/mock"
require "heroku/api/version"
require "heroku/api/addons"
@@ -100,10 +100,10 @@
end
if response.body && !response.body.empty?
decompress_response!(response)
begin
- response.body = Heroku::API::OkJson.decode(response.body)
+ response.body = MultiJson.load(response.body)
rescue
# leave non-JSON body as is
end
end