Be able to patch for nested associations require includes though ch…

…ild associations are already included

lib/bulletmark_repairer.rb

@@ -6,6 +6,7 @@
 require 'bulletmark_repairer/associations_builder'
 require 'bulletmark_repairer/configuration'
 require 'bulletmark_repairer/corrector_builder'
+require 'bulletmark_repairer/loaded_associations'
 require 'bulletmark_repairer/markers'
 require 'bulletmark_repairer/patcher'
 

lib/bulletmark_repairer/associations_builder.rb

@@ -10,7 +10,11 @@ def build(marker)
       if associations[marker.index]
         associations[marker.index].add(marker)
       else
-        associations[marker.index] = Associations.new(marker, @application_associations)
+        associations[marker.index] = Associations.new(
+          marker,
+          @application_associations,
+          @loaded_associations
+        )
       end
     end
 
@@ -20,8 +24,9 @@ def associations
 
     private
 
-    def initialize
+    def initialize(loaded_associations)
       @application_associations = BulletmarkRepairer::ApplicationAssociations.new
+      @loaded_associations = BulletmarkRepairer::LoadedAssociations.new(loaded_associations)
     end
   end
 
@@ -44,10 +49,12 @@ def corrector(dir)
 
     private
 
-    def initialize(marker, application_associations)
+    def initialize(marker, application_associations, loaded_associations)
       @marker = marker
-      @associations = { base: marker.associations }
       @application_associations = application_associations
+      @loaded_associations = loaded_associations
+      key = @loaded_associations.key(marker.base_class)
+      @associations = { base: key ? { key => marker.associations } : marker.associations }
     end
 
     # @return [Hash, nil]

lib/bulletmark_repairer/loaded_associations.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module BulletmarkRepairer
+  class LoadedAssociations
+    attr_reader :associations
+
+    def key(target_klass_name)
+      key = target_klass_name.underscore
+
+      result = nil
+      @associations.each do |_base_klass_name, all_associations|
+        all_associations.each do |_key, associations|
+          # TODO: return key
+          # TODO: reccurent check
+          associations.any? do |values|
+            result = key.pluralize.to_sym if key.pluralize.to_sym.in?(values)
+            result = key.singularize.to_sym if key.singularize.to_sym.in?(values)
+          end
+        end
+      end
+      result
+    end
+
+    def initialize(original_associations)
+      @associations = Hash.new { |h, k| h[k] = {} }
+      original_associations.each do |base_class, all_associations|
+        all_associations.each do |key, associations|
+          @associations[base_class][key] = associations.to_a
+        end
+      end
+    end
+  end
+end

lib/bulletmark_repairer/patcher.rb

@@ -6,8 +6,8 @@
 
 module BulletmarkRepairer
   class Patcher
-    def self.execute(notifications:, controller:, action:)
-      new(notifications: notifications, controller: controller, action: action).execute
+    def self.execute(notifications:, controller:, action:, loaded_associations:)
+      new(notifications: notifications, controller: controller, action: action, loaded_associations: loaded_associations).execute
     end
 
     def execute
@@ -24,9 +24,9 @@ def execute
 
     private
 
-    def initialize(notifications:, controller:, action:)
+    def initialize(notifications:, controller:, action:, loaded_associations:)
       @markers = Markers.new(notifications, controller: controller, action: action)
-      @associations_builder = BulletmarkRepairer::AssociationsBuilder.new
+      @associations_builder = BulletmarkRepairer::AssociationsBuilder.new(loaded_associations)
     end
   end
 end

lib/bulletmark_repairer/rack.rb

@@ -7,19 +7,24 @@ def initialize(app)
     end
 
     def call(env)
+      Thread.current[:bulletmark_repaier_loaded_associations] = Hash.new do |hash, key|
+        hash[key] = { includes: Set.new, eager_load: Set.new, preload: Set.new }
+      end
       @app.call(env)
     ensure
       begin
         if Thread.current[:bullet_notification_collector].notifications_present?
           BulletmarkRepairer::Patcher.execute(
             notifications: Thread.current[:bullet_notification_collector],
             controller: env['action_dispatch.request.parameters']['controller'],
-            action: env['action_dispatch.request.parameters']['action']
+            action: env['action_dispatch.request.parameters']['action'],
+            loaded_associations: Thread.current[:bulletmark_repaier_loaded_associations]
           )
         end
       rescue StandardError => e
         raise e if BulletmarkRepairer.config.debug?
       end
+      Thread.current[:bulletmark_repaier_loaded_associations].clear
     end
   end
 end

spec/associations_builder/associations_builder_spec.rb

@@ -4,8 +4,9 @@
 
 RSpec.describe BulletmarkRepairer::Associations do
   describe '#build_associations!' do
-    let(:associations) { described_class.new(parent_marker, application_associations) }
+    let(:associations) { described_class.new(parent_marker, application_associations, loaded_associations) }
     let(:application_associations) { BulletmarkRepairer::ApplicationAssociations.new }
+    let(:loaded_associations) { BulletmarkRepairer::LoadedAssociations.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) }
 

spec/requests/nested_though_only_grand_child_is_required_includes_spec.rb

@@ -13,7 +13,7 @@ def index
   let(:patched_src) do
     <<-SRC
   def index
-    @plays = Play.includes([{:actors=>[:company]}])
+    @plays = Play.includes(:actors).includes({:actors=>[:company]})
   end
     SRC
   end
@@ -25,5 +25,5 @@ def index
 
   subject { get nested_though_only_grand_child_is_required_includes_path }
 
-  # it_behaves_like 'correctly patched'
+  it_behaves_like 'correctly patched'
 end