rigortype 0.1.15 → 0.1.16

data/plugins/rigor-actionmailer/lib/rigor/plugin/actionmailer/mailer_discoverer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "prism"
+require "rigor/source/literals"
 
 require_relative "mailer_index"
 
@@ -264,7 +265,7 @@ module Rigor
             next unless node.is_a?(Prism::CallNode) && node.receiver.nil?
 
             args = (node.arguments&.arguments || []).filter_map do |arg|
-              arg.is_a?(Prism::SymbolNode) ? arg.unescaped.to_sym : nil
+              Rigor::Source::Literals.symbol(arg)
             end
             next if args.empty?
 
@@ -371,7 +372,11 @@ module Rigor
         # denied) are swallowed.
         def view_exists?(class_name, action_name)
           views_root_absolute = File.expand_path(@views_root)
-          underscore_path = underscore(class_name.delete_prefix("::"))
+          # ADR-39: the real ActiveSupport::Inflector resolves the mailer's
+          # view directory (`Foo::BarMailer` → `foo/bar_mailer`), so a
+          # divergence from Rails' real underscore can't point the
+          # missing-view check at the wrong directory.
+          underscore_path = Rigor::Plugin::Inflector.underscore(class_name.delete_prefix("::"))
           mailer_dir = File.join(views_root_absolute, underscore_path)
 
           VIEW_FORMATS.any? do |format|
@@ -381,17 +386,6 @@ module Rigor
             end
           end
         end
-
-        # Convert `Foo::BarMailer` → `foo/bar_mailer`. Mirrors
-        # ActiveSupport's String#underscore for ASCII-only
-        # constant names; we don't try to be inflector-perfect
-        # here.
-        def underscore(name)
-          name.gsub("::", "/")
-              .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-              .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-              .downcase
-        end
       end
     end
   end

data/plugins/rigor-actionmailer/lib/rigor/plugin/actionmailer.rb

@@ -59,16 +59,12 @@ module Rigor
         version: "0.4.0",
         description: "Validates ActionMailer call shape and view template existence.",
         config_schema: {
-          "mailer_search_paths" => :array,
-          "mailer_base_classes" => :array,
-          "views_root" => :string
+          "mailer_search_paths" => { kind: :array, default: ["app/mailers"] },
+          "mailer_base_classes" => { kind: :array, default: %w[ApplicationMailer ActionMailer::Base] },
+          "views_root" => { kind: :string, default: "app/views" }
         }
       )
 
-      DEFAULT_MAILER_SEARCH_PATHS = ["app/mailers"].freeze
-      DEFAULT_MAILER_BASE_CLASSES = %w[ApplicationMailer ActionMailer::Base].freeze
-      DEFAULT_VIEWS_ROOT = "app/views"
-
       producer :mailer_index do |_params|
         MailerDiscoverer.new(
           io_boundary: io_boundary,
@@ -79,22 +75,33 @@ module Rigor
       end
 
       def init(_services)
-        @mailer_search_paths = Array(config.fetch("mailer_search_paths", DEFAULT_MAILER_SEARCH_PATHS)).map(&:to_s)
-        @mailer_base_classes = Array(config.fetch("mailer_base_classes", DEFAULT_MAILER_BASE_CLASSES)).map(&:to_s)
-        @views_root = config.fetch("views_root", DEFAULT_VIEWS_ROOT).to_s
+        @mailer_search_paths = Array(config.fetch("mailer_search_paths")).map(&:to_s)
+        @mailer_base_classes = Array(config.fetch("mailer_base_classes")).map(&:to_s)
+        @views_root = config.fetch("views_root").to_s
         @mailer_index = nil
         @load_error = nil
       end
 
+      # File-level: load-error + the missing-view check (anchored on the
+      # mailer's own source file, so it is genuinely per-file, not
+      # per-call). The per-call mailer validation (action existence /
+      # arity) runs over the engine-owned walk via the node_rule below
+      # (ADR-37). The mailer index is lazily loaded + memoised, shared.
       def diagnostics_for_file(path:, scope:, root:) # rubocop:disable Lint/UnusedMethodArgument
         index = mailer_index_or_nil
         return [load_error_diagnostic(path)] if index.nil? && @load_error
         return [] if index.nil? || index.empty?
 
-        diagnostics = []
-        diagnostics.concat(call_site_diagnostics(path, root, index))
-        diagnostics.concat(missing_view_diagnostics(path, index))
-        diagnostics
+        missing_view_diagnostics(path, index)
+      end
+
+      node_rule Prism::CallNode do |node, _scope, path|
+        index = mailer_index_or_nil
+        next [] if index.nil? || index.empty?
+
+        Analyzer.violations_for(call_node: node, mailer_index: index).map do |violation|
+          diagnostic(node, path: path, message: violation.message, severity: violation.severity, rule: violation.rule)
+        end
       end
 
       private
@@ -121,10 +128,6 @@ module Rigor
         nil
       end
 
-      def call_site_diagnostics(path, root, index)
-        Analyzer.diagnose(path: path, root: root, mailer_index: index).map { |diag| build_diagnostic(diag) }
-      end
-
       # Anchors `missing-view` diagnostics on the mailer file
       # itself: when the file currently being analysed is the
       # mailer's source file, emit one diagnostic per missing
@@ -143,7 +146,7 @@ module Rigor
             severity: :warning,
             rule: "missing-view",
             message: "`#{class_entry.class_name}##{action_name}` has no view template " \
-                     "under `#{@views_root}/#{underscore(class_entry.class_name.delete_prefix('::'))}/`"
+                     "under `#{@views_root}/#{Rigor::Plugin::Inflector.underscore(class_entry.class_name.delete_prefix('::'))}/`"
           )
         end
       end
@@ -154,13 +157,6 @@ module Rigor
         File.expand_path(path)
       end
 
-      def underscore(name)
-        name.gsub("::", "/")
-            .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-            .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-            .downcase
-      end
-
       def load_error_diagnostic(path)
         Rigor::Analysis::Diagnostic.new(
           path: path, line: 1, column: 1,
@@ -169,13 +165,6 @@ module Rigor
           rule: "load-error"
         )
       end
-
-      def build_diagnostic(diag)
-        Rigor::Analysis::Diagnostic.new(
-          path: diag.path, line: diag.line, column: diag.column,
-          message: diag.message, severity: diag.severity, rule: diag.rule
-        )
-      end
     end
 
     Rigor::Plugin.register(Actionmailer)