drip-ruby 2.0.0 → 3.0.0

data/test/drip/client/workflow_triggers_test.rb

@@ -2,25 +2,17 @@ require File.dirname(__FILE__) + '/../../test_helper.rb'
 
 class Drip::Client::WorkflowTriggersTest < Drip::TestCase
   def setup
-    @stubs = Faraday::Adapter::Test::Stubs.new
-
-    @connection = Faraday.new do |builder|
-      builder.adapter :test, @stubs
-    end
-
     @client = Drip::Client.new { |c| c.account_id = "12345" }
-    @client.expects(:connection).at_least_once.returns(@connection)
   end
 
   context "#workflow_triggers" do
     setup do
       @id = 9999999
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
 
-      @stubs.get "12345/workflows/#{@id}/triggers" do
-        [@response_status, {}, @response_body]
-      end
+      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
@@ -43,11 +35,10 @@ class Drip::Client::WorkflowTriggersTest < Drip::TestCase
       @payload = { "triggers" => [@data] }.to_json
 
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
 
-      @stubs.post "12345/workflows/#{@id}/triggers", @payload do
-        [@response_status, {}, @response_body]
-      end
+      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
@@ -70,11 +61,10 @@ class Drip::Client::WorkflowTriggersTest < Drip::TestCase
       @payload = { "triggers" => [@data] }.to_json
 
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
 
-      @stubs.put "12345/workflows/#{@id}/triggers", @payload do
-        [@response_status, {}, @response_body]
-      end
+      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

data/test/drip/client/workflows_test.rb

@@ -2,24 +2,16 @@ require File.dirname(__FILE__) + '/../../test_helper.rb'
 
 class Drip::Client::WorkflowsTest < Drip::TestCase
   def setup
-    @stubs = Faraday::Adapter::Test::Stubs.new
-
-    @connection = Faraday.new do |builder|
-      builder.adapter :test, @stubs
-    end
-
     @client = Drip::Client.new { |c| c.account_id = "12345" }
-    @client.expects(:connection).at_least_once.returns(@connection)
   end
 
   context "#workflows" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
 
-      @stubs.get "12345/workflows" do
-        [@response_status, {}, @response_body]
-      end
+      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
@@ -31,12 +23,11 @@ class Drip::Client::WorkflowsTest < Drip::TestCase
   context "#workflow" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
       @id = 1234
 
-      @stubs.get "12345/workflows/#{@id}" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:get, "https://api.getdrip.com/v2/12345/workflows/#{@id}").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
@@ -48,12 +39,11 @@ class Drip::Client::WorkflowsTest < Drip::TestCase
   context "#activate_workflow" do
     setup do
       @response_status = 204
-      @response_body = stub
+      @response_body = nil
       @id = 1234
 
-      @stubs.post "12345/workflows/#{@id}/activate" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:post, "https://api.getdrip.com/v2/12345/workflows/#{@id}/activate").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
@@ -65,12 +55,11 @@ class Drip::Client::WorkflowsTest < Drip::TestCase
   context "#pause_workflow" do
     setup do
       @response_status = 204
-      @response_body = stub
+      @response_body = nil
       @id = 1234
 
-      @stubs.post "12345/workflows/#{@id}/pause" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:post, "https://api.getdrip.com/v2/12345/workflows/#{@id}/pause").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
@@ -89,11 +78,10 @@ class Drip::Client::WorkflowsTest < Drip::TestCase
       @payload = { "subscribers" => [@data] }.to_json
 
       @response_status = 204
-      @response_body = stub
+      @response_body = nil
 
-      @stubs.post "12345/workflows/#{@id}/subscribers", @payload do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:post, "https://api.getdrip.com/v2/12345/workflows/#{@id}/subscribers").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do
@@ -105,13 +93,12 @@ class Drip::Client::WorkflowsTest < Drip::TestCase
   context "#remove_subscriber_workflow" do
     setup do
       @response_status = 200
-      @response_body = stub
+      @response_body = "stub"
       @id = 1234
       @email = "someone@example.com"
 
-      @stubs.delete "12345/workflows/#{@id}/subscribers/#{CGI.escape @email}" do
-        [@response_status, {}, @response_body]
-      end
+      stub_request(:delete, "https://api.getdrip.com/v2/12345/workflows/#{@id}/subscribers/#{CGI.escape @email}").
+        to_return(status: @response_status, body: @response_body, headers: {})
     end
 
     should "send the right request" do

data/test/drip/client_test.rb

@@ -11,6 +11,19 @@ class Drip::ClientTest < Drip::TestCase
       assert_equal "aaaa", client.api_key
     end
 
+    should "accept url prefix" do
+      client = Drip::Client.new do |config|
+        config.url_prefix = "aaaa"
+      end
+
+      assert_equal "aaaa", client.url_prefix
+    end
+
+    should "have default url prefix" do
+      client = Drip::Client.new
+      assert_equal "https://api.getdrip.com/v2/", client.url_prefix
+    end
+
     should "accept access token" do
       client = Drip::Client.new do |config|
         config.access_token = "aaaa"
@@ -61,8 +74,32 @@ class Drip::ClientTest < Drip::TestCase
     end
 
     should "use Basic authentication" do
-      header = "Basic #{Base64.encode64(@key + ":")}".strip
-      assert_equal header, @client.connection.headers["Authorization"]
+      stub_request(:get, "https://api.getdrip.com/v2/testpath").
+        to_return(status: 200, body: "", headers: {})
+
+      @client.get("testpath")
+
+      header = "Basic #{Base64.encode64(@key + ':')}".strip
+      assert_requested :get, "https://api.getdrip.com/v2/testpath", headers: { 'Authorization' => header }
+    end
+  end
+
+  context "given a different url prefix" do
+    setup do
+      @key = "aaaa"
+      @url_prefix = "https://api.example.com/v9001/"
+      @client = Drip::Client.new do |config|
+        config.api_key = @key
+        config.url_prefix = @url_prefix
+      end
+    end
+
+    should "connect to alternate prefix" do
+      stub_request(:get, "https://api.example.com/v9001/testpath").
+        to_return(status: 200, body: "", headers: {})
+      @client.get("testpath")
+
+      assert_requested :get, "https://api.example.com/v9001/testpath"
     end
   end
 
@@ -75,8 +112,38 @@ class Drip::ClientTest < Drip::TestCase
     end
 
     should "use Bearer token authentication" do
+      stub_request(:get, "https://api.getdrip.com/v2/testpath").
+        to_return(status: 200, body: "", headers: {})
+      @client.get("testpath")
       header = "Bearer #{@key}"
-      assert_equal header, @client.connection.headers["Authorization"]
+      assert_requested :get, "https://api.getdrip.com/v2/testpath", headers: { 'Authorization' => header }
+    end
+  end
+
+  context "given a redirecting url" do
+    setup do
+      @client = Drip::Client.new
+    end
+
+    should "follow redirect" do
+      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")
+      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
+    end
+
+    should "not follow too many redirects" do
+      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: 302, body: "", headers: { "Location" => "https://api.getdrip.com/v2/testpath" })
+      assert_raises(Drip::TooManyRedirectsError) { @client.get("testpath") }
+      assert_requested :get, "https://api.getdrip.com/v2/testpath", times: 5
+      assert_requested :get, "https://api.example.com/mytestpath", times: 5
     end
   end
 end

data/test/test_helper.rb

@@ -4,14 +4,7 @@ require "drip"
 require "minitest/autorun"
 require "shoulda-context"
 require "mocha/setup"
-# require "webmock/minitest"
-# require "vcr"
-require "faraday"
-
-# VCR.configure do |c|
-#   c.cassette_library_dir = 'test/cassettes'
-#   c.hook_into :webmock # or :fakeweb
-# end
+require "webmock/minitest"
 
 class Drip::TestCase < Minitest::Test
   def expand_fixture_path(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drip-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Derrick Reimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,89 +25,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 0.56.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 0.56.0
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :runtime
+        version: '1.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-  type: :runtime
+        version: '3.4'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '3.4'
 description: A simple wrapper for the Drip API
 email:
 - derrickreimer@gmail.com
@@ -119,6 +119,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -135,7 +136,6 @@ files:
 - lib/drip/client/events.rb
 - lib/drip/client/forms.rb
 - lib/drip/client/orders.rb
-- lib/drip/client/purchases.rb
 - lib/drip/client/subscribers.rb
 - lib/drip/client/tags.rb
 - lib/drip/client/webhooks.rb
@@ -155,6 +155,7 @@ files:
 - lib/drip/collections/webhooks.rb
 - lib/drip/collections/workflow_triggers.rb
 - lib/drip/collections/workflows.rb
+- lib/drip/errors.rb
 - lib/drip/resource.rb
 - lib/drip/resources.rb
 - lib/drip/resources/account.rb
@@ -180,7 +181,6 @@ files:
 - test/drip/client/events_test.rb
 - test/drip/client/forms_test.rb
 - test/drip/client/orders_test.rb
-- test/drip/client/purchases_test.rb
 - test/drip/client/subscribers_test.rb
 - test/drip/client/tags_test.rb
 - test/drip/client/webhooks_test.rb
@@ -210,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for interacting with the Drip API
@@ -232,7 +232,6 @@ test_files:
 - test/drip/client/events_test.rb
 - test/drip/client/forms_test.rb
 - test/drip/client/orders_test.rb
-- test/drip/client/purchases_test.rb
 - test/drip/client/subscribers_test.rb
 - test/drip/client/tags_test.rb
 - test/drip/client/webhooks_test.rb