studio-engine 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f351e5f2cf75e05dfc8befdd34cb525310ab4c4415bb084d15c57a1e3713b782
-  data.tar.gz: f84aad6087299527b4cdb330e644ee707f695b6a70597c753039c8b7af81ee93
+  metadata.gz: a8a6751151b77737dbf25bd04a59d9ad3f801ec8f66c214dc5a97ef5f006b1f6
+  data.tar.gz: f0283ba8e4e38b8e2375b563b6f93917c3ffbc3a0880353c62ec2c5f9441b6f4
 SHA512:
-  metadata.gz: fc184764831f825771d76f9cc93ae51f0103823c571ad886431beeffeb1ba55c15907004dc1796d6901fdafc560571c02cbde8fdd02141f2629c5cd60071f5a0
-  data.tar.gz: 20a76451338e9aea84191a1c5f3efb995c46514117e18e80d014bda75524ff50e6288abb88da26b84ce463fd296f601e63580de9bfb729458c31cfaf54fa96dc
+  metadata.gz: a911d76518bba342d65e2e5cb1d32c80f28a484057deb8ea630a2aae34867a530b51f0814abedee21267ff66a03df2c71e4c5610b24248e8cb5174b289f92da5
+  data.tar.gz: '09a3b96acf18c3cd876463445eb02f704b25292f048006be18c44aeaffe2e9e152d1f42977bad66cde5834c87a0eda05489ebbf1b53cdb8c7ab6ca1f5a1d3d7b'

data/CHANGELOG.md

@@ -6,6 +6,16 @@ The format is [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). This pro
 
 No entries yet.
 
+## v0.5.3 (2026-06-14)
+
+### Added
+- **`Studio::Email.deliver`** — shared ActionMailer delivery entry point that uses an app-level `EmailDelivery` when present, the engine's namespaced durable outbox when installed, and raw `deliver_later` as a fallback.
+- **`Studio::EmailDelivery` / `Studio::EmailDeliveryJob`** — namespaced durable delivery rows for apps that want shared audit, retry, and resend recovery without colliding with an existing top-level `EmailDelivery` model.
+- **`studio_email_deliveries` migration template** — installable shared outbox table for new or migrating consumer apps.
+
+### Changed
+- Engine magic-link and passwordless signup controllers now send through `Studio::Email.deliver` instead of calling `deliver_later` directly.
+
 ## v0.5.2 (2026-06-13)
 
 ### Added

data/app/controllers/magic_links_controller.rb

@@ -22,7 +22,7 @@ class MagicLinksController < ApplicationController
     email = params[:email].to_s.strip.downcase
     if email.match?(URI::MailTo::EMAIL_REGEXP)
       token = MagicLink.generate(email: email, return_to: safe_path(params[:return_to]))
-      UserMailer.magic_link(email, token).deliver_later
+      Studio::Email.deliver(UserMailer, :magic_link, email, token, to: email)
     end
     respond_to do |format|
       format.json { render json: { success: true } }

data/app/controllers/registrations_controller.rb

@@ -14,7 +14,7 @@ class RegistrationsController < ApplicationController
       email = (params.dig(:user, :email) || params[:email]).to_s.strip.downcase
       if email.match?(URI::MailTo::EMAIL_REGEXP)
         token = MagicLink.generate(email: email)
-        UserMailer.magic_link(email, token).deliver_later
+        Studio::Email.deliver(UserMailer, :magic_link, email, token, to: email)
       end
       return redirect_to login_path, notice: "Check your inbox — we just emailed you a sign-in link."
     end

data/app/jobs/studio/email_delivery_job.rb

@@ -0,0 +1,9 @@
+module Studio
+  class EmailDeliveryJob < (defined?(::ApplicationJob) ? ::ApplicationJob : ActiveJob::Base)
+    queue_as :mailers
+
+    def perform(id)
+      Studio::EmailDelivery.find_by(id: id)&.deliver_now!
+    end
+  end
+end

data/app/models/studio/email_delivery.rb

@@ -0,0 +1,46 @@
+module Studio
+  class EmailDelivery < ApplicationRecord
+    self.table_name = "studio_email_deliveries"
+
+    belongs_to :user, optional: true
+
+    scope :unsent, -> { where(sent: false) }
+    scope :recent, -> { order(created_at: :desc) }
+
+    def self.available?
+      connection.data_source_exists?(table_name)
+    rescue ActiveRecord::ActiveRecordError, NoMethodError
+      false
+    end
+
+    def self.deliver(mailer, action, *args, to:, user: nil, **kwargs)
+      record = create!(
+        mailer: mailer.to_s,
+        action: action.to_s,
+        email_key: "#{mailer}##{action}",
+        to: to.to_s,
+        user: user,
+        args: ActiveJob::Arguments.serialize(args),
+        kwargs: ActiveJob::Arguments.serialize([kwargs]).first
+      )
+      Studio::EmailDeliveryJob.perform_later(record.id)
+      record
+    end
+
+    def deliver_now!
+      return if sent?
+
+      pos = ActiveJob::Arguments.deserialize(args)
+      kw = ActiveJob::Arguments.deserialize([kwargs]).first.symbolize_keys
+      mailer.constantize.public_send(action, *pos, **kw).deliver_now
+      update!(sent: true, sent_at: Time.current, error: nil)
+    rescue StandardError => e
+      update(error: e.message.to_s.first(500))
+      raise
+    end
+
+    def self.resend_unsent!
+      unsent.find_each { |delivery| Studio::EmailDeliveryJob.perform_later(delivery.id) }
+    end
+  end
+end

