mailjet 1.7.3 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8196f5f49e3b7aa6766ad97b0e8a2346c4591f56f30a37e124a346ba46e06f3b
-  data.tar.gz: b7264d284ac5267785d26c0d8a14810f714ea74893f52eb8d82dc049347b1883
+  metadata.gz: aa7ab8289156e4e9277f016b2e75195de319fcdfc772e3f3de7c1b227ab52a48
+  data.tar.gz: 30de5a68c95d2dbfe3474fa3cb9d01e1b897dcea43cba3ea02acdf5c7741cfc4
 SHA512:
-  metadata.gz: e2c289c1757e6cbc7980296b2de8b9bf7052dbea80265e93d4131a8b8de720c11daa07e83d1ca0d42f4acbc8e637ed387130ca6cf12efbf896e089fb460cc4f8
-  data.tar.gz: 7502fade84d6f8690394c3a911dfdb48786d21a3414a79416436a04da69aba2f0450b35ea1912b586c69126d6b3052573c3b29a8f3929c969b3d97c3bb0d76ad
+  metadata.gz: f9b4217fd1bccc44eb887e14532f5f1c8036bafc98d714743d22deac6e25fa3213d9dd8164e34a4fa3165a6b42a0503790d7d04cb3eafc0862788e2392c6ef27
+  data.tar.gz: '08ac1f8b54f6b5e34bbd6b1bd45af8a8bcb10714a1e488ce7a9b648b309d468aaba3dd9ac6a101994e6fc5ae65d8a97957603156848c0eba12c12a1b352e2d0e'

data/README.md

