rails_mail 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0111e011c108a5b717fcb3f4074985e58faaeef49d4247587697be29facff12
-  data.tar.gz: edbcf7e6c0856e325c7d3fba6d0d03ac024eb26874a194d9554b0b39685d2ddb
+  metadata.gz: 74639c1eeda1941950ff03fed49be529f335fc3e1e6e9896afd8ce9a636daaa6
+  data.tar.gz: bd46e033763529b995f444ef78d0390404d088d816e46300cf59bec3efbf3719
 SHA512:
-  metadata.gz: 1d4e8443a570257b4f3fd15b1a807610968968de29ad779a21e2073611b7efdd5f062e2073a250f2b3834a7af2f2b154ff92daba835fd9492747536178d49e42
-  data.tar.gz: 27d2f45c1ffb9db48e0916078c6afe565aeaa9be29c6d6bf9dddb53fad28706501313539352c1e1857b29c3ba364a5474397a02ab6dd042999e87b149974f104
+  metadata.gz: 4d1899db5ec6f5d1373c50e3dcc737be3a0156c01bbb60c8291e32a9ca5a8f0902451c7c90478ff4967624d1e372e842862067e9229ae634757f2518f311f557
+  data.tar.gz: 24845fe1ef0b59edcc0257f0b1cf695b2e5872b38d0dd8f5d5afb1989401684cc4e2aa0e5764ea74f90ec4279a829443ee42e6cde6eb9ec84a7d65e321f727bc

data/README.md

@@ -15,9 +15,10 @@ RailsMail saves all outgoing emails to your database instead of actually sending
 * Clean, responsive UI for viewing email contents
 * Optional authentication support
 * Trimming emails older than a specified duration or a maximum number of emails
-* Ability to manually clear emails out and turn on/off that functionality based on environment (eg, so that in Staging, other stakeholders can't clear emails out, but in dev sometimes you want a clean slate)
+* Ability to manually clear emails in bulk or individually. The bulk delete can be turned on/off based on environment (eg, so that in Staging, other stakeholders can't clear emails out, but in dev sometimes you want a clean slate)
 * Dynamic time ago in words using date-fns
 * Ability to customize how the job that trims emails is enqueued
+* Ability to customize the title in the top left of the page via a standard Rails view that overrides the engine's default view.
 
 ## Installation
 
@@ -79,7 +80,7 @@ To use RailsMail in your application:
 3. **Configure the initializer**
    See the [Configuration](#configuration) section for more details.
 
-4. **Visit `/rails_mail` in your browser to view all captured emails.**
+4. **Visit `/rails_mail` (or where ever you mounted the engine) in your browser to view all captured emails.**
 
 ### Configuration
 
@@ -90,11 +91,17 @@ RailsMail can be configured through an initializer:
 RailsMail.configure do |config|
   # Optional authentication callback
   # (if using Authlogic. If using Devise see the Authentication section)
-  config.authentication_callback do
+  config.authenticate do
     user_session = UserSession.find
     raise ActionController::RoutingError.new('Not Found') unless user_session&.user&.admin?
   end
 
+  # Optional decide whether to show the clear button
+  # Useful if you want devs in local envs to be able to clear all emails, but not in staging
+  config.show_clear_all_button do
+    Rails.env.development?
+  end
+
   # Delete emails older than the specified duration
   config.trim_emails_older_than = 30.days
 
@@ -113,6 +120,13 @@ end
 - `trim_emails_max_count`: Keeps only the N most recent emails, deleting older ones.
 - `sync_via`: Controls whether the trimming job runs synchronously (:now) or asynchronously (:later)
 
+### Customize the title
+Since this is a Rails engine, you can customize the title by creating a file at `app/views/layouts/rails_mail/_title.html.erb`.
+
+```erb
+<h1 class="text-xl font-bold">My apps mails</h1>
+```
+
 ## Authentication
 Authentication is optional, but recommended and will depend on your application's authentication setup. This gem provides an `authentication_callback` that you can configure in the initializer which is helpful for Authlogic. If you are using Devise, you can simply wrap the mount point of the engine. 
 

data/app/controllers/rails_mail/emails_controller.rb

@@ -17,10 +17,19 @@ module RailsMail
     def show
       @emails = Email.order(created_at: :desc)
       @email = Email.find(params[:id])
-      if request.headers["Turbo-Frame"]
-        render partial: "rails_mail/emails/show", locals: { email: @email }
-      else
-        render :index
+      session[:current_email_id] = @email.id
+
+      render :show
+    end
+
+    def destroy
+      @email = Email.find(params[:id])
+      @current_email_id = session[:current_email_id]
+      @email.destroy
+
+      respond_to do |format|
+        format.html { redirect_to emails_path }
+        format.turbo_stream
       end
     end
 

data/app/frontend/rails_mail/application.js

@@ -1,14 +1,16 @@
 import { Application } from "stimulus";
 import "turbo";
 import EmailHighlightController from "email_highlight_controller";
+import RedirectController from "redirect_controller";
 import AutoSubmit from 'auto_submit'
 import Timeago from 'timeago'
 
 const application = Application.start();
 
 application.register("email-highlight", EmailHighlightController);
-application.register('auto-submit', AutoSubmit)
-application.register('timeago', Timeago)
+application.register("redirect", RedirectController);
+application.register('auto-submit', AutoSubmit);
+application.register('timeago', Timeago);
 
 window.Stimulus = Application.start();
 

data/app/frontend/rails_mail/modules/email_highlight_controller.js

@@ -19,14 +19,14 @@ export default class extends Controller {
 
   // Called when a link is clicked
   highlight(event) {
-    // Remove active class from all links
+    // Remove active class from all email containers
     this.linkTargets.forEach(link => {
-      link.classList.remove(this.constructor.activeClass)
+      link.closest(".group").classList.remove(this.constructor.activeClass)
     })
 
-    // Add active class to clicked link
+    // Add active class to clicked email's container
     const clickedLink = event.currentTarget
-    clickedLink.classList.add(this.constructor.activeClass)
+    clickedLink.closest(".group").classList.add(this.constructor.activeClass)
   }
 
   highlightCurrentEmail() {
@@ -35,12 +35,13 @@ export default class extends Controller {
     if (emailContent) {
       const currentEmailId = emailContent.dataset.emailId
 
-      // Highlight the link with the matching email ID
+      // Highlight the container with the matching email ID
       this.linkTargets.forEach(link => {
+        const container = link.closest(".group")
         if (link.dataset.emailId === currentEmailId) {
-          link.classList.add(this.constructor.activeClass)
+          container.classList.add(this.constructor.activeClass)
         } else {
-          link.classList.remove(this.constructor.activeClass)
+          container.classList.remove(this.constructor.activeClass)
         }
       })
     }

data/app/frontend/rails_mail/modules/redirect_controller.js

@@ -0,0 +1,12 @@
+import { Controller } from 'stimulus'
+
+export default class extends Controller {
+  static values = { url: String }
+  connect () {
+    // Need to remove the element
+    // Otherwise, if we revisit this page using a Turbo page cache
+    // it may end up redirecting again
+    this.element.remove();
+    Turbo.visit(this.urlValue)
+  }
+}

data/app/models/rails_mail/email.rb

@@ -1,6 +1,7 @@
 module RailsMail
   class Email < ApplicationRecord
-    store_accessor :data, :from, :to, :cc, :bcc, :subject, :body, :content_type, :attachments
+    include RailsMail::Engine.routes.url_helpers
+    store_accessor :data, :from, :to, :cc, :bcc, :subject, :html_part, :text_part, :content_type, :attachments
 
     validates :from, presence: true
     validates :to, presence: true
@@ -13,24 +14,45 @@ module RailsMail
     }
 
     def text?
-      content_type&.include?("text/plain")
+      content_type&.include?("text/plain") || content_type&.include?("multipart/alternative")
     end
 
     def html?
-      content_type&.include?("text/html")
+      content_type&.include?("text/html") || content_type&.include?("multipart/alternative")
+    end
+
+    def next_email
+      RailsMail::Email.where("id < ?", id).last || RailsMail::Email.first
+    end
+
+    def html_body
+      return nil unless html?
+
+      html_part["raw_source"]
+    end
+
+    def text_body
+      return nil unless text?
+
+      text_part["raw_source"]
     end
 
     private
 
     def broadcast_email
-      return unless defined?(::Turbo) && defined?(::ActionCable)
+      return unless defined?(::ActionCable)
 
-      ::Turbo::StreamsChannel.broadcast_prepend_to(
-        "rails_mail:emails",
-        target: "email-sidebar",
+      html = ApplicationController.render(
         partial: "rails_mail/shared/email",
-        locals: { email: self }
+        locals: { email: self, email_path: email_path(self) }
+      )
+
+      turbo_stream = RailsMail::TurboHelper::TurboStreamBuilder.new.prepend(
+        target: "email-sidebar",
+        content: html
       )
+
+      ActionCable.server.broadcast("rails_mail:emails", turbo_stream)
     rescue StandardError => e
       Rails.logger.error "RailsMail::Email#broadcast_email failed: #{e.message}"
     end

data/app/views/layouts/rails_mail/_head.html.erb

@@ -0,0 +1,16 @@
+
+<head>
+  <title>RailsMail - <%= yield(:title) if content_for?(:title) %></title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <%= action_cable_meta_tag if defined?(::ActionCable) %>
+  <%= csrf_meta_tags %>
+  <%= csp_meta_tag %>
+  <%= tag.link rel: "stylesheet", href: frontend_static_path(:style, format: :css, v: RailsMail::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+  
+  <%= tag.script "", src: frontend_static_path(:tailwind, format: :js, v: RailsMail::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+
+  <% importmaps = RailsMail::FrontendsController.js_modules.keys.index_with { |module_name| frontend_module_path(module_name, format: :js, locale: nil) } %>
+  <%= tag.script({ imports: importmaps }.to_json.html_safe, type: "importmap", nonce: content_security_policy_nonce) %>
+  <%= tag.script "", type: "module", nonce: content_security_policy_nonce do %> import "application"; <% end %>    
+
+</head>

data/app/views/layouts/rails_mail/_title.html.erb

@@ -0,0 +1 @@
+<h1 class="text-xl font-bold">Rails Mail</h1>

data/app/views/layouts/rails_mail/application.html.erb

@@ -1,34 +1,37 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>RailsMail - <%= yield(:title) if content_for?(:title) %></title>
-    <meta name="viewport" content="width=device-width,initial-scale=1">
-    <%= action_cable_meta_tag if defined?(::ActionCable) %>
-    <%= csrf_meta_tags %>
-    <%= csp_meta_tag %>
-    <%= tag.link rel: "stylesheet", href: frontend_static_path(:style, format: :css, v: RailsMail::VERSION, locale: nil), nonce: content_security_policy_nonce %>
-    
-    <%= tag.script "", src: frontend_static_path(:tailwind, format: :js, v: RailsMail::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+  <%= render "layouts/rails_mail/head" %>
 
-    <% importmaps = RailsMail::FrontendsController.js_modules.keys.index_with { |module_name| frontend_module_path(module_name, format: :js, locale: nil) } %>
-    <%= tag.script({ imports: importmaps }.to_json.html_safe, type: "importmap", nonce: content_security_policy_nonce) %>
-    <%= tag.script "", type: "module", nonce: content_security_policy_nonce do %> import "application"; <% end %>    
+  <body class="bg-gray-100">
+    <div class="flex h-screen relative">
+      <!-- Mobile menu checkbox (hidden) -->
+      <input type="checkbox" class="hidden peer" id="sidebar-toggle">
 
-  </head>
+      <!-- Collapsed menu button -->
+      <label for="sidebar-toggle" class="lg:hidden fixed top-4 left-4 z-20 p-2 rounded-md text-gray-600 hover:text-gray-900 hover:bg-gray-100 cursor-pointer peer-checked:hidden bg-gray-200">
+        <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
+        </svg>
+      </label>
 
-  <body class="bg-gray-100">
-    <div class="flex h-screen">
       <!-- Sidebar -->
-      <div class="w-80 bg-white border-r border-gray-200 flex flex-col">
+      <div class="fixed lg:static inset-y-0 left-0 transform -translate-x-full peer-checked:translate-x-0 lg:translate-x-0 transition duration-200 ease-in-out w-80 bg-white border-r border-gray-200 flex flex-col z-10">
         <div class="flex-none p-4">
-          <div class="flex items-center justify-between">
-            <div class="flex items-center">
-              <%= link_to root_path, class: "text-gray-900" do %>
-                <h1 class="text-xl font-bold">Rails Mail</h1>
-              <% end %>
-            </div>
+          <div class="flex items-center justify-between w-full">
+            <!-- Menu icon (visible only on mobile) -->
+            <label for="sidebar-toggle" class="lg:hidden p-2 rounded-md text-gray-600 hover:text-gray-900 hover:bg-gray-100 cursor-pointer bg-gray-200">
+              <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
+              </svg>
+            </label>
+            
+            <!-- Title (centered) -->
+            <%= link_to root_path, class: "text-gray-900" do %>
+              <%= render "layouts/rails_mail/title" %>
+            <% end %>
 
-            <% if instance_eval(&RailsMail.show_clear_button?) %>                
+            <!-- Clear All button (or empty div for spacing when button is hidden) -->
+            <% if instance_eval(&RailsMail.show_clear_all_button_callback) %>
               <%= button_to destroy_all_emails_path, 
                   class: "text-sm text-gray-600 hover:text-gray-900",
                   form: { data: { turbo_confirm: "Are you sure you want to clear all emails?" } },
@@ -40,6 +43,8 @@
                   Clear All
                 </div>
               <% end %>
+            <% else %>
+              <div class="w-[88px]"></div> <!-- Placeholder to maintain spacing when button is hidden -->
             <% end %>
           </div>
         </div>
@@ -60,11 +65,9 @@
       </div>
 
       <!-- Main content -->
-      <div class="flex-1 overflow-y-auto">
-        <div class="p-8">
-          <turbo-frame id="email_content">
-            <%= yield %>
-          </turbo-frame>
+      <div class="flex-1 overflow-y-auto lg:ml-0">
+        <div class="p-8 lg:p-8 sm:p-4">
+          <%= yield %>
         </div>
       </div>
     </div>

data/app/views/rails_mail/emails/_email_tabs.html.erb

@@ -0,0 +1,28 @@
+<div class="prose max-w-none break-words">
+  <input type="radio" name="email_tab" id="html_tab" class="hidden peer/html" <%= email.html? ? 'checked' : '' %> <%= email.html? ? '' : 'disabled' %> />
+  <label
+    for="html_tab"
+    class="px-4 py-2 text-sm font-medium cursor-pointer peer-checked/html:text-blue-600 peer-checked/html:border-blue-600 peer-checked/html:border-b-2 peer-disabled/html:text-gray-400 peer-disabled/html:cursor-not-allowed">
+    HTML
+  </label>
+  
+  <input type="radio" name="email_tab" id="text_tab" class="hidden peer/text" <%= email.text? ? (!email.html? ? 'checked' : '') : 'disabled' %> />
+  <label
+    for="text_tab"
+    class="px-4 py-2 text-sm font-medium cursor-pointer peer-checked/text:text-blue-600 peer-checked/text:border-blue-600 peer-checked/text:border-b-2 peer-disabled/text:text-gray-400 peer-disabled/text:cursor-not-allowed">
+    Text
+  </label>
+
+  <div class="hidden peer-checked/html:block mt-3">
+    <% if email.html? %>
+      <%= sanitize(email.html_body,
+        tags: ActionView::Base.sanitized_allowed_tags + ['table', 'tbody', 'tr', 'td'],
+        attributes: ActionView::Base.sanitized_allowed_attributes + ['style']) %>
+    <% end %>
+  </div>
+  <div class="hidden peer-checked/text:block mt-3 bg-black text-white font-mono p-4 rounded">
+    <% if email.text? %>
+      <%= simple_format email.text_body %>
+    <% end %>
+  </div>
+</div>

data/app/views/rails_mail/emails/destroy.turbo_stream.erb

@@ -0,0 +1,19 @@
+<turbo-stream action="remove" target="<%= dom_id(@email) %>">
+</turbo-stream>
+
+<% path_to_visit = if RailsMail::Email.count.zero?
+    root_path
+  else
+    email_path(@email.next_email)
+  end
+%>
+
+ <turbo-stream action="update" target="email_content">
+  <template>
+    <div class="" data-controller="redirect" data-redirect-url-value="<%= path_to_visit %>">
+      <div class="flex justify-center items-center min-h-screen">
+        <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-gray-900"></div>
+      </div>
+    </div>
+  </template>
+</turbo-stream>

data/app/views/rails_mail/emails/destroy_all.turbo_stream.erb

@@ -4,6 +4,8 @@
 </turbo-stream>
 <turbo-stream action="update" target="email_content">
   <template>
-    <%= render(partial: "rails_mail/emails/empty_state", formats: [ :html ]) %>
+    <div data-controller="redirect" data-redirect-url-value="<%= emails_path %>">
+      <%= render(partial: "rails_mail/emails/empty_state", formats: [ :html ]) %>
+    </div>
   </template>
 </turbo-stream>

data/app/views/rails_mail/emails/index.turbo_stream.erb

@@ -1,7 +1,7 @@
 <turbo-stream action="update" target="email-sidebar">
   <template>
     <% @emails&.each do |email| %>
-      <%= render partial: "rails_mail/shared/email", locals: {email: email}, formats: [:html] %>
+      <%= render partial: "rails_mail/shared/email", locals: {email: email, email_path: email_path(email) }, formats: [:html] %>
     <% end %>
   </template>
 </turbo-stream>

data/app/views/rails_mail/emails/show.html.erb

@@ -1,7 +1,8 @@
 <%= rails_mail_turbo_frame_tag "email_content" do %>
-  <div class="bg-white shadow rounded-lg">
+  <div class="bg-white shadow rounded-lg" data-email-id="<%= @email.id %>" 
+       data-email-highlight-current-id-value="<%= @email.id %>">
     <div class="px-6 py-4 border-b border-gray-200">
-      <h1 class="text-2xl font-semibold text-gray-900"><%= @email.subject %></h1>
+      <h1 class="text-2xl font-semibold text-gray-900 break-words"><%= @email.subject %></h1>
       <div class="mt-2 text-sm text-gray-600">
         <div>From: <%= @email.from %></div>
         <div>To: <%= @email.to.join(", ") %></div>
@@ -35,8 +36,8 @@
         </div>
       <% end %>
 
-      <div class="prose max-w-none">
-        <%= simple_format @email.body %>
+      <div>
+        <%= render "email_tabs", email: @email %>
       </div>
     </div>
   </div>

data/app/views/rails_mail/shared/_email.html.erb

@@ -2,24 +2,42 @@
   on_current_page = current_page?(RailsMail::Engine.routes.url_helpers.email_path(email))
   highlight_class = on_current_page ? 'bg-gray-300' : ''
 %>
-<%= link_to RailsMail::Engine.routes.url_helpers.email_path(email), 
-      class: "block px-3 py-2 rounded-md hover:bg-gray-200 #{highlight_class} active:bg-gray-300 focus:bg-gray-300", 
+<%= content_tag :div, id: dom_id(email), class: "group flex items-center px-3 py-2 hover:bg-gray-200 #{highlight_class} active:bg-gray-300 focus:bg-gray-300", data: {testid: "email-row"} do %>
+  <%= link_to RailsMail::Engine.routes.url_helpers.email_path(email), 
+        class: "flex-1 min-w-0 rounded-md", 
+        data: { 
+          "turbo-frame": "email_content",
+          "turbo-action": "advance",
+          "turbo-prefetch": "false",
+          "email-highlight-target": "link",
+          "email-id": email.id,
+          action: "click->email-highlight#highlight"
+        } do %>
+    <div class="min-w-0">
+      <div class="text-sm font-medium text-gray-900 truncate"><%= email.subject %></div>
+      <div class="text-xs text-gray-500">
+        <span class="truncate"><%= email.from %></span>
+        <time 
+          data-controller="timeago" 
+          data-timeago-datetime-value="<%= email.created_at.iso8601 %>" 
+          data-timeago-refresh-interval-value="1000" 
+          data-timeago-include-seconds-value="true" 
+          class="ml-2 text-gray-400"><%= time_ago_in_words(email.created_at) %> ago</time>
+      </div>
+    </div>
+  <% end %>
+
+  <%= button_to email_path,
+    method: :delete,
+    class: "hidden group-hover:block p-1 hover:bg-gray-300 rounded",
+    form: { 
       data: { 
-        "turbo-frame": "email_content",
-        "turbo-action": "advance",
-        "turbo-prefetch": "false",
-        "email-highlight-target": "link",
-        "email-id": email.id,
-        action: "click->email-highlight#highlight"
-      } do %>
-  <div class="text-sm font-medium text-gray-900 truncate"><%= email.subject %></div>
-  <div class="text-xs text-gray-500">
-    <span class="truncate"><%= email.from %></span>
-    <time 
-      data-controller="timeago" 
-      data-timeago-datetime-value="<%= email.created_at.iso8601 %>" 
-      data-timeago-refresh-interval-value="1000" 
-      data-timeago-include-seconds-value="true" 
-      class="ml-2 text-gray-400"><%= time_ago_in_words(email.created_at) %> ago</time>
-  </div>
+        turbo_confirm: "Are you sure you want to delete this email?",
+        turbo_frame: "_top"
+      },
+    } do %>
+    <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4 text-gray-500 transition-colors" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
+    </svg>
+  <% end %>
 <% end %> 

data/app/views/rails_mail/shared/_email_sidebar.html.erb

@@ -4,6 +4,6 @@
 
 <div id="email-sidebar" data-controller="email-highlight">
   <% @emails&.each do |email| %>
-    <%= render "rails_mail/shared/email", email: email %>
+    <%= render "rails_mail/shared/email", email: email, email_path: email_path(email) %>
   <% end %>
 </div>

data/config/routes.rb

@@ -4,7 +4,7 @@ RailsMail::Engine.routes.draw do
     get "static/:name", action: :static, as: :frontend_static, constraints: { format: %w[css js] }
   end
 
-  resources :emails, only: [ :index, :show ] do
+  resources :emails, only: [ :index, :show, :destroy ] do
     collection do
       delete "emails/destroy_all", to: "emails#destroy_all", as: :destroy_all
     end

data/lib/generators/rails_mail/install/templates/initializer.rb

@@ -4,14 +4,14 @@ Rails.configuration.to_prepare do
   RailsMail.configure do |config|
     # Authentication setup
     # if left blank, authentication is skipped
-    # config.authentication_callback do
+    # config.authenticate do
       # Example implementation for Authlogic:
       # user_session = UserSession.find
       # msg = Rails.env.development? ? 'Forbidden - make sure you have the correct permission in config/initializers/rails_mail.rb' : 'Not Found'
       # raise ActionController::RoutingError.new(msg) unless user_session&.user&.admin?
     # end
 
-    config.show_clear_button do
+    config.show_clear_all_button do
       # show clear button in development
       # and prefer to trim in non-development environments
       # to prevent accidental deletion of emails

data/lib/rails_mail/configuration.rb

@@ -1,29 +1,29 @@
 module RailsMail
   class Configuration
-    attr_accessor :authentication_callback, :show_clear_button,
+    attr_accessor :authentication_callback, :show_clear_all_button_callback,
                   :trim_emails_older_than, :trim_emails_max_count,
                   :enqueue_trim_job
 
     def initialize
       @authentication_callback = nil
-      @show_clear_button = nil
+      @show_clear_all_button_callback = nil
       @trim_emails_older_than = nil
       @trim_emails_max_count = nil
       @enqueue_trim_job = ->(email) { RailsMail::TrimEmailsJob.perform_later }
     end
 
-    def authentication_callback=(callback)
+    def authenticate(&callback)
       unless callback.nil? || callback.respond_to?(:call)
         raise ArgumentError, "authentication_callback must be nil or respond to #call"
       end
       @authentication_callback = callback
     end
 
-    def show_clear_button=(callback)
+    def show_clear_all_button(&callback)
       unless callback.nil? || callback.respond_to?(:call)
-        raise ArgumentError, "show_clear_button must be nil or respond to #call"
+        raise ArgumentError, "show_clear_all_button must be nil or respond to #call"
       end
-      @show_clear_button = callback
+      @show_clear_all_button_callback = callback
     end
   end
 end

data/lib/rails_mail/delivery_method.rb

@@ -10,7 +10,8 @@ module RailsMail
         cc: mail.cc,
         bcc: mail.bcc,
         subject: mail.subject,
-        body: mail.body.to_s,
+        text_part: extract_mail_body_by_type(mail, "text/plain"),
+        html_part: extract_mail_body_by_type(mail, "text/html"),
         content_type: mail.content_type,
         attachments: mail.attachments.map { |a| { filename: a.filename, content_type: a.content_type.split(";").first } }
       )
@@ -18,5 +19,16 @@ module RailsMail
       Rails.logger.error("Failed to deliver email: #{e.message}")
       raise e
     end
+
+    private
+
+    def extract_mail_body_by_type(mail, mime_type)
+      if mail.multipart?
+        part = mail.parts.find { |p| p.content_type.start_with?(mime_type) }
+        part ? part.body.as_json : nil
+      elsif mail.content_type.start_with?(mime_type)
+        mail.body.as_json
+      end
+    end
   end
 end

data/lib/rails_mail/version.rb

@@ -1,3 +1,3 @@
 module RailsMail
-  VERSION = "0.9.3"
+  VERSION = "0.10.0"
 end

data/lib/rails_mail.rb

@@ -17,24 +17,12 @@ module RailsMail
       @configuration = Configuration.new
     end
 
-    def authentication_callback(&block)
-      @authentication_callback = block if block
-      @authentication_callback || ->(request) { true }
+    def authentication_callback
+      configuration.authentication_callback || ->(request) { true }
     end
 
-    def show_clear_button?(&block)
-      @show_clear_button = block if block
-      @show_clear_button || ->(request) { true }
+    def show_clear_all_button_callback
+      configuration.show_clear_all_button || ->(request) { true }
     end
   end
-
-  # class Configuration
-  #   def authentication_callback(&block)
-  #     RailsMail.authentication_callback(&block)
-  #   end
-
-  #   def show_clear_button(&block)
-  #     RailsMail.show_clear_button?(&block)
-  #   end
-  # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_mail
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Peter Philips
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-09 00:00:00.000000000 Z
+date: 2025-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -69,6 +69,7 @@ files:
 - app/frontend/rails_mail/modules/consumer.js
 - app/frontend/rails_mail/modules/email_highlight_controller.js
 - app/frontend/rails_mail/modules/emails_channel.js
+- app/frontend/rails_mail/modules/redirect_controller.js
 - app/frontend/rails_mail/modules/timeago.js
 - app/frontend/rails_mail/style.css
 - app/frontend/rails_mail/vendor/action_cable.js
@@ -80,11 +81,14 @@ files:
 - app/helpers/rails_mail/turbo_helper.rb
 - app/jobs/rails_mail/trim_emails_job.rb
 - app/models/rails_mail/email.rb
+- app/views/layouts/rails_mail/_head.html.erb
+- app/views/layouts/rails_mail/_title.html.erb
 - app/views/layouts/rails_mail/application.html.erb
 - app/views/rails_mail/emails/_email.html.erb
+- app/views/rails_mail/emails/_email_tabs.html.erb
 - app/views/rails_mail/emails/_empty_state.html.erb
 - app/views/rails_mail/emails/_form.html.erb
-- app/views/rails_mail/emails/_show.html.erb
+- app/views/rails_mail/emails/destroy.turbo_stream.erb
 - app/views/rails_mail/emails/destroy_all.turbo_stream.erb
 - app/views/rails_mail/emails/edit.html.erb
 - app/views/rails_mail/emails/index.html.erb
@@ -126,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Database-backed Action Mailer delivery method with web interface

data/app/views/rails_mail/emails/_show.html.erb

@@ -1,50 +0,0 @@
-<%= rails_mail_turbo_frame_tag "email_content" do %>
-  <div class="bg-white shadow rounded-lg" data-email-id="<%= email.id %>" 
-       data-email-highlight-current-id-value="<%= email.id %>">
-    <div class="px-6 py-4 border-b border-gray-200">
-      <h1 class="text-2xl font-semibold text-gray-900"><%= email.subject %></h1>
-      <div class="mt-2 text-sm text-gray-600">
-        <div>From: <%= email.from %></div>
-        <div>To: <%= email.to.join(", ") %></div>
-        <% if email.cc.present? %>
-          <div>CC: <%= email.cc.join(", ") %></div>
-        <% end %>
-        <% if email.bcc.present? %>
-          <div>BCC: <%= email.bcc.join(", ") %></div>
-        <% end %>
-        <div class="text-gray-400 mt-1">
-          <%= email.created_at.strftime("%B %d, %Y at %I:%M %p") %>
-        </div>
-      </div>
-    </div>
-
-    <div class="px-6 py-4">
-      <% if email.attachments.present? %>
-        <div class="mb-4 p-4 bg-gray-50 rounded-md">
-          <h3 class="text-sm font-medium text-gray-900 mb-2">Attachments</h3>
-          <div class="space-y-2">
-            <% email.attachments.each do |attachment| %>
-              <div class="flex items-center text-sm">
-                <svg class="h-5 w-5 text-gray-400 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.172 7l-6.586 6.586a2 2 0 102.828 2.828l6.414-6.586a4 4 0 00-5.656-5.656l-6.415 6.585a6 6 0 108.486 8.486L20.5 13" />
-                </svg>
-                <span><%= attachment["filename"] %></span>
-                <span class="ml-2 text-gray-500">(<%= attachment["content_type"] %>)</span>
-              </div>
-            <% end %>
-          </div>
-        </div>
-      <% end %>
-
-      <div class="prose max-w-none">
-        <% if email.html? %>
-          <%= sanitize(email.body, 
-            tags: ActionView::Base.sanitized_allowed_tags + ['table', 'tbody', 'tr', 'td'], 
-            attributes: ActionView::Base.sanitized_allowed_attributes + ['style']) %>
-        <% else %>
-          <%= simple_format email.body %>
-        <% end %>
-      </div>
-    </div>
-  </div>
-<% end %>