From e1a9117c9f6d390a46a33f4ab1c49f91fdbfe4c1 Mon Sep 17 00:00:00 2001 From: Rob Eanes Date: Mon, 3 Jun 2019 18:01:12 -0500 Subject: [PATCH 1/2] ensure JSON.parse gets a string, not an HTTParty::Response object --- lib/bamboozled/api/base.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bamboozled/api/base.rb b/lib/bamboozled/api/base.rb index ae950b7..25e39eb 100644 --- a/lib/bamboozled/api/base.rb +++ b/lib/bamboozled/api/base.rb @@ -37,10 +37,11 @@ def request(method, path, options = {}) case response.code when 200..201 begin - if response.body.to_s.empty? + body = response.body.to_s + if body.empty? { "headers" => response.headers } else - JSON.parse(response) + JSON.parse(body) end rescue typecast = options.fetch(:typecast_values, true) From 1c911a6ae7cac1e4e521e95229f83a2175fae184 Mon Sep 17 00:00:00 2001 From: Rob Eanes Date: Thu, 26 Mar 2020 09:09:00 -0500 Subject: [PATCH 2/2] allow json gem >= 1.8 --- bamboozled.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bamboozled.gemspec b/bamboozled.gemspec index 590b14f..c2200d5 100644 --- a/bamboozled.gemspec +++ b/bamboozled.gemspec @@ -26,5 +26,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "webmock", "~> 1.20" spec.add_dependency "httparty", "~> 0.13" - spec.add_dependency "json", "~> 1.8" + spec.add_dependency "json", ">= 1.8" end