rubocop-factory_bot 2.26.1 → 2.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60519b0d051edd3ba23a10f3dfb346dc5aaed4964c489bcfabdb7d16c084cb63
-  data.tar.gz: effac41ed4215d5cb27295cdb0a37d8c7021c309e97a8f8e6f8fdf6e385e8226
+  metadata.gz: 9a5c117626f22cbe451b7044b247be8b9be8aecaa460f64ea87eb948d54cb6f5
+  data.tar.gz: eff63053af204522a4c23f814c4be844ffb985daf357751a7b411ad35b2051ec
 SHA512:
-  metadata.gz: ee33ad705e93ffa3a68240adabd9de50735819d4d82bbf66868f2efa80d489a0032fd045878bf8fd539dc7677fed9bbf9ef0e3755340b81b4fc1881220e0b24c
-  data.tar.gz: 89936fe77a9c8f3ff5dad656b9e30455ec2f6467ac7cba1c678e63fca22396825c3859bc1830f6e766a90109cbae3eca68f64d5a110e3bbd8cebd229cf3218e9
+  metadata.gz: ef628bbb79001d540c0f21ff8d978b05bf37d3a7f9942f4a75d6348589d4c9349b5ce86406123cbc2e4c2aaa276aad488dc31c4f2058ed3d3c7f1be24604bdbb
+  data.tar.gz: 57f5195ad3056db88fe3f5c76f2085b16db8c3ba65bc27357042e22be9c7d421621fc6fefcb5be3be6380e9e70e3401230e0218e1199c567989b1cf6af8426d6

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Master (Unreleased)
 
+## 2.28.0 (2025-11-12)
+
+- Fix an error for `FactoryBot/AssociationStyle` cop when `trait` is not inside `factory` block. ([@viralpraxis])
+- Fix an error for `FactoryBot/ConsistentParenthesesStyle` cop when using keyword splat argument. ([@viralpraxis])
+- Fix a false negative for `FactoryBot/SyntaxMethods` when method is used inside a module. ([@lovro-bikic])
+
+## 2.27.1 (2025-03-12)
+
+- Fix incorrect plugin version. ([@koic])
+
+## 2.27.0 (2025-03-06)
+
+- Fix a false positive for `FactoryBot/ConsistentParenthesesStyle` when using traits and omitting hash values. ([@thejonroberts])
+- Make RuboCop FactoryBot work as a RuboCop plugin. ([@bquorning])
+
 ## 2.26.1 (2024-06-12)
 
 - Bump RuboCop requirement to +1.61. ([@ydah])
@@ -100,8 +115,10 @@
 [@jaydorsey]: https://github.com/jaydorsey
 [@jfragoulis]: https://github.com/jfragoulis
 [@jonatas]: https://github.com/jonatas
+[@koic]: https://github.com/koic
 [@leoarnold]: https://github.com/leoarnold
 [@liberatys]: https://github.com/Liberatys
+[@lovro-bikic]: https://github.com/lovro-bikic
 [@morissetcl]: https://github.com/morissetcl
 [@ngouy]: https://github.com/ngouy
 [@owst]: https://github.com/owst
@@ -110,6 +127,8 @@
 [@seanpdoyle]: https://github.com/seanpdoyle
 [@tdeo]: https://github.com/tdeo
 [@tejasbubane]: https://github.com/tejasbubane
+[@thejonroberts]: https://github.com/thejonroberts
+[@viralpraxis]: https://github.com/viralpraxis
 [@vzvu3k6k]: https://github.com/vzvu3k6k
 [@walf443]: https://github.com/walf443
 [@ybiquitous]: https://github.com/ybiquitous

data/README.md

@@ -31,13 +31,13 @@ ways to do this:
 Put this into your `.rubocop.yml`.
 
 ```yaml
-require: rubocop-factory_bot
+plugins: rubocop-factory_bot
 ```
 
 Alternatively, use the following array notation when specifying multiple extensions.
 
 ```yaml
-require:
+plugins:
   - rubocop-other-extension
   - rubocop-factory_bot
 ```
@@ -45,17 +45,20 @@ require:
 Now you can run `rubocop` and it will automatically load the RuboCop factory_bot
 cops together with the standard cops.
 
+> [!NOTE]
+> The plugin system is supported in RuboCop 1.72+. In earlier versions, use `require` instead of `plugins`.
+
 ### Command line
 
 ```bash
-rubocop --require rubocop-factory_bot
+rubocop --plugin rubocop-factory_bot
 ```
 
 ### Rake task
 
 ```ruby
 RuboCop::RakeTask.new do |task|
-  task.requires << 'rubocop-factory_bot'
+  task.plugins << 'rubocop-factory_bot'
 end
 ```
 

data/lib/rubocop/cop/factory_bot/association_style.rb

@@ -65,14 +65,6 @@ module RuboCop
 
         include ConfigurableEnforcedStyle
 
-        DEFAULT_NON_IMPLICIT_ASSOCIATION_METHOD_NAMES = %w[
-          association
-          factory
-          sequence
-          skip_create
-          traits_for_enum
-        ].freeze
-
         RESTRICT_ON_SEND = %i[factory trait].freeze
         KEYWORDS = %i[alias and begin break case class def defined? do
                       else elsif end ensure false for if in module
@@ -175,7 +167,9 @@ module RuboCop
         def bad?(node)
           if style == :explicit
             implicit_association?(node) &&
-              !trait_within_trait?(node)
+              (factory_node = trait_factory_node(node)) && !trait_within_trait?(
+                node, factory_node
+              )
           else
             explicit_association?(node) &&
               !with_strategy_build_option?(node) &&
@@ -226,7 +220,7 @@ module RuboCop
         end
 
         def non_implicit_association_method_names
-          DEFAULT_NON_IMPLICIT_ASSOCIATION_METHOD_NAMES +
+          RuboCop::FactoryBot.reserved_methods.map(&:to_s) +
             (cop_config['NonImplicitAssociationMethodNames'] || [])
         end
 
@@ -247,12 +241,14 @@ module RuboCop
           options
         end
 
-        def trait_within_trait?(node)
-          factory_node = node.ancestors.reverse.find do |ancestor|
+        def trait_within_trait?(node, factory_node)
+          trait_name(factory_node).include?(node.method_name)
+        end
+
+        def trait_factory_node(node)
+          node.ancestors.reverse.find do |ancestor|
             ancestor.method?(:factory) if ancestor.block_type?
           end
-
-          trait_name(factory_node).include?(node.method_name)
         end
       end
     end

data/lib/rubocop/cop/factory_bot/consistent_parentheses_style.rb

@@ -79,9 +79,9 @@ module RuboCop
         def_node_matcher :omit_hash_value?, <<~PATTERN
           (send
             #factory_call? %FACTORY_CALLS
-            {sym str send lvar}
+            {sym str send lvar} _*
             (hash
-              <value_omission? ...>
+              <[!kwsplat value_omission?] ...>
             )
           )
         PATTERN

data/lib/rubocop/cop/factory_bot/syntax_methods.rb

@@ -99,19 +99,9 @@ module RuboCop
         end
 
         def inside_example_group?(node)
-          return spec_group?(node) if example_group_root?(node)
-
-          root = node.ancestors.find { |parent| example_group_root?(parent) }
-
-          spec_group?(root)
-        end
-
-        def example_group_root?(node)
-          node.parent.nil? || example_group_root_with_siblings?(node.parent)
-        end
-
-        def example_group_root_with_siblings?(node)
-          node.begin_type? && node.parent.nil?
+          spec_group?(node) || node.each_ancestor.any? do |parent|
+            spec_group?(parent)
+          end
         end
       end
     end

data/lib/rubocop/factory_bot/plugin.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'lint_roller'
+
+module RuboCop
+  module FactoryBot
+    # A plugin that integrates RuboCop FactoryBot with RuboCop's plugin system.
+    class Plugin < LintRoller::Plugin
+      # :nocov:
+      def about
+        LintRoller::About.new(
+          name: 'rubocop-factory_bot',
+          version: Version::STRING,
+          homepage: 'https://github.com/rubocop/rubocop-factory_bot',
+          description: 'Code style checking for FactoryBot test files.'
+        )
+      end
+      # :nocov:
+
+      def supported?(context)
+        context.engine == :rubocop
+      end
+
+      def rules(_context)
+        project_root = Pathname.new(__dir__).join('../../..')
+
+        obsoletion = project_root.join('config', 'obsoletion.yml')
+        ConfigObsoletion.files << obsoletion if obsoletion.exist?
+
+        LintRoller::Rules.new(
+          type: :path,
+          config_format: :rubocop,
+          value: project_root.join('config/default.yml')
+        )
+      end
+    end
+  end
+end

data/lib/rubocop/factory_bot/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module FactoryBot
     # Version information for the factory_bot RuboCop plugin.
     module Version
-      STRING = '2.26.1'
+      STRING = '2.28.0'
     end
   end
 end

data/lib/rubocop-factory_bot.rb

@@ -7,12 +7,9 @@ require 'rubocop'
 
 require_relative 'rubocop/factory_bot/factory_bot'
 require_relative 'rubocop/factory_bot/language'
+require_relative 'rubocop/factory_bot/plugin'
+require_relative 'rubocop/factory_bot/version'
 
 require_relative 'rubocop/cop/factory_bot/mixin/configurable_explicit_only'
 
 require_relative 'rubocop/cop/factory_bot_cops'
-
-project_root = File.join(__dir__, '..')
-RuboCop::ConfigLoader.inject_defaults!(project_root)
-obsoletion = File.join(project_root, 'config', 'obsoletion.yml')
-RuboCop::ConfigObsoletion.files << obsoletion if File.exist?(obsoletion)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-factory_bot
 version: !ruby/object:Gem::Version
-  version: 2.26.1
+  version: 2.28.0
 platform: ruby
 authors:
 - John Backus
@@ -9,29 +9,47 @@ authors:
 - Phil Pirozhkov
 - Maxim Krizhanovsky
 - Andrew Bromwich
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: lint_roller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.61'
+        version: '1.72'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.72.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.61'
+        version: '1.72'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.72.1
 description: |
   Code style checking for factory_bot files.
   A plugin for the RuboCop code style enforcing & linting tool.
-email: 
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -62,6 +80,7 @@ files:
 - lib/rubocop/factory_bot/description_extractor.rb
 - lib/rubocop/factory_bot/factory_bot.rb
 - lib/rubocop/factory_bot/language.rb
+- lib/rubocop/factory_bot/plugin.rb
 - lib/rubocop/factory_bot/version.rb
 homepage: https://github.com/rubocop/rubocop-factory_bot
 licenses:
@@ -70,7 +89,7 @@ metadata:
   changelog_uri: https://github.com/rubocop/rubocop-factory_bot/blob/master/CHANGELOG.md
   documentation_uri: https://docs.rubocop.org/rubocop-factory_bot/
   rubygems_mfa_required: 'true'
-post_install_message: 
+  default_lint_roller_plugin: RuboCop::FactoryBot::Plugin
 rdoc_options: []
 require_paths:
 - lib
@@ -85,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Code style checking for factory_bot files
 test_files: []