data/db/migrate/20260614000000_create_studio_email_deliveries.rb

@@ -0,0 +1,22 @@
+class CreateStudioEmailDeliveries < ActiveRecord::Migration[7.2]
+  def change
+    create_table :studio_email_deliveries do |t|
+      t.string :email_key, null: false
+      t.string :to
+      t.string :mailer, null: false
+      t.string :action, null: false
+      t.jsonb :args, null: false, default: []
+      t.jsonb :kwargs, null: false, default: {}
+      t.boolean :sent, null: false, default: false
+      t.datetime :sent_at
+      t.text :error
+      t.references :user, foreign_key: true
+
+      t.timestamps
+    end
+
+    add_index :studio_email_deliveries, :sent
+    add_index :studio_email_deliveries, :email_key
+    add_index :studio_email_deliveries, :created_at
+  end
+end

data/lib/studio/email.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Studio
+  module Email
+    class << self
+      # Shared email send entry point for Studio apps.
+      #
+      # Apps with an existing top-level EmailDelivery model keep using it through
+      # this facade. Apps that have installed the engine outbox migration use the
+      # namespaced Studio::EmailDelivery model. Apps without either still send via
+      # ActionMailer's normal deliver_later path.
+      def deliver(mailer, action, *args, to:, user: nil, **kwargs)
+        if (adapter = app_delivery_adapter)
+          return adapter.deliver(mailer, action, *args, to: to, user: user, **kwargs)
+        end
+
+        if (adapter = studio_delivery_adapter)
+          return adapter.deliver(mailer, action, *args, to: to, user: user, **kwargs)
+        end
+
+        mailer.public_send(action, *args, **kwargs).deliver_later
+      end
+
+      private
+
+      def app_delivery_adapter
+        return unless Object.const_defined?(:EmailDelivery, false)
+
+        adapter = Object.const_get(:EmailDelivery, false)
+        adapter if adapter.respond_to?(:deliver)
+      rescue NameError
+        nil
+      end
+
+      def studio_delivery_adapter
+        return unless Studio.const_defined?(:EmailDelivery, false)
+
+        adapter = Studio.const_get(:EmailDelivery, false)
+        adapter if adapter.respond_to?(:available?) && adapter.available?
+      rescue NameError
+        nil
+      end
+    end
+  end
+end

data/lib/studio/version.rb

@@ -1,3 +1,3 @@
 module Studio
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/lib/studio.rb

@@ -5,6 +5,7 @@ require "studio/theme_resolver"
 require "studio/username_generator"
 require "studio/s3"
 require "studio/image_cache"
+require "studio/email"
 require "studio/mail_transport"
 
 module Studio
@@ -37,7 +38,7 @@ module Studio
   mattr_accessor :draw_auth_routes, default: true
 
   # Default From: for engine-sent mail (magic links). Apps set this to their
-  # verified Resend sending address in config/initializers/studio.rb.
+  # verified sending address in config/initializers/studio.rb.
   mattr_accessor :mailer_from, default: nil
 
   # Theme role colors (7 roles)

data/studio-engine.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
     "changelog_uri"   => "https://github.com/amcritchie/studio-engine/blob/main/CHANGELOG.md"
   }
 
-  spec.files = Dir["lib/**/*", "app/**/*", "config/**/*", "tailwind/**/*", "Gemfile", "studio-engine.gemspec", "README.md", "CHANGELOG.md", "LICENSE"]
+  spec.files = Dir["lib/**/*", "app/**/*", "config/**/*", "db/**/*", "tailwind/**/*", "Gemfile", "studio-engine.gemspec", "README.md", "CHANGELOG.md", "LICENSE"]
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails", ">= 7.0", "< 8.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: studio-engine
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Alex McRitchie
@@ -153,6 +153,7 @@ files:
 - app/controllers/theme_settings_controller.rb
 - app/helpers/studio_theme_helper.rb
 - app/jobs/error_log_cleanup_job.rb
+- app/jobs/studio/email_delivery_job.rb
 - app/mailers/application_mailer.rb
 - app/mailers/user_mailer.rb
 - app/models/concerns/sluggable.rb
@@ -160,6 +161,7 @@ files:
 - app/models/error_log.rb
 - app/models/image_cache.rb
 - app/models/session_context.rb
+- app/models/studio/email_delivery.rb
 - app/models/theme_setting.rb
 - app/services/google_oauth_validator.rb
 - app/services/magic_link.rb
@@ -199,9 +201,11 @@ files:
 - app/views/theme_settings/edit.html.erb
 - app/views/user_mailer/magic_link.html.erb
 - app/views/user_mailer/magic_link.text.erb
+- db/migrate/20260614000000_create_studio_email_deliveries.rb
 - lib/studio-engine.rb
 - lib/studio.rb
 - lib/studio/color_scale.rb
+- lib/studio/email.rb
 - lib/studio/engine.rb
 - lib/studio/image_cache.rb
 - lib/studio/mail_transport.rb