ree_lib 1.0.121 → 1.0.123

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 381666058a003165d365519531e3341ecc42c2b4756be1152651914bdd4f0419
-  data.tar.gz: 9e1648ebd630847fbbe7acd75bac9e5c876cfeb8cfcb065d80a85ac798442eb7
+  metadata.gz: 20fb3c9d6a6bc6f163de981a7591c4ba13e07a4077bd81741073e83e6346cdc6
+  data.tar.gz: c03d78b30e2f347f2aa54c1c3dcaa964a84bfa921eb63295cdba0604e0932850
 SHA512:
-  metadata.gz: 3138793f0e16c9e8dbb7152685d1aacaa411f8eb9c8c95b0ff571b609c3297a583361cfa3571e8a732206be323c9ea70e4df7c34b2c88f705f0af4ef5effacbe
-  data.tar.gz: 554d74d6c446a0628a803275e1841d35ad78bf192ba1a35bcd7105995185a244a5f14be0eab17d81484242e20d329414370c78b819afe2c0ff7a3c71dcd8a1a9
+  metadata.gz: 809b66804d318edd659bf8d3c80f4fe881518ab692b9e7887af1c5e790b3d73475f02fb542b4520f8beb60cfcfd7176a7a1283ae50cc071e69cfa2a70a738a86
+  data.tar.gz: 37c8769871641038cb8f17e8773a5ae4f025e87467334cdc5d2286776b37aa2f072457ff0d098d7e207b9f8f8124a15e99c8f13724806fa9d4219ad82da38182

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.121)
+    ree_lib (1.0.123)
       bigdecimal (~> 3.1.6)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.14.1)
@@ -20,11 +20,11 @@ GEM
     bigdecimal (3.1.8)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
-    bootsnap (1.18.3)
+    bootsnap (1.18.4)
       msgpack (~> 1.2)
     commander (5.0.0)
       highline (~> 3.0.0)
-    concurrent-ruby (1.3.3)
+    concurrent-ruby (1.3.4)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -33,7 +33,7 @@ GEM
     diff-lcs (1.5.1)
     faker (3.4.2)
       i18n (>= 1.8.11, < 2)
-    hashdiff (1.1.0)
+    hashdiff (1.1.1)
     highline (3.0.1)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
@@ -45,19 +45,21 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    oj (3.16.4)
+    oj (3.16.5)
       bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
+    ostruct (0.6.0)
     pg (1.5.7)
     public_suffix (6.0.1)
-    racc (1.8.0)
+    racc (1.8.1)
     rack (3.1.7)
     rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
     rake (13.2.1)
-    ree (1.0.43)
+    ree (1.0.45)
       commander (~> 5.0.0)
-    rexml (3.3.2)
+    rexml (3.3.6)
       strscan
     roda (3.76.0)
       rack
@@ -68,7 +70,7 @@ GEM
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.1)
+    rspec-expectations (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)

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

@@ -233,7 +233,7 @@ module ReeDao
           foreign_key = foreign_key_from_dao(parent_dao)
         end
 
-        root_ids = list.map(&:"#{primary_key}")
+        root_ids = list.map(&primary_key)
 
         scope ||= assoc_dao
         scope = scope.where(foreign_key => root_ids)
@@ -278,9 +278,12 @@ module ReeDao
       assoc_setter = if setter
         setter
       else
-        "set_#{assoc_name}"
+        "#{assoc_name}="
       end
 
+      fallback_assoc_setter = nil
+      fallback_fk = nil
+
       list.each do |item|
         if setter && setter.is_a?(Proc)
           if to_dto
@@ -305,7 +308,7 @@ module ReeDao
             if reverse
               primary_key
             else
-              foreign_key ? foreign_key : "#{assoc_name}_id"
+              foreign_key ? foreign_key : (fallback_fk ||= "#{assoc_name}_id")
             end
           end
 
@@ -321,10 +324,13 @@ module ReeDao
 
           value = [] if value.nil? && multiple
 
-          begin
+          if item.respond_to?(assoc_setter)
             item.send(assoc_setter, value)
-          rescue NoMethodError
-            item.send("#{assoc_name}=", value)
+          else
+            item.send(
+              fallback_assoc_setter ||= "set_#{assoc_name}", 
+              value
+            )
           end
         end
       end

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

@@ -13,14 +13,12 @@ RSpec.describe :agg do
   before :all do
     connection = build_pg_connection(ReeDaoAggTest::Db::DB_CONFIG)
 
-    connection.drop_table(:organizations, cascade: true) if connection.table_exists?(:organizations)
-    connection.drop_table(:users, cascade: true) if connection.table_exists?(:users)
-    connection.drop_table(:user_passports, cascade: true) if connection.table_exists?(:user_passports)
-    connection.drop_table(:books, cascade: true) if connection.table_exists?(:books)
-    connection.drop_table(:chapters, cascade: true) if connection.table_exists?(:chapters)
-    connection.drop_table(:avtorki, cascade: true) if connection.table_exists?(:avtorki)
-    connection.drop_table(:reviews, cascade: true) if connection.table_exists?(:reviews)
-    connection.drop_table(:review_authors, cascade: true) if connection.table_exists?(:review_authors)
+    [
+      :organizations, :users, :user_passports, :books, :chapters, :avtorki,
+      :reviews, :review_authors
+    ].each do |table|
+      connection.drop_table(table, cascade: true) if connection.table_exists?(table)
+    end
 
     connection.create_table :organizations do
       primary_key :id
@@ -866,7 +864,7 @@ RSpec.describe :agg do
 
     u = res[0]
     expect(u.books).to_not eq(nil)
-    expect(u.books[0].chapters).to eq(nil)
+    expect(u.books[0].chapters).to eq([])
     expect(u.books[0].author).to eq(nil)
     expect(u.books[0].reviews).to_not eq(nil)
     expect(u.books[0].reviews[0].review_author).to_not eq(nil)
@@ -994,4 +992,4 @@ RSpec.describe :agg do
       ENV.delete('REE_DAO_SYNC_ASSOCIATIONS')
     }
   end
-end
+end

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

@@ -44,31 +44,10 @@ class ReeDaoAggTest::Book
     field :user_id, Integer
     field :title, Nilor[String], default: nil
 
-    field :author, Any
-  end
-
-  def set_chapters(chapters)
-    @chapters = chapters; nil
-  end
-
-  def chapters
-    @chapters
-  end
-
-  def set_author(author)
-    @author = author
-  end
+    field :author, Any, default: nil
 
-  def author
-    @author
-  end
-
-  def set_reviews(reviews)
-    @reviews = reviews; nil
-  end
-
-  def reviews
-    @reviews
+    collection :chapters, Any
+    collection :reviews, Any
   end
 end
 
@@ -87,7 +66,7 @@ class ReeDaoAggTest::User
     field :organization, Any, default: nil
     field :passport, Any, default: nil
     field :custom_field, Any, default: nil
-    
+
     collection :movies, Any
     collection :videogames, Any
     collection :hobbies, Any
@@ -100,7 +79,7 @@ class ReeDaoAggTest::User
   end
 
   [
-    
+
   ].each do |attr|
     define_method("set_#{attr}") do |*args|
       instance_variable_set("@#{attr}", *args)
@@ -509,4 +488,4 @@ class ReeDaoAggTest::ReviewAuthors
     integer :review_id
     string :name
   end
-end
+end

data/lib/ree_lib/packages/ree_dto/package/ree_dto/dto/dto_instance_methods.rb

@@ -1,6 +1,8 @@
 require_relative "./field_meta"
 require "date"
 
+package_require("ree_object/functions/deep_dup")
+
 module ReeDto::DtoInstanceMethods
   include Ree::Contracts::Core
   include Ree::Contracts::ArgContracts
@@ -56,6 +58,11 @@ module ReeDto::DtoInstanceMethods
     @_attrs
   end
 
+  contract None => Hash
+  def to_h
+    each_field.to_h
+  end
+
   contract Symbol, Any => Any
   def set_attr(name, val)
     @_attrs[name] = val
@@ -129,6 +136,22 @@ module ReeDto::DtoInstanceMethods
     end
   end
 
+  def initialize_copy(_other)
+    deep_dupper = ReeObject::DeepDup.new
+    @_attrs = deep_dupper.call(@_attrs)
+    @collections = deep_dupper.call(@collections) if defined?(@collections)
+  end
+
+  def initialize_dup(_other)
+    super
+    @changed_fields = nil
+  end
+
+  def initialize_clone(_other)
+    super
+    @changed_fields = @changed_fields.dup if defined?(@changed_fields)
+  end
+
   private
 
   def inspect_value(v)

data/lib/ree_lib/packages/ree_dto/spec/ree_dto/dsl_spec.rb

@@ -175,4 +175,70 @@ RSpec.describe ReeDto::DSL do
       )
     }
   end
+
+  describe "#to_h" do
+    it {
+      dto = ReeDto::DtoClass.new(string: "str")
+      expect(dto.to_h).to eq({ string: "str", with_default: 1 })
+    }
+  end
+
+  describe "#dup" do
+    it {
+      dto = ReeDto::DtoClass.new(string: "str")
+      dto.string = +"changed"
+      expect(dto.changed_fields).to eq([:string])
+
+      dto.numbers = [1]
+
+      dup = dto.dup      
+      expect(dup).to eq(dto)
+      expect(dup.object_id).not_to eq(dto.object_id)
+      expect(dup.changed_fields).to eq([])
+      expect(dup.numbers).to eq([1])
+
+      dup.numbers << 2
+      expect(dto.numbers).to eq([1])
+
+      dup.string.concat("2")
+      expect(dto.string).to eq("changed")
+
+      dup.string = "changed3"
+      expect(dto.string).to eq("changed")
+
+      dto.freeze
+      expect(dto.dup.frozen?).to eq(false)
+    }
+  end
+
+  describe "#clone" do
+    it {
+      dto = ReeDto::DtoClass.new(string: "str")
+      dto.string = "changed"
+      expect(dto.changed_fields).to eq([:string])
+
+      dto.numbers = [1]
+
+      clone = dto.clone
+      expect(clone).to eq(dto)
+      expect(clone.object_id).not_to eq(dto.object_id)
+      expect(clone.changed_fields).to eq([:string])
+      expect(clone.numbers).to eq([1])
+
+      clone.numbers << 2
+      expect(dto.numbers).to eq([1])
+
+      clone.string.concat("2")
+      expect(dto.string).to eq("changed")
+
+      clone.string = "changed3"
+      expect(dto.string).to eq("changed")
+
+      clone.with_default = 2
+      expect(dto.changed_fields).to eq([:string])
+
+      dto.freeze
+      expect(dto.clone.frozen?).to eq(true)
+    }
+  end
 end

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.121
+  version: 1.0.123
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree