bulletmark_repairer 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90214d67d25519f3e4b352583ad3631773d29444e28ce319d62c89d11fa0149e
-  data.tar.gz: 59bda8070c7e775774e6d52af33687f3a1da3e26889fe51a2ce71069fb211498
+  metadata.gz: 533eed3a74c78c89236e5c1355f588814c6a4017cf79af12f0a0e23fe030fcde
+  data.tar.gz: bf8a718e822ba241ab3299f675db3809870d955257bc5279644285373a619141
 SHA512:
-  metadata.gz: 2ad6acf09c537b4c283a9404c3518d43f176cc0078406b0371d44f1ea86222e041ddb1f19e9607df95948149f899cc5cda3584753899cc4a85f64232389c2beb
-  data.tar.gz: a2f5532b82a8f2d9a60d5a72b986d8c81d0d5709905226fb9a5ceac1ddebe1e325039e2870ecc020293b87ed36b10a4aa0ff97a1bd920f09a83e1c2f63268573
+  metadata.gz: a33cc9ba73a76ebca97b8293677d8498761a07c2a6680e5182a65b2d8f7cb6237196506aedee63ed4f798168beb4161072ee5e62cbcee9506c4040e4584a508f
+  data.tar.gz: 2fb1af553ee13ca638023120306f6284b4d04ae567171616cee658ee5277f1bb33a589d769d7625ad0d6b445d06664a068dc49db479e8ac91934d36aef3553d6

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 3.2
+  TargetRubyVersion: 2.7
   NewCops: enable
   SuggestExtensions: false
 

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.1.2] - 2023-10-16
+
+- 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
+
+- Support Ruby 3.0 [dbdf27c](https://github.com/makicamel/bulletmark_repairer/commit/dbdf27c6c9a7259ad9474153d2394da5bac45b43)
+
 ## [0.1.0] - 2023-10-10
 
 - Initial release

data/Gemfile

@@ -8,7 +8,6 @@ gemspec
 gem 'rake', '~> 13.0'
 
 gem 'factory_bot_rails'
-gem 'rails'
 gem 'rspec', '~> 3.0'
 gem 'rspec-rails', '~> 3.0'
 gem 'sqlite3'

data/README.md

@@ -7,7 +7,7 @@ BulletmarkRepairer is an auto corrector for N+1 queries detected at runtime on R
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'bulletmark_repairer', group :development, :test
+gem 'bulletmark_repairer', group: %w(development test)
 ```
 
 ## Usage

data/lib/bulletmark_repairer/{bulletmark_repairer.rb → application_associations.rb}

@@ -1,18 +1,6 @@
 # frozen_string_literal: true
 
 module BulletmarkRepairer
-  def self.associations
-    @associations ||= ApplicationAssociations.new
-  end
-
-  def self.key(target_klass_name, base_klass_name, candidates)
-    associations.key(target_klass_name, base_klass_name, candidates)
-  end
-
-  def self.reset_associations
-    @associations = nil
-  end
-
   class ApplicationAssociations
     def key(target_klass_name, base_klass_name, candidates)
       key = target_klass_name.underscore

data/lib/bulletmark_repairer/associations_builder.rb

@@ -10,13 +10,19 @@ module BulletmarkRepairer
       if associations[marker.index]
         associations[marker.index].add(marker)
       else
-        associations[marker.index] = Associations.new(marker)
+        associations[marker.index] = Associations.new(marker, @application_associations)
       end
     end
 
     def associations
       @associations ||= {}
     end
+
+    private
+
+    def initialize
+      @application_associations = BulletmarkRepairer::ApplicationAssociations.new
+    end
   end
 
   class Associations
@@ -30,7 +36,7 @@ module BulletmarkRepairer
 
     def corrector(dir)
       BulletmarkRepairer::CorrectorBuilder.new(
-        dir:,
+        dir: dir,
         marker: @marker,
         associations: @associations
       ).execute
@@ -38,16 +44,17 @@ module BulletmarkRepairer
 
     private
 
-    def initialize(marker)
+    def initialize(marker, application_associations)
       @marker = marker
       @associations = { base: marker.associations }
+      @application_associations = application_associations
     end
 
     # @return [Hash, nil]
     def build_associations!(marker:, associations:, parent_keys:)
-      key = formed_key(marker:, associations:)
+      key = formed_key(marker: marker, associations: associations)
       if key
-        modify_value(key:, marker:, parent_keys:)
+        modify_value(key: key, marker: marker, parent_keys: parent_keys)
       else
         new_parent_keys = parent_keys
         new_parent_keys.append(0) if associations.is_a?(Array)
@@ -56,7 +63,7 @@ module BulletmarkRepairer
 
           association_values.each do |key, value|
             values = value.is_a?(Array) ? value : [value]
-            build_associations!(marker:, associations: { key => values }, parent_keys: new_parent_keys)
+            build_associations!(marker: marker, associations: { key => values }, parent_keys: new_parent_keys)
           end
         end
       end
@@ -66,12 +73,12 @@ module BulletmarkRepairer
     def formed_key(marker:, associations:)
       case associations
       when Hash
-        BulletmarkRepairer.key(marker.base_class, @marker.base_class, associations.keys) ||
-          BulletmarkRepairer.key(marker.base_class, @marker.base_class, associations.values.flatten)
+        @application_associations.key(marker.base_class, @marker.base_class, associations.keys) ||
+          @application_associations.key(marker.base_class, @marker.base_class, associations.values.flatten)
       when Array
-        BulletmarkRepairer.key(marker.base_class, @marker.base_class, associations)
+        @application_associations.key(marker.base_class, @marker.base_class, associations)
       else # Symbol, String
-        BulletmarkRepairer.key(marker.base_class, @marker.base_class, [associations])
+        @application_associations.key(marker.base_class, @marker.base_class, [associations])
       end
     end
 

data/lib/bulletmark_repairer/corrector.rb

@@ -42,7 +42,7 @@ class Corrector < Parser::TreeRewriter
       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:) }
+      node.children.each { |child_node| insert_includes_for_vasgn(node: child_node, type: type) }
     end
   end
 

data/lib/bulletmark_repairer/markers.rb

@@ -19,8 +19,8 @@ module BulletmarkRepairer
         else
           @markers[base_class] = Marker.new(
             notification,
-            controller:,
-            action:
+            controller: controller,
+            action: action
           )
         end
       end

data/lib/bulletmark_repairer/patcher.rb

@@ -5,9 +5,9 @@ require 'securerandom'
 require 'parser/runner/ruby_rewrite'
 
 module BulletmarkRepairer
-  class Pathcer
+  class Patcher
     def self.execute(notifications:, controller:, action:)
-      new(notifications:, controller:, action:).execute
+      new(notifications: notifications, controller: controller, action: action).execute
     end
 
     def execute
@@ -25,7 +25,7 @@ module BulletmarkRepairer
     private
 
     def initialize(notifications:, controller:, action:)
-      @markers = Markers.new(notifications, controller:, action:)
+      @markers = Markers.new(notifications, controller: controller, action: action)
       @associations_builder = BulletmarkRepairer::AssociationsBuilder.new
     end
   end

data/lib/bulletmark_repairer/rack.rb

@@ -7,12 +7,11 @@ module BulletmarkRepairer
     end
 
     def call(env)
-      BulletmarkRepairer.reset_associations
       @app.call(env)
     ensure
       begin
         if Thread.current[:bullet_notification_collector].notifications_present?
-          BulletmarkRepairer::Pathcer.execute(
+          BulletmarkRepairer::Patcher.execute(
             notifications: Thread.current[:bullet_notification_collector],
             controller: env['action_dispatch.request.parameters']['controller'],
             action: env['action_dispatch.request.parameters']['action']

data/lib/bulletmark_repairer/version.rb

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

data/lib/bulletmark_repairer.rb

@@ -2,7 +2,7 @@
 
 require 'bulletmark_repairer/version'
 require 'bulletmark_repairer/railtie' if ENV['REPAIR']
-require 'bulletmark_repairer/bulletmark_repairer'
+require 'bulletmark_repairer/application_associations'
 require 'bulletmark_repairer/associations_builder'
 require 'bulletmark_repairer/configuration'
 require 'bulletmark_repairer/corrector_builder'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bulletmark_repairer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - makicamel
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-10 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  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: bullet
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,8 +82,8 @@ files:
 - README.md
 - Rakefile
 - lib/bulletmark_repairer.rb
+- lib/bulletmark_repairer/application_associations.rb
 - lib/bulletmark_repairer/associations_builder.rb
-- lib/bulletmark_repairer/bulletmark_repairer.rb
 - lib/bulletmark_repairer/configuration.rb
 - lib/bulletmark_repairer/controller_corrector.rb
 - lib/bulletmark_repairer/corrector.rb
@@ -96,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="