courrier 0.10.0 → 0.11.0

data/lib/courrier/email/providers/ses.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Courrier
+  class Email
+    module Providers
+      class Ses < Base
+        def deliver
+          uri = URI.parse("https://email.#{@provider_options[:region]}.amazonaws.com/v2/email/outbound-emails")
+
+          request = Net::HTTP::Post.new(uri)
+          default_headers.merge(@custom_headers).each { |name, value| request[name] = value }
+
+          sign!(request)
+
+          request.body = JSON.dump(body)
+
+          options = {use_ssl: uri.scheme == "https"}
+          response = Net::HTTP.start(uri.hostname, uri.port, options) { it.request(request) }
+
+          Courrier::Email::Result.new(response: response)
+        rescue => error
+          Courrier::Email::Result.new(error: error)
+        end
+
+        def body
+          {
+            "FromEmailAddress" => @options.from,
+            "Destination" => {
+              "ToAddresses" => Array(@options.to),
+              "CcAddresses" => @options.cc ? Array(@options.cc) : nil,
+              "BccAddresses" => @options.bcc ? Array(@options.bcc) : nil
+            }.compact,
+
+            "ReplyToAddresses" => @options.reply_to ? Array(@options.reply_to) : nil,
+            "Content" => {
+              "Simple" => {
+                "Subject" => {"Data" => @options.subject},
+
+                "Body" => {
+                  "Text" => {"Data" => @options.text},
+                  "Html" => {"Data" => @options.html}
+                }.compact
+              }
+            }
+          }.compact
+        end
+
+        private
+
+        def default_headers
+          {
+            "Content-Type" => "application/json",
+            "Accept" => "application/json"
+          }
+        end
+
+        def sign!(request)
+          require "aws-sigv4"
+
+          Aws::Sigv4::Signer.new(
+            service: "ses",
+            region: @provider_options[:region],
+            access_key_id: @provider_options[:access_key_id],
+            secret_access_key: @provider_options[:secret_access_key],
+            session_token: @provider_options[:session_token]
+          ).sign_request(
+            http_method: request.method,
+            url: request.uri.to_s,
+            headers: request.to_hash
+          ).headers.each { |name, value| request[name] = value }
+        end
+      end
+    end
+  end
+end

data/lib/courrier/email/providers/smtp2go.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Courrier
+  class Email
+    module Providers
+      class Smtp2go < Base
+        ENDPOINT_URL = "https://api.smtp2go.com/v3/email/send"
+
+        def body
+          {
+            "sender" => @options.from,
+            "to" => @options.to.to_s.split(",").map(&:strip),
+            "cc" => @options.cc&.split(",")&.map(&:strip),
+            "bcc" => @options.bcc&.split(",")&.map(&:strip),
+            "subject" => @options.subject,
+            "html_body" => @options.html,
+            "text_body" => @options.text
+          }.compact
+        end
+
+        private
+
+        def default_headers
+          {"X-Smtp2go-Api-Key" => @api_key}
+        end
+      end
+    end
+  end
+end

data/lib/courrier/email/request.rb

@@ -25,7 +25,7 @@ module Courrier
         options = {use_ssl: uri.scheme == "https"}
 
         begin
-          response = Net::HTTP.start(uri.hostname, uri.port, options) { _1.request(request) }
+          response = Net::HTTP.start(uri.hostname, uri.port, options) { it.request(request) }
 
           Result.new(response: response)
         rescue => error

data/lib/courrier/email/transformer.rb

@@ -11,30 +11,30 @@ module Courrier
 
       def to_text
         Nokogiri::HTML(@content)
-          .then { remove_unwanted_elements(_1) }
-          .then { process_links(_1) }
-          .then { preserve_line_breaks(_1) }
-          .then { clean_up(_1) }
+          .then { remove_unwanted_elements(it) }
+          .then { process_links(it) }
+          .then { preserve_line_breaks(it) }
+          .then { clean_up(it) }
       end
 
       private
 
       BLOCK_ELEMENTS = %w[p div h1 h2 h3 h4 h5 h6 pre blockquote li]
 
