mailjet 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 156203494ae9dd313d17567b8a512d76d69c702f
-  data.tar.gz: e6abc5b3be30813cd8ba595269ffca54d046f8ac
+  metadata.gz: 2be6a74fb51bd389bb3891306adda8484d6502f8
+  data.tar.gz: fe9905f9978f227106ee168e241be967af1dacb8
 SHA512:
-  metadata.gz: 8ef83c13a06ab4abcdc1cad0bab70c8825fca208c6f69c2cb26198607cdd623aff145edb3bb002df65aad36955c2fda3093027787cb671e373df2488c8f9ef86
-  data.tar.gz: 1394da23d224428d2c3def93b3e6ae4a960bbfb74377c164f3cf2bbb31c442981b0d3282dde237737c97052c5de190ca9e02eafc334da06a21bee5f0b383b442
+  metadata.gz: 0a0e85431e034bea7ae72d69c88a4f0350b7050f5b43ec27b5e5f0528524e1cd13cbd80f82b9a81aea997dddbdfb0c96963f2eebdd56a9e4c3475bccd3818cb5
+  data.tar.gz: 4ec68185cb8d717dc824da84eb35ba9a3bcf2596f8bdc3df4b68ad6bfc83f286741379691b89ac87da125c2aee3b961a2d8b0742b931aa98392bffba27b5d0d5

data/README.md

@@ -96,7 +96,7 @@ As easy as:
 
 ```ruby
 # application.rb
-config.action_mailer.delivery_method = :mailjet_smtp
+config.action_mailer.delivery_method = :mailjet
 
 ```
 
@@ -117,6 +117,11 @@ You can find out all the resources you can access to in the [Official API docs][
 
 Let's have a look at the power of this thin wrapper
 
+### Naming conventions
+
+* Class names' first letter is capitalized followed by the rest of the resource name in lowercase (e.g. `listrecipient` will be `Listrecipient` in ruby)
+* Ruby attribute names are the [underscored][underscore-api] versions of API attributes names (e.g. `IsActive` will be `is_active` in ruby)
+
 ### Wrapper REST API
 
 Let's say we want to manage list recipients.
@@ -137,8 +142,6 @@ You can refine queries using [API Filters][apidoc-recipient]`*` as well as the f
 * offset: int (default: 0)
 * sort: `[[:property, :asc], [:property, :desc]]`
 
-`*` See below for [naming conventions](#naming-conventions)
-
 #### GET the resources count
 
 ```ruby
@@ -184,20 +187,6 @@ You can refine queries using [API Filters][apidoc-recipient]`*` as well as the f
 => #<Mailjet::Listrecipient>
  ```
 
-### Naming conventions
-
-* Classes names are the [camelcased][camelcase-api] version of resource names (e.g. class name for `listrecipient` resource will be `Listrecipient` - notice the "r" of "recipient" is downcase since the "listrecipient" resource has no dash or underscore between "list" and "recipient")
-* Ruby attribute names are the [underscored][underscore-api] versions of API attributes names (e.g. `IsActive` will be `is_active` in ruby)
-* If you do not like the name of the resource, you can easily rename them. For instance, if you want a capital R to ListRecipient, you can define the following class:
-
-```ruby
-class ListRecipient
-  include Mailjet::Resource
-  self.resource_path = 'listrecipient'
-  self.public_operations = [:get, :put, :post, :delete] # optional
-end
-```
-
 ## Send emails through API
 
 In order to send emails through the API, you just have to `create` a new `MessageDelivery` resource.

data/lib/mailjet/message_delivery.rb

@@ -3,7 +3,8 @@ require 'mailjet/resource'
 module Mailjet
   class MessageDelivery
     include Mailjet::Resource
-    self.resource_path = 'v3/send'
+    self.resource_path = 'v3/send/message'
     self.public_operations = [:post]
+    self.properties = [:from, :sender, :to, :cc, :bcc, :subject, :text, :html, :attachment, :inlineattachment, :header]
   end
 end

data/lib/mailjet/resource.rb

@@ -7,7 +7,12 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/concern'
 require 'active_support/json/decoding'
 
-ActiveSupport.parse_json_times = true
+
+# This option automatically transforms the date output by the API into something a bit more readable.
+# Setting this option to 'true' -- or having it at all -- may effect a users app by globally implementing this
+# date transformation feature which may not be desired by the developer for whatever reason.
+#
+# ActiveSupport.parse_json_times = false
 
 module Mailjet
   module Resource
@@ -29,6 +34,10 @@ module Mailjet
           public_operations: public_operations,
           read_only: read_only)
       end
+
+      def self.default_headers
+        { accept: :json, accept_encoding: :deflate }
+      end
     end
 
     module ClassMethods
@@ -38,21 +47,25 @@ module Mailjet
 
       def all(params = {})
         params = format_params(params)
-        attribute_array = parse_api_json(connection.get(params: params))
+        attribute_array = parse_api_json(connection.get(default_headers.merge(params: params)))
         attribute_array.map{ |attributes| instanciate_from_api(attributes) }
       end
 
       def count
-        response_json = connection.get(params: {limit: 1, countrecords: 1})
+        response_json = connection.get(default_headers.merge(params: {limit: 1, countrecords: 1}))
         response_hash = ActiveSupport::JSON.decode(response_json)
         response_hash['Total']
       end
 
       def find(id)
-        attributes = parse_api_json(connection[id].get).first
+        attributes = parse_api_json(connection[id].get(default_headers)).first
         instanciate_from_api(attributes)
-      rescue RestClient::ResourceNotFound
-        nil
+      rescue Mailjet::ApiError => e
+        if e.code == 404
+          nil
+        else
+          raise e
+        end
       end
 
       def create(attributes = {})
@@ -63,7 +76,7 @@ module Mailjet
       end
 
       def delete(id)
-        connection[id].delete
+        connection[id].delete(default_headers)
       end
 
       def instanciate_from_api(attributes = {})
@@ -72,10 +85,40 @@ module Mailjet
 
       def parse_api_json(response_json)
         response_hash = ActiveSupport::JSON.decode(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.
+        response_hash = convert_dates_from(response_hash)
+        #
+        #
         response_data_array = response_hash['Data']
         response_data_array.map{ |response_data| underscore_keys(response_data) }
       end
 
+      # 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.
+      #We may have to change this in the future if ActiveSupport's JSON implementation changes
+      def convert_dates_from(data)
+        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})?))$/
+          begin
+            DateTime.parse(data)
+          rescue ArgumentError
+            data
+          end
+        when Array
+          data.map! { |d| convert_dates_from(d) }
+        when Hash
+          data.each do |key, value|
+            data[key] = convert_dates_from(value)
+          end
+        else
+          data
+        end
+      end
+
+
       def format_params(params)
         if params[:sort]
           params[:sort] = params[:sort].map do |attribute, direction|
@@ -116,9 +159,9 @@ module Mailjet
 
     def save
       if persisted?
-        response = connection[id].put(formatted_payload)
+        response = connection[id].put(formatted_payload, default_headers)
       else
-        response = connection.post(formatted_payload)
+        response = connection.post(formatted_payload, default_headers)
       end
 
       self.attributes = parse_api_json(response).first
@@ -156,6 +199,10 @@ module Mailjet
       self.class.connection
     end
 
+    def default_headers
+      self.class.default_headers
+    end
+
     def formatted_payload
       payload = attributes.reject { |k,v| v.blank? }
       payload = payload.slice(*properties)
@@ -178,6 +225,12 @@ module Mailjet
       self.class.parse_api_json(response_json)
     end
 
+    #my code!
+    def convert_dates_from(data)
+      self.class.convert_dates_from(data)
+    end
+    #end my code
+
     def method_missing(method_symbol, *arguments) #:nodoc:
       method_name = method_symbol.to_s
 

data/lib/mailjet/resources/apikey.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Apikey
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/apikey'
+    self.resource_path = 'v3/REST/apikey'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:api_key, :confirm_key, :custom_status, :is_active, :is_master, :key_type, :name, :user]
     self.properties = [:api_key, :created_at, :custom_status, :id, :inactive_reason, :is_active, :is_master, :name, :runlevel, :secret_key, :track_host, :user_id]
-    
+
   end
 end

data/lib/mailjet/resources/apikeyaccess.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Apikeyaccess
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/apikeyaccess'
+    self.resource_path = 'v3/REST/apikeyaccess'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:api_key, :is_active, :real_user, :sub_account, :token, :user]
     self.properties = [:allowed_access, :api_key, :created_at, :custom_name, :id, :is_active, :last_activity_at, :real_user, :subaccount, :user]
-    
+
   end
 end

data/lib/mailjet/resources/apikeytotals.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Apikeytotals
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/apikeytotals'
+    self.resource_path = 'v3/REST/apikeytotals'
     self.public_operations = [:get]
     self.filters = []
     self.properties = [:blocked_count, :bounced_count, :clicked_count, :delivered_count, :last_activity, :opened_count, :processed_count, :queued_count, :spamcomplaint_count, :unsubscribed_count]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/apitoken.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Apitoken
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/apitoken'
+    self.resource_path = 'v3/REST/apitoken'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:api_key, :catched_ip, :is_active, :is_api_key_active, :token]
     self.properties = [:allowed_access, :api_key, :catched_ip, :created_at, :first_used_at, :id, :is_active, :lang, :last_used_at, :sent_data, :timezone, :token, :token_type, :valid_for]
-    
+
   end
 end

data/lib/mailjet/resources/axtesting.rb

@@ -0,0 +1,12 @@
+require 'mailjet/resource'
+
+module Mailjet
+  class Axtesting
+    include Mailjet::Resource
+    self.resource_path = 'v3/REST/axtesting'
+    self.public_operations =  [:get, :put, :post, :delete]
+    self.filters = [:contacts_list, :is_deleted, :segmentation]
+    self.properties = [:contact_list_id, :contact_list_alt, :created_at, :deleted, :id, :mode, :name, :percentage, :remainder_at, :segmentation_id, :segmentation_alt, :starred, :start_at, :status, :status_code, :status_string, :winner_click_rate, :winner_id, :winner_method, :winner_open_rate, :winner_spam_rate, :winner_unsub_rate]
+
+  end
+end

data/lib/mailjet/resources/batchjob.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Batchjob
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/batchjob'
+    self.resource_path = 'v3/REST/batchjob'
     self.public_operations = [:get, :put, :post]
     self.filters = [:api_key, :data, :job_type, :max_job_end, :max_job_start, :max_request_at, :method, :min_job_end, :min_job_start, :min_request_at, :ref_id, :status]
     self.properties = [:alive_at, :api_key, :blocksize, :count, :current, :data, :errcount, :err_treshold, :id, :job_end, :job_start, :job_type, :method, :ref_id, :request_at, :status, :throttle]
-    
+
   end
 end

data/lib/mailjet/resources/bouncestatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Bouncestatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/bouncestatistics'
+    self.resource_path = 'v3/REST/bouncestatistics'
     self.public_operations = [:get]
     self.filters = [:campaign_id, :campaign_status, :contacts_list, :custom_campaign, :from, :from_domain, :from_id, :from_ts, :from_type, :is_deleted, :is_newsletter_tool, :is_starred, :message_status, :period, :to_ts]
     self.properties = [:bounced_at, :campaign, :contact, :id, :is_blocked, :is_state_permanent, :state]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/campaign.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Campaign
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/campaign'
+    self.resource_path = 'v3/REST/campaign'
     self.public_operations = [:get, :put]
     self.filters = [:campaign_id, :campaign_status, :contacts_list, :custom_campaign, :from, :from_domain, :from_id, :from_ts, :from_type, :is_deleted, :is_newsletter_tool, :is_starred, :period, :to_ts]
     self.properties = [:campaign_type, :click_tracked, :created_at, :custom_value, :first_message_id, :from, :from_email, :from_name, :has_html_count, :has_txt_count, :id, :is_deleted, :is_starred, :list, :news_letter_id, :open_tracked, :segmentation, :send_end_at, :send_start_at, :spamass_score, :status, :subject, :unsubscribe_tracked_count]
-    
+
   end
 end

data/lib/mailjet/resources/campaignstatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Campaignstatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/campaignstatistics'
+    self.resource_path = 'v3/REST/campaignstatistics'
     self.public_operations = [:get]
     self.filters = [:blocked, :bounced, :campaign_status, :click, :contacts_list, :from_type, :is_deleted, :is_starred, :last_activity_at, :max_last_activity_at, :min_last_activity_at, :news_letter, :open, :queued, :sender, :sent, :spam, :subject, :unsubscribed]
     self.properties = [:blocked_count, :bounced_count, :campaign, :clicked_count, :delivered_count, :last_activity_at, :news_letter, :opened_count, :processed_count, :queued_count, :spam_complaint_count, :unsubscribed_count]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/clickstatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Clickstatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/clickstatistics'
+    self.resource_path = 'v3/REST/clickstatistics'
     self.public_operations = [:get]
     self.filters = [:campaign_id, :campaign_status, :contacts_list, :custom_campaign, :from, :from_domain, :from_id, :from_ts, :from_type, :is_deleted, :is_newsletter_tool, :is_starred, :message_id, :message_status, :period, :to_ts]
     self.properties = [:clicked_at, :clicked_delay, :contact, :id, :message, :url, :user_agent]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/contact.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Contact
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/contact'
+    self.resource_path = 'v3/REST/contact'
     self.public_operations = [:get, :put, :post]
     self.filters = [:campaign, :contacts_list, :is_unsubscribed, :last_activity_at, :recipient, :status]
     self.properties = [:created_at, :delivered_count, :email, :id, :is_opt_in_pending, :is_spam_complaining, :last_activity_at, :last_update_at, :name, :unsubscribed_at, :unsubscribed_by]
-    
+
   end
 end

data/lib/mailjet/resources/contactdata.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Contactdata
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/contactdata'
+    self.resource_path = 'v3/REST/contactdata'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:campaign, :contacts_list, :fields, :is_unsubscribed, :last_activity_at, :recipient, :status]
     self.properties = [:contact_id, :data, :id]
-    
+
   end
 end

data/lib/mailjet/resources/contactfilter.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Contactfilter
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/contactfilter'
+    self.resource_path = 'v3/REST/contactfilter'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:show_deleted, :status]
     self.properties = [:description, :expression, :id, :name, :status]
-    
+
   end
 end

data/lib/mailjet/resources/contacthistorydata.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Contacthistorydata
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/contacthistorydata'
+    self.resource_path = 'v3/REST/contacthistorydata'
     self.public_operations = [:get, :post, :delete]
     self.filters = [:contact, :last, :max_created_at, :min_created_at, :name]
     self.properties = [:contact, :created_at, :data, :id, :name]
-    
+
   end
 end

data/lib/mailjet/resources/contactmetadata.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Contactmetadata
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/contactmetadata'
+    self.resource_path = 'v3/REST/contactmetadata'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:data_type, :namespace]
     self.properties = [:datatype, :id, :name, :name_space]
-    
+
   end
 end

data/lib/mailjet/resources/contactslist.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Contactslist
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/contactslist'
+    self.resource_path = 'v3/REST/contactslist'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:address, :exclude_id, :is_deleted, :name]
     self.properties = [:address, :created_at, :id, :is_deleted, :name, :subscriber_count]
-    
+
   end
 end

data/lib/mailjet/resources/contactslistsignup.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Contactslistsignup
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/contactslistsignup'
+    self.resource_path = 'v3/REST/contactslistsignup'
     self.public_operations = [:get]
     self.filters = [:api_key, :contact, :contacts_list, :domain, :email, :local_part, :max_confirm_at, :max_signup_at, :min_confirm_at, :min_signup_at, :source, :source_id]
     self.properties = [:confirm_at, :confirm_ip, :contact, :email, :id, :list, :recipient, :signup_at, :signup_ip, :signup_key, :source, :source_id]
-    
+
   end
 end

