ree_lib 1.0.56 → 1.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23c4603ab3ab820869ca4478b42b3d350c5484c8da7b21c99b469449f45764a1
-  data.tar.gz: 4293f4d083185f09f6098e11698b5f35981a748b00ff84e486389bab19445751
+  metadata.gz: bdb25650f338b4be087e72a1ef04fff5b9e1bf47d0b22221ead03743c74de398
+  data.tar.gz: 333d7adc841964ddd5b50d690f6c016b096622ba327953ae5a5fa57d50f7bde1
 SHA512:
-  metadata.gz: fe885988996c1f0b9aeba40c9f61e119ab4ffc02aa471afe3774b470192fc5601093c1b13673febebad76bf348baa0be61cb2e19a5abf81b1970b518d86ddc9d
-  data.tar.gz: acbdf84eacfa6c46c6997999af1e0eb5dc03eedc95b95d954927a3907048c9c28d924328041203d02db1bd5c9dc78310c2cc234db826c74e585a8701b7982ed9
+  metadata.gz: 220bc20b778767ec025b5402e7f0fb5a32c2cd15b37373e26af20d5de11529a75b79c745fc9e062b5e27d0bf2c62e0438806aad79950498badebc5f980562825
+  data.tar.gz: 375223a38b2016acb6d3bf9f45a01b6e286b95b32dcd2ab39fa2f90e4d1758bc12e3409333b9370a1b4c653c0ee6d6e5d1249891d93fbff159e5d8d2ad2dcf66

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.56)
+    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
@@ -143,6 +144,8 @@ module ReeDao
     def get_assoc_opts(opts)
       if opts.is_a?(Proc)
         opts.call
+      elsif opts.is_a?(Sequel::Dataset)
+        { scope: opts }
       else
         {}
       end

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

@@ -37,7 +37,9 @@ class ReeDao::LoadAgg
     list = scope.is_a?(Sequel::Dataset) ? scope.all : scope
 
     if opts[:to_dto]
-      list = opts[:to_dto].call(list)
+      list = list.map do |item|
+        list = opts[:to_dto].call(item)
+      end
     end
 
     load_associations(list, **opts, &block) if block_given?
@@ -66,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

@@ -292,6 +292,22 @@ RSpec.describe :load_agg do
     end
   end
 
+  class ReeDaoLoadAggTest::UsersAggOnlyDataset
+    include ReeDao::AggregateDSL
+
+    aggregate :users_agg_only_dataset do
+      link :users, from: :ree_dao_load_agg_test
+      link :books, from: :ree_dao_load_agg_test
+      link :load_agg, from: :ree_dao
+    end
+
+    def call(ids_or_scope, **opts)
+      load_agg(users, ids_or_scope, **opts) do
+        has_many :books, books.where(title: "1408")
+      end
+    end
+  end
+
   class ReeDaoLoadAggTest::UsersAggWithoutDao
     include ReeDao::AggregateDSL
 
@@ -316,6 +332,7 @@ RSpec.describe :load_agg do
   let(:users_agg_autoload_reviews_children) { ReeDaoLoadAggTest::UsersAggAutoloadReviewsChildren.new }
   let(:users_agg_without_dao) { ReeDaoLoadAggTest::UsersAggWithoutDao.new }
   let(:users_agg_with_dto) { ReeDaoLoadAggTest::UsersAggWithDto.new }
+  let(:users_agg_only_dataset) { ReeDaoLoadAggTest::UsersAggOnlyDataset.new }
   let(:organizations) { ReeDaoLoadAggTest::Organizations.new }
   let(:users) { ReeDaoLoadAggTest::Users.new }
   let(:user_passports) { ReeDaoLoadAggTest::UserPassports.new }
@@ -354,21 +371,41 @@ RSpec.describe :load_agg do
 
     res = users_agg_with_dto.call(
       users.all,
-      to_dto: -> (users) {
-        users.map do |user|
-          ReeDaoLoadAggTest::UserDto.new(
-            id: user.id,
-            name: user.name,
-            organization_id: user.organization_id,
-            full_name: user.name
-          )
-        end
+      to_dto: -> (user) {
+        ReeDaoLoadAggTest::UserDto.new(
+          id: user.id,
+          name: user.name,
+          organization_id: user.organization_id,
+          full_name: user.name
+        )
       }
     )
 
-    res_user = res[0]
+    expect(res.first.class).to eq(ReeDaoLoadAggTest::UserDto)
+  }
+
+  it {
+    organizations.delete_all
+    users.delete_all
+
+    org = ReeDaoLoadAggTest::Organization.new(name: "Test Org")
+    organizations.put(org)
+
+    user = ReeDaoLoadAggTest::User.new(name: "John", age: 33, organization_id: org.id)
+    users.put(user)
+
+    book_1 = ReeDaoLoadAggTest::Book.new(user_id: user.id, title: "1984")
+    book_2 = ReeDaoLoadAggTest::Book.new(user_id: user.id, title: "1408")
+    book_3 = ReeDaoLoadAggTest::Book.new(user_id: user.id, title: "1408")
+
+    books.put(book_1)
+    books.put(book_2)
+    books.put(book_3)
+    
+    res = users_agg_only_dataset.call(users.where(name: "John"))
 
-    expect(res_user.class).to eq(ReeDaoLoadAggTest::UserDto)
+    user = res[0]
+    expect(user.books.map(&:title).uniq).to eq(["1408"])
   }
 
   it {

data/lib/ree_lib/version.rb

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