bulletmark_repairer 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 533eed3a74c78c89236e5c1355f588814c6a4017cf79af12f0a0e23fe030fcde
-  data.tar.gz: bf8a718e822ba241ab3299f675db3809870d955257bc5279644285373a619141
+  metadata.gz: a7110364b32065ccdce57c9220481a6c3ab36265a1fbc1fcb0d40a5d6a92ceeb
+  data.tar.gz: e69d9ae29d6a2f0e013e8d974ac5634e98750c31cf57eacbbbee1ed48778f5ce
 SHA512:
-  metadata.gz: a33cc9ba73a76ebca97b8293677d8498761a07c2a6680e5182a65b2d8f7cb6237196506aedee63ed4f798168beb4161072ee5e62cbcee9506c4040e4584a508f
-  data.tar.gz: 2fb1af553ee13ca638023120306f6284b4d04ae567171616cee658ee5277f1bb33a589d769d7625ad0d6b445d06664a068dc49db479e8ac91934d36aef3553d6
+  metadata.gz: 4eb6a1e8d2274100f04d72f544c0dce8588b758216bfbe08968947fc535d7fe3e0fba8f7d722600737c18e52cbe468e0ed2482e48e9d9372ca18c3f66e1c05fa
+  data.tar.gz: fe6a169678171236abebdff07cf2adfef7af32066c07656ad327fbb33d692a0b9171c5b418932c653ae4a8c0eb95be823c8d29d2f17423f7fe7d8be663fd5aa2

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## [0.1.3] - 2023-10-18
+
+- Fix a redundant auto-correct for multiple tests with n+1 queries when running RSpec [#6](https://github.com/makicamel/bulletmark_repairer/pull/6) ([@ydah])
+
 ## [0.1.2] - 2023-10-16
 
-- Reduce dependencies [#1](https://github.com/makicamel/bulletmark_repairer/pull/1) [@tricknotes]()
+- Reduce dependencies [#1](https://github.com/makicamel/bulletmark_repairer/pull/1) ([@tricknotes])
 - Stop using class instance variables for thread safe [024f6c5](https://github.com/makicamel/bulletmark_repairer/commit/024f6c53f82b182a998c1e43de48d8c6c9ce5bf3)
 
 ## [0.1.1] - 2023-10-11
@@ -10,3 +14,6 @@
 ## [0.1.0] - 2023-10-10
 
 - Initial release
+
+[@tricknotes]: https://github.com/tricknotes
+[@ydah]: https://github.com/ydah

data/lib/bulletmark_repairer/configuration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module BulletmarkRepairer
-  class Configration
+  class Configuration
     attr_accessor :skip_file_list, :logger
     attr_writer :debug
 
@@ -22,7 +22,7 @@ module BulletmarkRepairer
     end
 
     def config
-      @config ||= Configration.new
+      @config ||= Configuration.new
     end
   end
 end

data/lib/bulletmark_repairer/controller_corrector.rb

@@ -46,10 +46,12 @@ class ControllerCorrector < Parser::TreeRewriter
     return unless node.respond_to?(:to_sexp_array)
 
     type, identifier = node.to_sexp_array.take(2)
-
     if type == :ivasgn && identifier == instance_variable_name
-      insert_after node.children.last.location.expression, ".includes(#{associations})"
-      @patched = true
+      inserted = ".includes(#{associations})"
+      unless node.location.expression.source.include?(inserted)
+        insert_after node.children.last.location.expression, inserted
+        @patched = true
+      end
     else
       node
         .children

data/lib/bulletmark_repairer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BulletmarkRepairer
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bulletmark_repairer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - makicamel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2023-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codespellignore"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -86,7 +87,6 @@ files:
 - lib/bulletmark_repairer/associations_builder.rb
 - lib/bulletmark_repairer/configuration.rb
 - lib/bulletmark_repairer/controller_corrector.rb
-- lib/bulletmark_repairer/corrector.rb
 - lib/bulletmark_repairer/corrector_builder.rb
 - lib/bulletmark_repairer/markers.rb
 - lib/bulletmark_repairer/patcher.rb

data/lib/bulletmark_repairer/corrector.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-class Corrector < Parser::TreeRewriter
-  def on_def(node)
-    return if patched?
-
-    node.children.each { |child_node| insert_includes(node: child_node) }
-    return if patched?
-
-    node.children.each { |child_node| insert_includes_for_vasgn(node: child_node, type: :ivasgn) }
-    return if patched?
-
-    node.children.each { |child_node| insert_includes_for_vasgn(node: child_node, type: :lvasgn) }
-  end
-
-  private
-
-  def patched?
-    @patched ||= false
-  end
-
-  def insert_includes(node:)
-    return if patched?
-    return if !node.respond_to?(:children) || node.children.empty?
-    return unless node.location.expression.line <= line_no && line_no <= node.location.expression.last_line
-
-    # TODO: Patch Enumerable methods other than each and map
-    if node.children.last.in?(%i[each map])
-      insert_after node.children[0].location.expression, ".includes(#{associations})"
-      @patched = true
-    else
-      node.children.each { |child_node| insert_includes(node: child_node) }
-    end
-  end
-
-  def insert_includes_for_vasgn(node:, type:)
-    return if patched?
-    return if !node.respond_to?(:children) || node.children.empty?
-    return unless node.location.expression.line <= line_no && line_no <= node.location.expression.last_line
-
-    if node.type == type
-      insert_after node.children.last.location.expression, ".includes(#{associations})"
-      @patched = true
-    else
-      node.children.each { |child_node| insert_includes_for_vasgn(node: child_node, type: type) }
-    end
-  end
-
-  def line_no
-    __EMBEDDED_LINE_NO__
-  end
-
-  def associations
-    '__EMBEDDED_ASSOCIATIONS__'
-  end
-end