Quit using a class instance variable

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'

lib/bulletmark_repairer/bulletmark_repairer.rb → lib/bulletmark_repairer/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

lib/bulletmark_repairer/associations_builder.rb

@@ -10,13 +10,19 @@ def build(marker)
       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
@@ -38,9 +44,10 @@ def corrector(dir)
 
     private
 
-    def initialize(marker)
+    def initialize(marker, application_associations)
       @marker = marker
       @associations = { base: marker.associations }
+      @application_associations = application_associations
     end
 
     # @return [Hash, nil]
@@ -66,12 +73,12 @@ def build_associations!(marker:, associations:, parent_keys:)
     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
 

lib/bulletmark_repairer/rack.rb

@@ -11,7 +11,6 @@ def call(env)
     end
 
     def _call(env)
-      BulletmarkRepairer.reset_associations
       @app.call(env)
     ensure
       begin

spec/associations_builder/associations_builder_spec.rb

@@ -4,7 +4,8 @@
 
 RSpec.describe BulletmarkRepairer::Associations do
   describe '#build_associations!' do
-    let(:associations) { described_class.new(parent_marker) }
+    let(:associations) { described_class.new(parent_marker, application_associations) }
+    let(:application_associations) { BulletmarkRepairer::ApplicationAssociations.new }
     let(:parent_marker) { double(:marker, base_class: parent_attributes.keys.first, associations: parent_attributes.values.first) }
     let(:child_marker) { double(:marker, base_class: child_attributes.keys.first, associations: child_attributes.values.first) }