ree_lib 1.0.57 → 1.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84ad4225d13e31575c1799fd4c7a4b480a1e7ae6b9709834447a733a3a260367
-  data.tar.gz: ba98679b88ac6ad2cec30fcd0280c01638220fdd0a7488f8f33c7ead0dd2de7d
+  metadata.gz: bdb25650f338b4be087e72a1ef04fff5b9e1bf47d0b22221ead03743c74de398
+  data.tar.gz: 333d7adc841964ddd5b50d690f6c016b096622ba327953ae5a5fa57d50f7bde1
 SHA512:
-  metadata.gz: ccbda33bb5233fc869f470993a93ec1770471e6fdce354a49455bf15c487731b06384bb776ed762c172e75428d77a071fc4483087cdbd2de8ef780729ccae3ac
-  data.tar.gz: d24649974cf1ca2f05c0bece050a7aa91450244cc065f972acacef6f7d966ee52f285c458cf9925d76693b14862d9ebfe77d42142dbb1bea24c3277a26b5a887
+  metadata.gz: 220bc20b778767ec025b5402e7f0fb5a32c2cd15b37373e26af20d5de11529a75b79c745fc9e062b5e27d0bf2c62e0438806aad79950498badebc5f980562825
+  data.tar.gz: 375223a38b2016acb6d3bf9f45a01b6e286b95b32dcd2ab39fa2f90e4d1758bc12e3409333b9370a1b4c653c0ee6d6e5d1249891d93fbff159e5d8d2ad2dcf66

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.57)
+    ree_lib (1.0.58)
       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
 

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

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.57"
+  VERSION = "1.0.58"
 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.58
 platform: ruby
 authors:
 - Ruslan Gatiyatov