mailjet 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfee84cc597efea5f25e0a7698c37491da287b01283a45719e6d53a7650714db
-  data.tar.gz: bdc076e42432663e56783b4caef82eb558921f993f12ee681cad59740f217954
+  metadata.gz: bc1910e3eb07e5791f26146c52c3dd87740cf3cb49dc3a9689294377dd6c511c
+  data.tar.gz: df6a8b03c02ff54e62489fd41803d738dfbbee3daeb3899b173be17bbc3c64fb
 SHA512:
-  metadata.gz: 7c10c72fd4adf737b4e80c73b1c2c18daf7a0e0490426041abfbcaf3c918c29d72098a1114941d027e2befdcb77297691941a2f11c16e1372dd9037f9a163eab
-  data.tar.gz: ac4d539fcb23e3496d232fc51cfdf24170142b48b87ee0c448bd6457cda985e6f8635c38b6252aea87782fdb93363363030e247c9c24eb2d14a8caf7d64caff0
+  metadata.gz: a041287e3f47313fb2b433ecbf2431c48a58bc45b59e6bf91ac0ac83d69ff0568ec3480bc98deff2c62fa15ef7ca5e18722171574717852db51df941c25db820
+  data.tar.gz: 7ccac7db9d9f6f5f6d83d3c28fdcfefbfee174055d5e9e9916274b5cfba9f5df0766e94c67c9207938e070d1fde1b21d6252d67de041f9f86ccb65f7b14cecda

data/lib/mailjet/connection.rb

@@ -96,13 +96,26 @@ module Mailjet
       formatted_payload = (additional_headers[:content_type] == :json) ? JSON.parse(payload) : payload
       params = params.merge(formatted_payload)
 
-      http_body = if e.http_headers[:content_type] == "application/json"
+      http_body = if e.http_headers[:content_type].include?("application/json")
         e.http_body
       else
         "{}"
       end
 
-      raise Mailjet::ApiError.new(e.http_code, http_body, @adapter, @adapter.url, params)
+      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)
+      end
+    end
+
+    def sent_invalid_email?(error_http_body, url)
+      return false unless url.include?('v3.1/send')
+      return unless error_http_body
+
+      parsed_body = JSON.parse(error_http_body)
+      error_message = parsed_body['Messages']&.first&.dig('Errors')&.first&.dig('ErrorMessage')
+      error_message.include?('is an invalid email address.')
     end
 
   end

data/lib/mailjet/resource.rb

@@ -1,8 +1,10 @@
 require 'mailjet/connection'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/module/delegation'
-require 'active_support/hash_with_indifferent_access'
 #require 'mail'
+require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/hash'
+require 'active_support/json/decoding'
 require 'json'
 
 
@@ -23,7 +25,7 @@ module Mailjet
     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_accessor :resource_path, :public_operations, :read_only, :filters, :resourceprop, :read_only_attributes, :action, :non_json_urls, :version
         cattr_writer :connection
 
         def self.connection(options = {})
@@ -316,6 +318,7 @@ module Mailjet
       payload = attributes.reject { |k,v| v.blank? }
       if persisted?
         payload = payload.slice(*resourceprop.map(&:to_s))
+          .except(*read_only_attributes.map(&:to_s))
       end
       payload = camelcase_keys(payload)
       payload.tap { |hs| hs.delete("Persisted") }

data/lib/mailjet/resources/contact.rb

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

data/lib/mailjet/resources/statistics_linkclick.rb

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

data/lib/mailjet/version.rb

@@ -1,3 +1,3 @@
 module Mailjet
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailjet
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Tyler Nappy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -253,6 +253,7 @@ files:
 - lib/mailjet/resources/sender_validate.rb
 - lib/mailjet/resources/senderstatistics.rb
 - lib/mailjet/resources/statcounters.rb
+- lib/mailjet/resources/statistics_linkclick.rb
 - lib/mailjet/resources/template.rb
 - lib/mailjet/resources/template_detailcontent.rb
 - lib/mailjet/resources/toplinkclicked.rb