studio-engine 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dde49831782823962437f0efab2c8334fe0efc4376873ee9b9c4c2486aa4d1f
-  data.tar.gz: c9cb4750ad4298869623db8a98e93662b101a1b2ce055fb779d15a3095ba1529
+  metadata.gz: 6f49e5815738a1a37139e2a5f0667daa9d2a3db14f301b7e627e441100258c3b
+  data.tar.gz: b5b94d83793c7b408332d99fc60c198dc07e7d6bb6cd342de060bb41dd5a34fd
 SHA512:
-  metadata.gz: bb82ea299130783431b2dfea4fac8ddece0728b7f49d6ea15c1cff49d819fb6687a5a03f4eb80d4a0f8cb590cf78e45ccb1cdec410bc042ba6caed95bdde24b0
-  data.tar.gz: e93039393ac8e344f7eef097ce55629f41cdefdb8f48be418ad3f8a7228e1c01363a3646ecd23708cffa182d3e905e17a8c1b2f8eccbfe6b97a3c9ef203a855b
+  metadata.gz: 3fe90400d7a5e3653fc6fe7db6de0ffd3b6e3d03bb84b56c4a1cf200313178725068c30e58fa36c243e8166c6ce32910a14f2ef319b1a126855beb09ea835527
+  data.tar.gz: e253f58c29679abc6d70bd66c73c6d83012f2e7dacc118a9312b13395317115bda7558e7f7be55fcaff05e64395b8f082f8284eae90fca90c4476a576bf83e9a

data/CHANGELOG.md

@@ -4,7 +4,24 @@ The format is [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). This pro
 
 ## Unreleased
 
-No entries yet.
+## v0.5.7 (2026-06-14)
+
+### Added
+- **`Studio.mailer_from_for_transport` / `Studio.marketing_from_for_transport`** —
+  provider-aware sender helpers. SES-ready apps use app/domain-specific
+  `MAILER_FROM` and `MARKETING_MAILER_FROM`; Resend fallback uses
+  `RESEND_MAILER_FROM`, defaulting to `McRitchie Studio <team@mcritchie.studio>`
+  so new apps can send during SES sandbox/presetup without verifying a second
+  Resend domain.
+
+### Fixed
+- **`ses:check` / `ses:verify_domain` credential selection** now prefers
+  `SES_AWS_ACCESS_KEY_ID` / `SES_AWS_SECRET_ACCESS_KEY` before falling back to
+  generic `AWS_*` credentials, keeping SES account checks separate from
+  consumer app S3/ImageCache IAM users.
+- **`ses:verify_domain` existing identity handling** now accepts AWS SES's
+  `already exist` response wording and falls back to reading the existing
+  identity.
 
 ## v0.5.6 (2026-06-14)
 

data/README.md

@@ -11,7 +11,7 @@ Shared Rails engine for McRitchie apps. Provides authentication, error handling,
 gem "studio-engine", "~> 0.5"
 ```
 
-Then `bundle install`. The current release is **v0.5.5**; see [`CHANGELOG.md`](./CHANGELOG.md) for the history.
+Then `bundle install`. The current release is **v0.5.7**; see [`CHANGELOG.md`](./CHANGELOG.md) for the history.
 
 > Published to RubyGems as of v0.4.0 (2026-05-17). New installs should use the RubyGems form, which the consumer Rails apps (`mcritchie-studio`, `turf-monster`) already use.
 
@@ -35,7 +35,9 @@ Studio.configure do |config|
   config.auth_methods = %i[magic_link google]
   config.registration_params = [:name, :email]
   config.magic_link_token_name = "magic_link_my_app_v1"
-  config.mailer_from = ENV.fetch("MAILER_FROM", "noreply@example.com")
+  config.mailer_from = Studio.mailer_from_for_transport(
+    ses_from: "My App <team@example.com>"
+  )
   config.theme_primary = "#4BAF50"   # Override default violet
   config.theme_logos = ["logo.svg"]
 end
@@ -105,4 +107,7 @@ For short local experiments, temporarily point a consumer Gemfile at `path: "../
 
 ## Development Notes
 
-See [CLAUDE.md](./CLAUDE.md) only as legacy migration context while neutral agent docs are being extracted. Current cross-repo setup, ports, credentials, and workflow guidance live in McRitchie Studio's [`docs/agents/`](https://github.com/amcritchie/mcritchie-studio/tree/main/docs/agents).
+Use the docs in [`docs/`](./docs) for engine setup, release, email transport,
+and host-app contracts. Current cross-repo setup, ports, credentials, and
+workflow guidance live in McRitchie Studio's
+[`docs/agents/`](https://github.com/amcritchie/mcritchie-studio/tree/main/docs/agents).

data/app/mailers/application_mailer.rb

@@ -3,5 +3,5 @@ class ApplicationMailer < ActionMailer::Base
   # the host's config/initializers/studio.rb, with an ENV fallback. No layout is
   # forced — ActionMailer renders bare if the host ships no mailer layout, and a
   # host that defines its own ApplicationMailer (e.g. turf-monster) wins outright.
-  default from: -> { Studio.mailer_from || ENV["MAILER_FROM"] || "no-reply@mcritchie.studio" }
+  default from: -> { Studio.mailer_from || ENV["MAILER_FROM"] || "McRitchie Studio <team@mcritchie.studio>" }
 end

data/lib/studio/version.rb

@@ -1,3 +1,3 @@
 module Studio
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/lib/studio.rb

@@ -41,6 +41,7 @@ module Studio
   # Default From: for engine-sent mail (magic links). Apps set this to their
   # verified sending address in config/initializers/studio.rb.
   mattr_accessor :mailer_from, default: nil
+  mattr_accessor :resend_mailer_from, default: "McRitchie Studio <team@mcritchie.studio>"
 
   # Local/worktree email capture. nil means "auto": enabled when AGENT_WORKTREE
   # is truthy, otherwise disabled. Production always disables capture.
@@ -88,6 +89,36 @@ module Studio
     yield self
   end
 
+  def self.mailer_from_for_transport(env: ENV, ses_from:, resend_from: nil)
+    if ses_transport_ready?(env)
+      env_value(env, "MAILER_FROM") || ses_from
+    else
+      env_value(env, "RESEND_MAILER_FROM") || resend_from || resend_mailer_from
+    end
+  end
+
+  def self.marketing_from_for_transport(env: ENV, ses_from:, resend_from: nil)
+    if ses_transport_ready?(env)
+      env_value(env, "MARKETING_MAILER_FROM") || ses_from
+    else
+      env_value(env, "RESEND_MARKETING_FROM") ||
+        env_value(env, "RESEND_MAILER_FROM") ||
+        resend_from ||
+        resend_mailer_from
+    end
+  end
+
+  def self.ses_transport_ready?(env = ENV)
+    env["MAIL_TRANSPORT"].to_s.downcase == "ses" &&
+      env_value(env, "SES_SMTP_USERNAME") &&
+      env_value(env, "SES_SMTP_PASSWORD")
+  end
+
+  def self.env_value(env, key)
+    value = env[key]
+    value if value && !value.to_s.strip.empty?
+  end
+
   # True when the given sign-in method is enabled for this app.
   def self.auth_method?(method)
     auth_methods.include?(method.to_sym)

data/lib/tasks/studio_ses.rake

@@ -2,14 +2,39 @@
 
 unless Rake::Task.task_defined?("ses:check")
   namespace :ses do
+    def studio_ses_env_value(name)
+      value = ENV[name]
+      return nil if value.nil? || value.to_s.strip.empty?
+
+      value
+    end
+
+    def studio_ses_credential(name)
+      studio_ses_env_value("SES_#{name}") || studio_ses_env_value(name)
+    end
+
+    def studio_ses_credential_source(name)
+      return "SES_#{name}" if studio_ses_env_value("SES_#{name}")
+      return name if studio_ses_env_value(name)
+
+      "missing"
+    end
+
     def studio_ses_signer(region)
       require "aws-sigv4"
 
+      access_key_id = studio_ses_credential("AWS_ACCESS_KEY_ID")
+      secret_access_key = studio_ses_credential("AWS_SECRET_ACCESS_KEY")
+      missing = []
+      missing << "SES_AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY_ID" unless access_key_id
+      missing << "SES_AWS_SECRET_ACCESS_KEY or AWS_SECRET_ACCESS_KEY" unless secret_access_key
+      abort "ses:* needs #{missing.join(' and ')}." if missing.any?
+
       Aws::Sigv4::Signer.new(
         service: "ses",
         region: region,
-        access_key_id: ENV.fetch("AWS_ACCESS_KEY_ID"),
-        secret_access_key: ENV.fetch("AWS_SECRET_ACCESS_KEY")
+        access_key_id: access_key_id,
+        secret_access_key: secret_access_key
       )
     rescue LoadError
       abort "ses:* needs aws-sigv4; it is usually available through aws-sdk-s3."
@@ -45,6 +70,7 @@ unless Rake::Task.task_defined?("ses:check")
 
       code, account = get.call("/v2/email/account")
       puts "GetAccount (region #{region}) -> HTTP #{code}"
+      puts "  CredentialSource=#{studio_ses_credential_source('AWS_ACCESS_KEY_ID')}"
       if code == 200
         puts "  SendingEnabled=#{account['SendingEnabled']} ProductionAccessEnabled=#{account['ProductionAccessEnabled']} Enforcement=#{account['EnforcementStatus']}"
       else
@@ -74,8 +100,9 @@ unless Rake::Task.task_defined?("ses:check")
       signer = studio_ses_signer(region)
       body = { EmailIdentity: domain }.to_json
       code, response = studio_ses_request(signer, region, "POST", "/v2/email/identities", body)
+      already_exists = "#{response['message']} #{response['Message']}".match?(/already exist/i)
 
-      if code == 409 || "#{response['message']}#{response['Message']}".match?(/already exists/i)
+      if code == 409 || ([400, 409].include?(code) && already_exists)
         code, response = studio_ses_request(signer, region, "GET", "/v2/email/identities/#{domain}")
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: studio-engine
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Alex McRitchie