data/lib/mailjet/resources/contactstatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Contactstatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/contactstatistics'
+    self.resource_path = 'v3/REST/contactstatistics'
     self.public_operations = [:get]
     self.filters = [:blocked, :bounced, :click, :last_activity_at, :max_last_activity_at, :min_last_activity_at, :open, :queued, :sent, :spam, :unsubscribed]
     self.properties = [:blocked_count, :bounced_count, :clicked_count, :contact, :delivered_count, :last_activity_at, :opened_count, :processed_count, :queued_count, :spam_complaint_count, :unsubscribed_count]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/csvimport.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Csvimport
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/csvimport'
+    self.resource_path = 'v3/REST/csvimport'
     self.public_operations = [:get, :put, :post]
     self.filters = []
     self.properties = [: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/domainstatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Domainstatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/domainstatistics'
+    self.resource_path = 'v3/REST/domainstatistics'
     self.public_operations = [:get]
     self.filters = [:campaign_id, :campaign_status, :contacts_list, :custom_campaign, :from, :from_domain, :from_id, :from_ts, :from_type, :is_deleted, :is_newsletter_tool, :is_starred, :message_status, :period, :to_ts]
     self.properties = [:blocked_count, :bounced_count, :clicked_count, :delivered_count, :domain, :id, :opened_count, :processed_count, :queued_count, :spam_complaint_count, :unsubscribed_count]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/eventcallbackurl.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Eventcallbackurl
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/eventcallbackurl'
+    self.resource_path = 'v3/REST/eventcallbackurl'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:api_key, :backup, :event_type, :status, :version]
     self.properties = [:api_key, :event_type, :id, :is_backup, :status, :url, :version]
-    
+
   end
 end

data/lib/mailjet/resources/geostatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Geostatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/geostatistics'
+    self.resource_path = 'v3/REST/geostatistics'
     self.public_operations = [:get]
     self.filters = [:campaign_id, :campaign_status, :contacts_list, :custom_campaign, :from, :from_domain, :from_id, :from_ts, :from_type, :is_deleted, :is_newsletter_tool, :is_starred, :message_status, :period, :to_ts]
     self.properties = [:clicked_count, :country, :opened_count]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/graphstatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Graphstatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/graphstatistics'
+    self.resource_path = 'v3/REST/graphstatistics'
     self.public_operations = [:get]
     self.filters = [:campaign_id, :campaign_status, :contact, :contacts_list, :custom_campaign, :from, :from_domain, :from_id, :from_ts, :from_type, :is_deleted, :is_newsletter_tool, :is_starred, :message_status, :period, :scale, :to_ts]
     self.properties = [:blocked_count, :bounced_count, :clicked_count, :delivered_count, :opened_count, :processed_count, :queued_count, :ref_timestamp, :sendtime_start, :spamcomplaint_count, :unsubscribed_count]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/listrecipient.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Listrecipient
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/listrecipient'
+    self.resource_path = 'v3/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.properties = [:contact, :id, :is_active, :is_unsubscribed, :list, :unsubscribed_at]
-    
+    self.properties = [:contact, :id, :is_active, :is_unsubscribed, :list, :unsubscribed_at, :contact_id, :list_id, 'ContactID', 'ListID', 'ContactALT', 'ListALT']
+
   end
 end

data/lib/mailjet/resources/listrecipientstatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Listrecipientstatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/listrecipientstatistics'
+    self.resource_path = 'v3/REST/listrecipientstatistics'
     self.public_operations = [:get]
     self.filters = [:blocked, :bounced, :click, :contact, :contacts_list, :is_active, :is_unsubscribed, :last_activity_at, :max_last_activity_at, :max_unsubscribed_at, :min_last_activity_at, :min_unsubscribed_at, :open, :queued, :sent, :show_extra_data, :spam, :unsubscribed]
     self.properties = [:blocked_count, :bounced_count, :clicked_count, :data, :delivered_count, :last_activity_at, :list_recipient, :opened_count, :processed_count, :queued_count, :spam_complaint_count, :unsubscribed_count]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/liststatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Liststatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/liststatistics'
+    self.resource_path = 'v3/REST/liststatistics'
     self.public_operations = [:get]
     self.filters = [:address, :calc_active_unsub, :exclude_id, :is_deleted, :name]
     self.properties = [:active_count, :active_unsubscribed_count, :address, :blocked_count, :bounced_count, :clicked_count, :created_at, :delivered_count, :id, :is_deleted, :last_activity_at, :name, :opened_count, :spam_complaint_count, :subscriber_count, :unsubscribed_count]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/manycontacts.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Manycontacts
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/manycontacts'
+    self.resource_path = 'v3/REST/manycontacts'
     self.public_operations = [:post]
     self.filters = []
     self.properties = [:action, :addresses, :errors, :force, :list, :recipients]
