rubocop-infinum 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1135b596b05a6c1ca1a301ebd22040ec140a9c3a83409c3d1a261b839f4b7f50
-  data.tar.gz: d983ba7eac41b7ca5e282deb9d2d4bccd24ee3fea51e3e6c058de5a87566bb3b
+  metadata.gz: 5ce5713f9db1163d89bd60b0652f459b189563603b773964156ae9614964b0db
+  data.tar.gz: e81816a32ff60fe369de3d87eb8c25ead930e4b78ce27f761697d8ab4691637e
 SHA512:
-  metadata.gz: 74a5e95b3d4125d93b19b7ba67bd4413539287da3a12a16783533391903bc2630ef66a95baa83ed751dde6d92c9b0998d840955ac6df9ad64399a6471fb1243b
-  data.tar.gz: 378598448bc083feb676a192ca232ee107003e52e410b040f1fac2a8ec530194f85a21c551cd474f3aa173b85c3804efbd31483956057ba06f147be87271c406
+  metadata.gz: d858611ef5b4551f1bfb54815a8cd7f5f78702555fa25beacdbadb3d3f9bf48f481b948e53b3c903e0112359397209c2d88d2e49860db2bf26129efa71761954
+  data.tar.gz: e7e33b3116f0db388c524e33125a32a4bf2f2f9fd8e699b787a01f8a8a431f37825cdf244dbf09c56abdab9983e839d60bde89a88164e0925bc500cd6722ecdd

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # RuboCop Infinum Change Log
 
+## 0.9.1 (Oct 24th 2024)
+
+- Resolved deprecated usage of `RuboCop::Cop::Cop` and updated cops to use new rubocop API (PR[#22](https://github.com/infinum/rubocop-infinum/pull/22) @PetarCurkovic)
+
 ## 0.9.0 (Oct 7th 2024)
 
 - "Cop#corrections is deprecated" warning fixed ([PR#21](https://github.com/infinum/rubocop-infinum/pull/21) tnx @unavailabl3)

data/lib/rubocop/cop/infinum/attribute_default_block_value.rb

@@ -18,7 +18,9 @@ module RuboCop
       #   class User < ActiveRecord::Base
       #     attribute :confirmed_at, :datetime, default: -> { Time.zone.now }
       #   end
-      class AttributeDefaultBlockValue < ::RuboCop::Cop::Cop
+      class AttributeDefaultBlockValue < ::RuboCop::Cop::Base
+        extend AutoCorrector
+
         MSG = 'Pass method in a block to `:default` option.'
 
         def_node_matcher :default_attribute, <<~PATTERN
@@ -29,17 +31,14 @@ module RuboCop
 
         def on_send(node)
           default_attribute(node) do |hash_pair|
-            value = attribute(hash_pair)
-
-            add_offense(node, location: value) if value.send_type?
-          end
-        end
+            target_node = attribute(hash_pair)
+            return unless target_node.send_type?
 
-        def autocorrect(node)
-          expression = attribute(default_attribute(node))
+            add_offense(target_node, message: MSG) do |corrector|
+              expression = attribute(default_attribute(node))
 
-          lambda do |corrector|
-            corrector.replace(expression, "-> { #{expression.source} }")
+              corrector.replace(target_node, "-> { #{expression.source} }")
+            end
           end
         end
       end

data/lib/rubocop/cop/infinum/factory_bot_association.rb

@@ -38,7 +38,10 @@ module RuboCop
       #        name { 'J. R. R. Tolkien' }
       #      end
       #    end
-      class FactoryBotAssociation < ::RuboCop::Cop::Cop
+      class FactoryBotAssociation < ::RuboCop::Cop::Base
+        extend AutoCorrector
+        include IgnoredNode
+
         MSG = 'Use %<association_name>s { build(:%<factory_name>s) } instead'
 
         def_node_matcher :association_definition, <<~PATTERN
@@ -53,7 +56,7 @@ module RuboCop
           inline_association_definition(node) do |association_name, factory_name|
             message = format(MSG, association_name: association_name.to_s, factory_name: factory_name.to_s)
 
-            add_offense(node, message: message)
+            handle_offense(node, message)
           end
         end
 
@@ -63,21 +66,21 @@ module RuboCop
 
             message = format(MSG, association_name: association_name.to_s, factory_name: factory_name.first.to_s)
 
-            add_offense(node, message: message)
+            handle_offense(node, message)
           end
         end
 
-        def autocorrect(node)
-          lambda do |corrector|
-            if expression(node).size == 1
-              corrector.replace(node, "#{expression(node)[0]} { build(:#{expression(node)[0]}) }")
-            else
-              corrector.replace(node, "#{expression(node)[0]} { build(:#{expression(node)[1]}) }")
-            end
+        private
+
+        def handle_offense(node, message)
+          add_offense(node, message: message) do |corrector|
+            next if part_of_ignored_node?(node)
+
+            corrector.replace(node, "#{expression(node).first} { build(:#{expression(node).last}) }")
           end
-        end
 
-        private
+          ignore_node(node)
+        end
 
         def expression(node)
           if node.block_type?

data/lib/rubocop/infinum/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Infinum
-    VERSION = '0.9.0'
+    VERSION = '0.9.1'
   end
 end

data/rubocop-infinum.gemspec

@@ -31,7 +31,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('rspec', '~> 3.9')
 
   spec.add_runtime_dependency('rubocop', '>= 1.28.0')
+  spec.add_runtime_dependency('rubocop-factory_bot')
+  spec.add_runtime_dependency('rubocop-performance')
   spec.add_runtime_dependency('rubocop-rails')
   spec.add_runtime_dependency('rubocop-rspec')
-  spec.add_runtime_dependency('rubocop-performance')
+  spec.add_runtime_dependency('rubocop-rspec_rails')
 end

data/rubocop.yml

@@ -1,6 +1,8 @@
 require:
   - rubocop-rails
   - rubocop-rspec
+  - rubocop-rspec_rails
+  - rubocop-factory_bot
   - rubocop-performance
 
 Layout/LineLength:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-infinum
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Marko Ćilimković
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-07 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -54,6 +54,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.28.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +111,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rspec_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="