immosquare-cleaner 0.1.70 → 0.1.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 782a12c647e52cbe70bc4acd7b09e66e4d2003f7f9bd19f3492a113e3fb439b4
-  data.tar.gz: 259600c6629bbf15fcc2b88789905524225e5055003f3c326ba2f7586f4dc3a6
+  metadata.gz: 8aa35cadcbf70139cbb0af0a069f2a0fe2f0f2eebf7828a2a4f55cd561d244a0
+  data.tar.gz: 66bf6deadd22989fa4c3b77d3479760e68e0c8a17e2b3d102567686d2cc38e49
 SHA512:
-  metadata.gz: 4518f8288d7f75406220f77dfee70b1c215465c1481a6ae3e6aabc91364c890d99ec77f03836ca4743ab5006e19ae1c2312c7af010b7ad31a4a234411575de60
-  data.tar.gz: d132961013cec829005dda99912bddd0a5da2914bc014154e5fa5db6c744c158746fe2286b942750e5e1445ccad0ef7fbc5c537d248c3a86fe792bc1583f2e37
+  metadata.gz: e5f8431e8415eb8e90fe3373d7c3b2ac26c0753225b52ba4ac22b40323eb2943f7159520f672572c8f74d930f28ece4fef34837c8cefbd0431d801eede1f4e9c
+  data.tar.gz: 279c5b7297e477b301904215ce3db41d6c610b7fbd07d0a213f3490be33abb535a3fb6b8b4a865736b8a6bc582861e255c2adae6868738fbf6001e604e94dcdc

data/lib/immosquare-cleaner/version.rb

@@ -1,3 +1,3 @@
 module ImmosquareCleaner
-  VERSION = "0.1.70".freeze
+  VERSION = "0.1.71".freeze
 end

data/linters/rubocop/cop/custom_cops/style/align_assignments.rb

@@ -0,0 +1,127 @@
+module RuboCop
+  module Cop
+    module CustomCops
+      module Style
+        ##============================================================##
+        ## This cop checks that consecutive assignments are aligned
+        ##
+        ## @example
+        ## bad
+        ## d2 = "xxx"
+        ## variable = "yyy"
+        ## very_long_variable = "zzz"
+        ##
+        ## good
+        ## d2                 = "xxx"
+        ## variable           = "yyy"
+        ## very_long_variable = "zzz"
+        ##============================================================##
+        class AlignAssignments < Base
+
+          extend AutoCorrector
+
+          MSG              = "Align the assignment operators of consecutive assignments.".freeze
+          ASSIGNMENT_TYPES = [:lvasgn, :casgn, :ivasgn, :cvasgn, :gvasgn].freeze
+
+          def on_new_investigation
+            @assignment_groups = find_assignment_groups
+          end
+
+          ASSIGNMENT_TYPES.each do |type|
+            define_method(:"on_#{type}") do |node|
+              check_alignment(node)
+            end
+          end
+
+          private
+
+          def find_assignment_groups
+            assignments_by_line = {}
+
+            processed_source.ast.each_node do |node|
+              next unless ASSIGNMENT_TYPES.include?(node.type)
+
+              assignments_by_line[node.source_range.line] = node
+            end
+
+            group_consecutive_assignments(assignments_by_line)
+          end
+
+          def group_consecutive_assignments(assignments_by_line)
+            groups        = []
+            current_group = []
+            previous_line = nil
+
+            assignments_by_line.keys.sort.each do |line|
+              if previous_line&.+(1) == line
+                current_group << assignments_by_line[previous_line] if current_group.empty?
+                current_group << assignments_by_line[line]
+              else
+                groups << current_group if current_group.size > 1
+                current_group = [assignments_by_line[line]]
+              end
+              previous_line = line
+            end
+
+            groups << current_group if current_group.size > 1
+            groups
+          end
+
+          def check_alignment(node)
+            group = @assignment_groups.find {|g| g.include?(node) }
+            return unless group
+
+            target_column  = calculate_target_column(group)
+            current_column = assignment_operator_column(node)
+
+            return if current_column == target_column
+
+            spaces_needed = target_column - current_column
+            return if spaces_needed <= 0
+
+            add_offense(node.source_range, :message => MSG) do |corrector|
+              corrector.insert_before(assignment_operator_range(node), " " * spaces_needed)
+            end
+          end
+
+          def calculate_target_column(group)
+            base_column    = group.first.source_range.column
+            max_var_length = group.map {|node| variable_name_length(node) }.max
+            base_column + max_var_length + 1
+          end
+
+          def variable_name_length(node)
+            case node.type
+            when :lvasgn, :ivasgn, :cvasgn, :gvasgn
+              node.children[0].to_s.length
+            when :casgn
+              if node.children[0]
+                "#{node.children[0].source}::#{node.children[1]}".length
+              else
+                node.children[1].to_s.length
+              end
+            end
+          end
+
+          def assignment_operator_column(node)
+            assignment_operator_range(node).column
+          end
+
+          def assignment_operator_range(node)
+            source     = node.source
+            equals_pos = source.index("=")
+            return node.source_range if equals_pos.nil?
+
+            start_pos = node.source_range.begin_pos + equals_pos
+            range(processed_source.buffer, start_pos, start_pos + 1)
+          end
+
+          def range(buffer, start_pos, end_pos)
+            Parser::Source::Range.new(buffer, start_pos, end_pos)
+          end
+
+        end
+      end
+    end
+  end
+end

data/linters/rubocop-3.4.1.yml

@@ -3,6 +3,7 @@ require:
 - rubocop/cop/style/method_call_with_args_parentheses_override
 - rubocop/cop/custom_cops/style/comment_normalization
 - rubocop/cop/custom_cops/style/font_awesome_normalization
+- rubocop/cop/custom_cops/style/align_assignments
 AllCops:
   NewCops: enable
   EnabledByDefault: false

data/linters/rubocop.yml

@@ -2,6 +2,7 @@ require:
   - rubocop/cop/style/method_call_with_args_parentheses_override
   - rubocop/cop/custom_cops/style/comment_normalization
   - rubocop/cop/custom_cops/style/font_awesome_normalization
+  - rubocop/cop/custom_cops/style/align_assignments
 
 # Pour activer toutes les méthodes de Rubocop et activer le cache pour les gros fichiers
 AllCops:
@@ -113,6 +114,9 @@ CustomCops/Style/CommentNormalization:
 CustomCops/Style/FontAwesomeNormalization:
   Enabled: true # On veut forcer l'utilisation du nom complet de la font awesome
 
+CustomCops/Style/AlignAssignments:
+  Enabled: true # On veut forcer l'alignement des assignations consécutives
+
 #################### GEM ###########################
 Gemspec/RequireMFA:
   Enabled: false # On ne veut pas obliger le MFA pour pusher un gem

data/package.json

@@ -2,14 +2,14 @@
   "name":         "immosquare-cleaner",
   "private":      true,
   "dependencies": {
-    "@eslint/js":                      "^9.24.0",
-    "eslint":                          "^9.24.0",
+    "@eslint/js":                      "^9.29.0",
+    "eslint":                          "^9.29.0",
     "eslint-plugin-align-assignments": "^1.1.2",
     "eslint-plugin-align-import":      "^1.0.0",
     "eslint-plugin-erb":               "^2.1.1",
     "eslint-plugin-prefer-arrow":      "^1.2.3",
-    "eslint-plugin-sonarjs":           "^3.0.2",
-    "prettier":                        "^3.5.3"
+    "eslint-plugin-sonarjs":           "^3.0.3",
+    "prettier":                        "^3.6.0"
   },
   "scripts": {"morning": "bundle update && bundle clean --force && bun update && bundle exec immosquare-cleaner 'package.json'"}
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: immosquare-cleaner
 version: !ruby/object:Gem::Version
-  version: 0.1.70
+  version: 0.1.71
 platform: ruby
 authors:
 - immosquare
@@ -152,6 +152,7 @@ files:
 - linters/prettier.yml
 - linters/rubocop-3.4.1.yml
 - linters/rubocop.yml
+- linters/rubocop/cop/custom_cops/style/align_assignments.rb
 - linters/rubocop/cop/custom_cops/style/comment_normalization.rb
 - linters/rubocop/cop/custom_cops/style/font_awesome_normalization.rb
 - linters/rubocop/cop/style/method_call_with_args_parentheses_override.rb
@@ -175,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.7.0
 specification_version: 4
 summary: A gem to lint and organize files in a Rails application.
 test_files: []