-      def remove_unwanted_elements(html) = html.tap { _1.css("script, style").remove }
+      def remove_unwanted_elements(html) = html.tap { it.css("script, style").remove }
 
       def process_links(html)
         html.tap do |document|
           document.css("a")
-            .select { valid?(_1) }
-            .reject { _1.text.strip.empty? || _1.text.strip == _1["href"] }
-            .each { _1.content = "#{_1.text.strip} (#{_1["href"]})" }
+            .select { valid?(it) }
+            .reject { it.text.strip.empty? || it.text.strip == it["href"] }
+            .each { it.content = "#{it.text.strip} (#{it["href"]})" }
         end
       end
 
       def preserve_line_breaks(html)
         html.tap do |document|
-          document.css(BLOCK_ELEMENTS.join(",")).each { _1.after("\n") }
+          document.css(BLOCK_ELEMENTS.join(",")).each { it.after("\n") }
         end
       end
 

data/lib/courrier/email.rb

@@ -3,7 +3,6 @@
 require "erb"
 
 require "courrier/email/address"
-require "courrier/jobs/email_delivery_job" if defined?(Rails)
 require "courrier/email/layouts"
 require "courrier/markdown"
 require "courrier/email/options"
@@ -52,23 +51,29 @@ module Courrier
         self.layouts = options
       end
 
+      def before_deliver(&block)
+        (@before_deliver ||= []) << block
+      end
+
+      def after_deliver(&block)
+        (@after_deliver ||= []) << block
+      end
+
+      def before_deliver_callbacks
+        @before_deliver || []
+      end
+
+      def after_deliver_callbacks
+        @after_deliver || []
+      end
+
       def deliver(**options)
         new(options).deliver_now
       end
       alias_method :deliver_now, :deliver
 
-      def deliver_later(**options)
-        new(options).deliver_later
-      end
-
       def inherited(subclass)
         super
-
-        # If you read this and know how to move this Rails-specific logic somewhere
-        # else, e.g. `lib/courrier/railtie.rb`, open a PR ❤️
-        if defined?(Rails) && Rails.application
-          subclass.include Rails.application.routes.url_helpers
-        end
       end
     end
 
@@ -100,6 +105,8 @@ module Courrier
         return nil
       end
 
+      return nil if self.class.before_deliver_callbacks.any? { |callback| callback.call(self) == false }
+
       Provider.new(
         provider: @provider,
         api_key: @api_key,
@@ -107,33 +114,13 @@ module Courrier
         provider_options: Courrier.configuration&.providers&.[](@provider.to_s.downcase.to_sym),
         context_options: @context_options,
         custom_headers: self.class.headers
-      ).deliver
-    end
-    alias_method :deliver_now, :deliver
+      ).deliver.tap do |result|
+        Test.record(self, result)
 
-    def deliver_later
-      if delivery_disabled?
-        Courrier.configuration&.logger&.info "[Courrier] Email delivery skipped: delivery is disabled via environment variable"
-
-        return nil
+        self.class.after_deliver_callbacks.each { |callback| callback.call(self, result) }
       end
-
-      data = {
-        email_class: self.class.name,
-        provider: @provider,
-        api_key: @api_key,
-        options: @options.to_h,
-        provider_options: Courrier.configuration&.providers&.[](@provider.to_s.downcase.to_sym),
-        context_options: @context_options
-      }
-
-      job = Courrier::Jobs::EmailDeliveryJob
-      job = job.set(**self.class.queue_options) if self.class.queue_options.any?
-
-      job.perform_later(data)
-    rescue => error
-      raise Courrier::BackgroundDeliveryError, "Failed to enqueue email: #{error.message}"
     end
+    alias_method :deliver_now, :deliver
 
     private
 

