mailer-log 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4126d246df4b031556df419f2fc9c2ea85b2ff1290947e6d832121ff9684672
-  data.tar.gz: 4b6e0c00f59e2210324d7d9d2e3d6ccb74210984d31c54b702428cd6e801b231
+  metadata.gz: 26775ff2d2392f342c9abeaefb88bdfb17eb4cf7474f7b7de2e8455196ccabce
+  data.tar.gz: 83ea69d74409c16c64df60899ba17e570f141e608326d54751e5e3603f4c0311
 SHA512:
-  metadata.gz: f95a160a50060fec7b7a67f1eeca4f62e5bfe3b15d43d5630113e08bc3497329c8fd674e185567ba8a5ab4f15eb8feb5090f021b4ce3ac0c4261c66ba75728a1
-  data.tar.gz: 804f2fbeb927c8f963a08dee20a12bbc8cc3d977343a3195443c93999b324bea60258f641d5d51b6aaab0874a896e2cec75ef5320e7f1a0d14c2ded5a7ec7d08
+  metadata.gz: 1cc55ff6f8f4f6a399534f201cc528a9ac09a6921e47078cedff710e960b71a0e76e25e0579d4cc1d5167af51b59fb28af070a89cee14652960030443904df7d
+  data.tar.gz: a3a234f111a2dcd6d613f44613c15d0222cfad244c87a7664750c694f48766c2eafd544327ea35c360af9fd96f537683b92577284fd8d23c1ecfdbe4075a7215

data/app/controllers/mailer_log/admin_controller.rb

@@ -2,24 +2,9 @@
 
 module MailerLog
   class AdminController < ::AdminsController
-    prepend HasScope
-
-    # Expose main app routes to views for navbar/layout links
-    helper Rails.application.routes.url_helpers
-
     before_action :authenticate_mailer_log!
 
-    # Make main_app proxy available in views
-    helper_method :main_app
-
-    # Override url_options to prevent main app routes from being prefixed
-    # with the engine's mount path
-    def url_options
-      script_name = request.env['SCRIPT_NAME']
-      return super unless script_name&.include?('mailer_log') || script_name&.include?('mailer-log') || script_name&.include?('email_log')
-
-      super.merge(script_name: '')
-    end
+    rescue_from 'Pundit::NotAuthorizedError', with: :render_not_found
 
     private
 
@@ -29,9 +14,8 @@ module MailerLog
       MailerLog.configuration.authenticate_with_proc.call(self)
     end
 
-    def mailer_log_engine
-      MailerLog::Engine.routes.url_helpers
+    def render_not_found
+      raise ActionController::RoutingError, 'Not Found'
     end
-    helper_method :mailer_log_engine
   end
 end

data/app/controllers/mailer_log/api/emails_controller.rb

@@ -3,6 +3,15 @@
 module MailerLog
   module Api
     class EmailsController < MailerLog::AdminController
+      BASE_EMAIL_ATTRIBUTES = %i[
+        id tracking_id message_id mailer_class mailer_action
+        from_address to_addresses cc_addresses bcc_addresses
+        subject domain status delivered_at opened_at clicked_at
+        bounced_at created_at updated_at
+      ].freeze
+      BODY_ATTRIBUTES = %i[html_body text_body headers call_stack].freeze
+      EVENT_ATTRIBUTES = %i[id event_type occurred_at recipient ip_address user_agent].freeze
+
       skip_before_action :verify_authenticity_token, only: [:index, :show]
 
       def index
@@ -40,47 +49,9 @@ module MailerLog
       end
 
       def email_json(email, include_body: false, include_events: false)
-        data = {
-          id: email.id,
-          tracking_id: email.tracking_id,
-          message_id: email.message_id,
-          mailer_class: email.mailer_class,
-          mailer_action: email.mailer_action,
-          from_address: email.from_address,
-          to_addresses: email.to_addresses,
-          cc_addresses: email.cc_addresses,
-          bcc_addresses: email.bcc_addresses,
-          subject: email.subject,
-          domain: email.domain,
-          status: email.status,
-          delivered_at: email.delivered_at,
-          opened_at: email.opened_at,
-          clicked_at: email.clicked_at,
-          bounced_at: email.bounced_at,
-          created_at: email.created_at,
-          updated_at: email.updated_at
-        }
-
-        if include_body
-          data[:html_body] = email.html_body
-          data[:text_body] = email.text_body
-          data[:headers] = email.headers
-          data[:call_stack] = email.call_stack
-        end
-
-        if include_events
-          data[:events] = email.events.recent.map do |event|
-            {
-              id: event.id,
-              event_type: event.event_type,
-              occurred_at: event.occurred_at,
-              recipient: event.recipient,
-              ip_address: event.ip_address,
-              user_agent: event.user_agent
-            }
-          end
-        end
-
+        data = email.slice(*BASE_EMAIL_ATTRIBUTES)
+        data.merge!(email.slice(*BODY_ATTRIBUTES)) if include_body
+        data[:events] = email.events.recent.map { _1.slice(*EVENT_ATTRIBUTES) } if include_events
         data
       end
     end

data/app/views/mailer_log/spa/index.html.erb

@@ -11,11 +11,16 @@
   <% end %>
 </head>
 <body class="bg-gray-100 min-h-screen">
+  <% header_partial = MailerLog.configuration.header_partial %>
   <script>
     window.MAILER_LOG_CONFIG = {
-      mountPath: '<%= request.script_name %>'
+      mountPath: '<%= request.script_name %>',
+      hideNavbar: <%= header_partial.present? %>
     };
   </script>
+  <% if header_partial %>
+    <%= render partial: header_partial %>
+  <% end %>
   <div id="app"></div>
   <% if (js = mailer_log_js_entry) %>
     <script type="module" src="<%= request.script_name %>/<%= js %>"></script>

data/lib/mailer_log/configuration.rb

@@ -6,7 +6,8 @@ module MailerLog
       :webhook_signing_key,
       :capture_call_stack,
       :call_stack_depth,
-      :per_page
+      :per_page,
+      :header_partial
 
     attr_reader :authenticate_with_proc, :resolve_accountable_proc
 
@@ -16,6 +17,7 @@ module MailerLog
       @capture_call_stack = true
       @call_stack_depth = 20
       @per_page = 25
+      @header_partial = nil # e.g., 'shared/admin_navbar'
       @authenticate_with_proc = nil
       @resolve_accountable_proc = nil
     end

data/lib/mailer_log/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MailerLog
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

data/lib/tasks/mailer_log.rake

@@ -1,75 +1,43 @@
 # frozen_string_literal: true
 
 namespace :mailer_log do
-  desc 'Build MailerLog Vue.js frontend (set MAILER_LOG_OVERRIDES_PATH to customize components)'
-  task :build_frontend do
-    frontend_dir = MailerLog::Engine.root.join('frontend')
-
-    unless frontend_dir.exist?
-      puts <<~MSG
-        ERROR: Frontend source not available.
-
-        This task is for gem development only. When using mailer-log from RubyGems,
-        the frontend is pre-built and included in public/mailer_log/.
+  desc 'Copy MailerLog assets to public/'
+  task install_assets: :environment do
+    source = MailerLog::Engine.root.join('public', 'mailer_log')
+    destination = Rails.root.join('public', 'mailer_log')
 
-        To customize the frontend with overrides:
-        1. Clone the gem repository: git clone https://github.com/trafficrunners/mailer-log.git
-        2. cd mailer-log/frontend
-        3. MAILER_LOG_OVERRIDES_PATH=/path/to/your/overrides npm run build
-        4. Copy public/mailer_log/ to your app
-      MSG
+    unless source.exist?
+      puts "ERROR: MailerLog assets not found at #{source}"
       exit 1
     end
 
-    overrides_path = ENV['MAILER_LOG_OVERRIDES_PATH']
-
-    puts 'Installing npm dependencies...'
-    system('npm install', chdir: frontend_dir.to_s) || raise('npm install failed')
-
-    if overrides_path
-      puts "Building frontend with overrides from: #{overrides_path}"
-    else
-      puts 'Building frontend (no overrides)...'
-      puts 'Tip: Set MAILER_LOG_OVERRIDES_PATH to customize navbar and other components'
-    end
-
-    env = overrides_path ? { 'MAILER_LOG_OVERRIDES_PATH' => overrides_path } : {}
-    system(env, 'npm run build', chdir: frontend_dir.to_s) || raise('npm build failed')
-
-    puts 'Frontend built successfully!'
+    FileUtils.rm_rf(destination) if destination.exist?
+    FileUtils.cp_r(source, destination)
+    puts "MailerLog assets copied to #{destination}"
   end
 
-  desc 'Start Vite development server for MailerLog frontend'
-  task :dev_server do
+  desc 'Build MailerLog Vue.js frontend (for gem development only)'
+  task :build_frontend do
     frontend_dir = MailerLog::Engine.root.join('frontend')
 
     unless frontend_dir.exist?
-      puts <<~MSG
-        ERROR: Frontend source not available.
-
-        This task is for gem development only. When using mailer-log from RubyGems,
-        the frontend is pre-built and served automatically.
-
-        To develop the frontend with hot-reload:
-        1. Clone the gem repository: git clone https://github.com/trafficrunners/mailer-log.git
-        2. cd mailer-log/frontend
-        3. npm install
-        4. MAILER_LOG_OVERRIDES_PATH=/path/to/your/overrides npm run dev
-      MSG
+      puts 'ERROR: Frontend source not available (only in gem source, not RubyGems)'
       exit 1
     end
 
-    overrides_path = ENV['MAILER_LOG_OVERRIDES_PATH']
+    puts 'Installing npm dependencies...'
+    system('npm install', chdir: frontend_dir.to_s) || raise('npm install failed')
 
-    puts 'Starting Vite dev server...'
-    puts 'Frontend will be available at http://localhost:5173'
-    puts 'Make sure Rails is running on http://localhost:3000'
+    puts 'Building frontend...'
+    system('npm run build', chdir: frontend_dir.to_s) || raise('npm build failed')
 
-    if overrides_path
-      puts "Using overrides from: #{overrides_path}"
-    end
+    puts 'Frontend built successfully!'
+  end
+end
 
-    env = overrides_path ? { 'MAILER_LOG_OVERRIDES_PATH' => overrides_path } : {}
-    exec(env, 'npm run dev', chdir: frontend_dir.to_s)
+# Hook into assets:precompile to copy MailerLog assets
+if Rake::Task.task_defined?('assets:precompile')
+  Rake::Task['assets:precompile'].enhance do
+    Rake::Task['mailer_log:install_assets'].invoke
   end
 end

data/public/mailer_log/.vite/manifest.json

@@ -1,6 +1,6 @@
 {
   "index.html": {
-    "file": "assets/mailer_log-CzkGXWPn.js",
+    "file": "assets/mailer_log-zD1d7Bvi.js",
     "name": "index",
     "src": "index.html",
     "isEntry": true,