rubocop-nueca 1.2.3 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3678eac28f6575b9cee5fb58f88a02e46de0c91bf36437a242fc34208cd4da3
-  data.tar.gz: a11bbc18d306047a0b8c1b329430b15d92bff287190adcd99e9994eceb4d33d8
+  metadata.gz: 6ae060f2f69c576434c27818dc11cb0261f36ff4bea5d2bf8cd7921db648a742
+  data.tar.gz: f1ba128f09eecdde792dc78363f958814c6243cdbdfcb4ee9bfde539e13e399e
 SHA512:
-  metadata.gz: a5ab9039fb41adbeb81026aa2d7bfa8f4f542c6566f01c0c853fce78ee6b987919750c983524eef7cc467902f7b6b1e7921a542ea48c1ff624d8eece8d96e5f1
-  data.tar.gz: '078491a8477ad8a25a19c0a6a6e38541f599cc5d44efc35ec24974e86eec267fd1026c5517063367e7a64163f595014f1d912d6cc467f1fd828c7b044b2eb550'
+  metadata.gz: ed1840e4b53be4f603c35937e9787ba26c24b9e91450d15d994f3ce06941daa95f9dbf4fd3f0a2b15a748e9942f98d8b6ca641cf59f4e5ef4c2bbef04d1be03f
+  data.tar.gz: 644a0cd75f372919536c623f6ce1580fb40f72631bbf33e7b00efece86d1cad46164838ac7e6dff1caa525add3c4b7bc39e2cb26ee8d2b9c053be790d5a17b03

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

@@ -36,7 +36,8 @@ module RuboCop
 
         def same_type_and_level?(current_route, next_route)
           current_route[:type] == next_route[:type] &&
-            current_route[:namespace_level] == next_route[:namespace_level]
+            current_route[:namespace_level] == next_route[:namespace_level] &&
+            current_route[:namespace_path] == next_route[:namespace_path]
         end
 
         def blank_line_between?(current_route, next_route)

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

@@ -7,7 +7,7 @@ module RuboCop
         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
 
@@ -44,7 +44,7 @@ module RuboCop
           send_node = node.send_node
           return unless send_node.send_type? && route_method?(send_node)
 
-          add_route_block_if_valid(node)
+          add_route_block_if_valid(node) unless [:member, :collection].include?(send_node.method_name)
           process_nested_context(node)
         end
 
@@ -67,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?
@@ -199,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'

data/lib/rubocop/nueca/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Nueca
-    VERSION = '1.2.3'
+    VERSION = '1.2.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-nueca
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.6
 platform: ruby
 authors:
 - Tien