immosquare-cleaner 0.1.81 → 0.1.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f7191ad53888a016ec0dfa5fd727e79303c499d6a6be0219e8b34dbe1f882e3
-  data.tar.gz: cff9ae3ebbe2136a1fec9cf40131741b2a445ee84ef3db21d955a0404937a321
+  metadata.gz: c1ef4621cff404769813cf6e8de68d657912a80e590f8626f6fb7b4e92c214e9
+  data.tar.gz: 427c3a61e31512a98a566f1ff786aeca114f7843bc707e4c1aa0de130adfb411
 SHA512:
-  metadata.gz: c0273782e0e3f462f7ee7ae2869fce0a73096616ac3f84069f4cd78503e0700ac34e549eca1aff8c3617fca22d4af9e754bd81f946d79b553edcdf52f653ca3d
-  data.tar.gz: 5ba775d04996966b8ce6a6406e722db27ef9d7c040ea4fb1ed6ef58960e53540487ebaccbcae7a6ec8e26e0a77c0c987d02521105b2640ed6ba19fd140e8417c
+  metadata.gz: 1e6a3fda2aab18322d56d2c580248cbfaba77c8c68c780c5aad461bcb832215a4062ff2da3eee716db76f9883bcea4cb793e8ba3fff43964407206f96240d270
+  data.tar.gz: 88535ccc05485fc89947862c3032abad0d9fe85113dc54e5aa953a56b4b9bce2a2ab974ae6165616be6d90124783c1dabf7ae99649b76a4b1aa02c6f03c87495

data/lib/immosquare-cleaner/version.rb

@@ -1,3 +1,3 @@
 module ImmosquareCleaner
-  VERSION = "0.1.81".freeze
+  VERSION = "0.1.83".freeze
 end

data/linters/erb_lint/custom_html_to_content_tag.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "prism"
+
 module ERBLint
   module Linters
     ##============================================================##
@@ -7,14 +9,15 @@ module ERBLint
     ## output statement and converts them to content_tag helpers.
     ##
     ## @example
-    ##   # bad
+    ## bad
     ##   <div class="card-title"><%= t("app.title") %></div>
     ##
-    ##   # good
+    ## good
     ##   <%= content_tag(:div, t("app.title"), :class => "card-title") %>
     ##
     ##============================================================##
     class CustomHtmlToContentTag < Linter
+
       include LinterRegistry
 
       MSG = "Use content_tag helper instead of HTML tag with ERB output."
@@ -22,9 +25,26 @@ module ERBLint
       ##============================================================##
       ## Void elements that cannot have content (self-closing tags)
       ##============================================================##
-      VOID_ELEMENTS = %w[
-        area base br col command embed hr img input keygen
-        link menuitem meta param source track wbr
+      VOID_ELEMENTS = [
+        "area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "menuitem", "meta", "param", "source", "track", "wbr"
+      ].freeze
+
+      ##============================================================##
+      ## Methods that should not be converted to content_tag
+      ## - render: partials should stay in HTML for readability
+      ## - content_tag: prevents cascading on multiple erb_lint passes
+      ##
+      ## Note: If content_tag is removed from exclusions, additional
+      ## logic is needed to prevent cascading conversions. The approach
+      ## would be to check if the content_tag has HTML attributes
+      ## (:class, :id) which indicates it was generated by us in a
+      ## previous pass. See same_tag_content_tag? method pattern:
+      ##   - content_tag(:div, x, :class => "y") → skip (generated)
+      ##   - content_tag(:div, x) → allow (user-written)
+      ##============================================================##
+      EXCLUDED_METHODS = [
+        "render",
+        "content_tag"
       ].freeze
 
       def run(processed_source)
@@ -60,11 +80,15 @@ module ERBLint
           next unless extract_tag_name(closing_child) == tag_name
 
           ##============================================================##
-          ## Build the content_tag replacement
+          ## Extract ERB code and check if it should be skipped
           ##============================================================##
-          attributes = extract_attributes(child)
           erb_code = extract_erb_code(erb_node)
+          next if excluded_method?(erb_code)
 
+          ##============================================================##
+          ## Build the content_tag replacement
+          ##============================================================##
+          attributes = extract_attributes(child)
           new_code = build_content_tag(tag_name, erb_code, attributes)
 
           ##============================================================##
@@ -140,6 +164,43 @@ module ERBLint
         code_node&.loc&.source&.strip
       end
 
+      ##============================================================##
+      ## Check if the ERB code calls an excluded method
+      ## Uses Prism parser for proper Ruby AST analysis
+      ##============================================================##
+      def excluded_method?(erb_code)
+        return false unless erb_code
+
+        method_name = extract_method_name(erb_code)
+        return false unless method_name
+
+        EXCLUDED_METHODS.include?(method_name)
+      end
+
+      ##============================================================##
+      ## Extract the method name from Ruby code using Prism parser
+      ## Handles both direct calls and calls with if/unless modifiers
+      ##============================================================##
+      def extract_method_name(erb_code)
+        result = Prism.parse(erb_code)
+        return nil unless result.success?
+
+        node = result.value.statements.body.first
+
+        ##============================================================##
+        ## Handle if/unless modifiers: `render(...) if condition`
+        ##============================================================##
+        if node.is_a?(Prism::IfNode) || node.is_a?(Prism::UnlessNode)
+          node = node.statements&.body&.first
+        end
+
+        return nil unless node.is_a?(Prism::CallNode)
+
+        node.name.to_s
+      rescue StandardError
+        nil
+      end
+
       ##============================================================##
       ## Extract attributes from tag node as hash
       ##============================================================##
@@ -203,10 +264,8 @@ module ERBLint
             ## Check if value contains interpolation
             ##============================================================##
             if value&.include?('#{')
-              "#{key} => \"#{value}\""
-            else
-              "#{key} => \"#{value}\""
             end
+            "#{key} => \"#{value}\""
           end.join(", ")
 
           "<%= content_tag(:#{tag_name}, #{content}, #{attrs_str}) %>"
@@ -224,6 +283,7 @@ module ERBLint
           ":\"#{name}\""
         end
       end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: immosquare-cleaner
 version: !ruby/object:Gem::Version
-  version: 0.1.81
+  version: 0.1.83
 platform: ruby
 authors:
 - immosquare
@@ -147,7 +147,6 @@ files:
 - lib/immosquare-cleaner/railtie.rb
 - lib/immosquare-cleaner/version.rb
 - lib/tasks/immosquare_cleaner.rake
-- linters/erb-lint-3.4.1.yml
 - linters/erb-lint.yml
 - linters/erb_lint/custom_html_to_content_tag.rb
 - linters/erb_lint/custom_single_line_if_modifier.rb

data/linters/erb-lint-3.4.1.yml

@@ -1,18 +0,0 @@
----
-EnableDefaultLinters: true
-linters:
-  NoJavascriptTagHelper:
-    enabled: false
-  SpaceInHtmlTag:
-    enabled: false
-  CustomSingleLineIfModifier:
-    enabled: true
-  CustomHtmlToContentTag:
-    enabled: true
-  Rubocop:
-    enabled: true
-    rubocop_config:
-      inherit_from:
-      - linters/rubocop-3.4.1.yml
-      Layout/TrailingWhitespace:
-        Enabled: false