ree_lib 1.0.62 → 1.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69b23ef012a6748604d4b82d1d81c791902ee23bc6179d231a340e48289a5d7
-  data.tar.gz: 6233c958a32bfdeea0efaf5b5692d0e824a5e04d9d334bf002d519b0789d6cc3
+  metadata.gz: 58dcd5d4f8eeefdbea1dc995ea2e76734a8dccc6a913354085453ca9a0ddd72e
+  data.tar.gz: 1d29d9be3027f3d57e3502e6269ac3cd455e50e5ecdf4b17ea73877b15379423
 SHA512:
-  metadata.gz: eee96a99fe5217675f4ff9c3db4915571ae444c7af4a33ca763b786b51a07f77f55fe794aa004688ccfd0f6c00f478631ba100181625de5d5f8d503f62b85edb
-  data.tar.gz: 1abc64ad140c4901e52f62b9a74f30e16f9fd4364a5e066f5321597c4246b7c5d7e2a0cba0515396b1a18aacd27d786321b17fa29004ed7336fac22a8ee75b06
+  metadata.gz: 35b733d5bcaf9f7f837d212c7279c77044f29e11b5e48d0480a879180497f77805b3aa0bf5e17a8b2b1aa991f769a1452fad291d6895436d8d1eca6e9a6a4fb6
+  data.tar.gz: '08ec8fe4b53aceff584a515ca820484e59bfa387ae3d5f9c9d21fcdf73afa018d777882f40cab8e6f835fc5eb80ca941977f211614aa0005e10ebcea9fc333c9'

data/Gemfile.lock

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

@@ -4,7 +4,6 @@ module ReeDao
 
     link :group_by, from: :ree_array
     link :index_by, from: :ree_array
-    link :transform_values, from: :ree_hash
 
     attr_reader :parent, :parent_dao_name, :list, :global_opts
 
@@ -163,12 +162,14 @@ module ReeDao
         assoc_dao = find_dao(assoc_name, parent, scope)
 
         if reverse
+          # has_one
           if !foreign_key
             foreign_key = "#{parent_assoc_name.to_s.gsub(/s$/,'')}_id".to_sym
           end
 
           root_ids = list.map(&:id).uniq
         else
+          # belongs_to
           if !foreign_key
             foreign_key = :"#{assoc_name}_id"
           end
@@ -182,7 +183,6 @@ module ReeDao
         items = add_scopes(scope, global_opts[assoc_name])
       end
 
-
       assoc = index_by(items) { _1.send(reverse ? foreign_key : :id) }
 
       populate_association(
@@ -272,8 +272,14 @@ module ReeDao
       list.each do |item|
         if setter && setter.is_a?(Proc)
           if to_dto
-            assoc_index = transform_values(association_index) do |key, value|
-              to_dto.call(value)
+            assoc_index = {}
+
+            association_index.each do |key, value|
+              if value.is_a?(Array)
+                assoc_index[key] = value.map { to_dto.call(_1) }
+              else
+                assoc_index[key] = to_dto.call(value)
+              end
             end
 
             self.instance_exec(item, assoc_index, &assoc_setter)
@@ -290,16 +296,14 @@ module ReeDao
           value = association_index[item.send(key)]
 
           if to_dto && !value.nil?
-            if value.is_a?(Array)
-              value = value.map { to_dto.call(_1) }
+            value = if value.is_a?(Array)
+              value.map { to_dto.call(_1) }
             else
-              value = to_dto.call(value)
+              to_dto.call(value)
             end
           end
 
-          if value.nil? && multiple
-            value = []
-          end
+          value = [] if value.nil? && multiple
 
           begin
             item.send(assoc_setter, value)

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

@@ -43,7 +43,7 @@ module ReeDao
     def belongs_to(assoc_name, opts = nil, &block)
       association(__method__, assoc_name, opts, &block)
     end
-  
+
     contract(
       Symbol,
       Nilor[Proc, Sequel::Dataset],
@@ -52,7 +52,7 @@ module ReeDao
     def has_one(assoc_name, opts = nil, &block)
       association(__method__, assoc_name, opts, &block)
     end
-  
+
     contract(
       Symbol,
       Nilor[Proc, Sequel::Dataset],
@@ -61,7 +61,7 @@ module ReeDao
     def has_many(assoc_name, opts = nil, &block)
       association(__method__, assoc_name, opts, &block)
     end
-  
+
     contract(Symbol, Proc => Any)
     def field(assoc_name, proc)
       association(__method__, assoc_name, proc)
@@ -83,8 +83,9 @@ module ReeDao
     def association(assoc_type, assoc_name, opts, &block)
       if self.class.sync_mode?
         return if association_is_not_included?(assoc_name) || list.empty?
-        
+
         association = Association.new(self, parent_dao_name, list, **global_opts)
+
         if assoc_type == :field
           association.handle_field(assoc_name, opts)
         else
@@ -92,14 +93,14 @@ module ReeDao
         end
       else
         if association_is_not_included?(assoc_name) || list.empty?
-          return { association_threads: @assoc_threads, field_threads: @field_threads } 
+          return { association_threads: @assoc_threads, field_threads: @field_threads }
         end
 
         association = Association.new(self, parent_dao_name, list, **global_opts)
 
         if assoc_type == :field
           field_proc = opts
-          { 
+          {
             association_threads: @assoc_threads,
             field_threads: @field_threads << [
               association, field_proc
@@ -125,7 +126,7 @@ module ReeDao
 
         if only && !only.include?(assoc_name)
           return false if autoload_children
-          return true 
+          return true
         end
       end
 

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

@@ -251,7 +251,9 @@ RSpec.describe :load_agg do
 
     _users = []
     st_time = Time.now
+
     puts "Seeding #{NUM_OF_USERS} users..."
+
     NUM_OF_USERS.times do
       u = ReeDaoLoadAggTest::User.new(
         name: Faker::Name.name,

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

@@ -130,8 +130,8 @@ RSpec.describe :load_agg do
     end
 
     def some_method(list)
-      puts list.map(&:id)
-      puts list.map { _1.class.name }
+      # puts list.map(&:id)
+      # puts list.map { _1.class.name }
     end
 
     def passport_opts

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.62
+  version: 1.0.64
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree