rubocop-petal 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7d73cfbe6b4f194f1c60d25235331cf7a08b04b516411efeabeafce9e6e7886
-  data.tar.gz: 193dd79a6efd61cdd2edbb5bfae7158497ca7cc2bb52da38b02dfecd776eadfa
+  metadata.gz: 7943295b53d5afb66efeedd6b5801405d67f41ca3e87cbe80afe6310e8dfa65a
+  data.tar.gz: 2ee305587c6e13494669395c45ce9e405d902ca3a05727f9fac28858af800c0e
 SHA512:
-  metadata.gz: 15ef827ea4cf56872e2c85178463e2d3a05a6a47411832439c81cb4dd9a9ff9221efb61603d2a9e6b38d5859fe0aa2745499bd1d98ef516169e1947065bf1ebb
-  data.tar.gz: 0c14a8c68e7af71afbd81cd827fdd76dfbcc8780e06ab7f1f2f662cc7409fe505b2afc05fa6260f18c6d3a1dd8df05176d51c965c71b68c4f75501abe4a9aa96
+  metadata.gz: db9b94e57d4ce9c6656488786e91c7a9f89d71b93e7ee816535610a2877b2e2a29ffbec578c2f97eec195b68e5d86e54d35a27208b23986a46956a2b034b5817
+  data.tar.gz: 9bff7fea4ee7d6df84a93f6acac7518591fbe6a75dda9ba2b9fd8a894ce305c028076e1c7bd9e3bf5cf4b5ae03d82c01ca594df4218eda7b6ad12e1860c867b7

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 # main
 
+# v0.7.0
+
+* Support more cases for `Grape/UnnecessaryNamespace`. ([#26](https://github.com/petalmd/rubocop-petal/pull/26))
+
 # v0.6.0
 
 * Added cop `RSpec::SidekiqInline` ([#24](https://github.com/petalmd/rubocop-petal/pull/24))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-petal (0.6.0)
+    rubocop-petal (0.7.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-rails (~> 2.10)
 

data/lib/rubocop/cop/grape/unnecessary_namespace.rb

@@ -6,17 +6,17 @@ module RuboCop
       # Detect unnecessary usage of Grape namespace.
       #
       #   # bad
-      #   namespace :my_namespace
+      #   namespace :some_path do
       #     get {}
       #   end
       #
       #   # good
-      #   get :my_namespace {}
+      #   get :some_path {}
       #
       class UnnecessaryNamespace < Base
         MSG = 'Unnecessary usage of Grape namespace. '\
-              'Specify endpoint name with a argument: `get :my_namespace`.'
-        HTTP_ACTIONS = Set.new(%i[get put post patch delete])
+              'Specify endpoint name with an argument: `get :some_path`.'
+        HTTP_ACTIONS = Set.new(%i[get head put post patch delete])
         GRAPE_NAMESPACE_ALIAS = Set.new(%i[namespace resource resources])
         METHOD_JUSTIFY_NAMESPACE = Set.new(%i[route_param namespaces resource resources version])
 
@@ -28,8 +28,12 @@ module RuboCop
           (block (send nil? METHOD_JUSTIFY_NAMESPACE ...) ...)
         PATTERN
 
-        def_node_matcher :http_action?, <<~PATTERN
-          (block (send nil? HTTP_ACTIONS) ...)
+        def_node_matcher :http_action_with_path?, <<~PATTERN
+          (block (send nil? HTTP_ACTIONS ({sym | str} $_)? ...) ...)
+        PATTERN
+
+        def_node_matcher :http_action_with_options?, <<~PATTERN
+          (block (send nil? HTTP_ACTIONS ...) ...)
         PATTERN
 
         def on_send(node)
@@ -42,13 +46,21 @@ module RuboCop
           end
 
           http_action_node = select_http_action_block_node(node_to_select_http_action)
-          add_offense(node) if http_action_node.size == 1
+
+          return if http_action_node.size != 1
+
+          paths = paths_added_with_http_action(http_action_node.first)
+          add_offense(node) if paths.size.zero?
         end
 
         private
 
+        def paths_added_with_http_action(node)
+          http_action_with_path?(node).yield_self.to_a.flatten.compact
+        end
+
         def select_http_action_block_node(nodes)
-          nodes.select { |node| http_action?(node) }
+          nodes.select { |node| http_action_with_path?(node) || http_action_with_options?(node) }
         end
 
         def namespace_node(node)

data/lib/rubocop/petal/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Petal
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-petal
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jean-Francis Bastien
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-24 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop