drip-ruby 3.2.0 → 3.3.0

data/lib/drip/client/conversions.rb

@@ -10,7 +10,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#conversions
       def conversions(options = {})
-        get "#{account_id}/goals", options
+        make_json_api_request :get, "v2/#{account_id}/goals", options
       end
 
       # Public: Fetch a conversion.
@@ -20,7 +20,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#conversions
       def conversion(id)
-        get "#{account_id}/goals/#{id}"
+        make_json_api_request :get, "v2/#{account_id}/goals/#{id}"
       end
     end
   end

data/lib/drip/client/custom_fields.rb

@@ -6,7 +6,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#custom_fields
       def custom_fields
-        get "#{account_id}/custom_field_identifiers"
+        make_json_api_request :get, "v2/#{account_id}/custom_field_identifiers"
       end
     end
   end

data/lib/drip/client/events.rb

@@ -14,7 +14,7 @@ module Drip
       # See https://www.getdrip.com/docs/rest-api#record_event
       def track_event(email, action, properties = {}, options = {})
         data = options.merge({ "email" => email, "action" => action, "properties" => properties })
-        post "#{account_id}/events", generate_resource("events", data)
+        make_json_api_request :post, "v2/#{account_id}/events", private_generate_resource("events", data)
       end
 
       # Public: Track a collection of events all at once.
@@ -27,8 +27,8 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#event_batches
       def track_events(events)
-        url = "#{account_id}/events/batches"
-        post url, generate_resource("batches", { "events" => events })
+        url = "v2/#{account_id}/events/batches"
+        make_json_api_request :post, url, private_generate_resource("batches", { "events" => events })
       end
 
       # Public: Fetch all custom event actions.
@@ -41,7 +41,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#events
       def event_actions(options = {})
-        get "#{account_id}/event_actions", options
+        make_json_api_request :get, "v2/#{account_id}/event_actions", options
       end
     end
   end

data/lib/drip/client/forms.rb

@@ -6,7 +6,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#forms
       def forms
-        get "#{account_id}/forms"
+        make_json_api_request :get, "v2/#{account_id}/forms"
       end
 
       # Public: Fetch a form.
@@ -16,7 +16,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#forms
       def form(id)
-        get "#{account_id}/forms/#{id}"
+        make_json_api_request :get, "v2/#{account_id}/forms/#{id}"
       end
     end
   end

data/lib/drip/client/http_client.rb

@@ -0,0 +1,64 @@
+module Drip
+  class Client
+    class HTTPClient
+      REDIRECT_LIMIT = 10
+      private_constant :REDIRECT_LIMIT
+
+      def initialize(config)
+        @config = config
+      end
+
+      def make_request(drip_request, redirected_url: nil, step: 0)
+        raise TooManyRedirectsError, 'too many HTTP redirects' if step >= REDIRECT_LIMIT
+
+        uri = redirected_url || drip_request.url.tap do |orig_url|
+          next if drip_request.http_verb != :get
+
+          orig_url.query = URI.encode_www_form(drip_request.options)
+        end
+
+        response = Net::HTTP.start(uri.host, uri.port, connection_options(uri.scheme)) do |http|
+          request = drip_request.verb_klass.new uri
+          request.body = drip_request.body
+
+          add_standard_headers(request)
+          request['Content-Type'] = drip_request.content_type
+
+          http.request request
+        end
+
+        return make_request(drip_request, redirected_url: URI(response["Location"]), step: step + 1) if response.is_a?(Net::HTTPRedirection)
+
+        response
+      end
+
+    private
+
+      def add_standard_headers(request)
+        request['User-Agent'] = "Drip Ruby v#{Drip::VERSION}"
+        request['Accept'] = "*/*"
+
+        if @config.access_token
+          request['Authorization'] = "Bearer #{@config.access_token}"
+        else
+          request.basic_auth @config.api_key, ""
+        end
+
+        request
+      end
+
+      def connection_options(uri_scheme)
+        options = { use_ssl: uri_scheme == "https" }
+
+        if @config.http_open_timeout
+          options[:open_timeout] = @config.http_open_timeout
+          options[:ssl_timeout] = @config.http_open_timeout
+        end
+
+        options[:read_timeout] = @config.http_timeout if @config.http_timeout
+
+        options
+      end
+    end
+  end
+end

data/lib/drip/client/orders.rb

@@ -11,7 +11,7 @@ module Drip
       # See https://developer.drip.com/#orders
       def create_or_update_order(email, options = {})
         data = options.merge(email: email)
-        post "#{account_id}/orders", generate_resource("orders", data)
+        make_json_api_request :post, "v2/#{account_id}/orders", private_generate_resource("orders", data)
       end
 
       # Public: Create or update a batch of orders.
@@ -21,7 +21,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://developer.drip.com/#create-or-update-a-batch-of-orders
       def create_or_update_orders(orders)
-        post "#{account_id}/orders/batches", generate_resource("batches", { "orders" => orders })
+        make_json_api_request :post, "v2/#{account_id}/orders/batches", private_generate_resource("batches", { "orders" => orders })
       end
 
       # Public: Create or update a refund.
@@ -38,7 +38,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://developer.drip.com/#create-or-update-a-refund
       def create_or_update_refund(options)
-        post "#{account_id}/refunds", generate_resource("refunds", options)
+        make_json_api_request :post, "v2/#{account_id}/refunds", private_generate_resource("refunds", options)
       end
     end
   end

data/lib/drip/client/shopper_activity.rb

@@ -0,0 +1,78 @@
+module Drip
+  class Client
+    module ShopperActivity
+      # Public: Create a cart activity event.
+      #
+      # options    - Required. A Hash of additional cart options. Refer to the
+      #                       Drip API docs for the required schema.
+      #
+      # Returns a Drip::Response.
+      # See https://developer.drip.com/#cart-activity
+      def create_cart_activity_event(data = {})
+        raise ArgumentError, 'email: or person_id: parameter required' if !data.key?(:email) && !data.key?(:person_id)
+
+        %i[provider action cart_id cart_url].each do |key|
+          raise ArgumentError, "#{key}: parameter required" unless data.key?(key)
+        end
+
+        data[:occurred_at] = Time.now.iso8601 unless data.key?(:occurred_at)
+        make_json_request :post, "v3/#{account_id}/shopper_activity/cart", data
+      end
+
+      # Public: Create an order activity event.
+      #
+      # options    - Required. A Hash of additional order options. Refer to the
+      #                       Drip API docs for the required schema.
+      #
+      # Returns a Drip::Response.
+      # See https://developer.drip.com/#order-activity
+      def create_order_activity_event(data = {})
+        raise ArgumentError, 'email: or person_id: parameter required' if !data.key?(:email) && !data.key?(:person_id)
+
+        %i[provider action order_id].each do |key|
+          raise ArgumentError, "#{key}: parameter required" unless data.key?(key)
+        end
+
+        data[:occurred_at] = Time.now.iso8601 unless data.key?(:occurred_at)
+        make_json_request :post, "v3/#{account_id}/shopper_activity/order", data
+      end
+
+      # Public: Create a batch of order activity events.
+      #
+      # records    - Required. An array of hashes containing orders attributes.
+      #                       Refer to the Drip API docs for the required schema.
+      #
+      # Returns a Drip::Response.
+      # See https://developer.drip.com/#create-or-update-a-batch-of-orders
+      def create_order_activity_events(records = [])
+        records.each_with_index do |record, i|
+          raise ArgumentError, "email: or person_id: parameter required in record #{i}" if !record.key?(:email) && !record.key?(:person_id)
+
+          %i[provider action order_id].each do |key|
+            raise ArgumentError, "#{key}: parameter required in record #{i}" unless record.key?(key)
+          end
+
+          record[:occurred_at] = Time.now.iso8601 unless record.key?(:occurred_at)
+        end
+
+        make_json_request :post, "v3/#{account_id}/shopper_activity/order/batch", records
+      end
+
+      # Public: Create a product activity event.
+      #
+      # options    - Required. A Hash of additional product options. Refer to the
+      #                       Drip API docs for the required schema.
+      #
+      # Returns a Drip::Response.
+      # See https://developer.drip.com/#product-activity
+      def create_product_activity_event(data = {})
+        %i[provider action product_id name price].each do |key|
+          raise ArgumentError, "#{key}: parameter required" unless data.key?(key)
+        end
+
+        data[:occurred_at] = Time.now.iso8601 unless data.key?(:occurred_at)
+        make_json_request :post, "v3/#{account_id}/shopper_activity/product", data
+      end
+    end
+  end
+end

data/lib/drip/client/subscribers.rb

@@ -16,7 +16,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#list_subscribers
       def subscribers(options = {})
-        get "#{account_id}/subscribers", options
+        make_json_api_request :get, "v2/#{account_id}/subscribers", options
       end
 
       # Public: Fetch a subscriber.
@@ -26,7 +26,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#fetch_subscriber
       def subscriber(id_or_email)
-        get "#{account_id}/subscribers/#{CGI.escape id_or_email}"
+        make_json_api_request :get, "v2/#{account_id}/subscribers/#{CGI.escape id_or_email}"
       end
 
       # Public: Create or update a subscriber.
@@ -51,7 +51,7 @@ module Drip
         data[:email] = args[0] if args[0].is_a? String
         data.merge!(args.last) if args.last.is_a? Hash
         raise ArgumentError, 'email: or id: parameter required' if !data.key?(:email) && !data.key?(:id)
-        post "#{account_id}/subscribers", generate_resource("subscribers", data)
+        make_json_api_request :post, "v2/#{account_id}/subscribers", private_generate_resource("subscribers", data)
       end
 
       # Public: Create or update a collection of subscribers.
@@ -70,8 +70,8 @@ module Drip
       # Returns a Drip::Response
       # See https://www.getdrip.com/docs/rest-api#subscriber_batches
       def create_or_update_subscribers(subscribers)
-        url = "#{account_id}/subscribers/batches"
-        post url, generate_resource("batches", { "subscribers" => subscribers })
+        url = "v2/#{account_id}/subscribers/batches"
+        make_json_api_request :post, url, private_generate_resource("batches", { "subscribers" => subscribers })
       end
 
       # Public: Unsubscribe a collection of subscribers.
@@ -82,8 +82,8 @@ module Drip
       # Returns a Drip::Response
       # See https://www.getdrip.com/docs/rest-api#subscriber_batches
       def unsubscribe_subscribers(subscribers)
-        url = "#{account_id}/unsubscribes/batches"
-        post url, generate_resource("batches", { "subscribers" => subscribers })
+        url = "v2/#{account_id}/unsubscribes/batches"
+        make_json_api_request :post, url, private_generate_resource("batches", { "subscribers" => subscribers })
       end
 
       # Public: Unsubscribe a subscriber globally or from a specific campaign.
@@ -96,9 +96,9 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#unsubscribe
       def unsubscribe(id_or_email, options = {})
-        url = "#{account_id}/subscribers/#{CGI.escape id_or_email}/remove"
+        url = "v2/#{account_id}/subscribers/#{CGI.escape id_or_email}/remove"
         url += options[:campaign_id] ? "?campaign_id=#{options[:campaign_id]}" : ""
-        post url
+        make_json_api_request :post, url
       end
 
       # Public: Subscribe to a campaign.
@@ -126,8 +126,8 @@ module Drip
       # See https://www.getdrip.com/docs/rest-api#subscribe
       def subscribe(email, campaign_id, options = {})
         data = options.merge("email" => email)
-        url = "#{account_id}/campaigns/#{campaign_id}/subscribers"
-        post url, generate_resource("subscribers", data)
+        url = "v2/#{account_id}/campaigns/#{campaign_id}/subscribers"
+        make_json_api_request :post, url, private_generate_resource("subscribers", data)
       end
 
       # Public: Delete a subscriber.
@@ -137,7 +137,7 @@ module Drip
       # Returns No Content.
       # See https://www.getdrip.com/docs/rest-api#fdelete_subscriber
       def delete_subscriber(id_or_email)
-        delete "#{account_id}/subscribers/#{CGI.escape id_or_email}"
+        make_json_api_request :delete, "v2/#{account_id}/subscribers/#{CGI.escape id_or_email}"
       end
 
       # Public: Unsubscribe a subscriber from all mailings.
@@ -147,7 +147,7 @@ module Drip
       # Returns No Content.
       # See https://www.getdrip.com/docs/rest-api#fdelete_subscriber
       def unsubscribe_from_all(id_or_email)
-        post "#{account_id}/subscribers/#{CGI.escape id_or_email}/unsubscribe_all"
+        make_json_api_request :post, "v2/#{account_id}/subscribers/#{CGI.escape id_or_email}/unsubscribe_all"
       end
     end
   end

data/lib/drip/client/tags.rb

@@ -8,7 +8,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#tags
       def tags
-        get "#{account_id}/tags"
+        make_json_api_request :get, "v2/#{account_id}/tags"
       end
 
       # Public: Apply a tag to a subscriber.
@@ -20,7 +20,7 @@ module Drip
       # See https://www.getdrip.com/docs/rest-api#apply_tag
       def apply_tag(email, tag)
         data = { "email" => email, "tag" => tag }
-        post "#{account_id}/tags", generate_resource("tags", data)
+        make_json_api_request :post, "v2/#{account_id}/tags", private_generate_resource("tags", data)
       end
 
       # Public: Remove a tag from a subscriber.
@@ -31,7 +31,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#remove_tag
       def remove_tag(email, tag)
-        delete "#{account_id}/subscribers/#{CGI.escape email}/tags/#{CGI.escape tag}"
+        make_json_api_request :delete, "v2/#{account_id}/subscribers/#{CGI.escape email}/tags/#{CGI.escape tag}"
       end
     end
   end

data/lib/drip/client/webhooks.rb

@@ -6,7 +6,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#webhooks
       def webhooks
-        get "#{account_id}/webhooks"
+        make_json_api_request :get, "v2/#{account_id}/webhooks"
       end
 
       # Public: Fetch a webhook
@@ -15,7 +15,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#webhooks
       def webhook(id)
-        get "#{account_id}/webhooks/#{id}"
+        make_json_api_request :get, "v2/#{account_id}/webhooks/#{id}"
       end
 
       # Public: Create a webhook.
@@ -34,9 +34,9 @@ module Drip
       # See https://www.getdrip.com/docs/rest-api#subscriber_batches
       def create_webhook(post_url, include_received_email, events)
         include_received_email = include_received_email ? true : false
-        url = "#{account_id}/webhooks"
+        url = "v2/#{account_id}/webhooks"
 
-        post url, generate_resource(
+        make_json_api_request :post, url, private_generate_resource(
           "webhooks",
           {
             "post_url" => post_url,
@@ -52,7 +52,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#webhooks
       def delete_webhook(id)
-        delete "#{account_id}/webhooks/#{id}"
+        make_json_api_request :delete, "v2/#{account_id}/webhooks/#{id}"
       end
     end
   end

data/lib/drip/client/workflow_triggers.rb

@@ -7,7 +7,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#workflow_triggers
       def workflow_triggers(id)
-        get "#{account_id}/workflows/#{id}/triggers"
+        make_json_api_request :get, "v2/#{account_id}/workflows/#{id}/triggers"
       end
 
       # Public: Create a workflow trigger.
@@ -22,7 +22,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#workflows
       def create_workflow_trigger(id, options = {})
-        post "#{account_id}/workflows/#{id}/triggers", generate_resource("triggers", options)
+        make_json_api_request :post, "v2/#{account_id}/workflows/#{id}/triggers", private_generate_resource("triggers", options)
       end
 
       # Public: Update a workflow trigger.
@@ -37,7 +37,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#workflows
       def update_workflow_trigger(id, options = {})
-        put "#{account_id}/workflows/#{id}/triggers", generate_resource("triggers", options)
+        make_json_api_request :put, "v2/#{account_id}/workflows/#{id}/triggers", private_generate_resource("triggers", options)
       end
     end
   end

data/lib/drip/client/workflows.rb

@@ -12,7 +12,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#workflows
       def workflows(options = {})
-        get "#{account_id}/workflows", options
+        make_json_api_request :get, "v2/#{account_id}/workflows", options
       end
 
       # Public: Fetch a workflow.
@@ -21,7 +21,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#workflows
       def workflow(id)
-        get "#{account_id}/workflows/#{id}"
+        make_json_api_request :get, "v2/#{account_id}/workflows/#{id}"
       end
 
       # Public: Activate a workflow.
@@ -30,7 +30,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#workflows
       def activate_workflow(id)
-        post "#{account_id}/workflows/#{id}/activate"
+        make_json_api_request :post, "v2/#{account_id}/workflows/#{id}/activate"
       end
 
       # Public: Pause a workflow.
@@ -39,7 +39,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#workflows
       def pause_workflow(id)
-        post "#{account_id}/workflows/#{id}/pause"
+        make_json_api_request :post, "v2/#{account_id}/workflows/#{id}/pause"
       end
 
       # Public: Start someone on a workflow.
@@ -63,7 +63,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#workflows
       def start_subscriber_workflow(id, options = {})
-        post "#{account_id}/workflows/#{id}/subscribers", generate_resource("subscribers", options)
+        make_json_api_request :post, "v2/#{account_id}/workflows/#{id}/subscribers", private_generate_resource("subscribers", options)
       end
 
       # Public: Remove someone from a workflow.
@@ -73,7 +73,7 @@ module Drip
       # Returns a Drip::Response.
       # See https://www.getdrip.com/docs/rest-api#workflows
       def remove_subscriber_workflow(workflow_id, id_or_email)
-        delete "#{account_id}/workflows/#{workflow_id}/subscribers/#{CGI.escape id_or_email}"
+        make_json_api_request :delete, "v2/#{account_id}/workflows/#{workflow_id}/subscribers/#{CGI.escape id_or_email}"
       end
     end
   end