ree_lib 1.0.54 → 1.0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c1de406ab816861e6a42c542db02cddbc0f68f6aeca80bff9dba9e8c76ef81a
-  data.tar.gz: 05dba8342aa073f8198c42d051ca9783396b40bc8a939edd64b3ddc42d35a868
+  metadata.gz: 7d792b73d0f067a0fc7e935ca257f79f4334afbbb811a060e94cb6de6f2f283c
+  data.tar.gz: 34fb81648b66cfb4e031650d6145556c05b454c0ca1f66f82ded0c3c774d97d6
 SHA512:
-  metadata.gz: cf9b082920297cca214ab5a21ce389d77833936d12c5b6583f2edcc34b3e794b1ac7565a1ae9c66745f0cd43010658f1bf9fbdee9af23cf82b7d7537529bc58e
-  data.tar.gz: ded7b6e245997cad79fbd20cfa8ad33f4b89b402985f9a133a0d55b6daee823764d5e0888cfed8eb0761f1d4108edeb176aaf61595864820d5562d516b907295
+  metadata.gz: 595ed040ab09ad6ff32283152de27cd85e4c4ec09c70777177817e5bc9fd2a19d178cc1caf3d1db35738331e71a3620dd81f3242c7c8d628e2cc36e073d6c47e
+  data.tar.gz: f2f4ce7c621d154d1e71b0a6cb7426f5c152c0cb2d396b15b859b9fa3df38a979164e091f827279f2d187668e8b53cd181b7adc937b0b6d810bd35186e302945

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.54)
+    ree_lib (1.0.55)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -38,6 +38,8 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     msgpack (1.6.0)
+    nokogiri (1.15.3-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.15.3-x86_64-linux)
       racc (~> 1.4)
     oj (3.13.23)

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

@@ -56,6 +56,7 @@ module ReeDao
           assoc_name,
           list,
           scope: opts[:scope],
+          primary_key: opts[:primary_key],
           foreign_key: opts[:foreign_key],
           setter: opts[:setter],
           reverse: false
@@ -65,6 +66,7 @@ module ReeDao
           assoc_name,
           list,
           scope: opts[:scope],
+          primary_key: opts[:primary_key],
           foreign_key: opts[:foreign_key],
           setter: opts[:setter],
           reverse: true
@@ -74,6 +76,7 @@ module ReeDao
           assoc_name,
           list,
           scope: opts[:scope],
+          primary_key: opts[:primary_key],
           foreign_key: opts[:foreign_key],
           setter: opts[:setter]
         )
@@ -82,6 +85,7 @@ module ReeDao
           assoc_name,
           list,
           scope: opts[:scope],
+          primary_key: opts[:primary_key],
           foreign_key: opts[:foreign_key],
           setter: opts[:setter],
           skip_dao: true
@@ -89,9 +93,9 @@ module ReeDao
       end
     end
 
-    contract(Hash, Bool, Block => Any)
+    contract(Or[Hash, Array], Bool, Block => Any)
     def process_block(assoc, autoload_children, &block)
-      assoc_list = assoc.values.flatten
+      assoc_list = assoc.is_a?(Array) ? assoc : assoc.values.flatten
 
       if ReeDao::Associations.sync_mode?
         ReeDao::Associations.new(
@@ -116,59 +120,73 @@ module ReeDao
       Symbol,
       Array,      
       Kwargs[
+        primary_key: Nilor[Symbol],
         foreign_key: Nilor[Symbol],
-        scope: Nilor[Sequel::Dataset],
+        scope: Nilor[Sequel::Dataset, Array],
         setter: Nilor[Or[Symbol, Proc]],
         reverse: Bool
-      ] => Hash
+      ] => Or[Hash, Array]
     )
     def one_to_one(
       assoc_name,
       list,
       scope: nil,
+      primary_key: :id,
       foreign_key: nil,
       setter: nil,
       reverse: true
     )
       return {} if list.empty?
 
-      assoc_dao = find_dao(assoc_name, parent, scope)
+      primary_key ||= :id
 
-      if reverse
-        if !foreign_key
-          name = underscore(demodulize(list.first.class.name))
-          foreign_key = "#{name}_id".to_sym
-        end
-
-        root_ids = list.map(&:id).uniq
+      # TODO: refactor
+      if scope.is_a?(Array)
+        items = scope
       else
-        if !foreign_key
-          dto_class = assoc_dao
-            .opts[:schema_mapper]
-            .dto(:db_load)
+        assoc_dao = find_dao(assoc_name, parent, scope)
+  
+        if reverse
+          if !foreign_key
+            name = underscore(demodulize(list.first.class.name))
+            foreign_key = "#{name}_id".to_sym
+          end
   
-          name = underscore(demodulize(dto_class.name))
-          
-          root_ids = list.map(&:"#{"#{name}_id".to_sym}").uniq
-          foreign_key = :id
+          root_ids = list.map(&:id).uniq
         else
-          root_ids = list.map(&:"#{foreign_key}")
-          foreign_key = :id
+          if !foreign_key
+            dto_class = assoc_dao
+              .opts[:schema_mapper]
+              .dto(:db_load)
+    
+            name = underscore(demodulize(dto_class.name))
+            
+            root_ids = list.map(&:"#{"#{name}_id".to_sym}").uniq
+            foreign_key = :id
+          else
+            root_ids = list.map(&:"#{foreign_key}")
+            foreign_key = :id
+          end
         end
+  
+        default_scope = assoc_dao&.where(foreign_key => root_ids)
+  
+        items = add_scopes(default_scope, scope, global_opts[assoc_name])
       end
 
-      default_scope = assoc_dao&.where(foreign_key => root_ids)
-
-      items = add_scopes(default_scope, scope, global_opts[assoc_name])
-
-      assoc = index_by(items) { _1.send(foreign_key) }
+      assoc = if foreign_key
+        index_by(items) { _1.send(foreign_key) }
+      else
+        items
+      end 
 
       populate_association(
         list,
         assoc,
         assoc_name,
         setter: setter,
-        reverse: reverse
+        reverse: reverse,
+        primary_key: primary_key
       )
 
       assoc
@@ -179,14 +197,16 @@ module ReeDao
       Array,
       Kwargs[
         foreign_key: Nilor[Symbol],
-        scope: Nilor[Sequel::Dataset],
+        primary_key: Nilor[Symbol],
+        scope: Nilor[Sequel::Dataset, Array],
         setter: Nilor[Or[Symbol, Proc]],
         skip_dao: Bool
-      ] => Hash
+      ] => Or[Hash, Array]
     )
     def one_to_many(
       assoc_name,
       list,
+      primary_key: nil,
       foreign_key: nil,
       scope: nil,
       setter: nil,
@@ -194,24 +214,36 @@ module ReeDao
     )
       return {} if list.empty?
 
-      assoc_dao = nil
-      assoc_dao = find_dao(assoc_name, parent, scope) if !skip_dao
-
-      foreign_key ||= "#{underscore(demodulize(list.first.class.name))}_id".to_sym
+      primary_key ||= :id
 
-      root_ids = list.map(&:id)
-
-      default_scope = assoc_dao&.where(foreign_key => root_ids)
-
-      items = add_scopes(default_scope, scope, global_opts[assoc_name])
+      # TODO: refactor
+      if scope.is_a?(Array)
+        items = scope
+      else
+        assoc_dao = nil
+        assoc_dao = find_dao(assoc_name, parent, scope) if !skip_dao
+  
+        foreign_key ||= "#{underscore(demodulize(list.first.class.name))}_id".to_sym
+  
+        root_ids = list.map(&:"#{primary_key}")
+  
+        default_scope = assoc_dao&.where(foreign_key => root_ids)
+  
+        items = add_scopes(default_scope, scope, global_opts[assoc_name])
+      end
 
-      assoc = group_by(items) { _1.send(foreign_key) }
+      assoc = if foreign_key
+        group_by(items) { _1.send(foreign_key) }
+      else
+        items
+      end
 
       populate_association(
         list,
         assoc,
         assoc_name,
-        setter: setter
+        setter: setter,
+        primary_key: primary_key
       )
 
       assoc
@@ -219,9 +251,10 @@ module ReeDao
 
     contract(
       Array,
-      Hash,
+      Or[Hash, Array],
       Symbol,
       Kwargs[
+        primary_key: Nilor[Symbol],
         reverse: Nilor[Bool],
         setter: Nilor[Or[Symbol, Proc]]
       ] => Any
@@ -230,6 +263,7 @@ module ReeDao
       list,
       association_index,
       assoc_name,
+      primary_key: nil,
       reverse: nil,
       setter: nil
     )
