ree_lib 1.0.61 → 1.0.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a16fe3f260e9c08dfa590a34ffeafce9413115416aaedc37bcb4ee50fbd5ae67
-  data.tar.gz: d93566783538e0ea2eb9aba94938a3eccdb34901197d5e38afa9f03da9e5f826
+  metadata.gz: bf0b2d37f1b4dab2dd798faa601db7969c49479c02eb39ee67a1a7344231b887
+  data.tar.gz: aabcce88a49279d7d1d970e59056a43b866edd4d81d0a64cb553c0142b9da4c2
 SHA512:
-  metadata.gz: d1b98f584c71eb035a29a411161a9556aef71ce4b2d9e292e219e767e335ba9cbfa3c8b7fa49e776d846732f84af7c7f6cc5ce91bcfe5a975bd7cf91a843ad83
-  data.tar.gz: b4106abe1f03951c28959f8b9edc4c5f66ff05dcc1788bd2c1e268dd02f0487350ba5074c62eafd73244435dd42a3e034d87e873aaf5c5e11f3791b4884a83f4
+  metadata.gz: f9bd4b78d0c104dccaee61ac1ab1979596c2d90c9006c0e939cb26c8984401d7e724edfff81f4ff106b9a5d153ab1a687bf3d1bb963ecefa1929839e81a0183c
+  data.tar.gz: cbe3d31611bf98d43bd5cced27d68689bf739e04a87c023e96ede58b9ea500319ec907e2df6ce55f17ff752bc34c4c0e727ab34ed721b51130e251657d6764b3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.61)
+    ree_lib (1.0.63)
       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,6 +4,7 @@ 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
 
@@ -141,7 +142,7 @@ module ReeDao
     contract(
       Symbol,
       Symbol,
-      Array,      
+      Array,
       Kwargs[
         primary_key: Nilor[Symbol],
         foreign_key: Nilor[Symbol],
@@ -160,12 +161,12 @@ module ReeDao
         items = scope
       else
         assoc_dao = find_dao(assoc_name, parent, scope)
-  
+
         if reverse
           if !foreign_key
-            foreign_key = "#{parent_assoc_name.to_s.gsub(/e?s$/,'')}_id".to_sym
+            foreign_key = "#{parent_assoc_name.to_s.gsub(/s$/,'')}_id".to_sym
           end
-  
+
           root_ids = list.map(&:id).uniq
         else
           if !foreign_key
@@ -174,10 +175,10 @@ module ReeDao
 
           root_ids = list.map(&:"#{foreign_key}").compact
         end
-  
+
         scope ||= assoc_dao
         scope = scope.where((reverse ? foreign_key : :id) => root_ids)
-        
+
         items = add_scopes(scope, global_opts[assoc_name])
       end
 
@@ -219,14 +220,14 @@ module ReeDao
       else
         assoc_dao = nil
         assoc_dao = find_dao(assoc_name, parent, scope)
-  
-        foreign_key ||= "#{parent_assoc_name.to_s.gsub(/e?s$/,'')}_id".to_sym
-  
+
+        foreign_key ||= "#{parent_assoc_name.to_s.gsub(/s$/, '')}_id".to_sym
+
         root_ids = list.map(&:"#{primary_key}")
-  
+
         scope ||= assoc_dao
         scope = scope.where(foreign_key => root_ids)
-  
+
         items = add_scopes(scope, global_opts[assoc_name])
       end
 
@@ -270,26 +271,37 @@ module ReeDao
 
       list.each do |item|
         if setter && setter.is_a?(Proc)
-          self.instance_exec(item, association_index, &assoc_setter)
+          if to_dto
+            assoc_index = transform_values(association_index) do |key, value|
+              if value.is_a?(Array)
+                value.map { to_dto.call(_1) }
+              else
+                to_dto.call(value)
+              end
+            end
+
+            self.instance_exec(item, assoc_index, &assoc_setter)
+          else
+            self.instance_exec(item, association_index, &assoc_setter)
+          end
         else
           key = if reverse.nil?
             primary_key
           else
             reverse ? primary_key : "#{assoc_name}_id"
           end
+
           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

@@ -129,7 +129,7 @@ RSpec.describe :load_agg do
     end
 
     def call(ids_or_scope)
-      load_agg(ids_or_scope, users) do
+      load_agg(users, ids_or_scope) do
         belongs_to :organization
 
         has_many :books
@@ -141,7 +141,7 @@ RSpec.describe :load_agg do
         has_many :skills
         has_many :dreams
 
-        has_one :passport, foreign_key: :user_id, scope: user_passports
+        has_one :passport, -> { {foreign_key: :user_id, scope: user_passports} }
       end
     end
   end
@@ -251,7 +251,7 @@ RSpec.describe :load_agg do
 
     _users = []
     st_time = Time.now
-    puts "Starting to seed #{NUM_OF_USERS} users..."
+    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

@@ -104,7 +104,7 @@ RSpec.describe :load_agg do
         has_many :books do |books_list|
           has_one :author
           has_many :chapters
-        
+
           has_many :reviews do |reviews_list|
             has_one :review_author
 
@@ -113,7 +113,7 @@ RSpec.describe :load_agg do
 
           field :book_calculatetable_field, -> { change_book_titles(books_list) }
         end
-        
+
         has_one :passport, -> { passport_opts }
         has_one :custom_field, -> { custom_field_opts }
 
@@ -166,7 +166,7 @@ RSpec.describe :load_agg do
 
         has_many :books, -> { books_opts } do
           has_one :author, -> { author_opts }
-          has_many :chapters, -> { chapters_opts } 
+          has_many :chapters, -> { chapters_opts }
         end
       end
     end
@@ -174,7 +174,12 @@ RSpec.describe :load_agg do
     private
 
     def books_opts
-      { to_dto: -> (book) { ReeDaoLoadAggTest::BookDto.new(book) }}
+      {
+        to_dto: -> (book) { ReeDaoLoadAggTest::BookDto.new(book) },
+        setter: -> (item, child_index) {
+          item.set_books(child_index[item.id] || [])
+        }
+      }
     end
 
     def author_opts
@@ -205,7 +210,7 @@ RSpec.describe :load_agg do
         has_many :books, -> { books_opts } do
           has_one :author
           has_many :chapters
-        
+
           has_many :reviews do
             has_one :review_author
           end
@@ -214,7 +219,7 @@ RSpec.describe :load_agg do
     end
 
     private
-    
+
     def books_opts
       { autoload_children: true }
     end
@@ -239,7 +244,7 @@ RSpec.describe :load_agg do
         has_many :books do
           has_one :author
           has_many :chapters
-        
+
           has_many :reviews, -> { { autoload_children: true } } do
             has_one :review_author
           end
@@ -435,7 +440,7 @@ RSpec.describe :load_agg do
     books.put(book_1)
     books.put(book_2)
     books.put(book_3)
-    
+
     res = users_agg_only_dataset.call(users.where(name: "John"))
 
     user = res[0]

data/lib/ree_lib/version.rb

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

metadata

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