mailjet 1.5.3 → 1.7.0

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))
+
+      raw_data.map do |entity|
+        instanciate_from_api(entity)
+      end
+    rescue Mailjet::ApiError => 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_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))
+
+      raw_data.map do |entity|
+        instanciate_from_api(entity)
+      end
+    rescue Mailjet::ApiError => e
+      if e.code == 404
+        nil
+      else
+        raise e
+      end
+    end
   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))
+
+      raw_data.map do |entity|
+        instanciate_from_api(entity)
+      end
+    rescue Mailjet::ApiError => 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))
+
+      raw_data.map do |entity|
+        instanciate_from_api(entity)
+      end
+    rescue Mailjet::ApiError => 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))
+
+      raw_data.map do |entity|
+        instanciate_from_api(entity)
+      end
+    rescue Mailjet::ApiError => e
+      if e.code == 404
+        nil
+      else
+        raise e
+      end
+    end
+
   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/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).first
+
+      instanciate_from_api(attributes)
+    rescue Mailjet::ApiError => 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.3"
+  VERSION = "1.7.0"
 end

data/lib/mailjet.rb

@@ -1,4 +1,4 @@
-require 'active_support'
+require 'json/ext'
 require 'ostruct'
 require 'mailjet/core_extensions/ostruct'
 require 'mailjet/configuration'
@@ -21,7 +21,7 @@ module Mailjet
   end
 end
 
-if defined?(ActionMailer)
+ActiveSupport.on_load(:action_mailer) do
   require 'action_mailer/version'
   require 'mailjet/mailer' if ActionMailer::Base.respond_to?(:add_delivery_method)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailjet
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Tyler Nappy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
@@ -69,62 +69,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.9
-- !ruby/object:Gem::Dependency
-  name: minitest
-  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: minitest-matchers
-  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: minitest-spec-context
-  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: turn
-  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -153,20 +97,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  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: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -195,34 +125,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  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: guard-minitest
-  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
   requirement: !ruby/object:Gem::Requirement
@@ -237,20 +139,6 @@ dependencies:
     - - ">="
       - !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
@@ -277,6 +165,8 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- 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
@@ -362,6 +252,7 @@ files:
 - lib/mailjet/resources/sender.rb
 - lib/mailjet/resources/sender_validate.rb
 - lib/mailjet/resources/senderstatistics.rb
+- lib/mailjet/resources/statcounters.rb
 - lib/mailjet/resources/template.rb
 - lib/mailjet/resources/template_detailcontent.rb
 - lib/mailjet/resources/toplinkclicked.rb
@@ -374,7 +265,17 @@ files:
 homepage: http://www.mailjet.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message: |2+
+
+    The Ruby wrapper for Mailjet has just been installed successfully, congrats!
+    Maybe you want to configure your credentials to use your account.
+    All informations available on https://github.com/mailjet/mailjet-gem.
+    But if you are using Rails, you'll be glad to generate it easily using:
+
+      $ rails generate mailjet:initializer
+
+    We hope you will enjoy Mailjet!
+
 rdoc_options: []
 require_paths:
 - lib
@@ -382,15 +283,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Mailjet a powerful all-in-one email service provider clients can use to get