mailer-log 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26775ff2d2392f342c9abeaefb88bdfb17eb4cf7474f7b7de2e8455196ccabce
-  data.tar.gz: 83ea69d74409c16c64df60899ba17e570f141e608326d54751e5e3603f4c0311
+  metadata.gz: 9549a1146ae922459b930c92b3e8d2b597967c31260cecf809eb91cd484d5de8
+  data.tar.gz: 2f6866fa48fc93054fcaf91e6b3538752df86287caa79b21d5daeb85a692f80b
 SHA512:
-  metadata.gz: 1cc55ff6f8f4f6a399534f201cc528a9ac09a6921e47078cedff710e960b71a0e76e25e0579d4cc1d5167af51b59fb28af070a89cee14652960030443904df7d
-  data.tar.gz: a3a234f111a2dcd6d613f44613c15d0222cfad244c87a7664750c694f48766c2eafd544327ea35c360af9fd96f537683b92577284fd8d23c1ecfdbe4075a7215
+  metadata.gz: f4c505ce0eb042ca077d9e9ad66fd699606f03a9c643c5b785ff3c9f508fb27b8b5407dff23e01ec75a5063be0b45a4c70d538091c767a594b95480798a3bba2
+  data.tar.gz: c02ec1955f93c463b9452f13a21577d502c33976e20beffeb724ebf0f5aaebd3d8dda0c7b7070baa020d823b41ec3cd4c71da1b9e382ede95d493747d52a6203

data/app/controllers/mailer_log/admin_controller.rb

@@ -2,9 +2,9 @@
 
 module MailerLog
   class AdminController < ::AdminsController
-    before_action :authenticate_mailer_log!
+    helper Rails.application.routes.url_helpers
 
-    rescue_from 'Pundit::NotAuthorizedError', with: :render_not_found
+    before_action :authenticate_mailer_log!
 
     private
 
@@ -13,9 +13,5 @@ module MailerLog
 
       MailerLog.configuration.authenticate_with_proc.call(self)
     end
-
-    def render_not_found
-      raise ActionController::RoutingError, 'Not Found'
-    end
   end
 end

data/app/controllers/mailer_log/webhooks_controller.rb

@@ -5,7 +5,7 @@ module MailerLog
     skip_before_action :verify_authenticity_token
 
     before_action :verify_signature
-    before_action :deduplicate_event
+    before_action :handle_deduplicate_event
 
     # POST /mailer_log/webhooks/mailgun
     def mailgun
@@ -55,12 +55,11 @@ module MailerLog
       head :unauthorized
     end
 
-    def deduplicate_event
+    def handle_deduplicate_event
       event_id = params.dig('event-data', 'id')
       return true unless event_id
 
       cache_key = "mailer_log:event:#{event_id}"
-
       if Rails.cache.exist?(cache_key)
         head :ok
         return false

data/app/helpers/mailer_log/spa_helper.rb

@@ -2,18 +2,7 @@
 
 module MailerLog
   module SpaHelper
-    def mailer_log_asset_path(name)
-      manifest = mailer_log_manifest
-      base_path = request.script_name
-      return "#{base_path}/assets/#{name}" unless manifest
-
-      entry = manifest[name] || manifest["src/#{name}"] || manifest["assets/#{name}"]
-      return "#{base_path}/assets/#{name}" unless entry
-
-      file = entry.is_a?(Hash) ? entry['file'] : entry
-      # Manifest paths already include 'assets/' prefix
-      "#{base_path}/#{file}"
-    end
+    ASSET_BASE_PATH = '/mailer_log'
 
     def mailer_log_js_entry
       manifest = mailer_log_manifest
@@ -22,7 +11,8 @@ module MailerLog
       entry = manifest['index.html'] || manifest['src/main.js']
       return nil unless entry
 
-      entry.is_a?(Hash) ? entry['file'] : entry
+      file = entry.is_a?(Hash) ? entry['file'] : entry
+      "#{ASSET_BASE_PATH}/#{file}"
     end
 
     def mailer_log_css_entry
@@ -32,18 +22,25 @@ module MailerLog
       entry = manifest['index.html']
       return nil unless entry.is_a?(Hash)
 
-      css_files = entry['css']
-      css_files&.first
+      css_file = entry['css']&.first
+      return nil unless css_file
+
+      "#{ASSET_BASE_PATH}/#{css_file}"
     end
 
     private
 
     def mailer_log_manifest
       @mailer_log_manifest ||= begin
-        manifest_path = MailerLog::Engine.root.join('public', 'mailer_log', '.vite', 'manifest.json')
-        return nil unless File.exist?(manifest_path)
+        # First check Rails app's public (after assets:precompile)
+        rails_manifest = Rails.root.join('public', 'mailer_log', '.vite', 'manifest.json')
+        return JSON.parse(File.read(rails_manifest)) if File.exist?(rails_manifest)
+
+        # Fallback to gem's built-in assets
+        gem_manifest = MailerLog::Engine.root.join('public', 'mailer_log', '.vite', 'manifest.json')
+        return JSON.parse(File.read(gem_manifest)) if File.exist?(gem_manifest)
 
-        JSON.parse(File.read(manifest_path))
+        nil
       end
     end
   end

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

@@ -5,9 +5,9 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Email Log</title>
   <% if (css = mailer_log_css_entry) %>
-    <link rel="stylesheet" href="<%= request.script_name %>/<%= css %>">
+    <link rel="stylesheet" href="<%= css %>">
   <% else %>
-    <script type="module" src="http://localhost:5173/@vite/client"></script>
+    <script type="module" src="http://localhost:5173/mailer_log/@vite/client"></script>
   <% end %>
 </head>
 <body class="bg-gray-100 min-h-screen">
@@ -23,9 +23,9 @@
   <% end %>
   <div id="app"></div>
   <% if (js = mailer_log_js_entry) %>
-    <script type="module" src="<%= request.script_name %>/<%= js %>"></script>
+    <script type="module" src="<%= js %>"></script>
   <% else %>
-    <script type="module" src="http://localhost:5173/src/main.js"></script>
+    <script type="module" src="http://localhost:5173/mailer_log/src/main.js"></script>
   <% end %>
 </body>
 </html>

data/config/routes.rb

@@ -10,10 +10,7 @@ MailerLog::Engine.routes.draw do
     resources :mailers, only: :index
   end
 
-  # Static assets for Vue SPA
-  get 'assets/*path', to: 'assets#show', as: :asset, format: false
-
-  # SPA catch-all - serves Vue app for all other routes
-  get '/', to: 'spa#index'
-  get '/*path', to: 'spa#index', constraints: ->(req) { !req.path.start_with?('/api', '/webhooks', '/assets') }
+  # SPA catch-all - serves Vue app for all routes
+  get '*path', to: 'spa#index'
+  root to: 'spa#index'
 end

data/lib/mailer_log/engine.rb

@@ -29,6 +29,19 @@ module MailerLog
       g.factory_bot dir: 'spec/factories'
     end
 
+    # Serve gem's static assets at /mailer_log/
+    initializer 'mailer_log.static_assets' do |app|
+      next unless app.config.public_file_server.enabled
+
+      gem_public = MailerLog::Engine.root.join('public').to_s
+      app.middleware.insert_before(
+        ActionDispatch::Static,
+        ActionDispatch::Static,
+        gem_public,
+        headers: { 'Cache-Control' => 'public, max-age=31536000' }
+      )
+    end
+
     # Load rake tasks
     rake_tasks do
       load MailerLog::Engine.root.join('lib', 'tasks', 'mailer_log.rake')

data/lib/mailer_log/version.rb

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

data/public/mailer_log/index.html

@@ -4,8 +4,8 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Email Log</title>
-  <script type="module" crossorigin src="/admin/mailer-log/assets/assets/mailer_log-zD1d7Bvi.js"></script>
-  <link rel="stylesheet" crossorigin href="/admin/mailer-log/assets/assets/index-D3WsYsVX.css">
+  <script type="module" crossorigin src="/mailer_log/assets/mailer_log-zD1d7Bvi.js"></script>
+  <link rel="stylesheet" crossorigin href="/mailer_log/assets/index-D3WsYsVX.css">
 </head>
 <body>
   <div id="app"></div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailer-log
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - TrafficRunners
@@ -75,7 +75,6 @@ files:
 - app/controllers/mailer_log/api/emails_controller.rb
 - app/controllers/mailer_log/api/mailers_controller.rb
 - app/controllers/mailer_log/application_controller.rb
-- app/controllers/mailer_log/assets_controller.rb
 - app/controllers/mailer_log/spa_controller.rb
 - app/controllers/mailer_log/webhooks_controller.rb
 - app/helpers/mailer_log/spa_helper.rb

data/app/controllers/mailer_log/assets_controller.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module MailerLog
-  class AssetsController < ActionController::Base
-    skip_forgery_protection
-
-    def show
-      file_path = MailerLog::Engine.root.join('public', 'mailer_log', 'assets', params[:path])
-
-      if File.exist?(file_path) && file_path.to_s.start_with?(MailerLog::Engine.root.join('public', 'mailer_log').to_s)
-        content_type = content_type_for(file_path)
-        send_file file_path, type: content_type, disposition: 'inline'
-      else
-        head :not_found
-      end
-    end
-
-    private
-
-    def content_type_for(file_path)
-      extension = File.extname(file_path).downcase
-      case extension
-      when '.js'
-        'application/javascript'
-      when '.css'
-        'text/css'
-      when '.map'
-        'application/json'
-      when '.svg'
-        'image/svg+xml'
-      when '.png'
-        'image/png'
-      when '.jpg', '.jpeg'
-        'image/jpeg'
-      when '.woff', '.woff2'
-        'font/woff2'
-      else
-        'application/octet-stream'
-      end
-    end
-  end
-end