data/lib/courrier/errors.rb

@@ -8,6 +8,4 @@ module Courrier
   class ArgumentError < ::ArgumentError; end
 
   class NotImplementedError < ::NotImplementedError; end
-
-  class BackgroundDeliveryError < StandardError; end
 end

data/lib/courrier/test.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Courrier
+  module Test
+    Delivery = Data.define(:email_class, :to, :from, :reply_to, :cc, :bcc, :subject, :body, :headers, :provider, :result, :timestamp) do
+      def success?
+        result.success?
+      end
+    end
+
+    class << self
+      def deliveries
+        @deliveries ||= []
+      end
+
+      def clear!
+        @deliveries = []
+      end
+
+      def record(email, result)
+        deliveries << Delivery.new(
+          email_class: email.class.name,
+          to: email.options.to,
+          from: email.options.from,
+          reply_to: email.options.reply_to,
+          cc: email.options.cc,
+          bcc: email.options.bcc,
+          subject: email.options.subject,
+          body: {text: email.options.text, html: email.options.html},
+          headers: email.class.headers,
+          provider: email.provider,
+          result: result,
+          timestamp: Time.now
+        )
+      end
+    end
+  end
+end

data/lib/courrier/test_helper.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Courrier
+  module TestHelper
+    def assert_emails_delivered(count)
+      actual = Test.deliveries.size
+
+      assert_equal count, actual, "Expected #{count} email(s) to be delivered, but #{actual} were delivered"
+    end
+
+    def assert_no_emails_delivered
+      assert_emails_delivered(0)
+    end
+
+    def assert_email_delivered(email_class = nil, to: nil, from: nil, subject: nil, provider: nil)
+      deliveries = Test.deliveries
+
+      matching = deliveries.find do |delivery|
+        match_email_class(email_class, delivery.email_class) &&
+          match_recipient(to, delivery.to) &&
+          match_recipient(from, delivery.from) &&
+          match_subject(subject, delivery.subject) &&
+          match_provider(provider, delivery.provider)
+      end
+
+      assert matching, assertion_message(email_class, to: to, from: from, subject: subject, provider: provider, deliveries: deliveries)
+    end
+
+    private
+
+    def match_email_class(expected, actual)
+      return true if expected.nil?
+
+      expected == actual || (expected.is_a?(Class) && actual == expected.name)
+    end
+
+    def match_recipient(expected, actual)
+      return true if expected.nil?
+
+      actual.to_s.include?(expected.to_s)
+    end
+
+    def match_subject(expected, actual)
+      return true if expected.nil?
+
+      actual.to_s.include?(expected.to_s)
+    end
+
+    def match_provider(expected, actual)
+      return true if expected.nil?
+
+      actual.to_s == expected.to_s
+    end
+
+    def assertion_message(email_class, to:, from:, subject:, provider:, deliveries:)
+      "Expected email matching #{[].tap do |criteria|
+        criteria << "email_class=#{email_class}" if email_class
+        criteria << "to=#{to}" if to
+        criteria << "from=#{from}" if from
+        criteria << "subject=#{subject}" if subject
+        criteria << "provider=#{provider}" if provider
+      end.join(", ")} but none found. #{deliveries.size} email(s) delivered."
+    end
+  end
+end

data/lib/courrier/version.rb

@@ -1,3 +1,3 @@
 module Courrier
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/lib/courrier.rb

@@ -5,8 +5,8 @@ require "courrier/errors"
 require "courrier/configuration"
 require "courrier/email"
 require "courrier/subscriber"
-require "courrier/engine" if defined?(Rails)
-require "courrier/railtie" if defined?(Rails)
+require "courrier/test"
+require "courrier/test_helper"
 
 module Courrier
 end

metadata

@@ -1,35 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: courrier
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Rails Designer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -62,17 +61,12 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- app/controllers/courrier/previews/cleanups_controller.rb
-- app/controllers/courrier/previews_controller.rb
-- app/views/courrier/previews/index.html.erb
 - bin/console
 - bin/release
 - bin/setup
