ree_lib 1.0.50 → 1.0.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a53010ba7fdd43f86e011e0ee3f90675bb71e1b7f0c66d127736918ec89f6f0
-  data.tar.gz: 739eeb996f5ebfff231c613b5a6fd13022a4e91c5fa05716902dbd37d32f4d26
+  metadata.gz: 11c4d5cf16a6bfdbea763761f5f4a1c993d15b0fe5e912e257df949d5d6a9fd2
+  data.tar.gz: 1254d959c594b4b5cbf71c13c04304910648e937ca946c37bfe21dfb32593463
 SHA512:
-  metadata.gz: f3a66d7108179a12e92fc5b36eb1adaaff37a733760f02e8867bcd949b9507b966161c4cb245da9d308de3d6066d8e6990ebd81b7a0d76a3e52e6fca02b75fd3
-  data.tar.gz: 5008628b066547548f69f3690d14e3103756b01573d3be8eb001450538c76a88c4adf3ebfec0ae36b5b47c13af9f598264d11a50c3a54f8eca0f3a630039563c
+  metadata.gz: 36d76d580636a9990a1a691685931e987eb3f9e6cb0ca9f5bcc8759f4bdb1a6c542bcc24768272abec7c7c84f0828508904d49cc988b92fcf9337207259f4e78
+  data.tar.gz: 752394c6296ae13cfb4a8d963b0aeaff3de295863c5c48271001c2227a509b371bc264bd1a0942bf2de59b9786f5620ce2053f8e2518e721180c7f27c81ced23

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.50)
+    ree_lib (1.0.51)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -38,12 +38,14 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     msgpack (1.6.0)
+    nokogiri (1.15.2-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     oj (3.13.23)
     pg (1.4.6)
     public_suffix (5.0.1)
-    racc (1.6.2)
+    racc (1.7.1)
     rack (3.0.5)
     rack-test (2.0.2)
       rack (>= 1.3)

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

@@ -105,12 +105,12 @@ module ReeDao
     )
     def association(assoc_type, assoc_name, **assoc_opts, &block)
       if self.class.sync_mode?
-        return if association_is_not_included?(assoc_name)
+        return if association_is_not_included?(assoc_name) || list.empty?
 
         association = Association.new(self, list, **global_opts)
         association.load(assoc_type, assoc_name, **assoc_opts, &block)
       else
-        return @threads if association_is_not_included?(assoc_name)
+        return @threads if association_is_not_included?(assoc_name) || list.empty?
 
         @threads << Thread.new do
           association = Association.new(self, list, **global_opts)

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

@@ -47,6 +47,8 @@ class ReeDao::LoadAgg
   private
 
   def load_associations(list, **opts, &block)
+    return if list.empty?
+
     local_vars = block.binding.eval(<<-CODE, __FILE__, __LINE__ + 1)
       vars = self.instance_variables
       vars.reduce({}) { |hsh, var| hsh[var] = self.instance_variable_get(var); hsh }
@@ -54,10 +56,12 @@ class ReeDao::LoadAgg
 
     agg_caller = block.binding.eval("self")
 
+    associations = Associations.new(agg_caller, list, local_vars, **opts).instance_exec(list, &block)
+
     if ReeDao.load_sync_associations_enabled?
-      Associations.new(agg_caller, list, local_vars, **opts).instance_exec(list, &block)
+      associations
     else
-      Associations.new(agg_caller, list, local_vars, **opts).instance_exec(list, &block).map(&:join)
+      associations.map(&:join)
     end
   end
 end

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

@@ -203,7 +203,8 @@ RSpec.describe :load_agg do
     end
 
     def call(ids_or_scope, **opts)
-      load_agg(ids_or_scope, users, **opts) do
+      load_agg(ids_or_scope, users, **opts) do |agg_list|
+        some_id = agg_list.first.id
         title = "1984"
         belongs_to :organization
 
@@ -348,6 +349,30 @@ RSpec.describe :load_agg do
     expect(res_user.books.count).to eq(1)
   }
 
+  it {
+    organizations.delete_all
+    users.delete_all
+    books.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)
+
+    expect {
+      users_agg_scope_method.call(users.where(name: "Another names"))
+    }.to_not raise_error
+  }
+
   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.50"
+  VERSION = "1.0.51"
 end

metadata

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