mailjet 1.4.12 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 128c8f6b78690ae7cb6513b72a6b077f55225f68
-  data.tar.gz: d42aba90bc50df72366976e15e779f51ff229aa6
+  metadata.gz: 97d0fd939a2c9ce129ce2dc69ceacfa1e74927b0
+  data.tar.gz: 6fe2384a9d5142a6641e6246fa4cd78456464efe
 SHA512:
-  metadata.gz: ddf2f855a2744c08151ee3b41c491ba1fff143fe1e26023be86cf328cb7e5a4b24053f7654c07e4a2884f8738c42fb0940f2e935993e4547eecf83e683c91c1f
-  data.tar.gz: c520b425d3b886db0351478a9a80631cc99efcab907dcac1d92ed51421d4d3439effdaf9e58e7d90cf1dc718170e32459ba06282ec4846beec0ab5eeb233354b
+  metadata.gz: 915c0bcff51e94b47fffb16699326a765fb186a850f0763a0684c35c3def3288a87df4a859d885bf2d7cd5f187285f09aa552dd1e2af87ca0e8a95d018c887d5
+  data.tar.gz: 219fd219da5b8bdf8d3dae8931e21f3d4c600e71e2240d76e1bb02b100897646d05a8eaa85fac7e38a30923011112cf416c4028a49e7bf0419e6de5e855159af

data/README.md

