ree_lib 1.0.62 → 1.0.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69b23ef012a6748604d4b82d1d81c791902ee23bc6179d231a340e48289a5d7
-  data.tar.gz: 6233c958a32bfdeea0efaf5b5692d0e824a5e04d9d334bf002d519b0789d6cc3
+  metadata.gz: bf0b2d37f1b4dab2dd798faa601db7969c49479c02eb39ee67a1a7344231b887
+  data.tar.gz: aabcce88a49279d7d1d970e59056a43b866edd4d81d0a64cb553c0142b9da4c2
 SHA512:
-  metadata.gz: eee96a99fe5217675f4ff9c3db4915571ae444c7af4a33ca763b786b51a07f77f55fe794aa004688ccfd0f6c00f478631ba100181625de5d5f8d503f62b85edb
-  data.tar.gz: 1abc64ad140c4901e52f62b9a74f30e16f9fd4364a5e066f5321597c4246b7c5d7e2a0cba0515396b1a18aacd27d786321b17fa29004ed7336fac22a8ee75b06
+  metadata.gz: f9bd4b78d0c104dccaee61ac1ab1979596c2d90c9006c0e939cb26c8984401d7e724edfff81f4ff106b9a5d153ab1a687bf3d1bb963ecefa1929839e81a0183c
+  data.tar.gz: cbe3d31611bf98d43bd5cced27d68689bf739e04a87c023e96ede58b9ea500319ec907e2df6ce55f17ff752bc34c4c0e727ab34ed721b51130e251657d6764b3

data/Gemfile.lock

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

@@ -273,7 +273,11 @@ module ReeDao
         if setter && setter.is_a?(Proc)
           if to_dto
             assoc_index = transform_values(association_index) do |key, value|
-              to_dto.call(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)
@@ -290,16 +294,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/version.rb

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