mailpace-rails 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7357c468655883089e9d6d028387cd78a5b5499c3277ea5581837f3255ac192
-  data.tar.gz: c70e63597707b4811523a427efe95a48417a75f93b8c25443a1d0731f09dd260
+  metadata.gz: c31f68a3d8b609aae9c7b86a5012a3c681f8309e4e8a4e71c1c79149efd4cb7e
+  data.tar.gz: 4df6d4972fc3b231dd7db9093b249759a55279e254499cfa8a2e7224905c2497
 SHA512:
-  metadata.gz: 8c88ded5300cd4a9a7538f31a7b98a72d714b112469d96a628cbb160643c176a4ec543fbc52e7dd41a450ab3ea6edccd84be333a8480edd0f9e9f3588dcd1ba4
-  data.tar.gz: d691dbb4676db53f50d835e1fd993a88e2b1e838f20b06156b1dfbbefb95a2be2e0e88517581c611abde47e9f7ddc1142158381ddf1c61d728b53f337aa876dd
+  metadata.gz: 9c1711d716265352e54655562c3ecc0c53972c30e5123e648cc1cba7a63be36c0358fbfe922aecb179944e33cbac5ac2a29e0c47e3870909dfad96ca927eb979
+  data.tar.gz: 3f897e1309b778bcf0356a86df2baeb1bb52395c53749698d63004fdd94168c7238ed1519806577e35283e877bf1f3a63963060e61582239a26eda18c0f2ba6c

data/README.md

@@ -2,12 +2,14 @@
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT)
 [![Gem Version](https://badge.fury.io/rb/mailpace-rails.svg)](https://badge.fury.io/rb/mailpace-rails)
-[![MailPace Rails](https://circleci.com/gh/mailpace/mailpace-rails.svg?style=svg)](https://app.circleci.com/pipelines/github/mailpace/mailpace-rails)
+[![CI](https://github.com/mailpace/mailpace-rails/actions/workflows/ci.yml/badge.svg)](https://github.com/mailpace/mailpace-rails/actions/workflows/ci.yml)
 
 [MailPace](https://mailpace.com) lets you send transactional emails from your app over an easy to use API.
 
 The MailPace Rails Gem is a plug in for ActionMailer to send emails via [MailPace](https://mailpace.com) to make sending emails from Rails apps super simple.
 
+> **New in 0.5.0: The `httparty` dependency has been removed — requests now use Ruby's built-in `Net::HTTP`, and the delivery response stays backward compatible**
+
 > **New in 0.4.0: [Idempotent Requests](https://docs.mailpace.com/guide/idempotency/), Improved Error Handling, InReplyTo and References support**
 
 > **New in 0.3.0: The ability to consume [inbound emails](https://docs.mailpace.com/guide/inbound/) from MailPace via ActionMailbox**

data/lib/mailpace-rails/engine.rb

@@ -4,7 +4,9 @@ module Mailpace
   # Provides the delivery method & sets up action mailbox
   class Engine < ::Rails::Engine
     initializer 'mailpace.add_delivery_method', before: 'action_mailer.set_configs' do
-      ActionMailer::Base.add_delivery_method(:mailpace, Mailpace::DeliveryMethod)
+      ActiveSupport.on_load(:action_mailer) do
+        add_delivery_method(:mailpace, Mailpace::DeliveryMethod)
+      end
     end
 
     config.action_mailbox.mailpace = ActiveSupport::OrderedOptions.new

data/lib/mailpace-rails/response.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require 'delegate'
+require 'json'
+require 'net/http'
+
+module Mailpace
+  # The value returned by Mailpace::DeliveryMethod#deliver!.
+  #
+  # Because the delivery method sets `return_response: true`, Mail hands this
+  # object back from `mail.deliver!` / `deliver_now!`. It mirrors the public
+  # interface of the HTTParty::Response this gem used to return, so that
+  # removing the httparty dependency does not change what callers can do with
+  # the result: `res['id']`, `res.parsed_response`, `res.code`, `res.body`,
+  # `res.headers` and the `*?` status helpers all keep working.
+  #
+  # Not carried over from HTTParty::Response: `#request` (an HTTParty::Request)
+  # and Marshal support (`_dump` / `_load`).
+  class Response
+    # Presents the parsed headers the way HTTParty did: case-insensitive lookup
+    # with joined values (`headers['Content-Type']` => "application/json").
+    class Headers < ::SimpleDelegator
+      include ::Net::HTTPHeader
+
+      def initialize(values = {})
+        @header = {}
+        values.each_pair do |key, value|
+          Array(value).each { |sub_value| add_field(key, sub_value) }
+        end
+        super(@header)
+      end
+    end
+
+    attr_reader :response, :body, :headers
+
+    def initialize(response)
+      @response = response
+      @body = response.body
+      @headers = Headers.new(response.to_hash)
+      @parsed_response = parse(@body)
+    end
+
+    def parsed_response
+      @parsed_response
+    end
+
+    def code
+      response.code.to_i
+    end
+
+    def http_version
+      response.http_version
+    end
+
+    def nil?
+      response.nil? || body.nil? || body.empty?
+    end
+
+    def to_s
+      body.to_s
+    end
+
+    def to_hash
+      parsed_response
+    end
+
+    def [](key)
+      parsed_response[key] if parsed_response.respond_to?(:[])
+    end
+
+    def inspect
+      "#<#{self.class} code=#{code} parsed_response=#{parsed_response.inspect}>"
+    end
+
+    def method_missing(name, *args, &block)
+      return parsed_response.send(name, *args, &block) if parsed_response.respond_to?(name)
+
+      super
+    end
+
+    def respond_to_missing?(name, include_private = false)
+      parsed_response.respond_to?(name, include_private) || super
+    end
+
+    # HTTParty defines a predicate per HTTP status class (ok?, created?,
+    # not_found?, server_error?, ...). Rebuild the same set from Net::HTTP's
+    # tables so status checks keep working.
+    ::Net::HTTPResponse::CODE_CLASS_TO_OBJ.merge(::Net::HTTPResponse::CODE_TO_OBJ).each do |_code, klass|
+      name = klass.name.sub('Net::HTTP', '')
+      name = "#{name.gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').downcase}?"
+
+      define_method(name) { klass === response }
+    end
+
+    private
+
+    def parse(body)
+      JSON.parse(body.to_s)
+    rescue JSON::ParserError
+      nil
+    end
+  end
+end

data/lib/mailpace-rails/version.rb

@@ -1,5 +1,5 @@
 module Mailpace
   module Rails
-    VERSION = '0.4.3'
+    VERSION = '0.5.0'
   end
 end

data/lib/mailpace-rails.rb

@@ -1,9 +1,10 @@
 require 'action_mailer'
 require 'action_mailbox/engine'
-require 'httparty'
+require 'net/http'
 require 'uri'
 require 'json'
 require 'mailpace-rails/version'
+require 'mailpace-rails/response'
 require 'mailpace-rails/engine' if defined? Rails
 
 module Mailpace
@@ -27,32 +28,33 @@ module Mailpace
       end
 
       check_delivery_params(mail)
-      result = HTTParty.post(
-        'https://app.mailpace.com/api/v1/send',
-        body: {
-          from: address_list(mail.header[:from])&.addresses&.first.to_s,
-          to: address_list(mail.header[:to])&.addresses&.join(','),
-          subject: mail.subject,
-          htmlbody: htmlbody,
-          textbody: textbody,
-          cc: address_list(mail.header[:cc])&.addresses&.join(','),
-          bcc: address_list(mail.header[:bcc])&.addresses&.join(','),
-          replyto: address_list(mail.header[:reply_to])&.addresses&.join(','),
-          inreplyto: mail.header['In-Reply-To'].to_s,
-          references: mail.header['References'].to_s,
-          list_unsubscribe: mail.header['list_unsubscribe'].to_s,
-          attachments: format_attachments(mail.attachments),
-          tags: mail.header['tags'].to_s
-        }.delete_if { |_key, value| value.blank? }.to_json,
-        headers: {
-          'User-Agent' => "MailPace Rails Gem v#{Mailpace::Rails::VERSION}",
-          'Accept' => 'application/json',
-          'Content-Type' => 'application/json',
-          'Mailpace-Server-Token' => settings[:api_token]
-        }.tap do |h|
-          h['Idempotency-Key'] = mail.header['idempotency_key'].to_s if mail.header['idempotency_key']
-        end
-      )
+
+      uri = URI('https://app.mailpace.com/api/v1/send')
+      request = Net::HTTP::Post.new(uri)
+      request['User-Agent'] = "MailPace Rails Gem v#{Mailpace::Rails::VERSION}"
+      request['Accept'] = 'application/json'
+      request['Content-Type'] = 'application/json'
+      request['Mailpace-Server-Token'] = settings[:api_token]
+      request['Idempotency-Key'] = mail.header['idempotency_key'].to_s if mail.header['idempotency_key']
+      request.body = {
+        from: address_list(mail.header[:from])&.addresses&.first.to_s,
+        to: address_list(mail.header[:to])&.addresses&.join(','),
+        subject: mail.subject,
+        htmlbody: htmlbody,
+        textbody: textbody,
+        cc: address_list(mail.header[:cc])&.addresses&.join(','),
+        bcc: address_list(mail.header[:bcc])&.addresses&.join(','),
+        replyto: address_list(mail.header[:reply_to])&.addresses&.join(','),
+        inreplyto: mail.header['In-Reply-To'].to_s,
+        references: mail.header['References'].to_s,
+        list_unsubscribe: mail.header['list_unsubscribe'].to_s,
+        attachments: format_attachments(mail.attachments),
+        tags: mail.header['tags'].to_s
+      }.delete_if { |_key, value| value.blank? }.to_json
+
+      result = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+        http.request(request)
+      end
 
       handle_response(result)
     end
@@ -72,12 +74,13 @@ module Mailpace
     end
 
     def handle_response(result)
-      return result unless result.code != 200
+      response = Mailpace::Response.new(result)
+      return response if result.is_a?(Net::HTTPOK)
 
-      parsed_response = result.parsed_response
-      error_message = join_error_messages(parsed_response)
+      error_message = join_error_messages(response.parsed_response)
+      error_message = "HTTP #{response.code}" if error_message.empty?
 
-      raise DeliveryError, "MAILPACE Error: #{error_message}" unless error_message.empty?
+      raise DeliveryError, "MAILPACE Error: #{error_message}"
     end
 
     def format_attachments(attachments)
@@ -101,9 +104,11 @@ module Mailpace
       end
     end
 
-    def join_error_messages(response)
+    def join_error_messages(parsed_response)
       # Join 'error' and 'errors' keys from response into a single string
-      [response['error'], response['errors']].compact.join(', ')
+      return '' unless parsed_response.is_a?(Hash)
+
+      [parsed_response['error'], parsed_response['errors']].compact.join(', ')
     end
   end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mailpace-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - MailPace
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -52,20 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.18.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +94,7 @@ files:
 - config/routes.rb
 - lib/mailpace-rails.rb
 - lib/mailpace-rails/engine.rb
+- lib/mailpace-rails/response.rb
 - lib/mailpace-rails/version.rb
 homepage: https://mailpace.com
 licenses:
@@ -116,7 +102,6 @@ licenses:
 metadata:
   source_code_uri: https://github.com/mailpace/mailpace-rails
   changelog_uri: https://github.com/mailpace/mailpace-rails/blob/master/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,8 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Lets you send transactional emails from your app over an easy to use API
 test_files: []