fume-aloader 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d205f2e1934bebb8d922c2d17a5126b4a46d1f25897edbc82be331b3010e255
-  data.tar.gz: 37a54264eb5998a64bff6f9e400be6d1d2bcade3b5cc281add1687cbf88f9f0e
+  metadata.gz: 6dc81c2dd3679bbead750f74972bc067d9ef01b7780247e77c655169916714e3
+  data.tar.gz: caaa1cc9f14018a031847e3968103f5384a98614ab12b5d891a510d38eb762f2
 SHA512:
-  metadata.gz: 1b7192010a01bcc3cdc5ed17b91523d9f3b8135db14f6c7ef2a588bebf928eb83871115d89c548274dd999609f9cf59bd4c027250719c401b1b48ca82a2cdcfd
-  data.tar.gz: f4676daf7024f3b81eaa85599f1a2923de222027aefedac1cb9e499850eb87a09d6d7dd41afc0138577a8d2d054d19ae169e7bae909119792fecc851eb14a17b
+  metadata.gz: 9ad64312dc49a07a91f3f0c675f89aa2290c568f062d01fc56b255e93cac4bb31ce034a872933299a59af44c4c3d9b5f9f567198a690eb6011adcdc2fa2f50ee
+  data.tar.gz: 0050c9b262182d57ce8673b7880a15fe4cda47856a0f401c4e1e2623c7c6e43906eae69e7c0333332afb0c00aed36132b613ad0f2e36a065b73b9a4a50b4d6a6

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)
@@ -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/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

@@ -10,7 +10,7 @@ module Fume::Aloader
     end
 
     def spawn(*args)
-      result = already_in_scope? ? klass.all : clone
+      result = super
       result.aloader = nil
       result.al_init_loader
       result.aloader&.spawn_from(self.aloader) if self.aloader
@@ -46,11 +46,6 @@ module Fume::Aloader
     end
 
     def al_to_scope(preset = :default)
-      if self.is_a?(ActiveRecord::Associations::CollectionProxy)
-        scope.al_to_scope(preset)
-        return
-      end
-
       al_init_loader
       self.aloader.active(preset)
       result = self.aloader.apply_profile_scope_includes(self)

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.3"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fume-aloader
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - sunteya
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-10 00:00:00.000000000 Z
+date: 2022-07-05 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: []