drip-ruby 3.4.2 → 3.5.0

data/test/drip/client/subscribers_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 
 class Drip::Client::SubscribersTest < Drip::TestCase
   def setup
@@ -81,7 +81,7 @@ class Drip::Client::SubscribersTest < Drip::TestCase
 
     should "allow request with drip id keyword argument" do
       expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
-      assert_equal expected, @client.create_or_update_subscriber(id: 123456)
+      assert_equal expected, @client.create_or_update_subscriber(id: 123_456)
       assert_requested :post, "https://api.getdrip.com/v2/12345/subscribers", body: '{"subscribers":[{"id":123456}]}', times: 1
     end
 
@@ -164,6 +164,25 @@ class Drip::Client::SubscribersTest < Drip::TestCase
     end
   end
 
+  context "#subscribe with a campaign id that needs escaping" do
+    setup do
+      @email = "derrick@getdrip.com"
+      @campaign_id = "abc/123 xyz"
+      @data = { "time_zone" => "America/Los_Angeles" }
+
+      @response_status = 201
+      @response_body = "{}"
+
+      stub_request(:post, "https://api.getdrip.com/v2/12345/campaigns/#{CGI.escape @campaign_id}/subscribers").
+        to_return(status: @response_status, body: @response_body, headers: {})
+    end
+
+    should "escape the campaign id in the request path" do
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
+      assert_equal expected, @client.subscribe(@email, @campaign_id, @data)
+    end
+  end
+
   context "#unsubscribe" do
     context "if no campaign id is provided" do
       setup do
@@ -199,6 +218,24 @@ class Drip::Client::SubscribersTest < Drip::TestCase
         assert_equal expected, @client.unsubscribe(@id, campaign_id: @campaign)
       end
     end
+
+    context "if a campaign id that needs escaping is provided" do
+      setup do
+        @id = "derrick@getdrip.com"
+        @campaign = "abc/123 xyz"
+
+        @response_status = 201
+        @response_body = "{}"
+
+        stub_request(:post, "https://api.getdrip.com/v2/12345/subscribers/#{CGI.escape @id}/remove?campaign_id=#{CGI.escape @campaign}").
+          to_return(status: @response_status, body: @response_body, headers: {})
+      end
+
+      should "escape the campaign id in the query string" do
+        expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
+        assert_equal expected, @client.unsubscribe(@id, campaign_id: @campaign)
+      end
+    end
   end
 
   context "#unsubscribe_from_all" do

data/test/drip/client/tags_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 
 class Drip::Client::TagsTest < Drip::TestCase
   def setup

data/test/drip/client/users_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 
 class Drip::Client::UsersTest < Drip::TestCase
   def setup

data/test/drip/client/webhooks_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 
 class Drip::Client::WebhooksTest < Drip::TestCase
   def setup

data/test/drip/client/workflow_triggers_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 
 class Drip::Client::WorkflowTriggersTest < Drip::TestCase
   def setup
@@ -9,7 +9,7 @@ class Drip::Client::WorkflowTriggersTest < Drip::TestCase
 
   context "#workflow_triggers" do
     setup do
-      @id = 9999999
+      @id = 9_999_999
       @response_status = 200
       @response_body = "{}"
 

data/test/drip/client/workflows_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 
 class Drip::Client::WorkflowsTest < Drip::TestCase
   def setup
@@ -38,6 +38,22 @@ class Drip::Client::WorkflowsTest < Drip::TestCase
     end
   end
 
+  context "#workflow with an id that needs escaping" do
+    setup do
+      @response_status = 200
+      @response_body = "{}"
+      @id = "abc/123 xyz"
+
+      stub_request(:get, "https://api.getdrip.com/v2/12345/workflows/#{CGI.escape @id}").
+        to_return(status: @response_status, body: @response_body, headers: {})
+    end
+
+    should "escape the id in the request path" do
+      expected = Drip::Response.new(@response_status, JSON.parse(@response_body))
+      assert_equal expected, @client.workflow(@id)
+    end
+  end
+
   context "#activate_workflow" do
     setup do
       @response_status = 204
@@ -76,7 +92,7 @@ class Drip::Client::WorkflowsTest < Drip::TestCase
         "email" => "someone@example.com",
         "time_zone" => "America/Los_Angeles"
       }
-      @id = 9999999
+      @id = 9_999_999
       @payload = { "subscribers" => [@data] }.to_json
 
       @response_status = 204

data/test/drip/client_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require_relative '../test_helper'
 require "base64"
 
 class Drip::ClientTest < Drip::TestCase
@@ -43,7 +43,8 @@ class Drip::ClientTest < Drip::TestCase
         api_key: "aaaa",
         access_token: "bbbb",
         http_open_timeout: 20,
-        http_timeout: 25
+        http_timeout: 25,
+        skip_analytics: true
       )
 
       assert_equal "1234567", client.account_id
@@ -51,6 +52,7 @@ class Drip::ClientTest < Drip::TestCase
       assert_equal "bbbb", client.access_token
       assert_equal 20, client.http_open_timeout
       assert_equal 25, client.http_timeout
+      assert client.skip_analytics, "config should skip analytics"
     end
 
     should "accept options after initialization" do
@@ -65,7 +67,7 @@ class Drip::ClientTest < Drip::TestCase
     setup do
       @client = Drip::Client.new do |config|
         config.api_key = "Hello world"
-        config.account_id = 12345
+        config.account_id = 12_345
       end
     end
 
@@ -112,7 +114,7 @@ class Drip::ClientTest < Drip::TestCase
     should "return a resource and note deprecation" do
       client = Drip::Client.new
       resource = nil
-      assert_output(nil, /^\[DEPRECATED\] Drip\:\:Client\#generate_resource is deprecated/) { resource = client.generate_resource("hello", {}) }
+      assert_output(nil, /^\[DEPRECATED\] Drip::Client\#generate_resource is deprecated/) { resource = client.generate_resource("hello", {}) }
       assert_equal({ "hello" => [{}] }, resource)
     end
   end
@@ -122,7 +124,7 @@ class Drip::ClientTest < Drip::TestCase
     should "return default content type and print warning" do
       client = Drip::Client.new
       content_type = nil
-      assert_output(nil, /^\[DEPRECATED\] Drip\:\:Client\#content_type is deprecated/) { content_type = client.content_type }
+      assert_output(nil, /^\[DEPRECATED\] Drip::Client\#content_type is deprecated/) { content_type = client.content_type }
       assert_equal "application/vnd.api+json", content_type
     end
   end
@@ -135,7 +137,7 @@ class Drip::ClientTest < Drip::TestCase
 
       client = Drip::Client.new
       response = nil
-      assert_output(nil, /^\[DEPRECATED\] Drip\:\:Client\#get please use the API endpoint specific methods/) { response = client.get("testpath") }
+      assert_output(nil, /^\[DEPRECATED\] Drip::Client\#get please use the API endpoint specific methods/) { response = client.get("testpath") }
       assert_equal({}, response.body)
     end
   end

data/test/drip/collection_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require_relative '../test_helper'
 
 class Drip::CollectionTest < Drip::TestCase
   should "yield resources of the correct type" do

data/test/drip/collections/account_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 require "drip/collections/accounts"
 
 class Drip::AccountsTest < Drip::TestCase

data/test/drip/collections/broadcasts_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 require "drip/collections/broadcasts"
 
 class Drip::BroadcastsTest < Drip::TestCase

data/test/drip/collections/campaign_subscriptions_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 require "drip/collections/campaign_subscriptions"
 
 class Drip::CampaignSubscriptionsTest < Drip::TestCase

data/test/drip/collections/campaigns_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 require "drip/collections/campaigns"
 
 class Drip::CampaignsTest < Drip::TestCase

data/test/drip/collections/errors_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 require "drip/collections/errors"
 
 class Drip::ErrorsTest < Drip::TestCase

data/test/drip/collections/orders_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 require "drip/collections/orders"
 
 class Drip::OrdersTest < Drip::TestCase

data/test/drip/collections/purchases_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 require "drip/collections/purchases"
 
 class Drip::PurchasesTest < Drip::TestCase

data/test/drip/collections/tags_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 require "drip/collections/tags"
 
 class Drip::TagsTest < Drip::TestCase

data/test/drip/collections/webhooks_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 require "drip/collections/webhooks"
 
 class Drip::WebhooksTest < Drip::TestCase

data/test/drip/collections/workflow_triggers_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 require "drip/collections/workflow_triggers"
 
 class Drip::WorkflowTriggersTest < Drip::TestCase

data/test/drip/collections/workflows_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 require "drip/collections/workflows"
 
 class Drip::WorkflowsTest < Drip::TestCase

data/test/drip/collections_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require_relative '../test_helper'
 
 class Drip::CollectionsTest < Drip::TestCase
   should "find collections" do

data/test/drip/request_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require_relative '../test_helper'
 require "drip/request"
 
 class Drip::RequestTest < Drip::TestCase

data/test/drip/resource_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require_relative '../test_helper'
 
 class Drip::ResourceTest < Drip::TestCase
   class TestResource < Drip::Resource

data/test/drip/resources/account_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 
 class Drip::AccountTest < Drip::TestCase
   should "have a resource name" do

data/test/drip/resources/order_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 
 class Drip::OrderTest < Drip::TestCase
   should "have a resource name" do

data/test/drip/resources/subscriber_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 
 class Drip::SubscriberTest < Drip::TestCase
   should "have a resource name" do

data/test/drip/resources/tag_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../../test_helper.rb'
+require_relative '../../test_helper'
 require "drip/resources/tag"
 
 class Drip::TagTest < Drip::TestCase

data/test/drip/resources_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require_relative '../test_helper'
 
 class Drip::ResourcesTest < Drip::TestCase
   should "find resources" do

data/test/drip/response_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require_relative '../test_helper'
 
 class Drip::ResponseTest < Drip::TestCase
   context "#success?" do

data/test/test_helper.rb

@@ -3,12 +3,12 @@
 require 'simplecov'
 SimpleCov.start
 
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
 require "drip"
 require "minitest/autorun"
 require "shoulda-context"
-require "mocha/setup"
+require "mocha/minitest"
 require "webmock/minitest"
 
 class Drip::TestCase < Minitest::Test

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: drip-ruby
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0
 platform: ruby
 authors:
 - Drip
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies: []
 description: A simple wrapper for the Drip API
 email:
@@ -18,16 +17,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/pull_request_template.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - drip-ruby.gemspec
+- flake.lock
+- flake.nix
 - lib/drip.rb
 - lib/drip/client.rb
 - lib/drip/client/accounts.rb
@@ -126,8 +127,8 @@ files:
 homepage: http://github.com/DripEmail/drip-ruby
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -135,58 +136,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A Ruby gem for interacting with the Drip API
-test_files:
-- test/drip/client/accounts_test.rb
-- test/drip/client/broadcasts_test.rb
-- test/drip/client/campaign_subscriptions_test.rb
-- test/drip/client/campaigns_test.rb
-- test/drip/client/configuration_test.rb
-- test/drip/client/conversions_test.rb
-- test/drip/client/custom_fields_test.rb
-- test/drip/client/events_test.rb
-- test/drip/client/forms_test.rb
-- test/drip/client/http_client_test.rb
-- test/drip/client/orders_test.rb
-- test/drip/client/shopper_activity_test.rb
-- test/drip/client/subscribers_test.rb
-- test/drip/client/tags_test.rb
-- test/drip/client/users_test.rb
-- test/drip/client/webhooks_test.rb
-- test/drip/client/workflow_triggers_test.rb
-- test/drip/client/workflows_test.rb
-- test/drip/client_test.rb
-- test/drip/collection_test.rb
-- test/drip/collections/account_test.rb
-- test/drip/collections/broadcasts_test.rb
-- test/drip/collections/campaign_subscriptions_test.rb
-- test/drip/collections/campaigns_test.rb
-- test/drip/collections/errors_test.rb
-- test/drip/collections/orders_test.rb
-- test/drip/collections/purchases_test.rb
-- test/drip/collections/tags_test.rb
-- test/drip/collections/webhooks_test.rb
-- test/drip/collections/workflow_triggers_test.rb
-- test/drip/collections/workflows_test.rb
-- test/drip/collections_test.rb
-- test/drip/request_test.rb
-- test/drip/resource_test.rb
-- test/drip/resources/account_test.rb
-- test/drip/resources/order_test.rb
-- test/drip/resources/subscriber_test.rb
-- test/drip/resources/tag_test.rb
-- test/drip/resources_test.rb
-- test/drip/response_test.rb
-- test/fixtures/resources/not_found_error.json
-- test/fixtures/resources/subscriber.json
-- test/test_helper.rb
+test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 2.7
-  - 2.6
-  - 2.5
-  - jruby-19mode