ree_lib 1.0.57 → 1.0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84ad4225d13e31575c1799fd4c7a4b480a1e7ae6b9709834447a733a3a260367
-  data.tar.gz: ba98679b88ac6ad2cec30fcd0280c01638220fdd0a7488f8f33c7ead0dd2de7d
+  metadata.gz: ae96c3d6f51872601ad8c4a282cc8119e069a49a2942e624a3eed02817bbf450
+  data.tar.gz: 962693ff78a273ff60ab20f1e704759038e0402619c84ce2da5735f16cca28ad
 SHA512:
-  metadata.gz: ccbda33bb5233fc869f470993a93ec1770471e6fdce354a49455bf15c487731b06384bb776ed762c172e75428d77a071fc4483087cdbd2de8ef780729ccae3ac
-  data.tar.gz: d24649974cf1ca2f05c0bece050a7aa91450244cc065f972acacef6f7d966ee52f285c458cf9925d76693b14862d9ebfe77d42142dbb1bea24c3277a26b5a887
+  metadata.gz: 562c425026b16d0389287831ea2da44c08e79818c4f238e52f8e3ee0bb62bf36bc8e4bbfc75e3dbe658706a0b735c4c3e0e572287048e9a3095055e7183bfa62
+  data.tar.gz: 54c6f30b6c62de9a43284fc76fcf432e9b0c70691de5d0aaf074c8b4cdb9b889f816ee8219c2ba4e660684899793db9a1c3cd7f502f5567fbe32d9df105b7a67

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.57)
+    ree_lib (1.0.59)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)

data/lib/ree_lib/packages/ree_dao/package/ree_dao/association.rb

@@ -26,8 +26,8 @@ module ReeDao
       load_association(assoc_type, assoc_name, **opts, &block)
     end
 
-    def handle_field(assoc_name, proc)
-      proc.call
+    def handle_field(field_proc)
+      field_proc.call
     end
 
     contract(
@@ -109,13 +109,24 @@ module ReeDao
           **global_opts
         ).instance_exec(assoc_list, &block)
       else
-        ReeDao::Associations.new(
+        threads = ReeDao::Associations.new(
           parent.agg_caller,
           assoc_list,
           parent.local_vars,
           autoload_children,
           **global_opts
-        ).instance_exec(assoc_list, &block)[:association_threads].map(&:join)
+        ).instance_exec(assoc_list, &block)
+        threads[:association_threads].map do |association, assoc_type, assoc_name, opts, block|
+          Thread.new do
+            association.load(assoc_type, assoc_name, **opts, &block)
+          end
+        end.map(&:join)
+
+        threads[:field_threads].map do |association, field_proc|
+          Thread.new do
+            association.handle_field(field_proc)
+          end
+        end.map(&:join)
       end
     end
 
@@ -231,7 +242,8 @@ module ReeDao
         assoc,
         assoc_name,
         setter: setter,
-        primary_key: primary_key
+        primary_key: primary_key,
+        multiple: true
       )
 
       assoc
@@ -244,10 +256,11 @@ module ReeDao
       Kwargs[
         primary_key: Nilor[Symbol],
         reverse: Nilor[Bool],
-        setter: Nilor[Or[Symbol, Proc]]
+        setter: Nilor[Or[Symbol, Proc]],
+        multiple: Bool
       ] => Any
     )
-    def populate_association(list, association_index, assoc_name, primary_key: nil, reverse: nil, setter: nil)
+    def populate_association(list, association_index, assoc_name, primary_key: nil, reverse: nil, setter: nil, multiple: false)
       assoc_setter = if setter
         setter
       else
@@ -264,7 +277,8 @@ module ReeDao
             reverse ? primary_key : "#{assoc_name}_id"
           end
           value = association_index[item.send(key)]
-          next if value.nil?
+
+          value = [] if value.nil? && multiple
 
           begin
             item.send(assoc_setter, value)

data/lib/ree_lib/packages/ree_dao/package/ree_dao/associations.rb

@@ -97,17 +97,18 @@ module ReeDao
         association = Association.new(self, list, **global_opts)
 
         if assoc_type == :field
+          field_proc = opts
           { 
             association_threads: @assoc_threads,
-            field_threads: @field_threads << Thread.new do
-              association.handle_field(assoc_name, opts)
-            end
+            field_threads: @field_threads << [
+              association, field_proc
+            ]
           }
         else
           {
-            association_threads: @assoc_threads << Thread.new do
-              association.load(assoc_type, assoc_name, **get_assoc_opts(opts), &block)
-            end,
+            association_threads: @assoc_threads << [
+              association, assoc_type, assoc_name, get_assoc_opts(opts), block
+            ],
             field_threads: @field_threads
           }
         end

data/lib/ree_lib/packages/ree_dao/package/ree_dao/functions/load_agg.rb

@@ -68,8 +68,17 @@ class ReeDao::LoadAgg
     if ReeDao.load_sync_associations_enabled?
       associations
     else
-      associations[:association_threads].map(&:join)
-      associations[:field_threads].map(&:join)
+      associations[:association_threads].map do |association, assoc_type, assoc_name, opts, block|
+        Thread.new do
+          association.load(assoc_type, assoc_name, **opts, &block)
+        end
+      end.map(&:join)
+
+      associations[:field_threads].map do |association, field_proc|
+        Thread.new do
+          association.handle_field(field_proc)
+        end
+      end.map(&:join)
     end
   end
 end

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/load_agg/load_agg_spec.rb

@@ -275,7 +275,7 @@ RSpec.describe :load_agg do
       load_agg(users, ids_or_scope, **opts) do |agg_list|
         some_id = agg_list.first.id
         title = "1984"
-        belongs_to :organization, organizations.by_name("Corp")
+        belongs_to :organization
 
         has_many :books, -> { books_opts(title) }
       end
@@ -465,6 +465,49 @@ RSpec.describe :load_agg do
     expect(res_user.custom_field).to_not eq(nil)
   }
 
+  it {
+    organizations.delete_all
+    users.delete_all
+    user_passports.delete_all
+    books.delete_all
+    chapters.delete_all
+
+    organization = ReeDaoLoadAggTest::Organization.new(name: "Test Org")
+    organizations.put(organization)
+
+    user_1 = ReeDaoLoadAggTest::User.new(name: "John", age: 33, organization_id: organization.id)
+    user_2 = ReeDaoLoadAggTest::User.new(name: "Sam", age: 21, organization_id: organization.id)
+    users.put(user_1)
+    users.put(user_2)
+
+    book_1 = ReeDaoLoadAggTest::Book.new(user_id: user_1.id, title: "1984")
+    book_2 = ReeDaoLoadAggTest::Book.new(user_id: user_1.id, title: "1408")
+
+    books.put(book_1)
+    books.put(book_2)
+
+    author_1 = ReeDaoLoadAggTest::Author.new(book_id: book_1.id, name: "George Orwell")
+    author_2 = ReeDaoLoadAggTest::Author.new(book_id: book_2.id, name: "Stephen King")
+    authors.put(author_1)
+    authors.put(author_2)
+
+    res = users_agg.call(
+      users.all
+    )
+
+    expect(res[0].books.first.author).to_not eq(nil)
+
+    authors.delete(author_1)
+    authors.delete(author_2)
+
+    res = users_agg.call(
+      users.all
+    )
+
+    expect(res[0].books[0].author).to eq(nil)
+    expect(res[0].books[1].author).to eq(nil)
+  }
+
   it {
     organizations.delete_all
     users.delete_all

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.57"
+  VERSION = "1.0.59"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.57
+  version: 1.0.59
 platform: ruby
 authors:
 - Ruslan Gatiyatov