fume-aloader 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 221e8b06fc2100e3c646ab82f32c36e527e018bc7a9873fea4c181278af483bb
-  data.tar.gz: 2c5c8fee904a1f32e0b3b7f55512742ddbf2dac5c427d3779142243b0d8b135d
+  metadata.gz: 3d205f2e1934bebb8d922c2d17a5126b4a46d1f25897edbc82be331b3010e255
+  data.tar.gz: 37a54264eb5998a64bff6f9e400be6d1d2bcade3b5cc281add1687cbf88f9f0e
 SHA512:
-  metadata.gz: 2dff7bb5abe0b7718f322efd12c965c1806e99875c71758893dc66010a3c81538ee8f4ad9becd714bf08bb1fa1dc6430c5afbb0d91862119caf850d056173b7c
-  data.tar.gz: 3a59ef0c3ae2867a8480edaa84100cf2eaec0f8e8212152b1b79377bf0f8a9c784783fa655d590d9de410d641b993acb964170354b1a0d5538425def5052cea4
+  metadata.gz: 1b7192010a01bcc3cdc5ed17b91523d9f3b8135db14f6c7ef2a588bebf928eb83871115d89c548274dd999609f9cf59bd4c027250719c401b1b48ca82a2cdcfd
+  data.tar.gz: f4676daf7024f3b81eaa85599f1a2923de222027aefedac1cb9e499850eb87a09d6d7dd41afc0138577a8d2d054d19ae169e7bae909119792fecc851eb14a17b

data/lib/fume/aloader/association_loader.rb

@@ -44,7 +44,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) }

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/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
@@ -47,9 +46,15 @@ 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)
-      self.aloader.apply_profile_scope_includes(self)
+      result = self.aloader.apply_profile_scope_includes(self)
+      result
     end
   end
 end

data/lib/fume/aloader/version.rb

@@ -1,5 +1,5 @@
 module Fume
   module Aloader
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   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.3
 platform: ruby
 authors:
 - sunteya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails