momocop 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acef3c7f38f87034b619c4b5e9ca7ca77ac880a0a665f46abff3a19455ef2d5f
-  data.tar.gz: 4e06a90596825134bdad568b41b38ebdb93056d0fab4f58d381c8ffd6d16e6e5
+  metadata.gz: 125920382da157b5f151d8d7de60a05df4943fbbdf521db3b082001891f7af25
+  data.tar.gz: 8860b388475b79b0eec94ee28e9635a2c288b662bdcdbe33a5172b8959d969c9
 SHA512:
-  metadata.gz: 7c18582cdb50926ee4bbc7074c076d90f06504cdec64d0dc4a1389dadac1ad000864cdcea4e9e4322a7fcc2bc6bbb8aadd381a29cef2e4bdee1dee3f751833a9
-  data.tar.gz: 6ca756d9793ca03ef4ca8ea88e37d9169bea071641464af88f36e96688a613fa5dc09c3e50b252c56e79e1cf9376f46db1717e0b4dfa7d46be8352fbb656582a
+  metadata.gz: f538d288ad3858eb9c5c6bbd0c6576b6e8bd0811282da99215b295426e83b4d51f5b111fa256d1c6246eb1577209a114d8745c28c0568e8fc93b5f774774b93b
+  data.tar.gz: e49a4e8e1ab9ad2ce341566257730d7eab510002319a8c4c48db179f2be5dbdfc6ee7ddecec9552debef73360729546e6eb954eee14c2489f8c8037f950ac891

data/README.ja.md

@@ -30,6 +30,8 @@ Momocop/FactoryBotClassExistence:
   Enabled: true
 Momocop/FactoryBotConsistentFileName:
   Enabled: true
+Momocop/FactoryBotInlineAssociation:
+  Enabled: true
 Momocop/FactoryBotMissingAssociations:
   Enabled: true
 Momocop/FactoryBotMissingClassOption:
@@ -52,6 +54,7 @@ Momocop/FactoryBotSingularFactoryName:
 |---|:-:|:-:|
 |[`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:|

data/README.md

@@ -30,6 +30,8 @@ Momocop/FactoryBotClassExistence:
   Enabled: true
 Momocop/FactoryBotConsistentFileName:
   Enabled: true
+Momocop/FactoryBotInlineAssociation:
+  Enabled: true
 Momocop/FactoryBotMissingAssociations:
   Enabled: true
 Momocop/FactoryBotMissingClassOption:
@@ -52,6 +54,7 @@ Momocop/FactoryBotSingularFactoryName:
 |---|:-:|:-:|
 |[`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:|

data/lib/momocop/version.rb

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

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

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Momocop
+      # Enforces inline association definitions in FactoryBot factories.
+      #
+      # @example
+      #   # bad
+      #   factory :blog_post do
+      #     association(:user)
+      #   end
+      #
+      #   # good
+      #   factory :blog_post do
+      #     user { association :user }
+      #   end
+      class FactoryBotInlineAssociation < RuboCop::Cop::Base
+        extend AutoCorrector
+
+        MSG = 'Use inline association definition instead of separate `association` method call.'
+
+        RESTRICT_ON_SEND = %i[association].freeze
+
+        def_node_matcher :association_call?, <<-PATTERN
+          (send nil? :association (sym _))
+        PATTERN
+
+        def on_send(node)
+          return unless inside_factory_bot_define?(node)
+          return unless inside_factory_bot_factory?(node)
+
+          add_offense(node.loc.selector, message: MSG) do |corrector|
+            association_name = node.arguments.first.value
+            options = node.arguments.at(1)
+
+            convert_options(options) in {
+              factory_option:, rest_options:
+            }
+            factory = factory_option&.source || ":#{association_name}"
+            replacement =
+              if rest_options.empty?
+                "#{association_name} { association #{factory} }"
+              else
+                rest_options_source = rest_options.map(&:source).join(', ')
+                "#{association_name} { association #{factory}, #{rest_options_source} }"
+              end
+            corrector.replace(node, replacement)
+          end
+        end
+
+        # `association :foo, factory: :bar, baz: 1 ...` => `foo { association :bar, baz: 1 ...}`
+        private def convert_options(options)
+          factory_option = options&.pairs&.find { |pair| pair.key.value == :factory }&.value
+          rest_options = options&.pairs&.reject { |pair| pair.key.value == :factory } || []
+
+          return {
+            factory_option:,
+            rest_options:
+          }
+        end
+
+        private def inside_factory_bot_factory?(node)
+          context = node.each_ancestor(:block).first
+          send_node = context.block_type? ? context.send_node : context
+
+          return send_node.method_name == :factory
+        end
+
+        private def inside_factory_bot_define?(node)
+          ancestors = node.each_ancestor(:block).to_a
+          ancestors.any? { |ancestor| ancestor.method_name == :define && ancestor.receiver&.const_name == 'FactoryBot' }
+        end
+      end
+    end
+  end
+end

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

@@ -112,12 +112,29 @@ module RuboCop
           return [] unless body_node
 
           associations = association_definitions(body_node)
-          association_names = associations&.map(&:first_argument)&.map(&:value)&.map(&:to_s)
+          association_names = associations&.map { |node| get_association_name(node) }
           return association_names
         end
 
+        private def get_association_name(node)
+          # Explicit definition
+          return node.arguments.first.value.to_s if inside_factory_bot_factory?(node)
+
+          # Inline definition
+          context = node.each_ancestor(:block).first
+          send_node = context.block_type? ? context.send_node : context
+          return send_node.method_name.to_s
+        end
+
+        private def inside_factory_bot_factory?(node)
+          context = node.each_ancestor(:block).first
+          send_node = context.block_type? ? context.send_node : context
+
+          return send_node.method_name == :factory
+        end
+
         private def generate_association_definition(property)
-          "association(:#{property})"
+          "#{property} { association :#{property} }"
         end
 
         private def inside_factory_bot_define?(node)

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

@@ -116,8 +116,17 @@ module RuboCop
 
         private def definition_type(node)
           send_node = node.send_type? ? node : node.children.first
+          has_association_body =
+            send_node
+            .block_node
+            &.children
+            &.last
+            &.children
+            &.any? { _1.is_a?(Parser::AST::Node) && _1.send_type? && _1.method_name == :association }
           if %i[association sequence].include? send_node.method_name
             send_node.method_name
+          elsif has_association_body
+            :association
           else
             :property
           end

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

@@ -33,7 +33,6 @@ module RuboCop
           return if factory_name.singularize == factory_name
 
           add_offense(node.first_argument) do |corrector|
-            p node.first_argument
             if node.first_argument.type == :sym
               corrector.replace(node.first_argument.loc.expression, ":#{factory_name.singularize}")
             elsif node.first_argument.type == :str

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: momocop
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - supermomonga
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-22 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -93,6 +93,7 @@ files:
 - lib/momocop/version.rb
 - lib/rubocop/cop/momocop/factory_bot_class_existence.rb
 - lib/rubocop/cop/momocop/factory_bot_consistent_file_name.rb
+- lib/rubocop/cop/momocop/factory_bot_inline_association.rb
 - lib/rubocop/cop/momocop/factory_bot_missing_associations.rb
 - lib/rubocop/cop/momocop/factory_bot_missing_class_option.rb
 - lib/rubocop/cop/momocop/factory_bot_missing_properties.rb