momocop 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2217b77f50980c7b628b6be000f20a76093b41f13933b5e0e4c04c860215eb68
-  data.tar.gz: 3fd67a7eb04625b7021db01f453477f804b8e48609c9f41e859579d46239d89e
+  metadata.gz: dd1936728acc124e621799990c68af8e6aa54c7cd984ce038efcbe8929c2416c
+  data.tar.gz: 0b6b2242cb847844e0279ff35193c391922facae5c32dc2ca86cf7778e97aebc
 SHA512:
-  metadata.gz: 5d5dfa8b78691d8cf4bc8938d3bed507969eec0dbc3940032a22eb3ca0fa705abbecc82f1f4586be8e8d9e963afd5144572399c2854abed205f85c866b75fbe4
-  data.tar.gz: 7feb8e1104912f6d595becbd4b4fa20ec3fd38910892d52da3f64b12f5fc6ac37f4ef352f6a57b29b094d5c2fce434895eb9c54d8bc0e5516c5ce24b9ce9a082
+  metadata.gz: 34e3af0e7bcb5a2b3091fa79e713ceb4fd50acc2bec9c7c815680fb93cb37e0052ba08d70e2adc35a5ba4718c4b622e738acfc0a0e6f33113021978eedb3b1f7
+  data.tar.gz: fa078fbc91b3bfe61ac9da25463b59eaab3871e882c16f9e59e8d40d04bb12d82e948d6c08d933a6534b7600661fb6ce13db3009fbfcf850d5ca4cdf2708ce85

data/.rubocop.yml

@@ -56,6 +56,9 @@ Style/FrozenStringLiteralComment:
 Style/IfUnlessModifier:
   Enabled: false
 
+Style/MultilineBlockChain:
+  Enabled: false
+
 Style/ParallelAssignment:
   Enabled: false
 

data/lib/momocop/version.rb

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

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

@@ -43,6 +43,14 @@ module RuboCop
 
           block_node = node.block_node
 
+          # Add block if it's missing
+          unless block_node
+            add_offense(node, message: MSG) do |corrector|
+              indentation = ' ' * node.loc.column
+              corrector.replace(node.source_range, "#{node.source} do\n#{indentation}end")
+            end
+          end
+
           # Check missing associations
           defined_associations = get_defined_association_names(block_node)
           model_associations = get_model_association_names(class_name)
@@ -52,8 +60,6 @@ module RuboCop
           return unless missing_associations.any?
 
           add_offense(node, message: MSG) do |corrector|
-            next unless block_node
-
             # Add newline before closing block if it's a one-liner
             if one_line_block?(block_node)
               indentation = ' ' * node.loc.column
@@ -66,6 +72,8 @@ module RuboCop
 
               # TODO: calculate indentation size
               indentation = ' ' * (node.loc.column + 2)
+
+              # use send node if blockless
               corrector.insert_after(block_node.loc.begin, "\n#{indentation}#{definition}")
             end
           end
@@ -76,6 +84,8 @@ module RuboCop
         end
 
         private def one_line_block?(block_node)
+          return false if block_node.nil?
+
           block_node.loc.begin.line == block_node.loc.end.line
         end
 

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

@@ -50,6 +50,14 @@ module RuboCop
 
           block_node = node.block_node
 
+          # Add block if it's missing
+          unless block_node
+            add_offense(node, message: MSG) do |corrector|
+              indentation = ' ' * node.loc.column
+              corrector.replace(node.source_range, "#{node.source} do\n#{indentation}end")
+            end
+          end
+
           # Check missing associations
 
           # Exclude defined sequences

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

@@ -49,11 +49,15 @@ module RuboCop
           return unless inside_factory_bot_define?(node)
 
           block_node = node.block_node
+          return unless block_node
+
           entire_definitions = defined_properties(block_node)
 
           sections =
             entire_definitions
-            .slice_when { |a, b| b.loc.last_line - a.loc.last_line > 1 }
+            .slice_when { |a, b|
+              (range_with_comments(b).first_line - range_with_comments(a).last_line) > 1
+            }
             .select { |definitions| definitions.size >= 2 }
 
           sections.each do |definitions|
@@ -83,11 +87,31 @@ module RuboCop
 
         private def defined_properties(block_node)
           body_node = block_node&.children&.last
-          body_node&.children&.select { |node| definition_node?(node) }
+
+          # empty block
+          return [] unless body_node
+
+          # begin
+          if body_node.begin_type?
+            body_node&.children&.select { |node| definition_node?(node) } || []
+          # block
+          elsif body_node.send_type? && definition_node?(body_node)
+            [body_node]
+          else
+            []
+          end
         end
 
+        RUBOCOP_HELPER_METHODS = %i[trait transient before after].freeze
+
         private def definition_node?(node)
-          node.send_type? || (node.block_type? && node.children.first.send_type?)
+          if node.send_type?
+            return !RUBOCOP_HELPER_METHODS.include?(node.method_name)
+          elsif node.block_type? && node.children.first.send_type?
+            return !RUBOCOP_HELPER_METHODS.include?(node.children.first.method_name)
+          end
+
+          return false
         end
 
         private def definition_type(node)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: momocop
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - supermomonga
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.49.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.49.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement