lib/bobot/graph_facebook.rb in bobot-4.11.0 vs lib/bobot/graph_facebook.rb in bobot-4.13.0
- old
+ new
@@ -13,11 +13,12 @@
url,
params: URI.encode_www_form(query.reverse_merge(include_headers: false)),
headers: GRAPH_HEADERS,
ssl_verifypeer: false,
)
- json = ActiveSupport::JSON.decode(response.send(:body) || '{}')
+ json = (ActiveSupport::JSON.decode(response.send(:body) || '{}') rescue ::JSON::ParserError nil)
+ Bobot::ErrorParser.raise_errors_from_html(response, graph_body) if json.nil?
unless Rails.env.production?
Rails.logger.debug "[GET] >> #{url}"
Rails.logger.debug "[GET] << #{json}"
end
Bobot::ErrorParser.raise_errors_from(json)
@@ -33,11 +34,12 @@
params: URI.encode_www_form(query.reverse_merge(include_headers: false)),
body: graph_body,
headers: GRAPH_HEADERS,
ssl_verifypeer: false,
)
- json = ActiveSupport::JSON.decode(response.send(:body) || '{}')
+ json = (ActiveSupport::JSON.decode(response.send(:body) || '{}') rescue ::JSON::ParserError nil)
+ Bobot::ErrorParser.raise_errors_from_html(response, graph_body) if json.nil?
unless Rails.env.production?
Rails.logger.debug "[POST] >> #{url}"
Rails.logger.debug "[POST] << #{json}"
end
Bobot::ErrorParser.raise_errors_from(json, graph_body)
@@ -53,10 +55,11 @@
params: URI.encode_www_form(query.reverse_merge(include_headers: false)),
body: graph_body,
headers: GRAPH_HEADERS,
ssl_verifypeer: false,
)
- json = ActiveSupport::JSON.decode(response.send(:body) || '{}')
+ json = (ActiveSupport::JSON.decode(response.send(:body) || '{}') rescue ::JSON::ParserError nil)
+ Bobot::ErrorParser.raise_errors_from_html(response, graph_body) if json.nil?
unless Rails.env.production?
Rails.logger.debug "[DELETE] >> #{url}"
Rails.logger.debug "[DELETE] << #{json}"
end
Bobot::ErrorParser.raise_errors_from(json, graph_body)