@@ -244,14 +278,18 @@ module ReeDao
           self.instance_exec(item, association_index, &assoc_setter)
         else
           key = if reverse.nil?
-            :id
+            primary_key
           else
-            reverse ? :id : "#{assoc_name}_id"
+            reverse ? primary_key : "#{assoc_name}_id"
           end
           value = association_index[item.send(key)]
           next if value.nil?
 
-          item.send(assoc_setter, value)
+          begin
+            item.send(assoc_setter, value)
+          rescue NoMethodError
+            item.send("#{assoc_name}=", value)
+          end
         end
       end
     end
@@ -292,6 +330,10 @@ module ReeDao
         s1 = s1.order(*s2.opts[:order])
       end
 
+      if s1.opts[:schema_mapper] != s2.opts[:schema_mapper]
+        s1 = s1.with_mapper(s2.opts[:schema_mapper])
+      end
+
       s1
     end
 
@@ -307,5 +349,11 @@ module ReeDao
 
       raise ArgumentError, "can't find DAO for :#{assoc_name}, provide correct scope or association name"
     end
+
+    def method_missing(method, *args, &block)
+      return super if !parent.agg_caller.private_methods(false).include?(method)
+
+      parent.agg_caller.send(method, *args, &block)
+    end
   end
 end

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

