rubocop-nueca 1.2.2 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a49b9e5e060e7ec154ef9feaf553325fb156d58c59aba67ea3cc2ac1e1e13b67
-  data.tar.gz: 3e110fe0c9a710158865e3f67a443dacde11a7aba68f92df3ff305016cc2fdbc
+  metadata.gz: 86a3f50ec1bdcbb388b5843fc52caa7424579538bf73f995f3121a8e39e23544
+  data.tar.gz: e94a2e703f0ac39efa1ac5b9886fa711f7c2b5c482a6f27d9a4301af4bdae4eb
 SHA512:
-  metadata.gz: 376a36b1a4e897c49af1fc553504471e2c9014e8bfb1b147dc9f0d1af5f5202acb3e91feaf382310f17468e7515b1c59d2cb8d0198285418d5733cf2a643742d
-  data.tar.gz: 910aef0f0fd56d15ef56c1fe7b2e3bb2ebc18d65dfb35aa7c88ab698e6e6ed8fe8bd21635ff3ca94f85c10f9c730d81b5fc3b247a4412dfb180f9f869093d693
+  metadata.gz: 330371fdc147e6d9469a230d0a47545cc8855117c2cb9c6a5ab828946eb353357579b238db05658357f3301927dc5b9da868711691a84da4975741cf369c2db6
+  data.tar.gz: b9941dd2e7f84e12f5ceab85b2508e185ab80f04c06d387786f51949770f8faace0c023101f99322be2fb69cc69d020ce19cb814b60be47925242b23a1660938

data/.github/workflows/publish.yml

@@ -1,12 +1,16 @@
 name: Publish Gem
 
 on:
-  push:
+  workflow_run:
+    workflows: ["RuboCop"]
+    types:
+      - completed
     branches: [ master ]
 
 jobs:
   publish:
     runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
     steps:
     - uses: actions/checkout@v4

data/.github/workflows/rubocop.yml

@@ -0,0 +1,23 @@
+name: RuboCop
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  rubocop:
+    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: Run RuboCop
+      run: bundle exec rubocop

data/lib/rubocop/cop/shared/collection_context.rb

@@ -3,12 +3,11 @@
 module RuboCop
   module Cop
     module Rails
-      # rubocop:disable Metrics/ClassLength
-      class CollectionContext
+      class CollectionContext # rubocop:disable Metrics/ClassLength
         ROUTE_CATEGORIES = {
           simple: [:get, :post, :put, :patch, :delete, :head, :options, :match, :root],
           resource: [:resource, :resources],
-          namespace: [:namespace, :scope, :concern],
+          namespace: [:namespace, :scope, :concern, :member, :collection],
           draw: [:draw]
         }.freeze
 
@@ -45,10 +44,18 @@ module RuboCop
           send_node = node.send_node
           return unless send_node.send_type? && route_method?(send_node)
 
-          add_route_if_valid(send_node)
+          add_route_block_if_valid(node) unless [:member, :collection].include?(send_node.method_name)
           process_nested_context(node)
         end
 
+        def add_route_block_if_valid(node)
+          send_node = node.send_node
+          return unless route_method?(send_node)
+
+          route_info = build_route_info_from_block(node)
+          @collector.add_route(route_info) if route_info
+        end
+
         def process_nested_context(node)
           body = node.body
           return unless body
@@ -60,19 +67,41 @@ module RuboCop
 
         def build_namespace_path(send_node)
           new_namespace_path = @namespace_path.dup
+          method_name = send_node.method_name
 
-          case send_node.method_name
+          case method_name
           when :namespace
-            namespace_name = extract_namespace_name(send_node)
-            new_namespace_path << namespace_name if namespace_name
+            add_namespace_to_path(new_namespace_path, send_node)
           when :scope
-            scope_name = extract_scope_name(send_node)
-            new_namespace_path << scope_name if scope_name
+            add_scope_to_path(new_namespace_path, send_node)
+          when :resources, :resource
+            add_resource_to_path(new_namespace_path, send_node)
+          when :member, :collection
+            add_member_collection_to_path(new_namespace_path, method_name)
           end
 
           new_namespace_path
         end
 
+        def add_namespace_to_path(path, node)
+          namespace_name = extract_namespace_name(node)
+          path << namespace_name if namespace_name
+        end
+
+        def add_scope_to_path(path, node)
+          scope_name = extract_scope_name(node)
+          path << scope_name if scope_name
+        end
+
+        def add_resource_to_path(path, node)
+          resource_name = extract_namespace_name(node)
+          path << resource_name if resource_name
+        end
+
+        def add_member_collection_to_path(path, method_name)
+          path << method_name.to_s
+        end
+
         def extract_namespace_name(node)
           first_arg = node.arguments.first
           return first_arg.value.to_s if first_arg&.sym_type? || first_arg&.str_type?
@@ -84,7 +113,6 @@ module RuboCop
           scope_name = extract_scope_option_value(node)
           return scope_name if scope_name
 
-          # If no module/path specified, use first argument if it's a symbol/string
           first_arg = node.arguments.first
           return first_arg.value.to_s if first_arg&.sym_type? || first_arg&.str_type?
 
@@ -152,6 +180,26 @@ module RuboCop
           }
         end
 
+        def build_route_info_from_block(block_node)
+          send_node = block_node.send_node
+          method_name = send_node.method_name
+          route_name = extract_route_name(send_node)
+          return nil unless route_name
+
+          send_range = send_node.source_range
+          block_range = block_node.source_range
+          {
+            node: send_node,
+            method: method_name,
+            name: route_name,
+            line: send_range.line,
+            end_line: block_range.last_line,
+            namespace_level: @namespace_level,
+            namespace_path: @namespace_path.dup,
+            type: categorize_route_method(method_name)
+          }
+        end
+
         def extract_route_name(node)
           method_name = node.method_name
           first_arg = node.arguments.first
@@ -173,6 +221,7 @@ module RuboCop
 
         def extract_simple_route_name(first_arg)
           return first_arg.value.to_s if first_arg&.str_type?
+          return first_arg.value.to_s if first_arg&.sym_type?
           return extract_hash_route_name(first_arg) if first_arg&.hash_type?
 
           'unknown'
@@ -190,7 +239,6 @@ module RuboCop
           :other
         end
       end
-      # rubocop:enable Metrics/ClassLength
     end
   end
 end

data/lib/rubocop/nueca/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Nueca
-    VERSION = '1.2.2'
+    VERSION = '1.2.5'
   end
 end

metadata

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