drip-ruby 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cde072743a9010ff142889179cd1c5cb57eb6009
-  data.tar.gz: 2c94bb250107e5412a1e85ca418845ce81242711
+  metadata.gz: 34ab6a491e2d7b0bdf33b525a11c7d5499bd0e2f
+  data.tar.gz: d5b703ea0a8f113be93b5c19bbf13849f7fbb6b7
 SHA512:
-  metadata.gz: 229a86bbc7153395d73659ea272c9d2467678bf812ca2c687903701969dfd55281eed4c0c45e7eebd536bd3755f5ac31c6312d4f92e13fadac985c9ec804880d
-  data.tar.gz: 6032350979b07376d2de554ac22675a77d8a56a20492431df760e5f02793ce6e4a164013daa76bb9bbe02f8e85b42415a5054a473fa68b8aac3722bd88f8f7e4
+  metadata.gz: ffb4cacb8da55651f34b33c9377de84104fa5913eb520f7437a2b0cf045eba8da1743043538c10ee00be64b562697128d22e35225307d5f4dee1c318c5022bdc
+  data.tar.gz: 3bce36166a411416f7258939b2283c403ec35903b882144538f95b893f56a61bd7bb3f90503ae61f7c318a834356ca073b594555fbc62f6185f4d8d6fa29908c

data/CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+[master]: https://github.com/DripEmail/drip-ruby/compare/v3.0.0...HEAD
+
+- Your contribution here!
+
+## [3.1.1] - 2018-06-06
+
+[3.1.1]: https://github.com/DripEmail/drip-ruby/compare/v3.1.0...v3.1.1
+
+### 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

data/lib/drip/client.rb

@@ -116,7 +116,9 @@ module Drip
 
     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)

data/lib/drip/version.rb

@@ -1,3 +1,3 @@
 module Drip
-  VERSION = "3.1.0".freeze
+  VERSION = "3.1.1".freeze
 end

data/test/drip/client/accounts_test.rb

@@ -8,14 +8,14 @@ class Drip::Client::AccountsTest < Drip::TestCase
   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
@@ -23,7 +23,7 @@ class Drip::Client::AccountsTest < Drip::TestCase
   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}").
@@ -31,7 +31,7 @@ class Drip::Client::AccountsTest < Drip::TestCase
     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

data/test/drip/client/broadcasts_test.rb

@@ -8,14 +8,14 @@ class Drip::Client::BroadcastsTest < Drip::TestCase
   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
@@ -23,7 +23,7 @@ class Drip::Client::BroadcastsTest < Drip::TestCase
   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}").
@@ -31,7 +31,7 @@ class Drip::Client::BroadcastsTest < Drip::TestCase
     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

data/test/drip/client/campaign_subscriptions_test.rb

@@ -8,7 +8,7 @@ class Drip::Client::CampaignSubscriptionsTest < Drip::TestCase
   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").
@@ -16,7 +16,7 @@ class Drip::Client::CampaignSubscriptionsTest < Drip::TestCase
     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

data/test/drip/client/campaigns_test.rb

@@ -8,14 +8,14 @@ class Drip::Client::CampaignsTest < Drip::TestCase
   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
@@ -23,7 +23,7 @@ class Drip::Client::CampaignsTest < Drip::TestCase
   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}").
@@ -31,7 +31,7 @@ class Drip::Client::CampaignsTest < Drip::TestCase
     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,7 +71,7 @@ class Drip::Client::CampaignsTest < Drip::TestCase
   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").
@@ -79,7 +79,7 @@ class Drip::Client::CampaignsTest < Drip::TestCase
     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

data/test/drip/client/conversions_test.rb

@@ -8,14 +8,14 @@ class Drip::Client::ConversionsTest < Drip::TestCase
   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
@@ -23,7 +23,7 @@ class Drip::Client::ConversionsTest < Drip::TestCase
   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}").
@@ -31,7 +31,7 @@ class Drip::Client::ConversionsTest < Drip::TestCase
     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

