mailer-log 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c36e93f917cf148538170a5874f21ae944619a9297576a0ca4f7c22d8e1df5ad
-  data.tar.gz: 93dadd61e8429d629856adf0a740eec374019511404b7ae6f48c5fb534ebd877
+  metadata.gz: 3785cbf9b2307b102f2665f7d1d243a8ea47a5c24279880bff1909e8f73bd298
+  data.tar.gz: acec07a5240eecd4aa838003efa4121593983aaab5854412aa847df1c264ea8c
 SHA512:
-  metadata.gz: 98e72645f62e30e6e4298951b16e028de4d3418b9020ad78a6cda3deb33ae53feacb09644f947b07d265e81d1440ab0bf76998eb699d3ecec5b197e03b196edc
-  data.tar.gz: 4221adc21951a2f11e9c319b2f27be00ccb3a40e6d0b7b28b5f153218aaf4495bd4afd880313e48b06b9a2c072f8b22dbccdbbd41a0e61cc6517290fe9bc8bc0
+  metadata.gz: 2f9049e41b9200d4fcccafa04c25c145d255cff23fbb2cdd094e7fcf8892671b5046901ca92f8180f9c69302a1650745fe34320f898c6f8ff009858e3e74647a
+  data.tar.gz: dee222520c88d07c49b99a65d16c988ab5b4d3875653e57c03ed03acbe87368ecdda0eeb60787da3c61f50de7b3334365804bdbada95855370314ca35a877355

data/app/controllers/mailer_log/admin_controller.rb

@@ -2,13 +2,10 @@
 
 module MailerLog
   class AdminController < ::AdminsController
-    # Make main app routes available in views (for header_partial)
     helper Rails.application.routes.url_helpers
 
     before_action :authenticate_mailer_log!
 
-    rescue_from 'Pundit::NotAuthorizedError', with: :render_not_found
-
     private
 
     def authenticate_mailer_log!
@@ -16,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,48 +2,73 @@
 
 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
-
     def mailer_log_js_entry
+      return nil if mailer_log_dev_server_url
+
       manifest = mailer_log_manifest
       return nil unless manifest
 
       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
+      return nil if mailer_log_dev_server_url
+
       manifest = mailer_log_manifest
       return nil unless manifest
 
       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
+
+    def mailer_log_dev_server_url
+      return nil unless ENV['MAILER_LOG_DEV_SERVER_URL']
+
+      "#{ENV['MAILER_LOG_DEV_SERVER_URL']}/mailer_log"
     end
 
     private
 
+    def asset_base_path
+      # In dev, middleware serves from gem's public dir at /mailer_log/
+      # In production, assets are copied to asset pipeline dir
+      if Rails.application.config.public_file_server.enabled
+        '/mailer_log'
+      else
+        "/#{asset_output_dir}/mailer_log"
+      end
+    end
+
+    def asset_output_dir
+      @asset_output_dir ||= if defined?(ViteRuby)
+        ViteRuby.config.public_output_dir
+      elsif defined?(Webpacker)
+        Webpacker.config.public_output_path.basename.to_s
+      else
+        'assets'
+      end
+    end
+
     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)
+        # Check Rails app's asset output directory (after assets:precompile)
+        rails_manifest = Rails.root.join('public', asset_output_dir, 'mailer_log', '.vite', 'manifest.json')
+        return JSON.parse(File.read(rails_manifest)) if File.exist?(rails_manifest)
+
+        # Fallback to gem's built-in assets (served via middleware in dev)
+        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

@@ -4,10 +4,10 @@
   <meta charset="UTF-8">
   <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 %>">
-  <% else %>
-    <script type="module" src="http://localhost:5173/@vite/client"></script>
+  <% if (dev_url = mailer_log_dev_server_url) %>
+    <script type="module" src="<%= dev_url %>/@vite/client"></script>
+  <% elsif (css = mailer_log_css_entry) %>
+    <link rel="stylesheet" href="<%= css %>">
   <% end %>
 </head>
 <body class="bg-gray-100 min-h-screen">
@@ -22,10 +22,10 @@
     <%= render partial: header_partial %>
   <% end %>
   <div id="app"></div>
-  <% if (js = mailer_log_js_entry) %>
-    <script type="module" src="<%= request.script_name %>/<%= js %>"></script>
-  <% else %>
-    <script type="module" src="http://localhost:5173/src/main.js"></script>
+  <% if (dev_url = mailer_log_dev_server_url) %>
+    <script type="module" src="<%= dev_url %>/src/main.js"></script>
+  <% elsif (js = mailer_log_js_entry) %>
+    <script type="module" src="<%= 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,20 @@ module MailerLog
       g.factory_bot dir: 'spec/factories'
     end
 
+    # Serve gem's static assets in development
+    # In production, assets are copied via rake task and served by nginx
+    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.1'
+  VERSION = '0.2.4'
 end

data/lib/tasks/mailer_log.rake

@@ -1,10 +1,20 @@
 # frozen_string_literal: true
 
 namespace :mailer_log do
-  desc 'Copy MailerLog assets to public/'
+  desc 'Copy MailerLog assets to asset pipeline output directory'
   task install_assets: :environment do
     source = MailerLog::Engine.root.join('public', 'mailer_log')
-    destination = Rails.root.join('public', 'mailer_log')
+
+    # Detect asset output directory from ViteRuby or Webpacker
+    output_dir = if defined?(ViteRuby)
+      ViteRuby.config.public_output_dir
+    elsif defined?(Webpacker)
+      Webpacker.config.public_output_path.basename.to_s
+    else
+      'assets'
+    end
+
+    destination = Rails.root.join('public', output_dir, 'mailer_log')
 
     unless source.exist?
       puts "ERROR: MailerLog assets not found at #{source}"
@@ -12,30 +22,13 @@ namespace :mailer_log do
     end
 
     FileUtils.rm_rf(destination) if destination.exist?
+    FileUtils.mkdir_p(destination.dirname)
     FileUtils.cp_r(source, destination)
     puts "MailerLog assets copied to #{destination}"
   end
-
-  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 'ERROR: Frontend source not available (only in gem source, not RubyGems)'
-      exit 1
-    end
-
-    puts 'Installing npm dependencies...'
-    system('npm install', chdir: frontend_dir.to_s) || raise('npm install failed')
-
-    puts 'Building frontend...'
-    system('npm run build', chdir: frontend_dir.to_s) || raise('npm build failed')
-
-    puts 'Frontend built successfully!'
-  end
 end
 
-# Hook into assets:precompile to copy MailerLog assets
+# Hook into assets:precompile
 if Rake::Task.task_defined?('assets:precompile')
   Rake::Task['assets:precompile'].enhance do
     Rake::Task['mailer_log:install_assets'].invoke

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.1
+  version: 0.2.4
 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