mailjet 1.5.4 → 1.8.0

data/lib/mailjet/resource.rb

@@ -1,13 +1,9 @@
 require 'mailjet/connection'
-require 'active_support/hash_with_indifferent_access'
-require 'active_support/core_ext/class'
-require 'active_support/core_ext/hash'
+require 'yajl'
+require 'active_support'
 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 'json'
+require 'active_support/core_ext/hash/indifferent_access'
+
 
 
 # This option automatically transforms the date output by the API into something a bit more readable.
@@ -18,70 +14,90 @@ require 'json'
 
 module Mailjet
   module Resource
-    extend ActiveSupport::Concern
-
     # define here available options for filtering
     OPTIONS = [:version, :url, :perform_api_call, :api_key, :secret_key]
 
     NON_JSON_URLS = ['v3/send/message'] # urls that don't accept JSON input
+    DATA_URLS = ['plain', 'csv'] # url for send binary data , 'CSVError/text:csv'
 
-    included do
-      cattr_accessor :resource_path, :public_operations, :read_only, :filters, :resourceprop, :action, :non_json_urls, :version
-      cattr_writer :connection
+    def self.included(base)
+      base.extend ClassMethods
+      base.class_eval do
+        cattr_accessor :resource_path, :public_operations, :read_only, :filters, :resourceprop, :read_only_attributes, :action, :non_json_urls, :version
+        cattr_writer :connection
 
-      def self.connection(options = {})
-        class_variable_get(:@@connection) || default_connection(options)
-      end
+        self.read_only_attributes = []
 
-      def self.default_connection(options = {})
-        Mailjet::Connection.new(
-          "#{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,
-          perform_api_call: options[:perform_api_call])
-      end
+        def self.connection(options = {})
+          class_variable_get(:@@connection) || default_connection(options)
+        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 }
-        else
-          default_headers = { accept: :json, accept_encoding: :deflate, content_type: :json } #use JSON if *not* Send API
+        def self.default_connection(options = {})
+          Mailjet::Connection.new(
+            "#{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,
+            perform_api_call: options[:perform_api_call])
+        end
+
+        def self.default_headers
+          if NON_JSON_URLS.include?(self.resource_path) # don't use JSON if Send API
+            default_headers = { 'Accept' =>'application/json', 'Accept-Encoding' => 'deflate' }
+          elsif DATA_URLS.any? do |data_type|
+            default_headers = { 'Content-Type' => "text/#{data_type}" } if self.resource_path.include?(data_type)
+            end
+          else
+            # use JSON if *not* Send API
+            default_headers = {'Content-Type' =>'application/json', 'Accept' =>'application/json', 'Accept-Encoding' => 'deflate'}
+          end
+          return default_headers.merge!('User-Agent' => "mailjet-api-v3-ruby/#{Gem.loaded_specs["mailjet"].version}")
         end
-        return default_headers.merge(user_agent: "mailjet-api-v3-ruby/#{Gem.loaded_specs["mailjet"].version}")
       end
     end
 
     module ClassMethods
       def first(params = {}, options = {})
         all(params.merge!(limit: 1), options).first
+      rescue Mailjet::ApiError => error
+        raise error
       end
 
       def all(params = {}, options = {})
         opts = define_options(options)
         params = format_params(params)
-        response = connection(opts).get(default_headers.merge(params: params))
-        attribute_array = parse_api_json(response)
+        response = connection(opts).get(default_headers.merge!(params: params))
+        attribute_array = parse_api_json(response.body)
         attribute_array.map{ |attributes| instanciate_from_api(attributes) }
+      rescue Mailjet::ApiError => error
+        raise error
       end
 
       def count(options = {})
         opts = define_options(options)
-        response_json = connection(opts).get(default_headers.merge(params: {limit: 1, countrecords: 1}))
-        response_hash = ActiveSupport::JSON.decode(response_json)
+        response_json = connection(opts).get(default_headers.merge!(params: {limit: 1, countrecords: 1}))
+        response_hash = Yajl::Parser.parse(response_json.body)
         response_hash['Total']
+      rescue Mailjet::ApiError => error
+        raise error
       end
 
       def find(id, job_id = nil, options = {})
+        normalized_id = if id.is_a? String
+          URI.encode_www_form_component(id)
+        else
+          id
+        end
+
         # if action method, ammend url to appropriate id
         opts = define_options(options)
-        self.resource_path = create_action_resource_path(id, job_id) if self.action
-        #
-        attributes = parse_api_json(connection(opts)[id].get(default_headers)).first
+        self.resource_path = create_action_resource_path(normalized_id, job_id) if self.action
+
+        attributes = parse_api_json(connection(opts)[normalized_id].get(default_headers).body).first
         instanciate_from_api(attributes)
 
-      rescue Mailjet::ApiError => e
+      rescue Mailjet::CommunicationError => e
         if e.code == 404
           nil
         else
@@ -89,10 +105,18 @@ module Mailjet
         end
       end
 
+
+      def find_by_id(id, options = {})
+        # if action method, ammend url to appropriate id
+        opts = define_options(options)
+        self.resource_path = create_action_resource_path(id) if self.action
+        connection(opts).get(default_headers)
+      end
+
       def create(attributes = {}, options = {})
         # if action method, ammend url to appropriate id
         opts = define_options(options)
-        self.resource_path = create_action_resource_path(attributes[:id]) if self.action
+        self.resource_path = create_action_resource_path(attributes[:id]) if (self.action and attributes[:id])
         attributes.tap { |hs| hs.delete(:id) }
 
         if Mailjet.config.default_from and self.resource_path == 'send/'
@@ -106,9 +130,8 @@ module Mailjet
 
         self.new(attributes).tap do |resource|
           resource.save!(opts)
-          resource.persisted = true
+          resource.attributes[:persisted] = true
         end
-
       end
 
       def delete(id, options = {})
@@ -116,14 +139,25 @@ module Mailjet
          opts = define_options(options)
          self.resource_path = create_action_resource_path(id) if self.action
          connection(opts)[id].delete(default_headers)
+      rescue Mailjet::ApiError => error
+        raise error
+      end
+
+      def send_data(id, binary_data = nil, options = {})
+        opts = define_options(options)
+        self.resource_path = create_action_resource_path(id) if self.action
+        response = connection(opts).post(binary_data, default_headers.merge({'Content-Length' => "#{binary_data.size}", 'Transfer-Encoding' => 'chunked'}))
+
+        response_hash = response.respond_to?(:body) ? Yajl::Parser.parse(response.body) : Yajl::Parser.parse(response)
+        response_hash['ID'] ? response_hash['ID'] : response_hash
       end
 
       def instanciate_from_api(attributes = {})
-        self.new(attributes.merge(persisted: true))
+        self.new(attributes.merge!(persisted: true))
       end
 
       def parse_api_json(response_json)
-        response_hash = ActiveSupport::JSON.decode(response_json)
+        response_hash = Yajl::Parser.parse(response_json)
 
         #Take the response from the API and put it through a method -- taken from the ActiveSupport library -- which converts
         #the date-time from "2014-05-19T15:31:09Z" to "Mon, 19 May 2014 15:31:09 +0000" format.
@@ -138,17 +172,17 @@ module Mailjet
       end
 
       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
+        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 !(url_elements[1] == "contacts" && self.action == "managemanycontacts")
-           url_elements[2] = id.to_s
-         end
+        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("/")
+        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
+        return url
       end
 
 
@@ -159,9 +193,9 @@ module Mailjet
         case data
         when nil
           nil
-       when /^(?:\d{4}-\d{2}-\d{2}|\d{4}-\d{1,2}-\d{1,2}[T \t]+\d{1,2}:\d{2}:\d{2}(\.[0-9]*)?(([ \t]*)Z|[-+]\d{2}?(:\d{2})?))$/
+        when /^(?:\d{4}-\d{2}-\d{2}|\d{4}-\d{1,2}-\d{1,2}[T \t]+\d{1,2}:\d{2}:\d{2}(\.[0-9]*)?(([ \t]*)Z|[-+]\d{2}?(:\d{2})?))$/
           begin
-            DateTime.parse(data)
+            DateTime.iso8601(data)
           rescue ArgumentError
             data
           end
@@ -250,9 +284,9 @@ module Mailjet
       if opts[:perform_api_call] && !persisted?
         # get attributes only for entity creation
         self.attributes = if self.resource_path == 'send'
-          ActiveSupport::JSON.decode(response)
+          Yajl::Parser.parse(response.body)
         else
-          parse_api_json(response).first
+          parse_api_json(response.body).first
         end
       end
 
@@ -292,7 +326,7 @@ module Mailjet
       save(opts)
     end
 
-    def delete(call)
+    def delete
       self.class.delete(id)
     end
 
@@ -309,12 +343,15 @@ module Mailjet
     def formatted_payload
       payload = attributes.reject { |k,v| v.blank? }
       if persisted?
-        payload = payload.slice(*resourceprop)
+        payload = payload.slice(*resourceprop.map(&:to_s))
+          .except(*read_only_attributes.map(&:to_s))
       end
       payload = camelcase_keys(payload)
       payload.tap { |hs| hs.delete("Persisted") }
       payload.inject({}) do |h, (k, v)|
-        v = v.utc.as_json if v.respond_to? :utc
+        if v.respond_to? :utc
+          v = v.utc.to_s
+        end
         h.merge!({k => v})
       end
     end
@@ -337,20 +374,16 @@ module Mailjet
 
     def method_missing(method_symbol, *arguments) #:nodoc:
       method_name = method_symbol.to_s
-       if method_name =~ /(=|\?)$/
-        case $1
-        when "="
-          attributes[$`] = arguments.first
-        when "?"
-          attributes[$`]
-        end
-      else
-        return attributes[method_name] if attributes.include?(method_name)
-        # not set right now but we know about it
-        # return nil if known_attributes.include?(method_name)
-        super
+      if method_name.end_with?("=")
+        attributes[method_name.chop] = arguments.first
+        return
+      end
+
+      if attributes.include?(method_name)
+        return attributes[method_name]
       end
-    end
 
+      super
+    end
   end
 end

data/lib/mailjet/resources/campaigndraft.rb

@@ -1,7 +1,7 @@
 module Mailjet
   class Campaigndraft
     include Mailjet::Resource
-    self.resource_path = 'v3/REST/campaigndraft'
+    self.resource_path = 'REST/campaigndraft'
     self.public_operations = [:get, :put, :post]
     self.filters = [:campaign, :contacts_list, :delivered_at, :edit_mode, :is_archived, :is_campaign, :is_deleted, :is_handled, :is_starred, :modified, :news_letter_template, :segmentation, :status, :subject, :template]
     self.resourceprop = [:campaign, :contacts_list, :created_at, :delivered_at, :edit_mode, :id, :is_starred, :is_text_part_included, :locale, :modified_at, :preset, :reply_email, :segmentation, :sender, :sender_email, :sender_name, :status, :subject, :template_id, :title, :url, :used, 'CampaignID', 'CampaignALT', 'ContactsListID', 'ContactsListALT', 'SegmentationID', 'SegmentationALT', :contacts_list_id,'TemplateID']

data/lib/mailjet/resources/campaigndraft_detailcontent.rb

@@ -2,10 +2,26 @@ module Mailjet
   class Campaigndraft_detailcontent
     include Mailjet::Resource
     self.action = "detailcontent"
-    self.resource_path = "v3/REST/campaigndraft/id/#{self.action}"
+    self.resource_path = "REST/campaigndraft/id/#{self.action}"
     self.public_operations = [:get, :post]
     self.filters = []
     self.resourceprop = [:text_part, :html_part, :headers, :mjml_content]
 
+    def self.find(id, job_id = nil, options = {})
+      opts = define_options(options)
+      self.resource_path = create_action_resource_path(id, job_id) if self.action
+
+      raw_data = parse_api_json(connection(opts)[id].get(default_headers).body)
+
+      raw_data.map do |entity|
+        instanciate_from_api(entity)
+      end
+    rescue Mailjet::CommunicationError => e
+      if e.code == 404
+        nil
+      else
+        raise e
+      end
+    end
   end
 end

data/lib/mailjet/resources/campaigndraft_schedule.rb

@@ -2,7 +2,7 @@ module Mailjet
   class Campaigndraft_schedule
     include Mailjet::Resource
     self.action = "schedule"
-    self.resource_path = "v3/REST/campaigndraft/id/#{self.action}"
+    self.resource_path = "REST/campaigndraft/id/#{self.action}"
     self.public_operations = [:post, :delete , :get]
     self.filters = []
     self.resourceprop = [:date]

data/lib/mailjet/resources/campaigndraft_send.rb

@@ -2,7 +2,7 @@ module Mailjet
   class Campaigndraft_send
     include Mailjet::Resource
     self.action = "send"
-    self.resource_path = "v3/REST/campaigndraft/id/#{self.action}"
+    self.resource_path = "REST/campaigndraft/id/#{self.action}"
     self.public_operations = [:post]
     self.filters = []
     self.resourceprop = []

data/lib/mailjet/resources/campaigndraft_status.rb

@@ -2,7 +2,7 @@ module Mailjet
   class Campaigndraft_status
     include Mailjet::Resource
     self.action = 'status'
-    self.resource_path = "v3/REST/campaigndraft/id/#{self.action}"
+    self.resource_path = "REST/campaigndraft/id/#{self.action}"
     self.public_operations =  [:get]
     self.filters = []
     self.resourceprop = []

data/lib/mailjet/resources/campaigndraft_test.rb

@@ -2,7 +2,7 @@ module Mailjet
   class Campaigndraft_test
     include Mailjet::Resource
     self.action = "test"
-    self.resource_path = "v3/REST/campaigndraft/id/#{self.action}"
+    self.resource_path = "REST/campaigndraft/id/#{self.action}"
     self.public_operations = [:post]
     self.filters = []
     self.resourceprop = [:email, :name]

data/lib/mailjet/resources/contact.rb

@@ -4,7 +4,16 @@ module Mailjet
     self.resource_path = 'REST/contact'
     self.public_operations = [:get, :put, :post]
     self.filters = [:campaign, :contacts_list, :is_unsubscribed, :last_activity_at, :recipient, :status]
-    self.resourceprop = [:created_at, :delivered_count, :email, :id, :is_opt_in_pending, :is_spam_complaining, :last_activity_at, :last_update_at, :name, :unsubscribed_at, :unsubscribed_by]
-
+    self.resourceprop = [
+      :delivered_count,
+      :email,
+      :id,
+      :is_opt_in_pending,
+      :is_spam_complaining,
+      :name,
+      :unsubscribed_by,
+      :is_excluded_from_campaigns
+    ]
+    self.read_only_attributes = [:created_at, :last_activity_at, :last_update_at, :unsubscribed_at]
   end
 end

data/lib/mailjet/resources/contact_getcontactslists.rb

@@ -6,5 +6,22 @@ module Mailjet
     self.public_operations = [:get]
     self.filters = []
     self.resourceprop = []
+
+    def self.find(id, job_id = nil, options = {})
+      opts = define_options(options)
+      self.resource_path = create_action_resource_path(id, job_id) if self.action
+
+      raw_data = parse_api_json(connection(opts).get(default_headers).body)
+
+      raw_data.map do |entity|
+        instanciate_from_api(entity)
+      end
+    rescue Mailjet::CommunicationError => e
+      if e.code == 404
+        nil
+      else
+        raise e
+      end
+    end
   end
 end

data/lib/mailjet/resources/contact_pii.rb

@@ -0,0 +1,8 @@
+module Mailjet
+  class ContactPii
+    include Mailjet::Resource
+    self.version = 'v4'
+    self.resource_path = 'contacts'
+    self.public_operations = [:delete]
+  end
+end

data/lib/mailjet/resources/contactslist_csv.rb

@@ -0,0 +1,8 @@
+module Mailjet
+  class ContactslistCsv
+    include Mailjet::Resource
+    self.action = "DATA/contactslist"
+    self.resource_path = "#{self.action}/id/CSVData/text:plain"
+    self.public_operations = [:post]
+  end
+end

data/lib/mailjet/resources/csvimport.rb

@@ -5,6 +5,5 @@ module Mailjet
     self.public_operations = [:get, :put, :post]
     self.filters = []
     self.resourceprop = [:alive_at, :contacts_list, :count, :current, :data_id, :errcount, :err_treshold, :id, :import_options, :job_end, :job_start, :method, :request_at, :status]
-
   end
 end

data/lib/mailjet/resources/listrecipient.rb

@@ -4,7 +4,8 @@ module Mailjet
     self.resource_path = 'REST/listrecipient'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:active, :blocked, :contact, :contact_email, :contacts_list, :last_activity_at, :list_name, :opened, :status, :unsub]
-    self.resourceprop = [:contact, :id, :is_active, :is_unsubscribed, :list, :unsubscribed_at, :contact_id, :list_id, 'ContactID', 'ListID', 'ContactALT', 'ListALT']
+    self.resourceprop = [:contact, :id, :is_active, :is_unsubscribed, :list, :contact_id, :list_id, 'ContactID', 'ListID', 'ContactALT', 'ListALT']
 
+    self.read_only_attributes = [:subscribed_at, :unsubscribed_at]
   end
 end

data/lib/mailjet/resources/messagehistory.rb

@@ -8,5 +8,21 @@ module Mailjet
 
     self.read_only = true
 
+    def self.find(id, job_id = nil, options = {})
+      opts = define_options(options)
+      self.resource_path = create_action_resource_path(id, job_id) if self.action
+
+      raw_data = parse_api_json(connection(opts)[id].get(default_headers).body)
+
+      raw_data.map do |entity|
+        instanciate_from_api(entity)
+      end
+    rescue Mailjet::CommunicationError => e
+      if e.code == 404
+        nil
+      else
+        raise e
+      end
+    end
   end
 end

data/lib/mailjet/resources/messageinformation.rb

@@ -8,5 +8,22 @@ module Mailjet
 
     self.read_only = true
 
+    def self.find(id, job_id = nil, options = {})
+      opts = define_options(options)
+      self.resource_path = create_action_resource_path(id, job_id) if self.action
+
+      raw_data = parse_api_json(connection(opts)[id].get(default_headers).body)
+
+      raw_data.map do |entity|
+        instanciate_from_api(entity)
+      end
+    rescue Mailjet::CommunicationError => e
+      if e.code == 404
+        nil
+      else
+        raise e
+      end
+    end
+
   end
 end

data/lib/mailjet/resources/newsletter.rb

@@ -4,7 +4,6 @@ module Mailjet
     self.resource_path = 'REST/newsletter'
     self.public_operations = [:get, :put, :post]
     self.filters = [:campaign, :contacts_list, :delivered_at, :edit_mode, :is_archived, :is_campaign, :is_deleted, :is_handled, :is_starred, :modified, :news_letter_template, :segmentation, :status, :subject]
-    self.resourceprop = [:callback, :campaign, :contacts_list, :created_at, :delivered_at, :edit_mode, :edit_type, :footer, :footer_address, :footer_wysiwyg_type, :header_filename, :header_link, :header_text, :header_url, :id, :ip, :is_handled, :is_starred, :is_text_part_included, :locale, :modified_at, :permalink, :permalink_host, :permalink_wysiwyg_type, :politeness_mode, :reply_email, :segmentation, :sender, :sender_email, :sender_name, :status, :subject, :template, :test_address, :title, :url, 'CampaignID', 'CampaignALT', 'ContactsListID', 'ContactsListALT', 'SegmentationID', 'SegmentationALT', :contacts_list_id]
-
+    self.resourceprop = [:callback, :campaign, :contacts_list, :created_at, :delivered_at, :edit_mode, :edit_type, :footer, :footer_address, :footer_wysiwyg_type, :header_filename, :header_link, :header_text, :header_url, :id, :ip, :is_handled, :is_starred, :is_text_part_included, :locale, :modified_at, :permalink, :permalink_host, :permalink_wysiwyg_type, :politeness_mode, :reply_email, :segmentation, :segmentation_id, :sender, :sender_email, :sender_name, :status, :subject, :template, :test_address, :title, :url, 'CampaignID', 'CampaignALT', 'ContactsListID', 'ContactsListALT', 'SegmentationID', 'SegmentationALT', :contacts_list_id]
   end
 end