@@ -32,8 +32,9 @@ module ReeDao
     contract(
       Symbol,
       Ksplat[
-        scope?: Sequel::Dataset,
+        scope?: Or[Sequel::Dataset, Array],
         setter?: Or[Symbol, Proc],
+        primary_key?: Symbol,
         foreign_key?: Symbol,
         autoload_children?: Bool
       ],
@@ -46,8 +47,9 @@ module ReeDao
     contract(
       Symbol,
       Ksplat[
-        scope?: Sequel::Dataset,
+        scope?: Or[Sequel::Dataset, Array],
         setter?: Or[Symbol, Proc],
+        primary_key?: Symbol,
         foreign_key?: Symbol,
         autoload_children?: Bool
       ],
@@ -60,8 +62,9 @@ module ReeDao
     contract(
       Symbol,
       Ksplat[
-        scope?: Sequel::Dataset,
+        scope?: Or[Sequel::Dataset, Array],
         setter?: Or[Symbol, Proc],
+        primary_key?: Symbol,
         foreign_key?: Symbol,
         autoload_children?: Bool
       ],
@@ -74,8 +77,9 @@ module ReeDao
     contract(
       Symbol,
       Ksplat[
-        scope?: Sequel::Dataset,
+        scope?: Or[Sequel::Dataset, Array],
         setter?: Or[Symbol, Proc],
+        primary_key?: Symbol,
         foreign_key?: Symbol,
         autoload_children?: Bool
       ],
@@ -96,8 +100,9 @@ module ReeDao
       ],
       Symbol,
       Ksplat[
-        scope?: Sequel::Dataset,
+        scope?: Or[Sequel::Dataset, Array],
         setter?: Or[Symbol, Proc],
+        primary_key?: Symbol,
         foreign_key?: Symbol,
         autoload_children?: Bool
       ],

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

@@ -151,6 +151,26 @@ module ReeDao
         for_update
       end
 
+      def with_mapper(mapper)
+        clone(
+          schema_mapper: mapper || opts[:schema_mapper],
+        ).with_row_proc(
+          Proc.new { |hash|
+            m = mapper || opts[:schema_mapper]
+
+            if m
+              entity = m.db_load(hash)
+
+              self.set_entity_cache(entity, hash)
+
+              entity
+            else
+              hash
+            end
+          }
+        )
+      end
+
       private
 
       def __ree_dao_cache
@@ -179,26 +199,6 @@ module ReeDao
         end
       end
 
-      def with_mapper(mapper)
-        clone(
-          schema_mapper: mapper || opts[:schema_mapper],
-        ).with_row_proc(
-          Proc.new { |hash|
-            m = mapper || opts[:schema_mapper]
-
-            if m
-              entity = m.db_load(hash)
-
-              self.set_entity_cache(entity, hash)
-
-              entity
-            else
-              hash
-            end
-          }
-        )
-      end
-
       def extract_primary_key(entity)
         if primary_key.is_a?(Array)
           primary_key.map do |key|

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

@@ -111,7 +111,7 @@ RSpec.describe :load_agg do
         end
         
         has_one :passport, foreign_key: :user_id, scope: user_passports
-        field :custom_field, scope: books.where(title: "1984")
+        has_one :custom_field, scope: books.where(title: "1984")
       end
     end
   end
@@ -186,7 +186,8 @@ RSpec.describe :load_agg do
       load_agg(ids_or_scope, users, **opts) do
         belongs_to :organization
         has_many :books, setter: -> (item, items_index) {
-          item.set_books([1337, 1337])
+          b = items_index[item.id].each { |b| b.title = "Changed" }
+          item.set_books(b)
         }
       end
     end
@@ -540,7 +541,7 @@ RSpec.describe :load_agg do
     res = users_agg_block.call(user_1.id)
 
     u = res[0]
-    expect(u.books).to eq([1337, 1337])
+    expect(u.books.map(&:title)).to eq(["Changed"])
   }
 
   it {

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

@@ -35,25 +35,45 @@ class ReeDaoLoadAggTest::Db
   end
 end
 
-class ReeDaoLoadAggTest::Organization
+class ReeDaoLoadAggTest::Book
   include ReeDto::EntityDSL
 
   properties(
     id: Nilor[Integer],
-    name: String
+    user_id: Integer,
+    title: Nilor[String]
   )
 
-  def set_users(users)
-    @users = users
+  def set_chapters(chapters)
+    @chapters = chapters; nil
   end
 
-  def users
-    @users ||= []
+  def chapters
+    @chapters
   end
 
-  attr_accessor :name
-end
+  def set_author(author)
+    @author = author
+  end
 
+  def author
+    @author
+  end
+
+  def set_reviews(reviews)
+    @reviews = reviews; nil
+  end
+
+  def reviews
+    @reviews
+  end
+
+  def title=(t)
+    @title = t
+  end
+
+  attr_accessor :title, :user_id
+end
 
 class ReeDaoLoadAggTest::User
   include ReeDto::EntityDSL
@@ -81,10 +101,18 @@ class ReeDaoLoadAggTest::User
     @passport
   end
 
+  def books
+    @books
+  end
+
+  contract(ArrayOf[ReeDaoLoadAggTest::Book] => nil)
+  def set_books(books)
+    @books = books; nil
+  end
+
   [
     :organization,
     :passport,
-    :books,
     :movies,
     :videogames,
     :hobbies,
@@ -106,6 +134,26 @@ class ReeDaoLoadAggTest::User
   attr_accessor :name, :age, :organization_id
 end
 
+class ReeDaoLoadAggTest::Organization
+  include ReeDto::EntityDSL
+
+  properties(
+    id: Nilor[Integer],
+    name: String
+  )
+  
+  contract(Array[ReeDaoLoadAggTest::User] => nil)
+  def set_users(users)
+    @users = users; nil
+  end
+
+  def users
+    @users ||= []
+  end
+
+  attr_accessor :name
+end
+
 
 class ReeDaoLoadAggTest::UserPassport
   include ReeDto::EntityDSL
@@ -189,42 +237,6 @@ class ReeDaoLoadAggTest::Dream
   )
 end
 
-class ReeDaoLoadAggTest::Book
-  include ReeDto::EntityDSL
-
-  properties(
-    id: Nilor[Integer],
-    user_id: Integer,
-    title: Nilor[String]
-  )
-
-  def set_chapters(chapters)
-    @chapters = chapters; nil
-  end
-
-  def chapters
-    @chapters
-  end
-
-  def set_author(author)
-    @author = author
-  end
-
-  def author
-    @author
-  end
-
-  def set_reviews(reviews)
-    @reviews = reviews; nil
-  end
-
-  def reviews
-    @reviews
-  end
-
-  attr_accessor :title, :user_id
-end
-
 class ReeDaoLoadAggTest::Chapter
   include ReeDto::EntityDSL
 

data/lib/ree_lib/version.rb

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

metadata

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