rubocop-nueca 1.1.0 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cd3d37c24acab5f66947faec9dde637103acfa42f660988f38ea7354e605f2c
-  data.tar.gz: 788b97be9c8bed6dfbcf2782ee80b779e2dcda463a693a1a2bff8faadb91ef4f
+  metadata.gz: 0b98f767dd653eaae37a3d6f45edafb1434f096bd0278a20639f254fa1cf2bd1
+  data.tar.gz: c905f9858e98c95c71eddcbb6d8039beae354618257d1526c4199c04da3dba59
 SHA512:
-  metadata.gz: 34d5421a39b74e48d9eb999fe7ef10dd45b6e2868a6f6d2635fa90ecf2f85e1920ab092ff766be2ab920c342d539de2ff31e82945b92f42f3f1330a03d58a188
-  data.tar.gz: 54a9044c2ee9c452c59478be3783402d9b161112b34e06fa11e69b2ff0b4aab1f26afb0fb23aad37faf8cf3b657f412245fd1631db04f80732966be6bf02ae0c
+  metadata.gz: 4b7ae1a86b531b5847e8554a767631cae2277f2773379cf0e63fc133e8b0938a61f28b7c6da0c5bb2b5bb4419c0776d70ad36ca83697cbfef794a08eb0d77c89
+  data.tar.gz: c65696377777f5e0740e1776d6bf72ec57408524448ccac2bfedee5361bd14d934121a78db4d65644fe1b27ebee0f9d2ef5752d9931607f3cdb5d703d41c86a7

data/.github/workflows/publish.yml

@@ -0,0 +1,52 @@
+name: Publish Gem
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.4'
+        bundler-cache: true
+
+    - name: Get gem version
+      id: gem_version
+      run: |
+        VERSION=$(ruby -e "require './lib/rubocop/nueca/version'; puts RuboCop::Nueca::VERSION")
+        echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+    - name: Check if version exists on RubyGems
+      id: version_check
+      run: |
+        if gem list -r rubocop-nueca | grep -q "${{ steps.gem_version.outputs.version }}"; then
+          echo "exists=true" >> $GITHUB_OUTPUT
+        else
+          echo "exists=false" >> $GITHUB_OUTPUT
+        fi
+
+    - name: Build gem
+      if: steps.version_check.outputs.exists == 'false'
+      run: gem build *.gemspec
+
+    - name: Publish to RubyGems
+      if: steps.version_check.outputs.exists == 'false'
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}
+
+    - name: Skip publishing
+      if: steps.version_check.outputs.exists == 'true'
+      run: echo "Version ${{ steps.gem_version.outputs.version }} already exists on RubyGems. Skipping publish."

data/lib/rubocop/cop/rails/model_association_sorting.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Rails
-      class ModelAssociationSorting < RuboCop::Cop::Base
+      class ModelAssociationSorting < RuboCop::Cop::Base # rubocop:disable Metrics/ClassLength
         MSG = 'Sort associations of the same type alphabetically. Expected order: %<expected>s.'
         ASSOCIATION_METHODS = [
           :belongs_to,
@@ -93,14 +93,11 @@ module RuboCop
         end
 
         def check_group_sorting(group_associations)
-          # Separate associations with and without through
           through_associations = group_associations.select { |assoc| assoc[:through] }
           regular_associations = group_associations.reject { |assoc| assoc[:through] }
 
-          # Sort regular associations alphabetically
           regular_sorted = regular_associations.sort_by { |assoc| assoc[:name] }
 
-          # Build expected order respecting through dependencies
           expected_order = build_expected_order(regular_sorted, through_associations)
           actual_order = group_associations.map { |assoc| assoc[:name] }
 
@@ -113,28 +110,67 @@ module RuboCop
         end
 
         def build_expected_order(regular_associations, through_associations)
-          expected = []
+          all_associations = regular_associations + through_associations
+          association_lookup = build_association_lookup(all_associations)
+          dependency_graph = build_dependency_graph(all_associations, association_lookup)
 
-          # Add regular associations first, sorted alphabetically
-          regular_associations.each do |assoc|
-            expected << assoc[:name]
+          topological_sort_alphabetically(dependency_graph, all_associations.map { |a| a[:name] })
+        end
+
+        def build_association_lookup(associations)
+          associations.each_with_object({}) { |assoc, lookup| lookup[assoc[:name]] = assoc } # rubocop:disable Rails/IndexBy
+        end
+
+        def build_dependency_graph(associations, lookup)
+          graph = associations.each_with_object({}) { |assoc, deps| deps[assoc[:name]] = [] }
+
+          associations.each do |assoc|
+            graph[assoc[:through]] << assoc[:name] if assoc[:through] && lookup[assoc[:through]]
+          end
+
+          graph
+        end
+
+        def topological_sort_alphabetically(dependency_graph, all_nodes)
+          in_degrees = calculate_in_degrees(dependency_graph, all_nodes)
+          available_nodes = nodes_with_zero_dependencies(in_degrees)
+          result = []
+
+          until available_nodes.empty?
+            current = available_nodes.shift
+            result << current
 
-            # Add any through associations that depend on this one
-            dependent_through = through_associations.select { |ta| ta[:through] == assoc[:name] }
-            dependent_through.sort_by { |ta| ta[:name] }.each do |ta|
-              expected << ta[:name]
-            end
+            process_dependents(current, dependency_graph, in_degrees, available_nodes)
           end
 
-          # Add any through associations that don't have dependencies in this group
-          orphaned_through = through_associations.reject do |ta|
-            regular_associations.any? { |ra| ra[:name] == ta[:through] }
+          result
+        end
+
+        def calculate_in_degrees(dependency_graph, all_nodes)
+          in_degrees = all_nodes.each_with_object({}) { |node, degrees| degrees[node] = 0 }
+
+          dependency_graph.each_value do |dependents|
+            dependents.each { |dependent| in_degrees[dependent] += 1 }
           end
-          orphaned_through.sort_by { |ta| ta[:name] }.each do |ta|
-            expected << ta[:name]
+
+          in_degrees
+        end
+
+        def nodes_with_zero_dependencies(in_degrees)
+          in_degrees.select { |_node, degree| degree.zero? }.keys.sort
+        end
+
+        def process_dependents(current_node, dependency_graph, in_degrees, available_nodes)
+          dependency_graph[current_node]&.each do |dependent|
+            in_degrees[dependent] -= 1
+
+            insert_alphabetically(available_nodes, dependent) if in_degrees[dependent].zero?
           end
+        end
 
-          expected
+        def insert_alphabetically(sorted_array, element)
+          insert_position = sorted_array.bsearch_index { |x| x > element } || sorted_array.length
+          sorted_array.insert(insert_position, element)
         end
       end
     end

data/lib/rubocop/nueca/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Nueca
-    VERSION = '1.1.0'
+    VERSION = '1.1.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-nueca
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.4
 platform: ruby
 authors:
 - Tien
@@ -133,6 +133,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/publish.yml"
 - CODE_OF_CONDUCT.md
 - LICENSE.txt
 - README.md