@@ -9,6 +9,7 @@
 [![Build Status](https://secure.travis-ci.org/jbescoyez/mailjet.png?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/jbescoyez/mailjet.png)][gemnasium]
 [![Maintainance status](http://stillmaintained.com/jbescoyez/mailjet.png)][stillmaintained]
+![Current Version](https://img.shields.io/badge/version-1.5.0-green.svg)
 
 -->
 
@@ -42,8 +43,7 @@ This gem helps you to:
 
 Compatibility:
 
- - Ruby 1.9.X
- - Ruby 2.X.X
+ - Ruby 2.2.X
 
 Rails ActionMailer integration designed for Rails 3.X and 4.X
 
@@ -101,15 +101,13 @@ Mailjet.configure do |config|
 end
 ```
 
-
 `default_from` is optional if you send emails with `:mailjet`'s SMTP (below)
 
-### Send emails via the SendAPI
+### Send emails via the Send API
 
-Find more about the Mailjet SendAPI in the [official guides][send-api-doc]
+Find more about the Mailjet Send API in the [official guides](http://dev.mailjet.com/guides/?ruby#choose-sending-method)
 
 ``` ruby
-
 email = { :from_email   => "your email",
           :from_name    => "Your name",
           :subject      => "Hello",
@@ -120,7 +118,6 @@ test = Mailjet::Send.create(email)
 
 # retrieve the API response
 p test.attributes['Sent']
-
 ```
 
 ### Send emails with ActionMailer
@@ -139,10 +136,25 @@ Or if you prefer sending messages through [Mailjet Send API](http://dev.mailjet.
 config.action_mailer.delivery_method = :mailjet_api
 ```
 
-You can use mailjet specific options with `delivery_method_options` as detailed in the official [ActionMailer doc][http://guides.rubyonrails.org/action_mailer_basics.html#sending-emails-with-dynamic-delivery-options].
+You can use mailjet specific options with `delivery_method_options` as detailed in the official [ActionMailer doc](http://guides.rubyonrails.org/action_mailer_basics.html#sending-emails-with-dynamic-delivery-options):
+
+```ruby
+class AwesomeMailer < ApplicationMailer
+
+  def awesome_mail(user)
+
+    mail(
+      to: user.email,
+      delivery_method_options: { api_key: 'your-api-key', secret_key: 'your-secret-key' }
+    )
+  end
+end
+```
 
 Supported options are:
 ```ruby
+* :api_key
+* :secret_key
 * :'mj-prio'
 * :'mj-campaign'
 * :'mj-deduplicatecampaign'
@@ -369,8 +381,6 @@ In these modifiers, there is now the ability to add a Mailjet custom-id or Mailj
 
 For more information on custom properties and available params, see the [official doc][send-api-doc].
 
-##
-
 ## Track email delivery
 
 You can setup your Rack application in order to receive feedback on emails you sent (clicks, etc.)

data/lib/mailjet/configuration.rb

@@ -4,11 +4,16 @@ module Mailjet
   module Configuration
     mattr_accessor :api_key
     mattr_accessor :secret_key
-    mattr_accessor :end_point
     mattr_accessor :default_from
-
-    # @@end_point = 'https://api.preprod.mailjet.com'
-    @@end_point = 'https://api.mailjet.com'
+    mattr_accessor :api_version do
+      'v3'
+    end
+    mattr_accessor :end_point do
+      'https://api.mailjet.com'
+    end
+    mattr_accessor :perform_api_call do
+      true
+    end
 
   end
 end

data/lib/mailjet/connection.rb

@@ -39,32 +39,34 @@ module Mailjet
       self.adapter = adapter_class.new(end_point, options.merge(user: api_key, password: secret_key, content_type: 'application/json'))
     end
 
-    def get(additional_headers = {}, &block)
-      handle_api_call(:get, additional_headers, &block)
+    def get(additional_headers = {}, perform_api_call, &block)
+      handle_api_call(:get, additional_headers, perform_api_call, &block)
     end
 
-    def post(payload, additional_headers = {}, &block)
-      handle_api_call(:post, additional_headers, payload, &block)
+    def post(payload, additional_headers = {}, perform_api_call, &block)
+      handle_api_call(:post, additional_headers, payload, perform_api_call, &block)
     end
 
-    def put(payload, additional_headers = {}, &block)
-      handle_api_call(:put, additional_headers, payload, &block)
+    def put(payload, additional_headers = {}, perform_api_call, &block)
+      handle_api_call(:put, additional_headers, payload, perform_api_call, &block)
     end
 
-    def delete(additional_headers = {}, &block)
-      handle_api_call(:delete, additional_headers, &block)
+    def delete(additional_headers = {}, perform_api_call, &block)
+      handle_api_call(:delete, additional_headers, perform_api_call, &block)
     end
 
     private
 
-    def handle_api_call(method, additional_headers = {}, payload = {}, &block)
+    def handle_api_call(method, additional_headers = {}, payload = {}, perform_api_call, &block)
       formatted_payload = (additional_headers[:content_type] == :json) ? payload.to_json : payload
       raise Mailjet::MethodNotAllowed unless method_allowed(method)
 
-      if [:get, :delete].include?(method)
-        @adapter.send(method, additional_headers, &block)
-      else
-        @adapter.send(method, formatted_payload, additional_headers, &block)
+      if perform_api_call
+        if [:get, :delete].include?(method)
+          @adapter.send(method, additional_headers, &block)
+        else
+          @adapter.send(method, formatted_payload, additional_headers, &block)
+        end
       end
     rescue RestClient::Exception => e
       handle_exception(e, additional_headers, formatted_payload)

data/lib/mailjet/mailer.rb

@@ -12,8 +12,8 @@ class Mailjet::Mailer < ::Mail::SMTP
       address: 'in-v3.mailjet.com',
       port: 587,
       authentication: 'plain',
-      user_name: Mailjet.config.api_key,
-      password: Mailjet.config.secret_key,
+      user_name: options.delete(:api_key) || Mailjet.config.api_key,
+      password: options.delete(:secret_key) || Mailjet.config.secret_key,
       enable_starttls_auto: true
     }.merge(options))
   end
@@ -27,27 +27,178 @@ ActionMailer::Base.add_delivery_method :mailjet, Mailjet::Mailer
 # The deliver methods maps the Mail::Message attributes to the MailjetSend API JSON expected structure
 class Mailjet::APIMailer
   def initialize(options = {})
-    @delivery_method_options = options.slice(
+#    send = Mailjet.Send.new
+#    if send.version.exists
+#      version = send.version
+#    else
+      @version = Mailjet.config.api_version
+#    end
+    @delivery_method_options_v3_0 = options.slice(
+      :api_key, :secret_key,
       :recipients, :'mj-prio', :'mj-campaign', :'mj-deduplicatecampaign',
       :'mj-templatelanguage', :'mj-templateerrorreporting', :'mj-templateerrordeliver', :'mj-templateid',
       :'mj-trackopen', :'mj-trackclick',
-      :'mj-customid', :'mj-eventpayload', :vars, :headers
+      :'mj-customid', :'mj-eventpayload', :vars, :headers,
+    )
+    @delivery_method_options_v3_1 = options.slice(
+      :api_key, :secret_key,
+      :'Priority', :'CustomCampaign', :'DeduplicateCampaign',
+      :'TemplateLanguage', :'TemplateErrorReporting', :'TemplateErrorDeliver', :'TemplateID',
+      :'TrackOpens', :'TrackClicks',
+      :'CustomID', :'EventPayload', :'Variables', :'Headers',
     )
   end
 
-  def deliver!(mail)
+  def deliver!(mail, options = nil)
+#    p mail.header.fields
+
+    if (options && options.kind_of?(Object) && options['version'].present?)
+      @version = options['version']
+    end
+
+    if (!options.kind_of?(Object))
+      options = []
+    end
+
+    # Mailjet Send API does not support full from. Splitting the from field into two: name and email address
+    if mail[:from].nil? && Mailjet.config.default_from.present?
+      mail[:from] = Mailjet.config.default_from
+    end
+
+    if (@version == 'v3.1')
+      Mailjet::Send.create({:Messages => [setContentV3_1(mail)]})
+    else
+      Mailjet::Send.create(setContentV3_0(mail))
+    end
+  end
+
+  def setContentV3_1(mail)
     content = {}
+    content[:TextPart] = mail.text_part.try(:decoded) if !mail.text_part.blank?
+    content[:HTMLPart] = mail.html_part.try(:decoded) if !mail.html_part.blank?
+
+    if mail.attachments.any?
+      content[:Attachments] = []
+      content[:InlineAttachments] = []
+
+      mail.attachments.each do |attachment|
+        mailjet_attachment = {
+          'ContentType' => attachment.content_type.split(';')[0],
+          'Filename' => attachment.filename,
+          'Base64Content' => Base64.encode64(attachment.body.decoded)
+        }
 
-    if mail.text_part
-      content[:text_part] = mail.text_part.try(:decoded)
-      content[:text] = mail.text_part.try(:decoded)
+        if attachment.inline?
+          mailjet_attachment['ContentId'] = attachment.content_id
+          content[:InlineAttachments].push(mailjet_attachment)
+        else
+          content[:Attachments].push(mailjet_attachment)
+        end
+      end
     end
 
-    if mail.html_part
-      content[:html_part] = mail.html_part.try(:decoded)
-      content[:html] = mail.html_part.try(:decoded)
+    # We do the next part in purpose to accept only custom header from the user, but without accepting the mailjet related ones
+    # The mailjet related ones are stocked in another variable and directly added to the body
+    if mail.header && mail.header.fields.any?
+      content[:Headers] = {}
+      mail.header.fields.each do |header|
+        if header.name.start_with?('X-') && !header.name.start_with?('X-MJ') && !header.name.start_with?('X-Mailjet')
+          content[:Headers][header.name] = header.value
+        end
+      end
+    end
+
+    # Reply-To is not a property in Mailjet Send API
+    # Passing it as an header if mail.reply_to
+
+    if mail.reply_to
+      if mail.reply_to.display_names.first
+        content[:Headers]['Reply-To'] = {:Email=> mail[:reply_to].addresses.first, :Name=> mail[:reply_to].display_names.first}
+      else
+        content[:Headers]['Reply-To'] = {:Email=> mail[:reply_to].addresses.first}
+      end
     end
 
+    if (mail[:to])
+      if (mail[:to].is_a? String)
+        if mail[:to].display_names.first
+          to = [{:Email=>mail[:to].addresses.first, :Name=>mail[:to].display_names.first}]
+        else
+          to = [{:Email=>mail[:to].addresses.first}]
+        end
+      else
+        to = []
+        mail[:to].each do |t|
+          if (t.display_name)
+            to << { :Email => t.address, :Name => t.display_name }
+          else
+            to << { :Email => t.address }
+          end
+        end
+      end
+    end
+
+    base_from = {
+      From:{
+        :Email=> mail[:from].addresses.first
+      }
+    }
+    if (mail[:from].display_names.first)
+      base_from[:From][:Name] = mail[:from].display_names.first
+    end
+
+    if (mail[:cc])
+      if (mail[:cc].is_a? String)
+        if mail[:cc].display_name.first
+          ccs =[{:Email=>mail[:cc].address.first, :Name=>mail[:cc].display_name.first}]
+        else
+          ccs =[{:Email=>mail[:cc].address.first}]
+        end
+      else
+        mail[:cc].each do |cc|
+          ccs << {:Email=> cc.address, :Name=>cc.display_name}
+        end
+      end
+    end
+
+    if (mail[:bcc])
+      if (mail[:bcc].formatted.is_a? String)
+        if mail[:bcc].display_name.first
+          payload[:Bcc] = [{:Email=>mail[:bcc].address.first, :Name=>mail[:bcc].display_name.first}]
+        else
+          payload[:Bcc] = [{:Email=>mail[:bcc].address.first}]
+        end
+      else
+        mail[:bcc].formatted.each do |bcc|
+          if bcc.display_name
+            bccs << {:Email=> bcc.address, :Name=>bcc.display_name}
+          else
+            bccs << {:Email=> bcc.address}
+          end
+        end
+      end
+    end
+
+    payload = {
+      :To=> to,
+    }.merge(content)
+    .merge(base_from)
+    .merge(@delivery_method_options_v3_1)
+
+    payload[:Subject] = mail.subject if !mail.subject.blank?
+    payload[:Sender] = mail[:sender] if !mail[:sender].blank?
+    payload[:Cc] = ccs if mail[:cc]
+    payload[:Bcc] = bccs if mail[:bcc]
+
+    payload
+  end
+
+  def setContentV3_0(mail)
+    content = {}
+
+    content[:text_part] = mail.text_part.try(:decoded) if !mail.text_part.blank?
+    content[:html_part] = mail.html_part.try(:decoded) if !mail.html_part.blank?
+
     # Formatting attachments (inline + regular)
     unless mail.attachments.empty?
       content[:attachments] = []
@@ -68,12 +219,12 @@ class Mailjet::APIMailer
       end
     end
 
+    # We do the next part in purpose to accept only custom header from the user, but without accepting the mailjet related ones
+    # The mailjet related ones are stocked in another variable and directly added to the body
     if mail.header && !mail.header.fields.empty?
       content[:headers] = {}
       mail.header.fields.each do |header|
-        if header.name.start_with?('X-MJ') || header.name.start_with?('X-Mailjet')
-          content[:headers][header.name] = header.value
-        end
+        content[:headers][header.name] = header.value if header.name =~ /^X-(?!\b(MJ|Mailjet)\b).*$/
       end
     end
 
@@ -82,9 +233,7 @@ class Mailjet::APIMailer
     content[:headers]['Reply-To'] = mail.reply_to.join(', ') if mail.reply_to
 
     # Mailjet Send API does not support full from. Splitting the from field into two: name and email address
-    if mail[:from].nil? && Mailjet.config.default_from.present?
-      mail[:from] = Mailjet.config.default_from
-    end
+    mail[:from] ||= Mailjet.config.default_from
 
     base_from = { from_name: mail[:from].display_names.first,
                   from_email: mail[:from].addresses.first }
@@ -94,17 +243,16 @@ class Mailjet::APIMailer
       sender: mail[:sender],
       subject: mail.subject
     }
-              .merge(content)
-              .merge(base_from)
-              .merge(@delivery_method_options)
 
     payload[:cc] = mail[:cc].formatted.join(', ') if mail[:cc]
     payload[:reply_to] = mail[:reply_to].formatted.join(', ') if mail[:reply_to]
     payload[:bcc] = mail[:bcc].formatted.join(', ') if mail[:bcc]
 
     # Send the final payload to Mailjet Send API
-    Mailjet::Send.create(payload)
-  end
+    payload.merge(content)
+    .merge(base_from)
+    .merge(@delivery_method_options_v3_0)
+    end
 end
 
 ActionMailer::Base.add_delivery_method :mailjet_api, Mailjet::APIMailer

data/lib/mailjet/message_delivery.rb

@@ -1,9 +1,8 @@
-require 'mailjet/resource'
-
 module Mailjet
   class MessageDelivery
     include Mailjet::Resource
-    self.resource_path = 'v3/send/message'
+#    self.version = 'v3.1/'
+    self.resource_path = 'send/message'
     self.public_operations = [:post]
     self.resourceprop = [:from, :sender, :to, :cc, :bcc, :subject, :text, :html, :attachment, :inline_attachments, :headers]
   end

data/lib/mailjet/resource.rb

@@ -1,5 +1,4 @@
 require 'mailjet/connection'
-require 'mailjet/resource'
 require 'active_support/hash_with_indifferent_access'
 require 'active_support/core_ext/class'
 require 'active_support/core_ext/hash'
@@ -7,7 +6,7 @@ require 'active_support/core_ext/string'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/concern'
 require 'active_support/json/decoding'
-require 'mail'
+#require 'mail'
 require 'json'
 
 
@@ -21,27 +20,28 @@ module Mailjet
   module Resource
     extend ActiveSupport::Concern
 
+    NON_JSON_URLS = ['v3/send/message'] # urls that don't accept JSON input
+
     included do
-      cattr_accessor :resource_path, :public_operations, :read_only, :filters, :resourceprop, :action, :non_json_urls
+      cattr_accessor :resource_path, :public_operations, :read_only, :filters, :resourceprop, :action, :non_json_urls, :version
       cattr_writer :connection
 
-      def self.connection
-        @non_json_urls = ["v3/send/message"] #urls that don't accept JSON input
-        class_variable_get(:@@connection) || default_connection
+      def self.connection(options = {})
+        class_variable_get(:@@connection) || default_connection(options)
       end
 
-      def self.default_connection
+      def self.default_connection(options = {})
         Mailjet::Connection.new(
-          "#{Mailjet.config.end_point}/#{resource_path}",
-          Mailjet.config.api_key,
-          Mailjet.config.secret_key,
+          "#{options[:url]}/#{options[:version]}/#{resource_path}",
+          options[:api_key] || Mailjet.config.api_key,
+          options[:secret_key] || Mailjet.config.secret_key,
           public_operations: public_operations,
           read_only: read_only)
       end
 
       def self.default_headers
-        if @non_json_urls.include?(self.resource_path)#don't use JSON if Send API
-        default_headers = { accept: :json, accept_encoding: :deflate }
+        if NON_JSON_URLS.include?(self.resource_path) # don't use JSON if Send API
+          default_headers = { accept: :json, accept_encoding: :deflate }
         else
           default_headers = { accept: :json, accept_encoding: :deflate, content_type: :json } #use JSON if *not* Send API
         end
@@ -50,28 +50,31 @@ module Mailjet
     end
 
     module ClassMethods
-      def first(params = {})
-        all(params.merge!(limit: 1)).first
+      def first(params = {}, options = {})
+        all(params.merge!(limit: 1), options).first
       end
 
-      def all(params = {})
+      def all(params = {}, options = {})
+        opts = change_resource_path(options)
         params = format_params(params)
-        response = connection.get(default_headers.merge(params: params))
+        response = connection(opts).get(default_headers.merge(params: params), opts[:perform_api_call])
         attribute_array = parse_api_json(response)
         attribute_array.map{ |attributes| instanciate_from_api(attributes) }
       end
 
-      def count
-        response_json = connection.get(default_headers.merge(params: {limit: 1, countrecords: 1}))
+      def count(options = {})
+        opts = change_resource_path(options)
+        response_json = connection(opts).get(default_headers.merge(params: {limit: 1, countrecords: 1}), opts[:perform_api_call])
         response_hash = ActiveSupport::JSON.decode(response_json)
         response_hash['Total']
       end
 
-      def find(id, job_id = nil)
+      def find(id, job_id = nil, options = {})
         # if action method, ammend url to appropriate id
+        opts = change_resource_path(options)
         self.resource_path = create_action_resource_path(id, job_id) if self.action
         #
-        attributes = parse_api_json(connection[id].get(default_headers)).first
+        attributes = parse_api_json(connection(opts)[id].get(default_headers, opts[:perform_api_call])).first
         instanciate_from_api(attributes)
 
       rescue Mailjet::ApiError => e
@@ -82,14 +85,15 @@ module Mailjet
         end
       end
 
-      def create(attributes = {})
+      def create(attributes = {}, options = {})
         # if action method, ammend url to appropriate id
+        opts = change_resource_path(options)
         self.resource_path = create_action_resource_path(attributes[:id]) if self.action
         attributes.tap { |hs| hs.delete(:id) }
 
-        if Mailjet.config.default_from and self.resource_path == 'v3/send/'
-		  address = Mail::AddressList.new(Mailjet.config.default_from).addresses[0]
-		  default_attributes = { :from_email => address.address, :from_name => address.display_name}
+        if Mailjet.config.default_from and self.resource_path == 'send/'
+          address = Mail::AddressList.new(Mailjet.config.default_from).addresses[0]
+          default_attributes = { :from_email => address.address, :from_name => address.display_name}
         else
           default_attributes = {}
         end
@@ -97,17 +101,17 @@ module Mailjet
         attributes = default_attributes.merge(attributes)
 
         self.new(attributes).tap do |resource|
-          resource.save!
+          resource.save!(opts)
           resource.persisted = true
         end
 
       end
 
-      def delete(id)
+      def delete(id, options = {})
          # if action method, ammend url to appropriate id
+         opts = change_resource_path(options)
          self.resource_path = create_action_resource_path(id) if self.action
-         #
-        connection[id].delete(default_headers)
+         connection(options)[id].delete(default_headers)
       end
 
       def instanciate_from_api(attributes = {})
@@ -131,11 +135,14 @@ module Mailjet
       def create_action_resource_path(id, job_id = nil)
          url_elements = self.resource_path.split("/")
          url_elements.delete_at(url_elements.length-1) if url_elements.last.to_i > 0 #if there is a trailing number for the job id from last call, delete it
-         if self.action != "managemanycontacts" || (self.action == "managemanycontacts" && url_elements[2] == "contactslist")
-           url_elements[3] = id.to_s
-        end
-         url_elements << job_id.to_s if job_id #if job_id exists, ammend it to end of the URI
+
+         if !(url_elements[1] == "contacts" && self.action == "managemanycontacts")
+           url_elements[2] = id.to_s
+         end
+
+         url_elements << job_id.to_s if job_id #if job_id exists, amend it to end of the URI
          url = url_elements.join("/")
+
          return url
       end
 
@@ -201,6 +208,29 @@ module Mailjet
           _hash
         end
       end
+
+      def change_resource_path(options = {})
+        ver = choose_version(options)
+        url = Mailjet.config.end_point
+        perform_api_call = Mailjet.config.perform_api_call
+        if options.any?
+          if options.key?(:perform_api_call)
+            perform_api_call = options[:perform_api_call]
+          end
+          if options.key?(:url)
+            url = options['url']
+          end
+        end
+        ret = {version: ver, url: url, perform_api_call: perform_api_call}
+        ret
+      end
+
+      def choose_version(options = {})
+        ver = options['version'] || Mailjet.config.api_version || version
+
+        ver
+      end
+
     end
 
     attr_accessor :attributes, :persisted
@@ -213,20 +243,24 @@ module Mailjet
       attributes[:persisted]
     end
 
-    def save
+    def save(options)
       if persisted?
-        response = connection[attributes[:id]].put(formatted_payload, default_headers)
+        response = connection(options)[attributes[:id]].put(formatted_payload, default_headers, options[:perform_api_call])
       else
-        response = connection.post(formatted_payload, default_headers)
+        response = connection(options).post(formatted_payload, default_headers, options[:perform_api_call])
       end
 
-      if self.resource_path == 'v3/send/'
-        self.attributes = ActiveSupport::JSON.decode(response)
+      if options[:perform_api_call]
+        if self.resource_path == 'send/'
+          self.attributes = ActiveSupport::JSON.decode(response)
+          return true
+        end
+
+        self.attributes = parse_api_json(response).first
+        return true
+      else
         return true
       end
-
-      self.attributes = parse_api_json(response).first
-      return true
     rescue Mailjet::ApiError => e
       if e.code.to_s == "304"
         return true # When you save a record twice it should not raise error
@@ -235,8 +269,8 @@ module Mailjet
       end
     end
 
-    def save!
-      save || raise(StandardError.new("Resource not persisted"))
+    def save!(options)
+      save(options) || raise(StandardError.new("Resource not persisted"))
     end
 
     def attributes=(attribute_hash = {})
@@ -245,19 +279,19 @@ module Mailjet
       end
     end
 
-    def update_attributes(attribute_hash = {})
+    def update_attributes(attribute_hash = {}, options = {})
       self.attributes = attribute_hash
-      save
+      save(options)
     end
 
-    def delete
+    def delete(call)
       self.class.delete(id)
     end
 
     private
 
-    def connection
-      self.class.connection
+    def connection(options)
+      self.class.connection(options)
     end
 
     def default_headers
@@ -309,5 +343,6 @@ module Mailjet
         super
       end
     end
+
   end
 end