@@ -76,7 +76,7 @@ Check out all the resources and Ruby code examples in the [Offical Documentation
 
 This library requires **Ruby v2.2.X**.
 
-The Rails ActionMailer integration is designed for Rails 3.X and 4.X.
+The Rails ActionMailer integration is designed for Rails >= 5.
 
 ## Installation
 
@@ -139,7 +139,7 @@ Here's an example on how to send an email:
 require 'mailjet'
 Mailjet.configure do |config|
   config.api_key = ENV['MJ_APIKEY_PUBLIC']
-  config.secret_key = ENV['MJ_APIKEY_PRIVATE']  
+  config.secret_key = ENV['MJ_APIKEY_PRIVATE']
   config.api_version = "v3.1"
 end
 variable = Mailjet::Send.create(messages: [{
@@ -177,7 +177,7 @@ Since most Email API endpoints are located under `v3`, it is set as the default
 require 'mailjet'
 Mailjet.configure do |config|
   config.api_key = ENV['MJ_APIKEY_PUBLIC']
-  config.secret_key = ENV['MJ_APIKEY_PRIVATE']  
+  config.secret_key = ENV['MJ_APIKEY_PRIVATE']
   config.api_version = "v3.1"
 end
 ```
@@ -189,7 +189,7 @@ The default base domain name for the Mailjet API is `https://api.mailjet.com`. Y
 ```ruby
 Mailjet.configure do |config|
   config.api_key = ENV['MJ_APIKEY_PUBLIC']
-  config.secret_key = ENV['MJ_APIKEY_PRIVATE']  
+  config.secret_key = ENV['MJ_APIKEY_PRIVATE']
   config.api_version = "v3.1"
   config.end_point = "https://api.us.mailjet.com"
 end
@@ -221,7 +221,7 @@ Use the `create` method of the Mailjet CLient (i.e. `variable = Mailjet::$resour
 require 'mailjet'
 Mailjet.configure do |config|
   config.api_key = ENV['MJ_APIKEY_PUBLIC']
-  config.secret_key = ENV['MJ_APIKEY_PRIVATE']  
+  config.secret_key = ENV['MJ_APIKEY_PRIVATE']
 end
 variable = Mailjet::Contact.create(email: "Mister@mailjet.com"
 )
@@ -239,7 +239,7 @@ Use `id` to specify the ID you want to apply a POST request to (used in case of
 require 'mailjet'
 Mailjet.configure do |config|
   config.api_key = ENV['MJ_APIKEY_PUBLIC']
-  config.secret_key = ENV['MJ_APIKEY_PRIVATE']  
+  config.secret_key = ENV['MJ_APIKEY_PRIVATE']
 end
 variable = Mailjet::Contact_managecontactslists.create(id: $ID, contacts_lists: [{
     'ListID'=> '$ListID_1',
@@ -285,7 +285,7 @@ Use the `.find` method to retrieve a specific object. Specify the ID of the obje
 require 'mailjet'
 Mailjet.configure do |config|
   config.api_key = ENV['MJ_APIKEY_PUBLIC']
-  config.secret_key = ENV['MJ_APIKEY_PRIVATE']  
+  config.secret_key = ENV['MJ_APIKEY_PRIVATE']
 end
 variable = Mailjet::Contact.find($CONTACT_EMAIL)
 p variable.attributes['Data']
@@ -483,6 +483,17 @@ UserMailer.welcome_email.deliver_now!
 
 For more information on `ActionMailer::MessageDelivery`, see the documentation [HERE](http://edgeapi.rubyonrails.org/classes/ActionMailer/MessageDelivery.html)
 
+#### Manage contacts via CSV Upload
+Create the CSV content in a format compatible with the Mailjet API, see the documentation [HERE](https://dev.mailjet.com/email/guides/contact-management/#manage-contacts-via-csv-upload)
+```ruby
+Mailjet::ContactslistCsv.send_data(ID_CONTACTLIST, File.open('some_csvdata.csv', 'r'))
+```
+
+#### [Delete the Contact](https://dev.mailjet.com/email/guides/contact-management/#gdpr-delete-contacts)
+```ruby
+Mailjet::ContactPii.delete(contact_ID)
+```
+
 ## Track email delivery
 
 You can setup your Rack application in order to receive feedback on emails you sent (clicks, etc.)

data/lib/mailjet/connection.rb

@@ -1,6 +1,5 @@
 require 'rest_client'
-require 'mailjet/gem_extensions/rest_client'
-require 'json'
+require 'yajl/json_gem'
 
 module Mailjet
   class Connection
@@ -92,9 +91,11 @@ module Mailjet
     end
 
     def handle_exception(e, additional_headers, payload = {})
+      return e.http_body if e.http_headers[:content_type].include?("text/plain")
+
       params = additional_headers[:params] || {}
       formatted_payload = (additional_headers[:content_type] == :json) ? JSON.parse(payload) : payload
-      params = params.merge(formatted_payload)
+      params = params.merge!(formatted_payload) if formatted_payload.is_a?(Hash)
 
       http_body = if e.http_headers[:content_type].include?("application/json")
         e.http_body
@@ -105,8 +106,22 @@ module Mailjet
       if sent_invalid_email?(e.http_body, @adapter.url)
         return e.http_body
       else
-        raise Mailjet::ApiError.new(e.http_code, http_body, @adapter, @adapter.url, params)
+        raise communication_error(e)
+      end
+    end
+
+    def communication_error(e)
+      if e.respond_to?(:response) && e.response
+        return case e.response.code
+        when Unauthorized::CODE
+          Unauthorized.new(e.message, e.response)
+        when BadRequest::CODE
+          BadRequest.new(e.message, e.response)
+        else
+          CommunicationError.new(e.message, e.response)
+        end
       end
+      CommunicationError.new(e.message)
     end
 
     def sent_invalid_email?(error_http_body, url)

data/lib/mailjet/exception/errors.rb

@@ -0,0 +1,93 @@
+require 'yajl/json_gem'
+
+module Mailjet
+  class Error < StandardError
+    attr_reader :object
+
+    def initialize(message = nil, object = nil)
+      super(message)
+      @object = object
+    end
+  end
+
+  class ApiError < StandardError
+    attr_reader :code, :reason
+
+    # @param code [Integer] HTTP response status code
+    # @param body [String] JSON response body
+    # @param request [Object] any request object
+    # @param url [String] request URL
+    # @param params [Hash] request headers and parameters
+    def initialize(code, body, request, url, params)
+      @code = code
+      @reason = begin
+        resdec = JSON.parse(body)
+        resdec['ErrorMessage']
+      rescue JSON::ParserError
+        body
+      end
+
+      if request.respond_to?(:options)
+        request.options[:user] = '***'
+        request.options[:password] = '***'
+      end
+
+      message = "error #{code} while sending #{request.inspect} to #{url} with #{params.inspect}"
+      error_details = body.inspect
+      hint = "Please see https://dev.mailjet.com/email/reference/overview/errors/ for more informations on error numbers."
+
+      super("#{message}\n\n#{error_details}\n\n#{hint}\n\n")
+    end
+  end
+
+  class CommunicationError < Error
+    attr_reader :code
+
+    NOCODE = 000
+
+    def initialize(message = nil, response = nil)
+      @response = response
+      @code = if response.nil?
+                NOCODE
+              else
+                response.code
+              end
+
+      api_message = begin
+        JSON.parse(response.body)['ErrorMessage']
+      rescue Yajl::ParseError
+        response.body
+      rescue NoMethodError
+        "Unknown API error"
+      rescue
+        'Unknown API error'
+      end
+
+      message ||=  ''
+      api_message ||= ''
+      message = message + ': ' + api_message
+
+      super(message, response)
+    rescue NoMethodError, JSON::ParserError
+      @code = NOCODE
+      super(message, response)
+    end
+  end
+
+  class Unauthorized < CommunicationError
+    CODE = 401
+
+    def initialize(error_message, response)
+      error_message = error_message + ' - Invalid Domain or API key'
+      super(error_message, response)
+    end
+  end
+
+  class BadRequest < CommunicationError
+    CODE = 400
+
+    def initialize(error_message, response)
+      super(error_message, response)
+    end
+  end
+end

data/lib/mailjet/mailer.rb

@@ -1,7 +1,8 @@
 require 'action_mailer'
 require 'mail'
 require 'base64'
-require 'json'
+require 'yajl/json_gem'
+
 
 # Mailjet::Mailer enables to send a Mail::Message via Mailjet SMTP relay servers
 # User is the API key, and password the API secret
@@ -15,7 +16,7 @@ class Mailjet::Mailer < ::Mail::SMTP
       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))
+    }.merge!(options))
   end
 end
 
@@ -202,9 +203,7 @@ class Mailjet::APIMailer
 
     payload = {
       :To=> to,
-    }.merge(content)
-    .merge(base_from)
-    .merge(@delivery_method_options_v3_1)
+    }.merge!(content, base_from, @delivery_method_options_v3_1)
 
     payload[:Subject] = mail.subject if !mail.subject.blank?
     payload[:Sender] = mail[:sender] if !mail[:sender].blank?
@@ -294,9 +293,7 @@ class Mailjet::APIMailer
     payload[:bcc] = mail[:bcc].formatted.join(', ') if mail[:bcc]
 
     # Send the final payload to Mailjet Send API
-    payload.merge(content)
-    .merge(base_from)
-    .merge(@delivery_method_options_v3_0)
+    payload.merge!(content, base_from, @delivery_method_options_v3_0)
   end
 end
 

data/lib/mailjet/rack/endpoint.rb

@@ -1,5 +1,5 @@
 require 'rack/request'
-require 'json'
+require 'yajl/json_gem'
 
 module Mailjet
   module Rack

data/lib/mailjet/resource.rb

@@ -1,11 +1,9 @@
 require 'mailjet/connection'
+require 'yajl/json_gem'
+require 'active_support'
 require 'active_support/core_ext/string'
-require 'active_support/core_ext/module/delegation'
-#require 'mail'
-require 'active_support/hash_with_indifferent_access'
-require 'active_support/core_ext/hash'
-require 'active_support/json/decoding'
-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.
@@ -16,11 +14,11 @@ require 'json'
 
 module Mailjet
   module Resource
-
     # define here available options for filtering
     OPTIONS = [:version, :url, :perform_api_call, :api_key, :secret_key, :read_timeout, :open_timeout]
 
     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'
 
     def self.included(base)
       base.extend ClassMethods
@@ -49,10 +47,13 @@ module Mailjet
         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 }
+          elsif DATA_URLS.any? { |data_type| default_headers = { content_type: "text/#{data_type}" } if
+                                                                                self.resource_path.include?(data_type)
+                               }
           else
             default_headers = { accept: :json, accept_encoding: :deflate, content_type: :json } #use JSON if *not* Send API
           end
-          return default_headers.merge(user_agent: "mailjet-api-v3-ruby/#{Gem.loaded_specs["mailjet"].version}")
+          return default_headers.merge!(user_agent: "mailjet-api-v3-ruby/#{Gem.loaded_specs["mailjet"].version}")
         end
       end
     end
@@ -60,21 +61,27 @@ module Mailjet
     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))
+        response = connection(opts).get(default_headers.merge!(params: params))
         attribute_array = parse_api_json(response)
         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_json = connection(opts).get(default_headers.merge!(params: {limit: 1, countrecords: 1}))
         response_hash = JSON.parse(response_json)
         response_hash['Total']
+      rescue Mailjet::ApiError => error
+        raise error
       end
 
       def find(id, job_id = nil, options = {})
@@ -87,11 +94,11 @@ module Mailjet
         # if action method, ammend url to appropriate id
         opts = define_options(options)
         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)).first
         instanciate_from_api(attributes)
 
