momocop 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2217b77f50980c7b628b6be000f20a76093b41f13933b5e0e4c04c860215eb68
-  data.tar.gz: 3fd67a7eb04625b7021db01f453477f804b8e48609c9f41e859579d46239d89e
+  metadata.gz: 5441b62d81c8c1015b71ffb8f1457afe3be66007280372c5d239102ab08e9382
+  data.tar.gz: 3e030584e817127a5d77d83c7ff25d87438ce11d494556d19c196067503db69a
 SHA512:
-  metadata.gz: 5d5dfa8b78691d8cf4bc8938d3bed507969eec0dbc3940032a22eb3ca0fa705abbecc82f1f4586be8e8d9e963afd5144572399c2854abed205f85c866b75fbe4
-  data.tar.gz: 7feb8e1104912f6d595becbd4b4fa20ec3fd38910892d52da3f64b12f5fc6ac37f4ef352f6a57b29b094d5c2fce434895eb9c54d8bc0e5516c5ce24b9ce9a082
+  metadata.gz: 62c93ee8fc1733bf0a7e27e3e1a4636f6e8d70016d97646bf32e7a158ceb2950657993b15a6be622e7a579f9a7341b3ca6ff8f391ef0db53cef43bccb4e24a13
+  data.tar.gz: 4f0cde02768b237df824f17e231ac8444a7d18603644873f45974f3dcdb931e6e4e7e946780e4f6eda3ebb88e9cda278b27665e6586da7043377fafa7bbd765b

data/lib/momocop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Momocop
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 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.insert_after(node.source_range.end, " 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.insert_after(node.source_range.end, " do\n#{indentation}end")
+            end
+          end
+
           # Check missing associations
 
           # Exclude defined sequences

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

@@ -49,6 +49,8 @@ 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 =
@@ -83,11 +85,17 @@ module RuboCop
 
         private def defined_properties(block_node)
           body_node = block_node&.children&.last
-          body_node&.children&.select { |node| definition_node?(node) }
+          body_node&.children&.select { |node| definition_node?(node) } || []
         end
 
         private def definition_node?(node)
-          node.send_type? || (node.block_type? && node.children.first.send_type?)
+          if node.send_type?
+            return node.method_name != :trait
+          elsif node.block_type? && node.children.first.send_type?
+            return node.children.first.method_name != :trait
+          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.8
 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