mailjet 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb1ce2581817f7b85441380db47981af7390546d5e564e940339c39cddce0895
-  data.tar.gz: e67d8f4286a6598bff41d1cd634f0d04fd7520735e1611ec34d4f4a63e462472
+  metadata.gz: bfee84cc597efea5f25e0a7698c37491da287b01283a45719e6d53a7650714db
+  data.tar.gz: bdc076e42432663e56783b4caef82eb558921f993f12ee681cad59740f217954
 SHA512:
-  metadata.gz: abd06e818dbf2d6d5e1c2a5726427ff0c60620723c9598c4ffd3475c54caffb1c09cf81390428154e3b6e56b46aa3088cc92524b826cf7615774ddac8f488425
-  data.tar.gz: d9f56591b07747f7d997ffd01f76b16942521213bebd6087f064b595d1ae42f2064438585ea64835f8550d443eecc1e92b31eac545777b2bae2efde1fe0246c3
+  metadata.gz: 7c10c72fd4adf737b4e80c73b1c2c18daf7a0e0490426041abfbcaf3c918c29d72098a1114941d027e2befdcb77297691941a2f11c16e1372dd9037f9a163eab
+  data.tar.gz: ac4d539fcb23e3496d232fc51cfdf24170142b48b87ee0c448bd6457cda985e6f8635c38b6252aea87782fdb93363363030e247c9c24eb2d14a8caf7d64caff0

data/Rakefile

@@ -1,7 +1,9 @@
 require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = [
+    "spec/mailjet/rack/endpoint_spec.rb",
     "spec/mailjet/api_error_spec.rb",
     "spec/mailjet/apikey_spec.rb",
     "spec/mailjet/mailer_spec.rb",
@@ -16,6 +18,8 @@ RSpec::Core::RakeTask.new(:spec) do |t|
     "spec/resources/integration_spec.rb",
     "spec/resources/newsletter_spec.rb",
     "spec/resources/statcounters_spec.rb",
+    "spec/resources/send_spec.rb",
+    "spec/resources/resource_spec.rb",
   ]
 end
 

data/lib/mailjet/configuration.rb

@@ -1,8 +1,60 @@
-require 'active_support/core_ext/module/attribute_accessors'
-
 module Mailjet
   module Configuration
-    mattr_accessor :api_key, :secret_key, :default_from
+    def self.api_key
+      @api_key
+    end
+
+    def self.api_key=(api_key)
+      @api_key = api_key
+    end
+
+    def self.secret_key
+      @secret_key
+    end
+
+    def self.secret_key=(secret_key)
+      @secret_key = secret_key
+    end
+
+    def self.default_from
+      @default_from
+    end
+
+    def self.default_from=(default_from)
+      @default_from = default_from
+    end
+
+    def self.api_version
+      @api_version
+    end
+
+    def self.api_version=(api_version)
+      @api_version = api_version
+    end
+
+    def self.sandbox_mode
+      @sandbox_mode
+    end
+
+    def self.sandbox_mode=(sandbox_mode)
+      @sandbox_mode = sandbox_mode
+    end
+
+    def self.end_point
+      @end_point
+    end
+
+    def self.end_point=(end_point)
+      @end_point = end_point
+    end
+
+    def self.perform_api_call
+      @perform_api_call
+    end
+
+    def self.perform_api_call=(perform_api_call)
+      @perform_api_call = perform_api_call
+    end
 
     DEFAULT = {
       api_version: 'v3',
@@ -12,7 +64,6 @@ module Mailjet
     }
 
     DEFAULT.each do |param, default_value|
-      mattr_accessor param
       self.send("#{param}=", default_value)
     end
   end

data/lib/mailjet/connection.rb

@@ -1,6 +1,5 @@
 require 'rest_client'
 require 'mailjet/gem_extensions/rest_client'
-require 'active_support/core_ext/module/delegation'
 require 'json'
 
 module Mailjet
@@ -9,8 +8,6 @@ module Mailjet
     attr_accessor :adapter, :public_operations, :read_only, :perform_api_call, :read_timeout, :open_timeout
     alias :read_only? :read_only
 
-    delegate :options, :concat_urls, :url, to: :adapter
-
     def [](suburl, &new_block)
       broken_url = url.split("/")
       if broken_url.include?("contactslist") && broken_url.include?("managemanycontacts") && broken_url.last.to_i > 0
@@ -58,6 +55,18 @@ module Mailjet
       handle_api_call(:delete, additional_headers, &block)
     end
 
+    def options
+      self.adapter.options
+    end
+
+    def concat_urls(*options)
+      self.adapter.concat_urls(*options)
+    end
+
+    def url
+      self.adapter.url
+    end
+
     private
 
     def handle_api_call(method, additional_headers = {}, payload = {}, &block)

data/lib/mailjet/rack/endpoint.rb

@@ -1,6 +1,5 @@
-require 'active_support'
 require 'rack/request'
-
+require 'json'
 
 module Mailjet
   module Rack
@@ -13,7 +12,7 @@ module Mailjet
 
       def call(env)
         if env['PATH_INFO'] == @path && (content = env['rack.input'].read)
-          @block.call(ActiveSupport::JSON.decode(content))
+          @block.call(JSON.parse(content))
           [200, { 'Content-Type' => 'text/html', 'Content-Length' => '0' }, []]
         else
           @app.call(env)

data/lib/mailjet/resource.rb

@@ -1,11 +1,7 @@
 require 'mailjet/connection'
-require 'active_support/hash_with_indifferent_access'
-require 'active_support/core_ext/class'
-require 'active_support/core_ext/hash'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/module/delegation'
-require 'active_support/concern'
-require 'active_support/json/decoding'
+require 'active_support/hash_with_indifferent_access'
 #require 'mail'
 require 'json'
 
@@ -18,40 +14,42 @@ 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, :read_timeout, :open_timeout]
 
     NON_JSON_URLS = ['v3/send/message'] # urls that don't accept JSON input
 
-    included do
-      cattr_accessor :resource_path, :public_operations, :read_only, :filters, :resourceprop, :action, :non_json_urls, :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, :action, :non_json_urls, :version
+        cattr_writer :connection
 
-      def self.connection(options = {})
-        class_variable_get(:@@connection) || default_connection(options)
-      end
+        def self.connection(options = {})
+          class_variable_get(:@@connection) || default_connection(options)
+        end
 
-      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],
-          open_timeout: options[:open_timeout],
-          read_timeout: options[:read_timeout])
-      end
+        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],
+            open_timeout: options[:open_timeout],
+            read_timeout: options[:read_timeout])
+        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_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
+          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
 
@@ -71,7 +69,7 @@ module Mailjet
       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_hash = JSON.parse(response_json)
         response_hash['Total']
       end
 
@@ -131,7 +129,7 @@ module Mailjet
       end
 
       def parse_api_json(response_json)
-        response_hash = ActiveSupport::JSON.decode(response_json)
+        response_hash = JSON.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.
@@ -258,7 +256,7 @@ 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)
+          JSON.parse(response)
         else
           parse_api_json(response).first
         end
@@ -322,7 +320,9 @@ module Mailjet
       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

data/lib/mailjet/resources/campaigndraft_detailcontent.rb

@@ -7,5 +7,21 @@ module Mailjet
     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/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/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/version.rb

@@ -1,3 +1,3 @@
 module Mailjet
-  VERSION = "1.6.0"
+  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,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mailjet
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Tyler Nappy
 - Jean-Baptiste Escoyez
 - Aurélien AMILIN
 - Benoit Bénézech
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -290,12 +290,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+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
   maximum insight and deliverability results from both their marketing and transactional
   emails. Our analytics tools and intelligent APIs give senders the best understanding
   of how to maximize benefits for each individual contact, with each email sent.
 test_files: []
-...