fume-aloader 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12208e51420d3bf1332bd4b482170903d823458bdd62064bbc6a90c7b6e8af8a
-  data.tar.gz: 86ef2d545231f0164d7d0c05e8279d924c00819ffb1395707157020274234493
+  metadata.gz: d28c0f8cbcfe64fca00ab2f6ca8b9cdefeab90b866707e3ce04385a8ea369d52
+  data.tar.gz: 16b395ef8d8a26e26f6997eb5af7f89f1acad2b1d48d9f7dca0381c14e3f1a86
 SHA512:
-  metadata.gz: 2c974e163a5d91eddd8c933e54abfa56f3e0ae665d3a887113d343070e689560ec5b54d7d044eca8586341e364746890335e07aeeff501d21bf011c27952da45
-  data.tar.gz: 215584ac4d4589fa16ffacfadebaa29d82ab91018234a8418daf6842c9c70ba528f5db6322c50fee3f0bed7326dda986e77f2600dd083555ab21a1b51433c7ca
+  metadata.gz: 5a3c7e7784c54ece83c902c5c890d4ba608cd7726993af164446bd21dba029fadda12a8b95b3d85d0587033a059f800c5899e78335cf010075a69793ed668962
+  data.tar.gz: 902c5cbb173817c7e1df8de2a4ca2790251a4ca63fac323a6b219e3b5b2b4907ffaf3ae793068d660311c7d7716e58305dbac21875a92c09600ff8cc7ace5a0a

data/lib/fume/aloader/association_loader.rb

@@ -33,13 +33,24 @@ module Fume::Aloader
         # prefer use cached value
         association.target = find_cached_value(record, name)
       elsif association.loaded?
-        # ignore
+        ensure_attribute_aloader_inited(record, name)
       else
         init_records_value(name)
         association.target = find_cached_value(record, name)
       end
     end
 
+    def ensure_attribute_aloader_inited(record, name)
+      relationship = Relationship.build(klass, name)
+      return if relationship.loader_is_inited?(record)
+
+      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) }
+      end
+    end
+
     def preload_all(*path, values)
       path = [ path ].flatten
       name = path.shift

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,6 +20,12 @@ module Fume::Aloader
       end
     end
 
+    def al_build(preset = :default)
+      return self.aloader if self.aloader
+      self.aloader = self.class.al_build([ self ])
+      self.aloader.active(preset)
+    end
+
     module ClassMethods
       def aloader_init(&block)
         define_singleton_method :al_build do |records|

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

@@ -0,0 +1,25 @@
+require_relative "base"
+
+module Fume::Aloader
+  module Relationship
+    class BaseSingle < Base
+      def loader_is_inited?(parent)
+        value = parent.send(reflection.name)
+        value.nil? || !!value.aloader
+      end
+
+      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)
+
+        values.each do |value|
+          value.aloader = loader
+        end
+
+        loader.active(preset) if preset
+        [ loader ]
+      end
+    end
+  end
+end

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

@@ -1,8 +1,8 @@
-require_relative "base"
+require_relative "base_single"
 
 module Fume::Aloader
   module Relationship
-    class BelongsTo < Base
+    class BelongsTo < BaseSingle
       def get_cache_key(record)
         record.send(reflection.join_foreign_key)
       end

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

@@ -1,8 +1,8 @@
-require_relative "base"
+require_relative "base_single"
 
 module Fume::Aloader
   module Relationship
-    class BelongsToPolymorphic < Base
+    class BelongsToPolymorphic < BaseSingle
       def get_cache_key(record)
         [ record.send(reflection.join_foreign_type), record.send(reflection.join_foreign_key) ]
       end
@@ -15,12 +15,13 @@ module Fume::Aloader
         values_mapping = records.each_with_object({}).each do |record, hash|
           type = record.read_attribute(reflection.join_foreign_type)
           next if type.nil?
-          hash[type] ||= Set.new
 
           value = record.read_attribute(reflection.join_foreign_key)
-          hash[type] << value if !value.nil?
-        end
-
+          if value
+            hash[type] ||= Set.new
+            hash[type] << value
+          end
+        end.compact
 
         values_mapping.map do |type, values|
           values = [ values.to_a ]
@@ -39,6 +40,35 @@ module Fume::Aloader
           values_scope
         end
       end
+
+      def build_values_mapping(records)
+      end
+
+      def loaders_init(parents, preset)
+        values_mapping = parents.each_with_object({}).each do |parent, hash|
+          type = parent.read_attribute(reflection.join_foreign_type)
+          next if type.nil?
+
+          value = parent.send(reflection.name)
+          if value
+            hash[type] ||= Set.new
+            hash[type] << value
+          end
+        end.compact
+
+        values_mapping.each do |type, values|
+          loader_klass = type.constantize
+          next if !loader_klass.respond_to?(:al_build)
+          loader = loader_klass.al_build(values)
+
+          values.each do |value|
+            value.aloader = loader
+          end
+
+          loader.active(preset) if preset
+          loader
+        end
+      end
     end
   end
 end

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

@@ -13,6 +13,24 @@ module Fume::Aloader
           result[key] += [ it ]
         end
       end
+
+      def loader_is_inited?(parent)
+        values = parent.send(reflection.name)
+        values.nil? || values.empty? || !!values.first.aloader
+      end
+
+      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)
+
+        values.each do |value|
+          value.aloader = loader
+        end
+
+        loader.active(preset) if preset
+        [ loader ]
+      end
     end
   end
 end

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

@@ -1,8 +1,8 @@
-require_relative "base"
+require_relative "base_single"
 
 module Fume::Aloader
   module Relationship
-    class HasOne < Base
+    class HasOne < BaseSingle
       def get_cache_key(record)
         record.send(reflection.join_foreign_key)
       end

data/lib/fume/aloader/version.rb

@@ -1,5 +1,5 @@
 module Fume
   module Aloader
-    VERSION = "0.1.1"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fume-aloader
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - sunteya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +156,7 @@ files:
 - lib/fume/aloader/relation_addons.rb
 - lib/fume/aloader/relationship.rb
 - lib/fume/aloader/relationship/base.rb
+- lib/fume/aloader/relationship/base_single.rb
 - lib/fume/aloader/relationship/belongs_to.rb
 - lib/fume/aloader/relationship/belongs_to_polymorphic.rb
 - lib/fume/aloader/relationship/has_and_belongs_to_many.rb