Merge pull request #49 from DripEmail/repair_json_parsing

Repair json parsing issues.
DripEmail · Jun 6, 2018 · 56e1269 · 56e1269
2 parents a20094a + 0fc8f12
commit 56e1269
Show file tree

Hide file tree

Showing 17 changed files with 118 additions and 90 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Your contribution here!
 
+### Fixed
+
+- [#48](https://github.com/DripEmail/drip-ruby/issues/48): Repair json parsing to work correctly
+
 ## [3.1.0] - 2018-06-05
 
 [3.1.0]: https://github.com/DripEmail/drip-ruby/compare/v3.0.0...v3.1.0

diff --git a/lib/drip/client.rb b/lib/drip/client.rb
@@ -116,7 +116,9 @@ def make_request(verb_klass, uri, options, step = 0)
 
     def build_response(&block)
       response = yield
-      Drip::Response.new(response.code.to_i, response.body)
+      Drip::Response.new(response.code.to_i, response.body || response.body == "" ? JSON.parse(response.body) : nil)
+    rescue JSON::ParserError
+      Drip::Response.new(response.code.to_i, nil)
     end
 
     def connection_options(uri_scheme)

diff --git a/test/drip/client/accounts_test.rb b/test/drip/client/accounts_test.rb
@@ -8,30 +8,30 @@ def setup
   context "#accounts" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:get, "https://api.getdrip.com/v2/accounts").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.accounts
     end
   end
 
   context "#account" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
       @id = 9999999
 
       stub_request(:get, "https://api.getdrip.com/v2/accounts/#{@id}").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.account(@id)
     end
   end

diff --git a/test/drip/client/broadcasts_test.rb b/test/drip/client/broadcasts_test.rb
@@ -8,30 +8,30 @@ def setup
   context "#broadcasts" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/broadcasts").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the correct request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.broadcasts
     end
   end
 
   context "#broadcast" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
       @id = 99999
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/broadcasts/#{@id}").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the correct request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.broadcast(@id)
     end
   end

diff --git a/test/drip/client/campaign_subscriptions_test.rb b/test/drip/client/campaign_subscriptions_test.rb
@@ -8,15 +8,15 @@ def setup
   context "#campaign_subscriptions" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
       @subscriber_id = "abc123"
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/subscribers/#{@subscriber_id}/campaign_subscriptions").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.campaign_subscriptions(@subscriber_id)
     end
   end

diff --git a/test/drip/client/campaigns_test.rb b/test/drip/client/campaigns_test.rb
@@ -8,30 +8,30 @@ def setup
   context "#campaigns" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/campaigns").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.campaigns
     end
   end
 
   context "#campaign" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
       @id = 9999999
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/campaigns/#{@id}").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.campaign(@id)
     end
   end
@@ -71,15 +71,15 @@ def setup
   context "#campaign_subscribers" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
       @id = 9999999
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/campaigns/#{@id}/subscribers").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.campaign_subscribers(@id)
     end
   end

diff --git a/test/drip/client/conversions_test.rb b/test/drip/client/conversions_test.rb
@@ -8,30 +8,30 @@ def setup
   context "#conversions" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/goals").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.conversions
     end
   end
 
   context "#conversion" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
       @id = 9999999
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/goals/#{@id}").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.conversion(@id)
     end
   end

diff --git a/test/drip/client/custom_fields_test.rb b/test/drip/client/custom_fields_test.rb
@@ -8,14 +8,14 @@ def setup
   context "#custom_fields" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/custom_field_identifiers").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.custom_fields
     end
   end

diff --git a/test/drip/client/events_test.rb b/test/drip/client/events_test.rb
@@ -23,14 +23,14 @@ def setup
         }.to_json
 
         @response_status = 201
-        @response_body = "stub"
+        @response_body = "{}"
 
         stub_request(:post, "https://api.getdrip.com/v2/12345/events").
           to_return(status: @response_status, body: @response_body, headers: {})
       end
 
       should "send the right request" do
-        expected = Drip::Response.new(@response_status, @response_body)
+        expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
         assert_equal expected, @client.track_event(@email, @action, @properties)
       end
     end
@@ -50,14 +50,14 @@ def setup
         }.to_json
 
         @response_status = 201
-        @response_body = "stub"
+        @response_body = "{}"
 
         stub_request(:post, "https://api.getdrip.com/v2/12345/events").
           to_return(status: @response_status, body: @response_body, headers: {})
       end
 
       should "send the right request" do
-        expected = Drip::Response.new(@response_status, @response_body)
+        expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
         assert_equal expected, @client.track_event(@email, @action, @properties, @options)
       end
     end
@@ -78,29 +78,29 @@ def setup
 
       @payload = { "batches" => [{ "events" => @events }] }.to_json
       @response_status = 201
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:post, "https://api.getdrip.com/v2/12345/events/batches").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.track_events(@events)
     end
   end
 
   context "#event_actions" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/event_actions").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.event_actions
     end
   end

diff --git a/test/drip/client/forms_test.rb b/test/drip/client/forms_test.rb
@@ -8,30 +8,30 @@ def setup
   context "#forms" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/forms").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.forms
     end
   end
 
   context "#form" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
       @id = 9999999
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/forms/#{@id}").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.form(@id)
     end
   end

diff --git a/test/drip/client/orders_test.rb b/test/drip/client/orders_test.rb
@@ -24,14 +24,14 @@ def setup
       }
       @payload = { "orders" => [@options] }.to_json
       @response_status = 202
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:post, "https://api.getdrip.com/v2/12345/orders").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the correct request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.create_or_update_order(@email, @options)
     end
   end
@@ -71,14 +71,14 @@ def setup
 
       @payload = { "batches" => [{ "orders" => @orders }] }.to_json
       @response_status = 202
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:post, "https://api.getdrip.com/v2/12345/orders/batches").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the correct request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.create_or_update_orders(@orders)
     end
   end
@@ -96,14 +96,14 @@ def setup
 
       @payload = { "refunds" => [@options] }.to_json
       @response_status = 202
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:post, "https://api.getdrip.com/v2/12345/refunds").
         to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the correct request" do
-      expected = Drip::Response.new(@response_status, @response_body)
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
       assert_equal expected, @client.create_or_update_refund(@options)
     end
   end