-    
+
   end
 end

data/lib/mailjet/resources/message.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Message
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/message'
+    self.resource_path = 'v3/REST/message'
     self.public_operations = [:get]
     self.filters = [:campaign, :contact, :destination, :message_state, :plan_subscription, :sender]
     self.properties = [:arrived_at, :attachment_count, :attempt_count, :campaign, :contact, :delay, :destination, :filter_time, :from, :id, :is_click_tracked, :is_html_part_included, :is_open_tracked, :is_text_part_included, :is_unsub_tracked, :message_size, :spamassassin_score, :spamass_rules, :state, :state_permanent, :status]
-    
+
   end
 end

data/lib/mailjet/resources/messagehistory.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Messagehistory
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/messagehistory'
+    self.resource_path = 'v3/REST/messagehistory'
     self.public_operations = [:get]
     self.filters = [:message]
     self.properties = [:event_at, :event_type, :useragent]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/messageinformation.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Messageinformation
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/messageinformation'
+    self.resource_path = 'v3/REST/messageinformation'
     self.public_operations = [:get]
     self.filters = [:campaign_id, :campaign_status, :contacts_list, :custom_campaign, :from, :from_domain, :from_id, :from_ts, :from_type, :is_deleted, :is_newsletter_tool, :is_starred, :message_status, :period, :to_ts]
     self.properties = [:campaign, :click_tracked_count, :contact, :created_at, :id, :message_size, :open_tracked_count, :queued_count, :send_end_at, :sent_count, :spam_assassin_rules, :spam_assassin_score]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/messagesentstatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Messagesentstatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/messagesentstatistics'
+    self.resource_path = 'v3/REST/messagesentstatistics'
     self.public_operations = [:get]
     self.filters = [:all_messages, :campaign_id, :campaign_status, :contact, :contacts_list, :custom_campaign, :from, :from_domain, :from_id, :from_ts, :from_type, :is_deleted, :is_newsletter_tool, :is_starred, :message_status, :period, :to_ts]
     self.properties = [:arrival_ts, :blocked, :bounce, :campaign, :click, :cnt_recipients, :contact, :message_id, :open, :queued, :sent, :spam, :state, :state_permanent, :status]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/messagestate.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Messagestate
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/messagestate'
+    self.resource_path = 'v3/REST/messagestate'
     self.public_operations = [:get]
     self.filters = []
     self.properties = [:id, :related_to, :state]
-    
+
   end
 end

data/lib/mailjet/resources/messagestatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Messagestatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/messagestatistics'
+    self.resource_path = 'v3/REST/messagestatistics'
     self.public_operations = [:get]
     self.filters = [:campaign_id, :campaign_status, :contact_email, :contact_id, :custom_campaign, :from, :from_domain, :from_id, :from_ts, :from_type, :is_deleted, :is_newsletter_tool, :is_starred, :message_status, :period, :to_ts]
     self.properties = [:average_click_delay, :average_clicked_count, :average_open_delay, :average_opened_count, :blocked_count, :bounced_count, :campaign_count, :clicked_count, :delivered_count, :opened_count, :processed_count, :queued_count, :spam_complaint_count, :transactional_count, :unsubscribed_count]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/metadata.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Metadata
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/metadata'
+    self.resource_path = 'v3/REST/metadata'
     self.public_operations = [:get]
     self.filters = [:public_resources, :read_only_resources, :resource_name]
     self.properties = [:description, :filters, :is_read_only, :name, :private_operations, :properties, :public_operations, :sort_info, :unique_key]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/metasender.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Metasender
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/metasender'
+    self.resource_path = 'v3/REST/metasender'
     self.public_operations = [:get, :put, :post]
     self.filters = [:dns, :user]
     self.properties = [:created_at, :description, :email, :filename, :id, :is_enabled]
-    
+
   end
 end

data/lib/mailjet/resources/myprofile.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Myprofile
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/myprofile'
+    self.resource_path = 'v3/REST/myprofile'
     self.public_operations = [:get, :put]
     self.filters = [:user]
     self.properties = [:address_city, :address_country, :address_postal_code, :address_street, :billing_email, :birthday_at, :company_name, :contact_phone, :estimated_volume, :features, :firstname, :id, :industry, :lastname, :user, :vat, :vat_number, :website]
-    
+
   end
 end

data/lib/mailjet/resources/newsletter.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Newsletter
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/newsletter'
+    self.resource_path = 'v3/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.properties = [: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]
-    
+
   end
 end

data/lib/mailjet/resources/newsletterblock.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Newsletterblock
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/newsletterblock'
+    self.resource_path = 'v3/REST/newsletterblock'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:news_letter]
     self.properties = [:align, :alt, :block_type, :color, :content, :filename, :fontfamily, :fontsize, :id, :line, :link, :news_letter, :pos, :siblings, :src_height, :src_width, :url, :width]
-    
+
   end
 end

data/lib/mailjet/resources/newsletterproperties.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Newsletterproperties
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/newsletterproperties'
+    self.resource_path = 'v3/REST/newsletterproperties'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:news_letter]
     self.properties = [:id, :name, :news_letter, :property_name, :selector, :value]
-    
+
   end
 end

data/lib/mailjet/resources/newslettertemplate.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Newslettertemplate
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/newslettertemplate'
+    self.resource_path = 'v3/REST/newslettertemplate'
     self.public_operations = [:get, :put, :post]
     self.filters = [:is_public, :news_letter_template_category]
     self.properties = [:category, :created_at, :footer, :footer_address, :footer_wysiwyg_type, :header_filename, :header_link, :header_text, :header_url, :id, :locale, :name, :permalink, :permalink_wysiwyg_type, :source_news_letter_id, :status]
-    
+
   end
 end

data/lib/mailjet/resources/newslettertemplateblock.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Newslettertemplateblock
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/newslettertemplateblock'
+    self.resource_path = 'v3/REST/newslettertemplateblock'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:news_letter_template]
     self.properties = [:align, :alt, :block_type, :color, :content, :filename, :fontfamily, :fontsize, :id, :line, :link, :pos, :siblings, :src_height, :src_width, :template, :url, :width]
-    
+
   end
 end

data/lib/mailjet/resources/newslettertemplatecategory.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Newslettertemplatecategory
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/newslettertemplatecategory'
+    self.resource_path = 'v3/REST/newslettertemplatecategory'
     self.public_operations = [:get]
     self.filters = [:locale]
     self.properties = [:description, :id, :locale, :parent_category, :value]
-    
+
   end
 end

data/lib/mailjet/resources/newslettertemplateproperties.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Newslettertemplateproperties
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/newslettertemplateproperties'
+    self.resource_path = 'v3/REST/newslettertemplateproperties'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:news_letter_template]
     self.properties = [:id, :name, :property_name, :selector, :template, :value]
-    
+
   end
 end

data/lib/mailjet/resources/openinformation.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Openinformation
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/openinformation'
+    self.resource_path = 'v3/REST/openinformation'
     self.public_operations = [:get]
     self.filters = [:campaign_id, :campaign_status, :contacts_list, :custom_campaign, :from, :from_domain, :from_id, :from_ts, :from_type, :is_deleted, :is_newsletter_tool, :is_starred, :message_status, :period, :to_ts]
     self.properties = [:arrived_at, :campaign, :contact, :id, :message_id, :opened_at, :user_agent, :user_agent_full]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/openstatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Openstatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/openstatistics'
+    self.resource_path = 'v3/REST/openstatistics'
     self.public_operations = [:get]
     self.filters = [:campaign_id, :campaign_status, :contacts_list, :custom_campaign, :from, :from_domain, :from_id, :from_ts, :from_type, :is_deleted, :is_newsletter_tool, :is_starred, :message_status, :period, :to_ts]
     self.properties = [:opened_count, :opened_delay, :processed_count]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/parseroute.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Parseroute
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/parseroute'
+    self.resource_path = 'v3/REST/parseroute'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:api_key]
     self.properties = [:api_key, :email, :id, :url]
-    
+
   end
 end

data/lib/mailjet/resources/preferences.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Preferences
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/preferences'
+    self.resource_path = 'v3/REST/preferences'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:user]
     self.properties = [:id, :key, :user, :value]
-    
+
   end
 end

