momocop 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5441b62d81c8c1015b71ffb8f1457afe3be66007280372c5d239102ab08e9382
-  data.tar.gz: 3e030584e817127a5d77d83c7ff25d87438ce11d494556d19c196067503db69a
+  metadata.gz: 65a6e94746e124b9b4b7faa9f87effebbbe8f75f7a23ac9f80ee71ef0fee674c
+  data.tar.gz: e32490d4c0fc3e2f02d96ad154db9ff52ef17f56ba993ac7260bc04169fa0e01
 SHA512:
-  metadata.gz: 62c93ee8fc1733bf0a7e27e3e1a4636f6e8d70016d97646bf32e7a158ceb2950657993b15a6be622e7a579f9a7341b3ca6ff8f391ef0db53cef43bccb4e24a13
-  data.tar.gz: 4f0cde02768b237df824f17e231ac8444a7d18603644873f45974f3dcdb931e6e4e7e946780e4f6eda3ebb88e9cda278b27665e6586da7043377fafa7bbd765b
+  metadata.gz: 3aae3b5142feb84c7bc741a0d988e715c9101fc16f362e71325abbe330a7952e7ccaaa1ec99f260227b5e14c967341c57a3855810da3034d12e04dadb0c2dbaa
+  data.tar.gz: 31a58eb60a8f1cd43dadd62d0be672620157070f00b441171db634fdd24d65b0b6967c75cf743bff77a1ae5baa4776a2d84147f7b8b99ca86f5e5087effd019e

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.10'
 end

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

@@ -36,7 +36,6 @@ module RuboCop
           return unless class_node
 
           class_name = class_node.value.to_s
-          puts class_name
 
           return if class_exists?(class_name)
 

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.10
 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