associationist 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8685abcebf828aabc6f3337bfcbf4baac04c73dc847b5a235933c5b2e3e8e487
-  data.tar.gz: 21983405667e166041b1ad1670cdf399813d83579c4408ba0aa0c9e3d5dd8359
+  metadata.gz: 187820657e6aa46774e5161d105e4ae1e939d062ec389be51a9e510b5eda7aed
+  data.tar.gz: 57b2cdc4270aaf9b75a3b52957ce272e8c4492087079c20b5771208b8a2a9fe0
 SHA512:
-  metadata.gz: 8d77f497b70cf83ff9912af6cd80c3608de1593461fe0c1f30dbcfe459fe17fd118b94383ca78a37d38fbab5d5e1d2eb697fbbb8f0938e88b6ac7b78f62b180e
-  data.tar.gz: 71f89b2f935278cf9d044152d6fa92895af98e05a9f49523d0031ab39d0dca1d81f7546bfdbbf338c124c187d94100c10f6981e18451acb317e09c2063465f4e
+  metadata.gz: 938dd23506837a38292a3ae074a72a2b40815ddae10f0f946e14e00514b8cd601baa006b4589f580406aad73ff7ed8065e0d710544ba90c3847c63e4916cf30e
+  data.tar.gz: 830e60e54c9c865ff97c5b6d57b92270b67625093a3c28828e6d89f9abb44cbd2565080c9b8fcc3bdd967cd4e9cbce1b0307728e6ee9000844777c7af808c297

data/lib/associationist/associations/preloader/singular_association.rb

@@ -2,13 +2,18 @@ module Associationist
   module Associations
     module Preloader
       class SingularAssociation
-        def initialize klass, owners, reflection, preload_scope, associate_by_default = true
+        attr_reader :klass
+        def initialize klass, owners, reflection, preload_scope, reflection_scope = nil, associate_by_default = true
+          @klass = klass
           @owners = owners
           @reflection = reflection
+          @run = false
         end
 
         # handle >= 6.0
         def run preloader = nil
+          return self if @run
+          @run = true
           case
           when @reflection.config.preloader_proc
             @reflection.config.preloader_proc.call(@owners).each do |record, value|
@@ -36,15 +41,43 @@ module Associationist
         def preloaded_records
           @owners.flat_map { |owner| owner.association(@reflection.name).target }
         end
+
+        # handle >=7.0
+        def runnable_loaders
+          [self]
+        end
+
+        def run?
+          @run
+        end
+
+        def future_classes
+          if run?
+            []
+          else
+            if @klass <= ActiveRecord::Base
+              [@klass]
+            else
+              []
+            end
+          end
+        end
+
+        def table_name
+          if @klass <= ActiveRecord::Base
+            @klass.table_name
+          else
+            nil
+          end
+        end
       end
 
     end
   end
 
-  module ActiveRecordPreloaderPatch
-    case
-    when ActiveRecord.version < Gem::Version.new('5.2.0')
-      def preloader_for(reflection, owners, rhs_klass)
+  if ActiveRecord.version >= Gem::Version.new('7.0.0')
+    module ActiveRecordPreloaderBranchPatch
+      def preloader_for(reflection)
         config = reflection.options[:associationist]
         if config
           Associationist::Associations::Preloader::SingularAssociation
@@ -52,17 +85,72 @@ module Associationist
           super
         end
       end
-    when ActiveRecord.version >= Gem::Version.new('5.2.0')
-      def preloader_for(reflection, owners)
-        config = reflection.options[:associationist]
-        if config
-          Associationist::Associations::Preloader::SingularAssociation
-        else
-          super
+    end
+
+    ActiveRecord::Associations::Preloader::Branch.prepend ActiveRecordPreloaderBranchPatch
+
+    module ActiveRecordPreloaderPatch
+    end
+
+    ActiveRecord::Associations::Preloader.prepend ActiveRecordPreloaderPatch
+
+    module ActiveRecordPreloaderBatchPatch
+      def call
+        branches = @preloaders.flat_map(&:branches)
+        until branches.empty?
+          loaders = branches.flat_map(&:runnable_loaders)
+          loaders.each do |loader|
+            if loader.is_a? Associationist::Associations::Preloader::SingularAssociation
+            else
+              loader.associate_records_from_unscoped(@available_records[loader.klass.base_class])
+            end
+          end
+
+          if loaders.any?
+            future_tables = branches.flat_map do |branch|
+              branch.future_classes - branch.runnable_loaders.map(&:klass)
+            end.map(&:table_name).uniq
+
+            target_loaders = loaders.reject { |l| future_tables.include?(l.table_name)  }
+            target_loaders = loaders if target_loaders.empty?
+
+            non_associationist_loaders = target_loaders.reject{|x| x.is_a? Associationist::Associations::Preloader::SingularAssociation}
+            group_and_load_similar(non_associationist_loaders)
+            target_loaders.each(&:run)
+          end
+
+          finished, in_progress = branches.partition(&:done?)
+
+          branches = in_progress + finished.flat_map(&:children)
         end
       end
     end
-  end
 
-  ActiveRecord::Associations::Preloader.prepend ActiveRecordPreloaderPatch
+    ActiveRecord::Associations::Preloader::Batch.prepend ActiveRecordPreloaderBatchPatch
+  else
+    module ActiveRecordPreloaderPatch
+      case
+      when ActiveRecord.version < Gem::Version.new('5.2.0')
+        def preloader_for(reflection, owners, rhs_klass)
+          config = reflection.options[:associationist]
+          if config
+            Associationist::Associations::Preloader::SingularAssociation
+          else
+            super
+          end
+        end
+      when ActiveRecord.version >= Gem::Version.new('5.2.0')
+        def preloader_for(reflection, owners)
+          config = reflection.options[:associationist]
+          if config
+            Associationist::Associations::Preloader::SingularAssociation
+          else
+            super
+          end
+        end
+      end
+    end
+
+    ActiveRecord::Associations::Preloader.prepend ActiveRecordPreloaderPatch
+  end
 end

data/lib/associationist/associations/singular_association.rb

@@ -25,7 +25,11 @@ module Associationist
         if reflection.config.scope_proc
           association_scope.klass
         else
-          Object
+          if reflection.config.class_name
+            reflection.config.class_name.constantize
+          else
+            Object
+          end
         end
       end
 

data/lib/associationist/config.rb

@@ -30,6 +30,10 @@ module Associationist
       @config[:scope]
     end
 
+    def class_name
+      @config[:class_name]
+    end
+
     def check
       if @config[:loader] && @config[:scope]
         raise "cannot define both loader and scope"

data/lib/associationist/version.rb

@@ -1,3 +1,3 @@
 module Associationist
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/lib/associationist.rb

@@ -5,7 +5,13 @@ Dir.glob("#{File.dirname(__FILE__)}/**/*.rb").each do |file|
 end
 
 module Associationist
-  def self.preload records, associations
-    ActiveRecord::Associations::Preloader.new.preload records, associations
+  if ActiveRecord.version >= Gem::Version.new('7.0.0')
+    def self.preload records, associations
+      ActiveRecord::Associations::Preloader.new(records: records, associations: associations).call
+    end
+  else
+    def self.preload records, associations
+      ActiveRecord::Associations::Preloader.new.preload records, associations
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: associationist
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - onyxblade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement