mailjet 1.7.8 → 1.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa7ab8289156e4e9277f016b2e75195de319fcdfc772e3f3de7c1b227ab52a48
-  data.tar.gz: 30de5a68c95d2dbfe3474fa3cb9d01e1b897dcea43cba3ea02acdf5c7741cfc4
+  metadata.gz: a012dee3be1fc91064fb9295b7fe8b5a5b95785ccdd309b316ef36b38015b8ed
+  data.tar.gz: 0e178063bcafbe5fc50630d0571821b0088dd85c05f8461eb0fecd64f3ab9855
 SHA512:
-  metadata.gz: f9b4217fd1bccc44eb887e14532f5f1c8036bafc98d714743d22deac6e25fa3213d9dd8164e34a4fa3165a6b42a0503790d7d04cb3eafc0862788e2392c6ef27
-  data.tar.gz: '08ac1f8b54f6b5e34bbd6b1bd45af8a8bcb10714a1e488ce7a9b648b309d468aaba3dd9ac6a101994e6fc5ae65d8a97957603156848c0eba12c12a1b352e2d0e'
+  metadata.gz: f97b0f87b954c4d44496138a3dc278f662de15bba33b4a3975abc227a3b1ff91e75c1bb7fa56361f1bcc3ff2aa9d22918e8e127bfbec23a26c271268b7046aa5
+  data.tar.gz: cefc2978569f6082de806bdc60b2d7ae86eb646ab2c9070d1c503a9da24992066bec53bf4eed1f9ba7f980ace1a2b4ff476935a72c11b3c676abacb220d687e0

data/lib/mailjet/connection.rb

@@ -1,5 +1,5 @@
 require 'rest_client'
-require 'yajl/json_gem'
+require 'yajl'
 
 module Mailjet
   class Connection
@@ -69,7 +69,7 @@ module Mailjet
     private
 
     def handle_api_call(method, additional_headers = {}, payload = {}, &block)
-      formatted_payload = (additional_headers[:content_type] == :json) ? payload.to_json : payload
+      formatted_payload = (additional_headers[:content_type] == :json) ? Yajl::Encoder.encode(payload) : payload
       raise Mailjet::MethodNotAllowed unless method_allowed(method)
 
       if self.perform_api_call
@@ -79,7 +79,7 @@ module Mailjet
           @adapter.send(method, formatted_payload, additional_headers, &block)
         end
       else
-        return {'Count' => 0, 'Data' => [mock_api_call: true], 'Total' => 0}.to_json
+        return Yajl::Encoder.encode({'Count' => 0, 'Data' => [mock_api_call: true], 'Total' => 0})
       end
     rescue RestClient::Exception => e
       handle_exception(e, additional_headers, formatted_payload)
@@ -94,7 +94,7 @@ module Mailjet
       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
+      formatted_payload = (additional_headers[:content_type] == :json) ? Yajl::Parser.parse(payload) : payload
       params = params.merge!(formatted_payload) if formatted_payload.is_a?(Hash)
 
       http_body = if e.http_headers[:content_type].include?("application/json")
@@ -128,7 +128,7 @@ module Mailjet
       return false unless url.include?('v3.1/send')
       return unless error_http_body
 
-      parsed_body = JSON.parse(error_http_body)
+      parsed_body = Yajl::Parser.parse(error_http_body)
       error_message = parsed_body.dig('Messages')&.first&.dig('Errors')&.first&.dig('ErrorMessage') || []
       error_message.include?('is an invalid email address.')
     rescue

data/lib/mailjet/exception/errors.rb

@@ -1,4 +1,5 @@
-require 'yajl/json_gem'
+require 'yajl'
+require 'json'
 
 module Mailjet
   class Error < StandardError
@@ -54,7 +55,7 @@ module Mailjet
               end
 
       api_message = begin
-        JSON.parse(response.body)['ErrorMessage']
+        Yajl::Parser.parse(response.body)['ErrorMessage']
       rescue Yajl::ParseError
         response.body
       rescue NoMethodError

data/lib/mailjet/mailer.rb

@@ -1,7 +1,7 @@
 require 'action_mailer'
 require 'mail'
 require 'base64'
-require 'yajl/json_gem'
+require 'yajl'
 
 
 # Mailjet::Mailer enables to send a Mail::Message via Mailjet SMTP relay servers

data/lib/mailjet/rack/endpoint.rb

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

data/lib/mailjet/resource.rb

@@ -1,5 +1,5 @@
 require 'mailjet/connection'
-require 'yajl/json_gem'
+require 'yajl'
 require 'active_support'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/hash/indifferent_access'
@@ -78,7 +78,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 = JSON.parse(response_json)
+        response_hash = Yajl::Parser.parse(response_json)
         response_hash['Total']
       rescue Mailjet::ApiError => error
         raise error
@@ -140,7 +140,7 @@ module Mailjet
         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 = Yajl::Parser.parse(connection(opts).post(binary_data, default_headers))
         response_hash['ID'] ? response_hash['ID'] : response_hash
       end
 
@@ -157,7 +157,7 @@ module Mailjet
       end
 
       def parse_api_json(response_json)
-        response_hash = JSON.parse(response_json)
+        response_hash = Yajl::Parser.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.
@@ -284,7 +284,7 @@ module Mailjet
       if opts[:perform_api_call] && !persisted?
         # get attributes only for entity creation
         self.attributes = if self.resource_path == 'send'
-          JSON.parse(response)
+          Yajl::Parser.parse(response)
         else
           parse_api_json(response).first
         end

data/lib/mailjet/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mailjet
 version: !ruby/object:Gem::Version
-  version: 1.7.8
+  version: 1.7.10
 platform: ruby
 authors:
 - Tyler Nappy
 - Jean-Baptiste Escoyez
 - Aurélien AMILIN
 - Benoit Bénézech
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -97,6 +97,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  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
@@ -292,11 +306,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.21
+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: []
+...