data/lib/mailjet/resources/openinformation.rb

@@ -8,5 +8,22 @@ module Mailjet
 
     self.read_only = true
 
+    def self.find(id, job_id = nil, options = {})
+      opts = define_options(options)
+      self.resource_path = create_action_resource_path(id, job_id) if self.action
+
+      raw_data = parse_api_json(connection(opts)[id].get(default_headers).body)
+
+      raw_data.map do |entity|
+        instanciate_from_api(entity)
+      end
+    rescue Mailjet::CommunicationError => e
+      if e.code == 404
+        nil
+      else
+        raise e
+      end
+    end
+
   end
 end

data/lib/mailjet/resources/retrieve_errors_csv.rb

@@ -0,0 +1,8 @@
+module Mailjet
+  class RetrieveErrosCsv
+    include Mailjet::Resource
+    self.action = "DATA/BatchJob"
+    self.resource_path = "#{self.action}/id/CSVError/text:csv"
+    self.public_operations = [:get]
+  end
+end

data/lib/mailjet/resources/send.rb

@@ -1,7 +1,7 @@
 module Mailjet
   class Send
     include Mailjet::Resource
-#    self.version = 'v3.1'
+
     self.resource_path = 'send'
     self.public_operations = [:post]
   end

data/lib/mailjet/resources/statcounters.rb

@@ -0,0 +1,33 @@
+module Mailjet
+  class Statcounters
+    include Mailjet::Resource
+    self.resource_path = 'REST/statcounters'
+    self.public_operations = [:get]
+    self.filters = [:source_id, :counter_resolution, :counter_source, :counter_timing]
+    self.resourceprop = [
+      :api_key_id,
+      :event_click_delay,
+      :event_clicked_count,
+      :event_open_delay,
+      :event_opened_count,
+      :event_spam_count,
+      :event_unsubscribed_count,
+      :event_workflow_exited_count,
+      :message_blocked_count,
+      :message_clicked_count,
+      :message_deferred_count,
+      :message_hard_bounced_count,
+      :message_opened_count,
+      :message_queued_count,
+      :message_sent_count,
+      :message_soft_bounced_count,
+      :message_spam_count,
+      :message_unsubscribed_count,
+      :message_work_flow_exited_count,
+      :source_id,
+      :timeslice,
+      :total,
+    ]
+    self.read_only = true
+  end
+end

data/lib/mailjet/resources/statistics_linkclick.rb

@@ -0,0 +1,12 @@
+module Mailjet
+  class Statistics_linkclick
+    include Mailjet::Resource
+    self.resource_path = 'REST/statistics/link-click'
+    self.public_operations = [:get]
+    self.filters = [:campaign_id]
+    self.resourceprop = [:url, :position_index, :clicked_messages_count, :clicked_events_count]
+
+    self.read_only = true
+
+  end
+end

data/lib/mailjet/resources/template_detailcontent.rb

@@ -1,10 +1,26 @@
 module Mailjet
   class Template_detailcontent
     include Mailjet::Resource
-    self.resource_path = 'REST/template/id/${self.action}'
-    self.public_operations = [:get, :put, :post, :delete]
+    self.action = 'detailcontent'
+    self.resource_path = "REST/template/id/#{self.action}"
+    self.public_operations = [:get,:post]
     self.filters = [:api_key, :categories, :categories_selection_method, :edit_mode, :name, :owner_type, :purposes, :purposes_selection_method, :user]
     self.resourceprop = [:author, :categories, :copyright, :description, :edit_mode, :is_starred, :name, :owner_type, :presets, :purposes]
 
+    def self.find(id, options = {})
+      self.resource_path = create_action_resource_path(id)
+
+      opts = define_options(options)
+      response = connection(opts).get(default_headers)
+      attributes = parse_api_json(response.body).first
+
+      instanciate_from_api(attributes)
+    rescue Mailjet::CommunicationError => e
+      if e.code == 404
+        nil
+      else
+        raise e
+      end
+    end
   end
 end

data/lib/mailjet/version.rb

@@ -1,3 +1,3 @@
 module Mailjet
-  VERSION = "1.5.4"
+  VERSION = "1.8.0"
 end