batch-loader-active-record 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20293fa5d03f7ea6bf4639ccef5b99287cf2988c
-  data.tar.gz: 170d3adfc3c7b8b9513a5bffb5b358f3e9307736
+  metadata.gz: f442e69779971d6ff0f8a67e79a9b1afd68ee1d5
+  data.tar.gz: 5b457b1b5ac6a0bce872ca6a11b9778a1b67bb38
 SHA512:
-  metadata.gz: 39ee2cd6379fe68db021a13dd2a1433ffc96d2bd9f2c6677850c1fd34b34a27f87e9f160aea8027d61fe2a5ce1992a24c6f7e086012f6cc1cca8308c814c54b6
-  data.tar.gz: daf102a9d873e4f9cca57c1569e7ac5673cf3834013c381a69070d2be27b5011a6e428b7d0d00c402bac1265723a7ffa6e4c10fa3ec07714dd07cedd2ad388ff
+  metadata.gz: 88cde79729754c86cfb0af302fc5fed3e68b679f9a17bb1b9615fcec2ce9b1e6d229b84203ec106df35e04f9704d7a2613c092d629513f8e185cb0b7ba1611bb
+  data.tar.gz: 4b1ac2601cbd5cf2515b4b811211222bf6dd84b7dd425488308b7d33c4a30e7974457faad348a6180657f0ec5a8b6d69dd0f99876bdf7807eb6821f3d2c5cc00

data/CHANGELOG.md

@@ -4,6 +4,10 @@ Unreleased
 
 * none
 
+v0.5.0
+
+* support polymorphic associations
+
 v0.4.3
 
 * fix dependency to activerecord and builds

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    batch-loader-active-record (0.4.3)
+    batch-loader-active-record (0.5.0)
       activerecord (>= 4.2.0, < 5.3.0)
       batch-loader (~> 1.2.0)
 

data/README.md

@@ -14,7 +14,7 @@ It is not intended to be used for all associations though, but only where necess
 
 This gem has a very simple implementation and delegates all batch loading responsibilities (used to avoid N+1 calls to the database) to the [batch-loader gem](https://github.com/exAspArk/batch-loader). It allows to generate a lazy association accessor with a simple statement: `association_accessor :association_name`.
 
-Note that it doesn't yet support all cases handled by Active Record associations, refer to the [CHANGELOG](https://github.com/mathieul/batch-loader-active-record/blob/master/CHANGELOG.md) to know what is supported and what is not.
+Refer to the [CHANGELOG](https://github.com/mathieul/batch-loader-active-record/blob/master/CHANGELOG.md) to know what is supported and what is not.
 
 It is also possible to use one of the macros below in replacement of the original Active Record macro to both declare the association and trigger a lazy association accessort in a single statement.
 

data/gemfiles/activerecord_4_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    batch-loader-active-record (0.4.3)
+    batch-loader-active-record (0.5.0)
       activerecord (>= 4.2.0, < 5.3.0)
       batch-loader (~> 1.2.0)
 

data/gemfiles/activerecord_5_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    batch-loader-active-record (0.4.3)
+    batch-loader-active-record (0.5.0)
       activerecord (>= 4.2.0, < 5.3.0)
       batch-loader (~> 1.2.0)
 

data/gemfiles/activerecord_5_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    batch-loader-active-record (0.4.3)
+    batch-loader-active-record (0.5.0)
       activerecord (>= 4.2.0, < 5.3.0)
       batch-loader (~> 1.2.0)
 

data/gemfiles/activerecord_5_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    batch-loader-active-record (0.4.3)
+    batch-loader-active-record (0.5.0)
       activerecord (>= 4.2.0, < 5.3.0)
       batch-loader (~> 1.2.0)
 

data/lib/batch_loader_active_record.rb

@@ -15,7 +15,11 @@ module BatchLoaderActiveRecord
       manager = AssociationManager.new(model: self, reflection: reflection)
       case reflection.macro
       when :belongs_to
-        define_method(manager.accessor_name) { manager.belongs_to_batch_loader(self) }
+        if reflection.polymorphic?
+          define_method(manager.accessor_name) { manager.polymorphic_belongs_to_batch_loader(self) }
+        else
+          define_method(manager.accessor_name) { manager.belongs_to_batch_loader(self) }
+        end
       when :has_one
         define_method(manager.accessor_name) { manager.has_one_to_batch_loader(self) }
       when :has_many
@@ -32,22 +36,27 @@ module BatchLoaderActiveRecord
     end
 
     def belongs_to_lazy(*args)
-      belongs_to(*args).tap do |reflections|
-        manager = AssociationManager.new(model: self, reflection: reflections.values.last)
-        define_method(manager.accessor_name) { manager.belongs_to_batch_loader(self) }
+      belongs_to(*args).tap do
+        reflection = reflect_on_all_associations.last
+        manager = AssociationManager.new(model: self, reflection: reflection)
+        if reflection.polymorphic?
+          define_method(manager.accessor_name) { manager.polymorphic_belongs_to_batch_loader(self) }
+        else
+          define_method(manager.accessor_name) { manager.belongs_to_batch_loader(self) }
+        end
       end
     end
 
     def has_one_lazy(*args)
-      has_one(*args).tap do |reflections|
-        manager = AssociationManager.new(model: self, reflection: reflections.values.last)
+      has_one(*args).tap do
+        manager = AssociationManager.new(model: self, reflection: reflect_on_all_associations.last)
         define_method(manager.accessor_name) { manager.has_one_to_batch_loader(self) }
       end
     end
 
     def has_many_lazy(*args)
-      has_many(*args).tap do |reflections|
-        manager = AssociationManager.new(model: self, reflection: reflections.values.last)
+      has_many(*args).tap do
+        manager = AssociationManager.new(model: self, reflection: reflect_on_all_associations.last)
         define_method(manager.accessor_name) do |instance_scope = nil|
           manager.has_many_to_batch_loader(self, instance_scope)
         end
@@ -55,7 +64,7 @@ module BatchLoaderActiveRecord
     end
 
     def has_and_belongs_to_many_lazy(*args)
-      has_and_belongs_to_many(*args).tap do |reflections|
+      has_and_belongs_to_many(*args).tap do
         manager = AssociationManager.new(model: self, reflection: reflect_on_all_associations.last)
         define_method(manager.accessor_name) do |instance_scope = nil|
           manager.has_and_belongs_to_many_to_batch_loader(self, instance_scope)

data/lib/batch_loader_active_record/association_manager.rb

@@ -5,7 +5,6 @@ module BatchLoaderActiveRecord
     def initialize(model:, reflection:)
       @model = model
       @reflection = reflection
-      assert_not_polymorphic
     end
 
     def accessor_name
@@ -19,9 +18,26 @@ module BatchLoaderActiveRecord
       end
     end
 
+    def polymorphic_belongs_to_batch_loader(instance)
+      foreign_id = instance.send(reflection.foreign_key) or return nil
+      foreign_type = instance.send(reflection.foreign_type)&.constantize or return nil
+      BatchLoader.for([foreign_type, foreign_id]).batch(key: batch_key) do |foreign_ids_types, loader|
+        foreign_ids_types
+          .group_by(&:first)
+          .each do |type, type_ids|
+            ids = type_ids.map(&:second)
+            klass_scope(type).where(id: ids).each do |instance|
+              loader.call([type, instance.id], instance)
+            end
+          end
+      end
+    end
+
     def has_one_to_batch_loader(instance)
       BatchLoader.for(instance.id).batch(key: batch_key) do |model_ids, loader|
-        target_scope.where(reflection.foreign_key => model_ids).each do |instance|
+        relation = target_scope.where(reflection.foreign_key => model_ids)
+        relation = relation.where(reflection.type => model.to_s) if reflection.type
+        relation.each do |instance|
           loader.call(instance.public_send(reflection.foreign_key), instance)
         end
       end
@@ -32,6 +48,7 @@ module BatchLoaderActiveRecord
       custom_key += [instance_scope.to_sql.hash] unless instance_scope.nil?
       BatchLoader.for(instance.id).batch(default_value: [], key: custom_key) do |model_ids, loader|
         relation = relation_with_scope(instance_scope)
+        relation = relation.where(reflection.type => model.to_s) if reflection.type
         if reflection.through_reflection
           instances = fetch_for_model_ids(model_ids, relation: relation)
           instances.each do |instance|
@@ -78,14 +95,16 @@ module BatchLoaderActiveRecord
       end
     end
 
-    def batch_key
-      @batch_key ||= [model.table_name, reflection.name].freeze
+    def klass_scope(klass)
+      if reflection.scope.nil?
+        klass
+      else
+        klass.instance_eval(&reflection.scope)
+      end
     end
 
-    def assert_not_polymorphic
-      if reflection.polymorphic? || reflection.options.has_key?(:as) || reflection.options.has_key?(:source_type)
-        raise NotImplementedError, "polymorphic associations are not yet supported (#{reflection.name})"
-      end
+    def batch_key
+      @batch_key ||= [model.table_name, reflection.name].freeze
     end
 
     def fetch_for_model_ids(ids, relation:)

data/lib/batch_loader_active_record/version.rb

@@ -1,3 +1,3 @@
 module BatchLoaderActiveRecord
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: batch-loader-active-record
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - mathieul