momocop 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47c9203f322466a1799ecd615eace3f9c0112d959b560211bfc7b1e433d6697b
-  data.tar.gz: 1d63e00519322bf145ad906d40893cbab601dcdc447cd2ae4e7f3910da46e4ee
+  metadata.gz: bb919c2bf4b66616557833a7d67e79339689ad9f1f57153881571d448c3707ea
+  data.tar.gz: 98b78098e0b256e8ee1c12f1cef7a531a60087e6368473536f65db5b76c34146
 SHA512:
-  metadata.gz: ada13b67eda1015615e5ee8725580a595f20125458ff68d35f9a6b9929e6391c6ee7baad478671cd4885dbf31a6f59e529d00b400dd36deabf9d99eb4b9a36a9
-  data.tar.gz: 42dfc6d561aa4e6d80c468e6c3eb3da490a1843b8d5f1b78b992359d7f30279c780190bcc32a5034815d82fb301d88230f05547650587449823b980a44cbc0e3
+  metadata.gz: c067e346829c04611770041a2b166905172aabf7aa98e0135b42aad80d1c9fcdbd5e278235319fe533300d29f96a452875522bbbecb232b523f93ec0c00a3c3b
+  data.tar.gz: 939f262024e1846aec9af842bbed4ab08cdaf0057711e8d4696ea0d5cb9ab94206dc5f014480e0b70b36d20b76e7f820501c271332de82a403f8d31ebc9e2f79

data/README.ja.md

@@ -48,32 +48,35 @@ Momocop/FactoryBotSingularFactoryName:
   Enabled: true
 Momocop/Layout/LeadingCommentSpace:
   Enabled: true
-Momocop/RspecContextTextPattern:
+Momocop/RbiMissingExtendTSig:
   Enabled: true
-Momocop/RspecDescribeTextPattern:
+Momocop/RspecContextWording:
   Enabled: true
-Momocop/RspecItTextPattern:
+Momocop/RspecDescribeWording:
+  Enabled: true
+Momocop/RspecExampleWording:
   Enabled: true
 ```
 
 ## Cop一覧
 
-|Cop|Rails|FactoryBot|
-|---|:-:|:-:|
-|[`Momocop/FactoryBotClassExistence`](lib/rubocop/cop/momocop/factory_bot_class_existence.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotConsistentFileName`](lib/rubocop/cop/momocop/factory_bot_consistent_file_name.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotInlineAssociation`](lib/rubocop/cop/momocop/factory_bot_inline_association.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotMissingAssociations`](lib/rubocop/cop/momocop/factory_bot_missing_associations.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotMissingClassOption`](lib/rubocop/cop/momocop/factory_bot_missing_class_option.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotMissingProperties`](lib/rubocop/cop/momocop/factory_bot_missing_properties.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotPropertyOrder`](lib/rubocop/cop/momocop/factory_bot_property_order.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotSingleDefinePerFile`](lib/rubocop/cop/momocop/factory_bot_single_define_per_file.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotSingleFactoryPerDefine`](lib/rubocop/cop/momocop/factory_bot_single_factory_per_define.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotSingularFactoryName`](lib/rubocop/cop/momocop/factory_bot_singular_factory_name.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/Layout/LeadingCommentSpace`](lib/rubocop/cop/momocop/layout/leading_comment_space.rb)|||
-|[`Momocop/RspecContextTextPattern`](lib/rubocop/cop/momocop/rspec_context_text_pattern.rb)|||
-|[`Momocop/RspecDescribeTextPattern`](lib/rubocop/cop/momocop/rspec_describe_text_pattern.rb)|||
-|[`Momocop/RspecItTextPattern`](lib/rubocop/cop/momocop/rspec_it_text_pattern.rb)|||
+|Cop|Rails|FactoryBot|RSpec|
+|---|:-:|:-:|:-:|
+|[`Momocop/FactoryBotClassExistence`](lib/rubocop/cop/momocop/factory_bot_class_existence.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotConsistentFileName`](lib/rubocop/cop/momocop/factory_bot_consistent_file_name.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotInlineAssociation`](lib/rubocop/cop/momocop/factory_bot_inline_association.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotMissingAssociations`](lib/rubocop/cop/momocop/factory_bot_missing_associations.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotMissingClassOption`](lib/rubocop/cop/momocop/factory_bot_missing_class_option.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotMissingProperties`](lib/rubocop/cop/momocop/factory_bot_missing_properties.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotPropertyOrder`](lib/rubocop/cop/momocop/factory_bot_property_order.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotSingleDefinePerFile`](lib/rubocop/cop/momocop/factory_bot_single_define_per_file.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotSingleFactoryPerDefine`](lib/rubocop/cop/momocop/factory_bot_single_factory_per_define.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotSingularFactoryName`](lib/rubocop/cop/momocop/factory_bot_singular_factory_name.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/Layout/LeadingCommentSpace`](lib/rubocop/cop/momocop/layout/leading_comment_space.rb)||||
+|[`Momocop/RbiMissingExtendTSig`](lib/rubocop/cop/momocop/rbi_missing_extend_t_sig.rb)||||
+|[`Momocop/RspecContextWording`](lib/rubocop/cop/momocop/rspec_context_wording.rb)|||:white_check_mark:|
+|[`Momocop/RspecDescribeWording`](lib/rubocop/cop/momocop/rspec_describe_wording.rb)|||:white_check_mark:|
+|[`Momocop/RspecExampleWording`](lib/rubocop/cop/momocop/rspec_example_wording.rb)|||:white_check_mark:|
 
 ## 貢献
 

data/README.ja.md.erb

@@ -41,8 +41,8 @@ require:
 
 ## Cop一覧
 
-|Cop|Rails|FactoryBot|
-|---|:-:|:-:|
+|Cop|Rails|FactoryBot|RSpec|
+|---|:-:|:-:|:-:|
 <%
   files = Dir.glob('lib/rubocop/cop/momocop/**/*.rb').sort_by { |f| File.basename(f)}
   files.each do |cop_file_path|
@@ -51,10 +51,12 @@ require:
   cop_class_name = "#{namespace}/#{base_name.camelize}"
   is_factory_cop = cop_file_path.include?('factory_bot_')
   is_rails_cop = cop_file_path.match?(/(factory_bot_|rails_)/)
+  is_rspec_cop = cop_file_path.match?(/(rspec_)/)
   rails_mark = is_rails_cop ? ':white_check_mark:' : ''
   factory_bot_mark = is_factory_cop ? ':white_check_mark:' : ''
+  rspec_mark = is_rspec_cop ? ':white_check_mark:' : ''
 
-  table_row = "|[`#{cop_class_name}`](#{cop_file_path})|#{rails_mark}|#{factory_bot_mark}|"
+  table_row = "|[`#{cop_class_name}`](#{cop_file_path})|#{rails_mark}|#{factory_bot_mark}|#{rspec_mark}|"
 -%>
 <%= table_row %>
 <% end -%>

data/README.md

@@ -48,32 +48,35 @@ Momocop/FactoryBotSingularFactoryName:
   Enabled: true
 Momocop/Layout/LeadingCommentSpace:
   Enabled: true
-Momocop/RspecContextTextPattern:
+Momocop/RbiMissingExtendTSig:
   Enabled: true
-Momocop/RspecDescribeTextPattern:
+Momocop/RspecContextWording:
   Enabled: true
-Momocop/RspecItTextPattern:
+Momocop/RspecDescribeWording:
+  Enabled: true
+Momocop/RspecExampleWording:
   Enabled: true
 ```
 
 ## Cops
 
-|Cop|Rails|FactoryBot|
-|---|:-:|:-:|
-|[`Momocop/FactoryBotClassExistence`](lib/rubocop/cop/momocop/factory_bot_class_existence.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotConsistentFileName`](lib/rubocop/cop/momocop/factory_bot_consistent_file_name.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotInlineAssociation`](lib/rubocop/cop/momocop/factory_bot_inline_association.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotMissingAssociations`](lib/rubocop/cop/momocop/factory_bot_missing_associations.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotMissingClassOption`](lib/rubocop/cop/momocop/factory_bot_missing_class_option.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotMissingProperties`](lib/rubocop/cop/momocop/factory_bot_missing_properties.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotPropertyOrder`](lib/rubocop/cop/momocop/factory_bot_property_order.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotSingleDefinePerFile`](lib/rubocop/cop/momocop/factory_bot_single_define_per_file.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotSingleFactoryPerDefine`](lib/rubocop/cop/momocop/factory_bot_single_factory_per_define.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/FactoryBotSingularFactoryName`](lib/rubocop/cop/momocop/factory_bot_singular_factory_name.rb)|:white_check_mark:|:white_check_mark:|
-|[`Momocop/Layout/LeadingCommentSpace`](lib/rubocop/cop/momocop/layout/leading_comment_space.rb)|||
-|[`Momocop/RspecContextTextPattern`](lib/rubocop/cop/momocop/rspec_context_text_pattern.rb)|||
-|[`Momocop/RspecDescribeTextPattern`](lib/rubocop/cop/momocop/rspec_describe_text_pattern.rb)|||
-|[`Momocop/RspecItTextPattern`](lib/rubocop/cop/momocop/rspec_it_text_pattern.rb)|||
+|Cop|Rails|FactoryBot|RSpec|
+|---|:-:|:-:|:-:|
+|[`Momocop/FactoryBotClassExistence`](lib/rubocop/cop/momocop/factory_bot_class_existence.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotConsistentFileName`](lib/rubocop/cop/momocop/factory_bot_consistent_file_name.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotInlineAssociation`](lib/rubocop/cop/momocop/factory_bot_inline_association.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotMissingAssociations`](lib/rubocop/cop/momocop/factory_bot_missing_associations.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotMissingClassOption`](lib/rubocop/cop/momocop/factory_bot_missing_class_option.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotMissingProperties`](lib/rubocop/cop/momocop/factory_bot_missing_properties.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotPropertyOrder`](lib/rubocop/cop/momocop/factory_bot_property_order.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotSingleDefinePerFile`](lib/rubocop/cop/momocop/factory_bot_single_define_per_file.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotSingleFactoryPerDefine`](lib/rubocop/cop/momocop/factory_bot_single_factory_per_define.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/FactoryBotSingularFactoryName`](lib/rubocop/cop/momocop/factory_bot_singular_factory_name.rb)|:white_check_mark:|:white_check_mark:||
+|[`Momocop/Layout/LeadingCommentSpace`](lib/rubocop/cop/momocop/layout/leading_comment_space.rb)||||
+|[`Momocop/RbiMissingExtendTSig`](lib/rubocop/cop/momocop/rbi_missing_extend_t_sig.rb)||||
+|[`Momocop/RspecContextWording`](lib/rubocop/cop/momocop/rspec_context_wording.rb)|||:white_check_mark:|
+|[`Momocop/RspecDescribeWording`](lib/rubocop/cop/momocop/rspec_describe_wording.rb)|||:white_check_mark:|
+|[`Momocop/RspecExampleWording`](lib/rubocop/cop/momocop/rspec_example_wording.rb)|||:white_check_mark:|
 
 ## Contributing
 

data/README.md.erb

@@ -41,8 +41,8 @@ require:
 
 ## Cops
 
-|Cop|Rails|FactoryBot|
-|---|:-:|:-:|
+|Cop|Rails|FactoryBot|RSpec|
+|---|:-:|:-:|:-:|
 <%
   files = Dir.glob('lib/rubocop/cop/momocop/**/*.rb').sort_by { |f| File.basename(f)}
   files.each do |cop_file_path|
@@ -51,10 +51,12 @@ require:
   cop_class_name = "#{namespace}/#{base_name.camelize}"
   is_factory_cop = cop_file_path.include?('factory_bot_')
   is_rails_cop = cop_file_path.match?(/(factory_bot_|rails_)/)
+  is_rspec_cop = cop_file_path.match?(/(rspec_)/)
   rails_mark = is_rails_cop ? ':white_check_mark:' : ''
   factory_bot_mark = is_factory_cop ? ':white_check_mark:' : ''
+  rspec_mark = is_rspec_cop ? ':white_check_mark:' : ''
 
-  table_row = "|[`#{cop_class_name}`](#{cop_file_path})|#{rails_mark}|#{factory_bot_mark}|"
+  table_row = "|[`#{cop_class_name}`](#{cop_file_path})|#{rails_mark}|#{factory_bot_mark}|#{rspec_mark}|"
 -%>
 <%= table_row %>
 <% end -%>

data/config/default.yml

@@ -1,14 +1,14 @@
-Momocop/RSpecDescribeTextPattern:
+Momocop/RSpecDescribeWording:
   Description: 'Ensures that RSpec describe text matches the configured pattern'
   Enabled: true
   RequiredPattern: '^(?!When ).+'
 
-Momocop/RSpecContextTextPattern:
+Momocop/RSpecContextWording:
   Description: 'Ensures that RSpec context text starts with When or If'
   Enabled: true
   RequiredPattern: '^(When|If) .+'
 
-Momocop/RSpecItTextPattern:
+Momocop/RSpecItWording:
   Description: 'Ensures that RSpec it block text matches the configured pattern'
   Enabled: true
   RequiredPattern: '^(should|will) .+$'

data/lib/momocop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Momocop
-  VERSION = '0.3.0'
+  VERSION = '0.3.2'
 end

data/lib/rubocop/cop/momocop/factory_bot_single_factory_per_define.rb

@@ -65,12 +65,18 @@ module RuboCop
 
         # Returns all top-level factories within a FactoryBot.define block.
         private def top_level_factories(node)
+          block = node.block_node
+          return [] unless block
+
+          body = block.body
+          return [] unless body
+
           factory_nodes =
-            node
-            .block_node
-            .body.each_descendant(:send)
+            body
+            .each_descendant(:send)
             .select { |n| n.method_name == :factory }
-          factory_nodes.select { |factory_node|
+
+          factory_nodes.select do |factory_node|
             base_node = factory_node.block_node || factory_node
             context =
               base_node
@@ -78,7 +84,7 @@ module RuboCop
               .map { _1.send_node&.method_name&.to_sym }
               .find { %i[define factory].include? _1 }
             context == :define
-          }
+          end
         end
       end
     end

data/lib/rubocop/cop/momocop/rbi_missing_extend_t_sig.rb

@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Momocop
+      # Ensures that Sorbet signature declarations are accompanied by `extend T::Sig`.
+      #
+      # sig calls must be block-form invocations that appear immediately above a
+      # method definition to be considered.
+      #
+      # @example
+      #   # bad
+      #   class User
+      #     sig { void }
+      #     def call; end
+      #   end
+      #
+      #   # good
+      #   class User
+      #     extend T::Sig
+      #
+      #     sig { void }
+      #     def call; end
+      #   end
+      class RbiMissingExtendTSig < RuboCop::Cop::Base
+        extend AutoCorrector
+        include RangeHelp
+
+        MSG = 'Add `extend T::Sig` when using `sig` to type methods.'
+
+        def_node_matcher :extend_t_sig_call?, <<~PATTERN
+          (send nil? :extend <(const (const nil? :T) :Sig) ...>)
+        PATTERN
+
+        def_node_matcher :sig_block_call?, <<~PATTERN
+          (block (send nil? :sig ...) ...)
+        PATTERN
+
+        def on_class(node)
+          check_node(node, body_nodes(node), node.loc.keyword)
+        end
+
+        def on_module(node)
+          check_node(node, body_nodes(node), node.loc.keyword)
+        end
+
+        def on_sclass(node)
+          check_node(node, body_nodes(node), node.loc.keyword)
+        end
+
+        def on_new_investigation
+          return unless processed_source.ast
+
+          top_level_nodes = top_level_body_nodes(processed_source.ast)
+          check_node(nil, top_level_nodes, top_level_offense_location(top_level_nodes))
+        end
+
+        private def check_node(node, nodes, offense_location)
+          sig_node = sig_before_method_definition(nodes)
+          return unless sig_node
+          return if extend_t_sig?(nodes)
+
+          add_offense(offense_location || sig_location(sig_node)) do |corrector|
+            autocorrect(corrector, nodes)
+          end
+        end
+
+        private def sig_before_method_definition(nodes)
+          nodes.each_cons(2) do |previous, current|
+            next unless sig_block_call?(previous)
+            next unless method_definition?(current)
+            next unless consecutive_lines?(previous, current)
+
+            return previous
+          end
+
+          nil
+        end
+
+        private def extend_t_sig?(nodes)
+          nodes.any? do |child|
+            extend_t_sig_call?(child)
+          end
+        end
+
+        private def body_nodes(node)
+          body = node.body
+          return [] unless body
+
+          if body.begin_type?
+            body.children
+          else
+            [body]
+          end
+        end
+
+        private def top_level_body_nodes(ast)
+          return [] unless ast
+
+          if ast.begin_type?
+            ast.children
+          else
+            [ast]
+          end
+        end
+
+        private def top_level_offense_location(_nodes)
+          nil
+        end
+
+        private def method_definition?(node)
+          node.def_type? || node.defs_type?
+        end
+
+        private def consecutive_lines?(first_node, second_node)
+          first_node.loc.last_line + 1 == second_node.loc.line
+        end
+
+        private def sig_location(sig_node)
+          sig_node.send_node&.loc&.selector || sig_node.loc.expression
+        end
+
+        private def autocorrect(corrector, nodes)
+          first_child = nodes.first
+          return unless first_child
+
+          indentation = indentation_for(first_child)
+          insert_before_line_start(corrector, first_child, "#{indentation}extend T::Sig\n")
+        end
+
+        private def insert_before_line_start(corrector, node, text)
+          line_start = node.source_range.begin_pos - node.loc.column
+          insertion_range = range_between(line_start, line_start)
+          corrector.insert_before(insertion_range, text)
+        end
+
+        private def indentation_for(first_child)
+          ' ' * first_child.loc.column
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/momocop/{rspec_context_text_pattern.rb → rspec_context_wording.rb}

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Momocop
-      class RSpecContextTextPattern < Base
+      class RSpecContextWording < Base
         extend AutoCorrector
         include RangeHelp
 

data/lib/rubocop/cop/momocop/{rspec_describe_text_pattern.rb → rspec_describe_wording.rb}

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Momocop
-      class RSpecDescribeTextPattern < Base
+      class RSpecDescribeWording < Base
         extend AutoCorrector
         include RangeHelp
 

data/lib/rubocop/cop/momocop/{rspec_it_text_pattern.rb → rspec_example_wording.rb}

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Momocop
-      class RSpecItTextPattern < Base
+      class RSpecExampleWording < Base
         extend AutoCorrector
         include RangeHelp
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: momocop
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - supermomonga
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -104,9 +104,10 @@ files:
 - lib/rubocop/cop/momocop/factory_bot_single_factory_per_define.rb
 - lib/rubocop/cop/momocop/factory_bot_singular_factory_name.rb
 - lib/rubocop/cop/momocop/layout/leading_comment_space.rb
-- lib/rubocop/cop/momocop/rspec_context_text_pattern.rb
-- lib/rubocop/cop/momocop/rspec_describe_text_pattern.rb
-- lib/rubocop/cop/momocop/rspec_it_text_pattern.rb
+- lib/rubocop/cop/momocop/rbi_missing_extend_t_sig.rb
+- lib/rubocop/cop/momocop/rspec_context_wording.rb
+- lib/rubocop/cop/momocop/rspec_describe_wording.rb
+- lib/rubocop/cop/momocop/rspec_example_wording.rb
 - sig/momocop.rbs
 homepage: https://github.com/supermomonga/momocop
 licenses:
@@ -115,7 +116,7 @@ metadata:
   homepage_uri: https://github.com/supermomonga/momocop
   source_code_uri: https://github.com/supermomonga/momocop
   changelog_uri: https://github.com/supermomonga/momocop/releases
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,8 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Convention focused opinionated custom cops for RuboCop.
 test_files: []