fume-aloader 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 221e8b06fc2100e3c646ab82f32c36e527e018bc7a9873fea4c181278af483bb
-  data.tar.gz: 2c5c8fee904a1f32e0b3b7f55512742ddbf2dac5c427d3779142243b0d8b135d
+  metadata.gz: c8eda2429fb44edfe0b79564fff46b5da2141ec5ba0576fbb5fe02abd173c230
+  data.tar.gz: 2e00e7e678f27454a754a621bd82427a89449f6707161a6623f40dc6d00613fc
 SHA512:
-  metadata.gz: 2dff7bb5abe0b7718f322efd12c965c1806e99875c71758893dc66010a3c81538ee8f4ad9becd714bf08bb1fa1dc6430c5afbb0d91862119caf850d056173b7c
-  data.tar.gz: 3a59ef0c3ae2867a8480edaa84100cf2eaec0f8e8212152b1b79377bf0f8a9c784783fa655d590d9de410d641b993acb964170354b1a0d5538425def5052cea4
+  metadata.gz: e345b5a434ae6428b6ba81a67c1d0ecc149d19ed50e79b882919d726d6ab700d8bd9733a1f742f22df32cdcc276f056bb295d8373460c2d839a037e4b7f948e9
+  data.tar.gz: cd6fea905d1d95fde882b7f0ff2d75c0bc6eccddc2974b1028ca35bb8bbcf10b2a1704059d217f693cae3a1c75a73e6a20659346a0df442722c40319a78ce69a

data/lib/fume/aloader/association_loader.rb

@@ -10,15 +10,22 @@ module Fume::Aloader
     attr_accessor :cached_values
     attr_accessor :preload_values
 
-    def initialize(records, klass = nil, &block)
-      self.profile = :default
+    def initialize(records, options = {}, &block)
+      self.profile = options[:preset] || :default
       self.presets = {}
-      self.klass = klass || records.klass
+      self.klass = options[:klass] || records.klass
 
       self.cached_values = {}
       self.preload_values = {}
       self.records = records
+
       instance_exec(&block) if block
+
+      if options[:inject]
+        self.records.each do |record|
+          record.aloader = self
+        end
+      end
     end
 
     def find_cached_value(record, name)
@@ -44,7 +51,7 @@ module Fume::Aloader
       relationship = Relationship.build(klass, name)
       return if relationship.loader_is_inited?(record)
 
-      options = active_preset[:attributes][name] || {}
+      options = active_preset.dig(:attributes, name) || {}
       loaders = relationship.loaders_init(self.records, options[:preset])
       (self.preload_values[name] || []).each do |args|
         loaders.each { |it| it.preload_all(*args) }
@@ -196,8 +203,7 @@ module Fume::Aloader
       return attribute[:scope_includes] || [] if attr_preset_name.nil?
 
       association_klass ||= klass.new.association(name).reflection.klass
-      loader = association_klass.al_build([])
-      loader.active(attr_preset_name)
+      loader = association_klass.al_build([], preset: attr_preset_name)
       loader.build_profile_scope_includes
     end
 

data/lib/fume/aloader/railtie.rb

@@ -9,6 +9,11 @@ module Fume::Aloader
     initializer 'fume-aloader.configure_rails_initialization' do |app|
       ::ActiveRecord::Base.include(RecordAddons)
       ::ActiveRecord::Relation.prepend(RelationAddons)
+
+      # CollectionProxy is inhert from Relation, proxy back to Relation
+      ::ActiveRecord::Associations::CollectionProxy.class_eval do
+        delegate :al_to_scope, :aloader, to: :scope
+      end
     end
   end
 end

data/lib/fume/aloader/record_addons.rb

@@ -20,11 +20,18 @@ module Fume::Aloader
       end
     end
 
+    def al_build(preset = :default)
+      return self.aloader if self.aloader
+      self.aloader = self.class.al_build([ self ], preset: preset)
+    end
+
     module ClassMethods
       def aloader_init(&block)
-        define_singleton_method :al_build do |records|
+        define_singleton_method :al_build do |records, options = {}|
           dsl = DSL.new(&block)
-          dsl.apply_config(AssociationLoader.new(records, self))
+          loader = dsl.apply_config(AssociationLoader.new(records, { klass: self }.merge(options)))
+
+          loader
         end
       end
     end

data/lib/fume/aloader/relation_addons.rb

@@ -1,6 +1,5 @@
 module Fume::Aloader
   module RelationAddons
-
     attr_accessor :aloader
 
     def load(*args, &block)
@@ -11,7 +10,7 @@ module Fume::Aloader
     end
 
     def spawn(*args)
-      result = super
+      result = already_in_scope? ? klass.all : clone
       result.aloader = nil
       result.al_init_loader
       result.aloader&.spawn_from(self.aloader) if self.aloader
@@ -49,7 +48,8 @@ module Fume::Aloader
     def al_to_scope(preset = :default)
       al_init_loader
       self.aloader.active(preset)
-      self.aloader.apply_profile_scope_includes(self)
+      result = self.aloader.apply_profile_scope_includes(self)
+      result
     end
   end
 end

data/lib/fume/aloader/relationship/base_single.rb

@@ -11,13 +11,8 @@ module Fume::Aloader
       def loaders_init(parents, preset)
         values = parents.map { |it| it.send(reflection.name) }.compact
         return [] if !reflection.klass.respond_to?(:al_build)
-        loader = reflection.klass.al_build(values)
+        loader = reflection.klass.al_build(values, preset: preset, inject: true)
 
-        values.each do |value|
-          value.aloader = loader
-        end
-
-        loader.active(preset) if preset
         [ loader ]
       end
     end

data/lib/fume/aloader/relationship/belongs_to_polymorphic.rb

@@ -59,13 +59,8 @@ module Fume::Aloader
         values_mapping.each do |type, values|
           loader_klass = type.constantize
           next if !loader_klass.respond_to?(:al_build)
-          loader = loader_klass.al_build(values)
+          loader = loader_klass.al_build(values, preset: preset, inject: true)
 
-          values.each do |value|
-            value.aloader = loader
-          end
-
-          loader.active(preset) if preset
           loader
         end
       end

data/lib/fume/aloader/relationship/has_many.rb

@@ -22,13 +22,8 @@ module Fume::Aloader
       def loaders_init(parents, preset)
         values = parents.flat_map { |it| it.send(reflection.name) }.compact
         return [] if !reflection.klass.respond_to?(:al_build)
-        loader = reflection.klass.al_build(values)
+        loader = reflection.klass.al_build(values, preset: preset, inject: true)
 
-        values.each do |value|
-          value.aloader = loader
-        end
-
-        loader.active(preset) if preset
         [ loader ]
       end
     end

data/lib/fume/aloader/version.rb

@@ -1,5 +1,5 @@
 module Fume
   module Aloader
-    VERSION = "0.1.2"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fume-aloader
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - sunteya
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,7 +136,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.20.0
-description: 
+description:
 email:
 - sunteya@gmail.com
 executables: []
@@ -167,7 +167,7 @@ homepage: https://github.com/sunteya/fume-aloader
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: a configurable eager loading plugin for rails
 test_files: []