-- config/routes.rb
 - courrier.gemspec
 - lib/courrier.rb
 - lib/courrier/configuration.rb
-- lib/courrier/configuration/inbox.rb
 - lib/courrier/configuration/providers.rb
 - lib/courrier/email.rb
 - lib/courrier/email/address.rb
@@ -80,8 +74,8 @@ files:
 - lib/courrier/email/options.rb
 - lib/courrier/email/provider.rb
 - lib/courrier/email/providers/base.rb
-- lib/courrier/email/providers/inbox.rb
-- lib/courrier/email/providers/inbox/default.html.erb
+- lib/courrier/email/providers/cloudflare.rb
+- lib/courrier/email/providers/lettermint.rb
 - lib/courrier/email/providers/logger.rb
 - lib/courrier/email/providers/loops.rb
 - lib/courrier/email/providers/mailgun.rb
@@ -90,16 +84,15 @@ files:
 - lib/courrier/email/providers/postmark.rb
 - lib/courrier/email/providers/resend.rb
 - lib/courrier/email/providers/sendgrid.rb
+- lib/courrier/email/providers/ses.rb
+- lib/courrier/email/providers/smtp2go.rb
 - lib/courrier/email/providers/sparkpost.rb
 - lib/courrier/email/providers/userlist.rb
 - lib/courrier/email/request.rb
 - lib/courrier/email/result.rb
 - lib/courrier/email/transformer.rb
-- lib/courrier/engine.rb
 - lib/courrier/errors.rb
-- lib/courrier/jobs/email_delivery_job.rb
 - lib/courrier/markdown.rb
-- lib/courrier/railtie.rb
 - lib/courrier/subscriber.rb
 - lib/courrier/subscriber/base.rb
 - lib/courrier/subscriber/beehiiv.rb
@@ -109,21 +102,15 @@ files:
 - lib/courrier/subscriber/mailchimp.rb
 - lib/courrier/subscriber/mailerlite.rb
 - lib/courrier/subscriber/result.rb
-- lib/courrier/tasks/courrier.rake
+- lib/courrier/test.rb
+- lib/courrier/test_helper.rb
 - lib/courrier/version.rb
-- lib/generators/courrier/email_generator.rb
-- lib/generators/courrier/install_generator.rb
-- lib/generators/courrier/templates/email.rb.tt
-- lib/generators/courrier/templates/email/password_reset.rb.tt
-- lib/generators/courrier/templates/email/welcome.rb.tt
-- lib/generators/courrier/templates/initializer.rb.tt
-homepage: https://railsdesigner.com/courrier/
+homepage: https://railsdesigner.com/open-source/courrier/
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://railsdesigner.com/courrier/
+  homepage_uri: https://railsdesigner.com/open-source/courrier/
   source_code_uri: https://github.com/Rails-Designer/courrier/
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,15 +118,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 4.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: API-powered email delivery for Ruby apps
 test_files: []

data/app/controllers/courrier/previews/cleanups_controller.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Courrier
-  module Previews
-    class CleanupsController < ActionController::Base
-      def create
-        system("bin/rails courrier:clear")
-
-        redirect_to root_path
-      end
-    end
-  end
-end

data/app/controllers/courrier/previews_controller.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Courrier
-  class PreviewsController < ActionController::Base
-    def index
-      @emails = emails.map { Courrier::Email::Providers::Inbox::Email.from_file(_1) }
-    end
-
-    def show
-      file_path = File.join(Courrier.configuration.inbox.destination, params[:id])
-      content = File.read(file_path)
-
-      render html: content.html_safe, layout: false
-    end
-
-    private
-
-    def emails
-      @emails ||= Dir.glob("#{Courrier.configuration.inbox.destination}/*.html")
-        .sort_by { -File.basename(_1, ".html").to_i }
-    end
-  end
-end