data/lib/mailjet/resources/sender.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Sender
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/sender'
+    self.resource_path = 'v3/REST/sender'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:confirm_key, :domain, :email, :local_part, :show_deleted, :status]
     self.properties = [:confirm_key, :created_at, :dns, :email, :email_type, :filename, :id, :is_default_sender, :name, :status]
-    
+
   end
 end

data/lib/mailjet/resources/senderstatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Senderstatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/senderstatistics'
+    self.resource_path = 'v3/REST/senderstatistics'
     self.public_operations = [:get]
     self.filters = [:domain, :email, :sender]
     self.properties = [:blocked_count, :bounced_count, :clicked_count, :delivered_count, :last_activity_at, :opened_count, :processed_count, :queued_count, :sender, :spam_complaint_count, :unsubscribed_count]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/toplinkclicked.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Toplinkclicked
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/toplinkclicked'
+    self.resource_path = 'v3/REST/toplinkclicked'
     self.public_operations = [:get]
     self.filters = [:campaign_id, :campaign_status, :contact, :contacts_list, :custom_campaign, :from, :from_domain, :from_id, :from_ts, :from_type, :is_deleted, :is_newsletter_tool, :is_starred, :message, :period, :to_ts]
     self.properties = [:clicked_count, :id, :link_id, :url]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/trigger.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Trigger
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/trigger'
+    self.resource_path = 'v3/REST/trigger'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:event, :min_added_ts]
     self.properties = [:added_ts, :api_key, :details, :event, :id, :user]
-    
+
   end
 end

data/lib/mailjet/resources/user.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class User
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/user'
+    self.resource_path = 'v3/REST/user'
     self.public_operations = [:get, :put]
     self.filters = [:is_activated, :new_email, :user_name]
     self.properties = [:created_at, :email, :id, :is_rules_accepted, :last_ip, :last_login_at, :locale, :max_allowed_api_keys, :timezone, :username, :warned_ratelimit_at]
-    
+
   end
 end

data/lib/mailjet/resources/useragentstatistics.rb

@@ -3,12 +3,12 @@ require 'mailjet/resource'
 module Mailjet
   class Useragentstatistics
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/useragentstatistics'
+    self.resource_path = 'v3/REST/useragentstatistics'
     self.public_operations = [:get]
     self.filters = [:campaign_id, :campaign_status, :contacts_list, :custom_campaign, :event, :exclude_platform, :from, :from_domain, :from_id, :from_ts, :from_type, :is_deleted, :is_newsletter_tool, :is_starred, :period, :platform, :to_ts]
     self.properties = [:count, :distinct_count, :platform, :user_agent]
-    
+
     self.read_only = true
-    
+
   end
 end

data/lib/mailjet/resources/widget.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Widget
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/widget'
+    self.resource_path = 'v3/REST/widget'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:active, :api_key, :contacts_list, :locale, :message_template, :sender]
     self.properties = [:created_at, :from, :id, :is_active, :list, :locale, :name, :replyto, :sendername, :subject, :template]
-    
+
   end
 end

data/lib/mailjet/resources/widgetcustomvalue.rb

@@ -3,10 +3,10 @@ require 'mailjet/resource'
 module Mailjet
   class Widgetcustomvalue
     include Mailjet::Resource
-    self.resource_path = '/v3/REST/widgetcustomvalue'
+    self.resource_path = 'v3/REST/widgetcustomvalue'
     self.public_operations = [:get, :put, :post, :delete]
     self.filters = [:name, :widget]
     self.properties = [:api_key, :display, :id, :name, :value, :widget]
-    
+
   end
 end

data/lib/mailjet/version.rb

@@ -1,3 +1,3 @@
 module Mailjet
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailjet
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jean-Baptiste Escoyez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -236,6 +236,48 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Cloud Emailing for easy delivery.
 email:
 - jbescoyez@gmail.com
@@ -262,6 +304,7 @@ files:
 - lib/mailjet/resources/apikeyaccess.rb
 - lib/mailjet/resources/apikeytotals.rb
 - lib/mailjet/resources/apitoken.rb
+- lib/mailjet/resources/axtesting.rb
 - lib/mailjet/resources/batchjob.rb
 - lib/mailjet/resources/bouncestatistics.rb
 - lib/mailjet/resources/campaign.rb
@@ -332,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Cloud Emailing for easy delivery.