data/test/drip/client/custom_fields_test.rb

@@ -8,14 +8,14 @@ class Drip::Client::CustomFieldsTest < Drip::TestCase
   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

data/test/drip/client/events_test.rb

@@ -23,14 +23,14 @@ class Drip::Client::EventsTest < Drip::TestCase
         }.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 @@ class Drip::Client::EventsTest < Drip::TestCase
         }.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,14 +78,14 @@ class Drip::Client::EventsTest < Drip::TestCase
 
       @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
@@ -93,14 +93,14 @@ class Drip::Client::EventsTest < Drip::TestCase
   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

data/test/drip/client/forms_test.rb

@@ -8,14 +8,14 @@ class Drip::Client::FormsTest < Drip::TestCase
   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
@@ -23,7 +23,7 @@ class Drip::Client::FormsTest < Drip::TestCase
   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}").
@@ -31,7 +31,7 @@ class Drip::Client::FormsTest < Drip::TestCase
     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

data/test/drip/client/orders_test.rb

@@ -24,14 +24,14 @@ class Drip::Client::OrdersTest < Drip::TestCase
       }
       @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 @@ class Drip::Client::OrdersTest < Drip::TestCase
 
       @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 @@ class Drip::Client::OrdersTest < Drip::TestCase
 
       @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

data/test/drip/client/subscribers_test.rb

@@ -8,14 +8,14 @@ class Drip::Client::SubscribersTest < Drip::TestCase
   context "#subscribers" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/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.subscribers
     end
   end
@@ -24,14 +24,14 @@ class Drip::Client::SubscribersTest < Drip::TestCase
     setup do
       @id = "derrick@getdrip.com"
       @response_status = 201
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/subscribers/#{CGI.escape @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.subscriber(@id)
     end
   end
@@ -59,14 +59,14 @@ class Drip::Client::SubscribersTest < Drip::TestCase
       @payload = { "subscribers" => [@data.merge(email: @email)] }.to_json
 
       @response_status = 201
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:post, "https://api.getdrip.com/v2/12345/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.create_or_update_subscriber(@email, @data)
     end
   end
@@ -86,14 +86,14 @@ class Drip::Client::SubscribersTest < Drip::TestCase
 
       @payload = { "batches" => [{ "subscribers" => @subscribers }] }.to_json
       @response_status = 201
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:post, "https://api.getdrip.com/v2/12345/subscribers/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.create_or_update_subscribers(@subscribers)
     end
   end
@@ -131,14 +131,14 @@ class Drip::Client::SubscribersTest < Drip::TestCase
       @payload = { "subscribers" => [@data.merge(email: @email)] }.to_json
 
       @response_status = 201
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:post, "https://api.getdrip.com/v2/12345/campaigns/#{@campaign_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.subscribe(@email, @campaign_id, @data)
     end
   end
@@ -149,14 +149,14 @@ class Drip::Client::SubscribersTest < Drip::TestCase
         @id = "derrick@getdrip.com"
 
         @response_status = 201
-        @response_body = "stub"
+        @response_body = "{}"
 
         stub_request(:post, "https://api.getdrip.com/v2/12345/subscribers/#{CGI.escape @id}/remove").
           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.unsubscribe(@id)
       end
     end
@@ -167,14 +167,14 @@ class Drip::Client::SubscribersTest < Drip::TestCase
         @campaign = "12345"
 
         @response_status = 201
-        @response_body = "stub"
+        @response_body = "{}"
 
         stub_request(:post, "https://api.getdrip.com/v2/12345/subscribers/#{CGI.escape @id}/remove?campaign_id=#{@campaign}").
           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.unsubscribe(@id, campaign_id: @campaign)
       end
     end
@@ -184,14 +184,14 @@ class Drip::Client::SubscribersTest < Drip::TestCase
     setup do
       @id = "derrick@getdrip.com"
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:post, "https://api.getdrip.com/v2/12345/subscribers/#{CGI.escape @id}/unsubscribe_all").
         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.unsubscribe_from_all(@id)
     end
   end
@@ -203,14 +203,14 @@ class Drip::Client::SubscribersTest < Drip::TestCase
       @payload = { "tags" => [{ "email" => @email, "tag" => @tag }] }.to_json
 
       @response_status = 201
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:post, "https://api.getdrip.com/v2/12345/tags").
         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.apply_tag(@email, @tag)
     end
   end

data/test/drip/client/tags_test.rb

@@ -8,14 +8,14 @@ class Drip::Client::TagsTest < Drip::TestCase
   context "#tags" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/tags").
         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.tags
     end
   end
@@ -27,14 +27,14 @@ class Drip::Client::TagsTest < Drip::TestCase
       @payload = { "tags" => [{ "email" => @email, "tag" => @tag }] }.to_json
 
       @response_status = 201
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:post, "https://api.getdrip.com/v2/12345/tags").
         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.apply_tag(@email, @tag)
     end
   end

data/test/drip/client/webhooks_test.rb

@@ -8,14 +8,14 @@ class Drip::Client::WebhooksTest < Drip::TestCase
   context "#webhooks" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/webhooks").
         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.webhooks
     end
   end
@@ -23,7 +23,7 @@ class Drip::Client::WebhooksTest < Drip::TestCase
   context "#webhook" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
       @id = 1234
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/webhooks/#{@id}").
@@ -31,7 +31,7 @@ class Drip::Client::WebhooksTest < Drip::TestCase
     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.webhook(@id)
     end
   end
@@ -50,14 +50,14 @@ class Drip::Client::WebhooksTest < Drip::TestCase
 
       @payload = { "webhooks" => [@options] }.to_json
       @response_status = 201
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:post, "https://api.getdrip.com/v2/12345/webhooks").
         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.create_webhook(@post_url, @include_received_email, @events)
     end
   end
@@ -65,7 +65,7 @@ class Drip::Client::WebhooksTest < Drip::TestCase
   context "#delete_webhook" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
       @id = 1234
 
       stub_request(:delete, "https://api.getdrip.com/v2/12345/webhooks/#{@id}").
@@ -73,7 +73,7 @@ class Drip::Client::WebhooksTest < Drip::TestCase
     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.delete_webhook(@id)
     end
   end

data/test/drip/client/workflow_triggers_test.rb

@@ -9,14 +9,14 @@ class Drip::Client::WorkflowTriggersTest < Drip::TestCase
     setup do
       @id = 9999999
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/workflows/#{@id}/triggers").
         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.workflow_triggers(@id)
     end
   end
@@ -35,14 +35,14 @@ class Drip::Client::WorkflowTriggersTest < Drip::TestCase
       @payload = { "triggers" => [@data] }.to_json
 
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:post, "https://api.getdrip.com/v2/12345/workflows/#{@id}/triggers").
         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.create_workflow_trigger(@id, @data)
     end
   end
@@ -61,14 +61,14 @@ class Drip::Client::WorkflowTriggersTest < Drip::TestCase
       @payload = { "triggers" => [@data] }.to_json
 
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:put, "https://api.getdrip.com/v2/12345/workflows/#{@id}/triggers").
         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.update_workflow_trigger(@id, @data)
     end
   end

data/test/drip/client/workflows_test.rb

@@ -8,14 +8,14 @@ class Drip::Client::WorkflowsTest < Drip::TestCase
   context "#workflows" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/workflows").
         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.workflows
     end
   end
@@ -23,7 +23,7 @@ class Drip::Client::WorkflowsTest < Drip::TestCase
   context "#workflow" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
       @id = 1234
 
       stub_request(:get, "https://api.getdrip.com/v2/12345/workflows/#{@id}").
@@ -31,7 +31,7 @@ class Drip::Client::WorkflowsTest < Drip::TestCase
     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.workflow(@id)
     end
   end
@@ -93,7 +93,7 @@ class Drip::Client::WorkflowsTest < Drip::TestCase
   context "#remove_subscriber_workflow" do
     setup do
       @response_status = 200
-      @response_body = "stub"
+      @response_body = "{}"
       @id = 1234
       @email = "someone@example.com"
 
@@ -102,7 +102,7 @@ class Drip::Client::WorkflowsTest < Drip::TestCase
     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.remove_subscriber_workflow(@id, @email)
     end
   end

data/test/drip/client_test.rb

@@ -88,6 +88,31 @@ class Drip::ClientTest < Drip::TestCase
     end
   end
 
+  context "given a basic request" do
+    setup do
+      @client = Drip::Client.new do |config|
+        config.api_key = "Hello world"
+        config.account_id = 12345
+      end
+    end
+
+    should "return objects" do
+      stub_request(:get, "https://api.getdrip.com/v2/12345/subscribers/jdoe%40example.com").
+        to_return(status: 200, body: "{\"links\":{\"subscribers.account\":\"https://api.getdrip.com/v2/accounts/{subscribers.account}\"},\"subscribers\":[{\"id\":\"randomid\",\"href\":\"https://api.getdrip.com/v2/1234/subscribers/randomid\",\"status\":\"active\",\"email\":\"jdoe@example.com\",\"time_zone\":null,\"utc_offset\":0,\"visitor_uuid\":null,\"custom_fields\":{\"first_name\":\"John\"},\"tags\":[\"customer\"],\"created_at\":\"2018-06-04T21:29:49Z\",\"ip_address\":null,\"user_agent\":null,\"lifetime_value\":null,\"original_referrer\":null,\"landing_url\":null,\"prospect\":null,\"base_lead_score\":null,\"eu_consent\":\"unknown\",\"lead_score\":null,\"user_id\":\"123\",\"links\":{\"account\":\"1234\"}}]}")
+
+      response = @client.subscriber('jdoe@example.com')
+      assert_equal('randomid', response.subscribers.first.id)
+    end
+
+    should "handle empty string" do
+      stub_request(:get, "https://api.getdrip.com/v2/12345/subscribers/jdoe%40example.com").
+        to_return(status: 200, body: "")
+
+      response = @client.subscriber('jdoe@example.com')
+      assert_nil(response.body)
+    end
+  end
+
   context "given a different url prefix" do
     setup do
       @key = "aaaa"
@@ -133,11 +158,11 @@ class Drip::ClientTest < Drip::TestCase
       stub_request(:get, "https://api.getdrip.com/v2/testpath").
         to_return(status: 301, body: "", headers: { "Location" => "https://api.example.com/mytestpath" })
       stub_request(:get, "https://api.example.com/mytestpath").
-        to_return(status: 200, body: "mybody")
+        to_return(status: 200, body: "{}")
       response = @client.get("testpath")
       assert_requested :get, "https://api.getdrip.com/v2/testpath"
       assert_requested :get, "https://api.example.com/mytestpath"
-      assert_equal "mybody", response.body
+      assert_equal({}, response.body)
     end
 
     should "not follow too many redirects" do
@@ -156,7 +181,7 @@ class Drip::ClientTest < Drip::TestCase
       @client = Drip::Client.new
       @response = mock
       @response.stubs(:code).returns('200')
-      @response.stubs(:body).returns('mybody')
+      @response.stubs(:body).returns('{}')
 
       @http = mock
       @http.expects(:request).returns(@response)
@@ -167,9 +192,6 @@ class Drip::ClientTest < Drip::TestCase
     end
 
     should "encode query and not set body" do
-      stub_request(:get, "https://api.getdrip.com/v2/testpath").
-        to_return(status: 200, body: "mybody")
-
       Net::HTTP::Get.expects(:new).returns(@request)
       Net::HTTP.expects(:start).yields(@http).returns(@response)
 
@@ -177,7 +199,7 @@ class Drip::ClientTest < Drip::TestCase
       URI.expects(:encode_www_form).once
 
       response = @client.get("testpath")
-      assert_equal "mybody", response.body
+      assert_equal({}, response.body)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drip-ruby
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Derrick Reimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler