fume-aloader 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12208e51420d3bf1332bd4b482170903d823458bdd62064bbc6a90c7b6e8af8a
-  data.tar.gz: 86ef2d545231f0164d7d0c05e8279d924c00819ffb1395707157020274234493
+  metadata.gz: 221e8b06fc2100e3c646ab82f32c36e527e018bc7a9873fea4c181278af483bb
+  data.tar.gz: 2c5c8fee904a1f32e0b3b7f55512742ddbf2dac5c427d3779142243b0d8b135d
 SHA512:
-  metadata.gz: 2c974e163a5d91eddd8c933e54abfa56f3e0ae665d3a887113d343070e689560ec5b54d7d044eca8586341e364746890335e07aeeff501d21bf011c27952da45
-  data.tar.gz: 215584ac4d4589fa16ffacfadebaa29d82ab91018234a8418daf6842c9c70ba528f5db6322c50fee3f0bed7326dda986e77f2600dd083555ab21a1b51433c7ca
+  metadata.gz: 2dff7bb5abe0b7718f322efd12c965c1806e99875c71758893dc66010a3c81538ee8f4ad9becd714bf08bb1fa1dc6430c5afbb0d91862119caf850d056173b7c
+  data.tar.gz: 3a59ef0c3ae2867a8480edaa84100cf2eaec0f8e8212152b1b79377bf0f8a9c784783fa655d590d9de410d641b993acb964170354b1a0d5538425def5052cea4

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[: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/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.2"
   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.2
 platform: ruby
 authors:
 - sunteya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2022-05-07 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