-      rescue Mailjet::ApiError => e
+      rescue Mailjet::CommunicationError => e
         if e.code == 404
           nil
         else
@@ -118,7 +125,6 @@ module Mailjet
           resource.save!(opts)
           resource.attributes[:persisted] = true
         end
-
       end
 
       def delete(id, options = {})
@@ -126,10 +132,28 @@ 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_hash = JSON.parse(connection(opts).post(binary_data, default_headers))
+        response_hash['ID'] ? response_hash['ID'] : response_hash
+      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 instanciate_from_api(attributes = {})
-        self.new(attributes.merge(persisted: true))
+        self.new(attributes.merge!(persisted: true))
       end
 
       def parse_api_json(response_json)
@@ -169,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

data/lib/mailjet/resources/campaigndraft_detailcontent.rb

@@ -16,7 +16,7 @@ module Mailjet
       raw_data.map do |entity|
         instanciate_from_api(entity)
       end
-    rescue Mailjet::ApiError => e
+    rescue Mailjet::CommunicationError => e
       if e.code == 404
         nil
       else

data/lib/mailjet/resources/contact_getcontactslists.rb

@@ -16,7 +16,7 @@ module Mailjet
       raw_data.map do |entity|
         instanciate_from_api(entity)
       end
-    rescue Mailjet::ApiError => e
+    rescue Mailjet::CommunicationError => e
       if e.code == 404
         nil
       else

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/messagehistory.rb

@@ -17,7 +17,7 @@ module Mailjet
       raw_data.map do |entity|
         instanciate_from_api(entity)
       end
-    rescue Mailjet::ApiError => e
+    rescue Mailjet::CommunicationError => e
       if e.code == 404
         nil
       else

data/lib/mailjet/resources/messageinformation.rb

@@ -17,7 +17,7 @@ module Mailjet
       raw_data.map do |entity|
         instanciate_from_api(entity)
       end
-    rescue Mailjet::ApiError => e
+    rescue Mailjet::CommunicationError => e
       if e.code == 404
         nil
       else

data/lib/mailjet/resources/openinformation.rb

@@ -17,7 +17,7 @@ module Mailjet
       raw_data.map do |entity|
         instanciate_from_api(entity)
       end
-    rescue Mailjet::ApiError => e
+    rescue Mailjet::CommunicationError => e
       if e.code == 404
         nil
       else

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/template_detailcontent.rb

@@ -15,7 +15,7 @@ module Mailjet
       attributes = parse_api_json(response).first
 
       instanciate_from_api(attributes)
-    rescue Mailjet::ApiError => e
+    rescue Mailjet::CommunicationError => e
       if e.code == 404
         nil
       else

data/lib/mailjet/version.rb

@@ -1,3 +1,3 @@
 module Mailjet
-  VERSION = "1.7.3"
+  VERSION = "1.7.8"
 end

data/lib/mailjet.rb

@@ -1,13 +1,11 @@
 require 'json/ext'
-require 'ostruct'
-require 'mailjet/core_extensions/ostruct'
+require 'yajl'
 require 'mailjet/configuration'
-require 'mailjet/api_error'
 
 require 'mailjet/resource'
 require 'mailjet/message_delivery'
 
-Dir[File.expand_path("../mailjet/resources/*.rb", __FILE__)].each do |file|
+Dir[File.expand_path("../mailjet/{resources,exception}/*.rb", __FILE__)].each do |file|
   require file
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailjet
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.8
 platform: ruby
 authors:
 - Tyler Nappy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-15 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -47,44 +47,44 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: actionmailer
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.9
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -168,12 +168,10 @@ files:
 - lib/generators/mailjet/initializer_generator.rb
 - lib/generators/mailjet/templates/mailjet.rb.erb
 - lib/mailjet.rb
-- lib/mailjet/api_error.rb
 - lib/mailjet/collection_proxy.rb
 - lib/mailjet/configuration.rb
 - lib/mailjet/connection.rb
-- lib/mailjet/core_extensions/ostruct.rb
-- lib/mailjet/gem_extensions/rest_client.rb
+- lib/mailjet/exception/errors.rb
 - lib/mailjet/mailer.rb
 - lib/mailjet/message_delivery.rb
 - lib/mailjet/rack/endpoint.rb
@@ -203,11 +201,13 @@ files:
 - lib/mailjet/resources/contact_getcontactslists.rb
 - lib/mailjet/resources/contact_managecontactslists.rb
 - lib/mailjet/resources/contact_managemanycontacts.rb
+- lib/mailjet/resources/contact_pii.rb
 - lib/mailjet/resources/contactdata.rb
 - lib/mailjet/resources/contactfilter.rb
 - lib/mailjet/resources/contacthistorydata.rb
 - lib/mailjet/resources/contactmetadata.rb
 - lib/mailjet/resources/contactslist.rb
+- lib/mailjet/resources/contactslist_csv.rb
 - lib/mailjet/resources/contactslist_managecontact.rb
 - lib/mailjet/resources/contactslist_managemanycontacts.rb
 - lib/mailjet/resources/contactslistsignup.rb
@@ -248,6 +248,7 @@ files:
 - lib/mailjet/resources/openstatistics.rb
 - lib/mailjet/resources/parseroute.rb
 - lib/mailjet/resources/preferences.rb
+- lib/mailjet/resources/retrieve_errors_csv.rb
 - lib/mailjet/resources/send.rb
 - lib/mailjet/resources/sender.rb
 - lib/mailjet/resources/sender_validate.rb

data/lib/mailjet/api_error.rb

@@ -1,28 +0,0 @@
-require "json"
-
-module Mailjet
-  class ApiError < StandardError
-    attr_reader :code, :reason
-
-    # @param code [Integer] HTTP response status code
-    # @param body [String] JSON response body
-    # @param request [Object] any request object
-    # @param url [String] request URL
-    # @param params [Hash] request headers and parameters
-    def initialize(code, body, request, url, params)
-      @code = code
-      @reason = begin
-        resdec = JSON.parse(body)
-        resdec['ErrorMessage']
-      rescue JSON::ParserError
-        body
-      end
-
-      message = "error #{code} while sending #{request.inspect} to #{url} with #{params.inspect}"
-      error_details = body.inspect
-      hint = "Please see https://dev.mailjet.com/guides/#status-codes for more informations on error numbers."
-
-      super("#{message}\n\n#{error_details}\n\n#{hint}\n\n")
-    end
-  end
-end

data/lib/mailjet/core_extensions/ostruct.rb

@@ -1,9 +0,0 @@
-class OpenStruct
-  
-  # when asked for id, ruby 1.8.7's implementation of OpenStruct returns object's inner id instead of table's value if present. Evilishish infamous Monkey-Patch.
-  if RUBY_VERSION =~ /1\.8\./
-    def id
-      send(:eval, "@table[:id]")
-    end
-  end
-end

data/lib/mailjet/gem_extensions/rest_client.rb

@@ -1,19 +0,0 @@
-module RestClient
-  module Payload
-    class Base
-      def flatten_params_array value, calculated_key
-        result = []
-        value.each do |elem|
-          if elem.is_a? Hash
-            result += flatten_params(elem, calculated_key)
-          elsif elem.is_a? Array
-            result += flatten_params_array(elem, calculated_key)
-          else
-            result << ["#{calculated_key}", elem]
-          end
-        end
-        result
-      end
-    end
-  end
-end