ar_lazy_preload 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18eb45f9e1c299f719a7bdde76d9da3c9de0175919ad71556c4dfee750405d35
-  data.tar.gz: cec719881cff10f3687c8a22461d0b27acf9ab064104cbb5fb380eb6bd836701
+  metadata.gz: 7fa14f78a46e62ec3f8cb5053ea2887bbb6a5b12b77bb714efed694c21c36432
+  data.tar.gz: f82efd9fef819d6c4c909e366161dfc9e39d679554ae0073af3519aaad0814e6
 SHA512:
-  metadata.gz: 71d13fa6015289abc893816b695e920fb59c42d96691d5cd86c3ce41c2c5e4bb34e5c6ea343094aabd39136e4e01ef1e88cd1f5e50bf97968f074844b61b3d87
-  data.tar.gz: 5e4e2f0f95b42796d7f165afb7009db76fbbcfa083e2552c2b7c90e7bc9442445d533cdfd498dc8a39b4734e8c0e50641ea8d77f48a429a85568fb0421e72c3c
+  metadata.gz: 657987c4f3d36a53247aede5ffcd42cf362c732f286c87f7fada29e1ddcf775a49d39724a733c1281b0329c00f2bbab9ea74146e03b0a518756e91acaaa65820
+  data.tar.gz: de59065ed0ac071d39223f31f7028142d25d2fb7ac6e5af0149aff2211fdcf92ecf36aa5ba9a463883031e60d85b010df58dd55f7a9a3df228039f5de8fa0891

data/lib/ar_lazy_preload/associated_context_builder.rb

@@ -7,52 +7,42 @@ module ArLazyPreload
   # belonging to the same context and association name it will create and attach a new context to
   # the associated records based on the parent association tree.
   class AssociatedContextBuilder
+    # Initiates lazy preload context the records loaded lazily
+    def self.prepare(*args)
+      new(*args).perform
+    end
+
     attr_reader :parent_context, :association_name
 
+    # :parent_context - root context
+    # :association_name - lazily preloaded association name
     def initialize(parent_context:, association_name:)
       @parent_context = parent_context
       @association_name = association_name
     end
 
-    delegate :records, :association_tree, :model, to: :parent_context
-
     # Takes all the associated records for the records, attached to the :parent_context and creates
     # a preloading context for them
     def perform
-      return if child_association_tree.blank? || associated_records.blank?
+      records_by_class = parent_context.records.group_by(&:class)
 
-      Context.new(
-        model: reflection.klass,
-        records: associated_records,
-        association_tree: child_association_tree
-      )
+      associated_records = records_by_class.map do |klass, klass_records|
+        associated_records_for(klass, klass_records)
+      end.flatten
+
+      Context.register(records: associated_records, association_tree: child_association_tree)
     end
 
     private
 
     def child_association_tree
-      @child_association_tree ||= association_tree_builder.subtree_for(association_name)
-    end
-
-    def association_tree_builder
-      @association_tree_builder ||= AssociationTreeBuilder.new(association_tree)
-    end
-
-    def associated_records
-      @associated_records ||=
-        if reflection.collection?
-          record_associations.map(&:target).flatten
-        else
-          record_associations
-        end
-    end
-
-    def reflection
-      @reflection = model.reflect_on_association(association_name)
+      AssociationTreeBuilder.new(parent_context.association_tree).subtree_for(association_name)
     end
 
-    def record_associations
-      @record_associations ||= records.map { |record| record.send(association_name) }
+    def associated_records_for(klass, records)
+      record_associations = records.map { |record| record.send(association_name) }
+      reflection = klass.reflect_on_association(association_name)
+      reflection.collection? ? record_associations.map(&:target).flatten : record_associations
     end
   end
 end

data/lib/ar_lazy_preload/context.rb

@@ -9,13 +9,17 @@ module ArLazyPreload
   # Calling #preload_association method will cause loading of ALL associated objects for EACH
   # ecord when requested association is found in the association tree.
   class Context
-    attr_reader :model, :records, :association_tree
+    # Initiates lazy preload context for given records
+    def self.register(records:, association_tree:)
+      return if records.empty? || association_tree.empty?
+      ArLazyPreload::Context.new(records: records, association_tree: association_tree)
+    end
+
+    attr_reader :records, :association_tree
 
-    # :model - ActiveRecord class which records belong to
     # :records - array of ActiveRecord instances
     # :association_tree - list of symbols or hashes representing a tree of preloadable associations
-    def initialize(model:, records:, association_tree:)
-      @model = model
+    def initialize(records:, association_tree:)
       @records = records.compact
       @association_tree = association_tree
 
@@ -26,13 +30,8 @@ module ArLazyPreload
     # objects in the context it if needed.
     def try_preload_lazily(association_name)
       return unless association_needs_preload?(association_name)
-
       preloader.preload(records, association_name)
-
-      AssociatedContextBuilder.new(
-        parent_context: self,
-        association_name: association_name
-      ).perform
+      AssociatedContextBuilder.prepare(parent_context: self, association_name: association_name)
     end
 
     private

data/lib/ar_lazy_preload/ext/association.rb

@@ -4,14 +4,8 @@ module ArLazyPreload
   # ActiveRecord::Association patch with a hook for lazy preloading
   module Association
     def load_target
-      owner.try_preload_lazily(association_name)
+      owner.try_preload_lazily(reflection.name)
       super
     end
-
-    private
-
-    def association_name
-      @association_name ||= reflection.name
-    end
   end
 end

data/lib/ar_lazy_preload/ext/association_relation.rb

@@ -8,7 +8,7 @@ module ArLazyPreload
       super(*args)
 
       context = owner.lazy_preload_context
-      return if context.blank?
+      return if context.nil?
 
       association_tree_builder = AssociationTreeBuilder.new(context.association_tree)
       subtree = association_tree_builder.subtree_for(reflection.name)

data/lib/ar_lazy_preload/ext/base.rb

@@ -9,9 +9,6 @@ module ArLazyPreload
 
     attr_accessor :lazy_preload_context
 
-    # When context has been set, this method would cause preloading association with a given name
-    def try_preload_lazily(association_name)
-      lazy_preload_context.try_preload_lazily(association_name) if lazy_preload_context.present?
-    end
+    delegate :try_preload_lazily, to: :lazy_preload_context, allow_nil: true
   end
 end

data/lib/ar_lazy_preload/ext/relation.rb

@@ -9,9 +9,9 @@ module ArLazyPreload
     # for lazy preloading to loaded each record
     def load
       need_context = !loaded?
-      old_load_result = super
-      setup_lazy_preload_context if need_context
-      old_load_result
+      result = super
+      Context.register(records: @records, association_tree: lazy_preload_values) if need_context
+      result
     end
 
     # Specify relationships to be loaded lazily when association is loaded for the first time. For
@@ -49,15 +49,5 @@ module ArLazyPreload
     private
 
     attr_writer :lazy_preload_values
-
-    def setup_lazy_preload_context
-      return if lazy_preload_values.blank? || @records.blank?
-
-      ArLazyPreload::Context.new(
-        model: model,
-        records: @records,
-        association_tree: lazy_preload_values
-      )
-    end
   end
 end

data/lib/ar_lazy_preload/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArLazyPreload
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_lazy_preload
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec