momocop 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5441b62d81c8c1015b71ffb8f1457afe3be66007280372c5d239102ab08e9382
-  data.tar.gz: 3e030584e817127a5d77d83c7ff25d87438ce11d494556d19c196067503db69a
+  metadata.gz: dd1936728acc124e621799990c68af8e6aa54c7cd984ce038efcbe8929c2416c
+  data.tar.gz: 0b6b2242cb847844e0279ff35193c391922facae5c32dc2ca86cf7778e97aebc
 SHA512:
-  metadata.gz: 62c93ee8fc1733bf0a7e27e3e1a4636f6e8d70016d97646bf32e7a158ceb2950657993b15a6be622e7a579f9a7341b3ca6ff8f391ef0db53cef43bccb4e24a13
-  data.tar.gz: 4f0cde02768b237df824f17e231ac8444a7d18603644873f45974f3dcdb931e6e4e7e946780e4f6eda3ebb88e9cda278b27665e6586da7043377fafa7bbd765b
+  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.8'
+  VERSION = '0.1.9'
 end

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

@@ -47,7 +47,7 @@ module RuboCop
           unless block_node
             add_offense(node, message: MSG) do |corrector|
               indentation = ' ' * node.loc.column
-              corrector.insert_after(node.source_range.end, " do\n#{indentation}end")
+              corrector.replace(node.source_range, "#{node.source} do\n#{indentation}end")
             end
           end
 

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

@@ -54,7 +54,7 @@ module RuboCop
           unless block_node
             add_offense(node, message: MSG) do |corrector|
               indentation = ' ' * node.loc.column
-              corrector.insert_after(node.source_range.end, " do\n#{indentation}end")
+              corrector.replace(node.source_range, "#{node.source} do\n#{indentation}end")
             end
           end
 

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

@@ -55,7 +55,9 @@ module RuboCop
 
           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|
@@ -85,14 +87,28 @@ 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)
           if node.send_type?
-            return node.method_name != :trait
+            return !RUBOCOP_HELPER_METHODS.include?(node.method_name)
           elsif node.block_type? && node.children.first.send_type?
-            return node.children.first.method_name != :trait
+            return !RUBOCOP_HELPER_METHODS.include?(node.children.first.method_name)
           end
 
           return false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: momocop
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - supermomonga
@@ -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