ree_lib 1.0.120 → 1.0.122

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2116bbd5ccddea0d1712d9735936d9254e39218adda88a3b5589e8f38b10683
-  data.tar.gz: 878f695cf24c9f46bf41549a5213bf03e63d58f2a957c255a4b12559926dd86c
+  metadata.gz: '03921ccbd7050911caf9c2ff781b825b5b0c68e3ac461c0ca03b5a857aa32be9'
+  data.tar.gz: fe55c4f54db004e5603a198293b23feaef1538541b034137943d0dd990ebec39
 SHA512:
-  metadata.gz: 69ea27c870a0e5982eb019afa07486f00c6e21e5c916505141cb31748971bd2dab19f05ebecb5c58011540e6eb5e120971c28fe8a9fe9833df512ce459ac15d9
-  data.tar.gz: b0a5671bf0744fb788a825bc09a6b512b85c3db28f1717bbd91f79184e4372cd4f2bab963588ecd1b7c40b41caa5857fe529e1035aab1e23706e87f3fef3eadd
+  metadata.gz: 3b40ee304d8c9b72f81b80ce0e63687bad7f301ee4fd3f16bfa5628a61a3e5f47d796b1e5a197b93bc6c48fdfb90973a8512db1b283d4403770f4cfdcecb67ac
+  data.tar.gz: 15de0a6eacc51bf19cb406ddfd9b0f016ab2720ed4d6a3c6d4b7da835961590b9ba6417a1931518227508b46a6a80e7a68f6de88e126d31f997be02e788492ad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.120)
+    ree_lib (1.0.122)
       bigdecimal (~> 3.1.6)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.14.1)

data/lib/ree_lib/packages/ree_dao/package/ree_dao/contract/dto_contract.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+class ReeDao::DtoContract
+  extend Ree::Contracts::Truncatable
+
+  def self.valid?(obj)
+    obj.class.ancestors.include?(ReeDto::DSL)
+  end
+
+  def self.to_s
+    "ReeDto::Dto"
+  end
+
+  def self.message(value, name, lvl = 1)
+    "expected #{to_s}, got => #{truncate(value.inspect)}"
+  end
+end

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

@@ -97,6 +97,7 @@ module ReeDao
         end
 
         key = insert_conflict(conflict_opts).insert(raw)
+        return if key.nil?
 
         set_entity_primary_key(entity, raw, key)
         set_persistence_state(entity, raw)

data/lib/ree_lib/packages/ree_dao/package/ree_dao/functions/agg.rb

@@ -7,11 +7,12 @@ class ReeDao::Agg
     link "ree_dao/associations", -> { Associations }
     link "ree_dao/contract/dao_dataset_contract", -> { DaoDatasetContract }
     link "ree_dao/contract/entity_contract", -> { EntityContract }
+    link "ree_dao/contract/dto_contract", -> { DtoContract }
   end
 
   contract(
     DaoDatasetContract,
-    Or[Sequel::Dataset, ArrayOf[Integer], ArrayOf[EntityContract], Integer],
+    Or[Sequel::Dataset, ArrayOf[Integer], ArrayOf[EntityContract], ArrayOf[DtoContract], Integer],
     Ksplat[
       only?: ArrayOf[Symbol],
       except?: ArrayOf[Symbol],

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

@@ -181,7 +181,7 @@ RSpec.describe :agg do
       {
         to_dto: -> (book) { ReeDaoAggTest::BookDto.new(book) },
         setter: -> (item, child_index) {
-          item.set_books(child_index[item.id] || [])
+          item.books = child_index[item.id] || []
         }
       }
     end
@@ -286,7 +286,7 @@ RSpec.describe :agg do
       {
         setter: -> (item, items_index) {
           b = items_index[item.id].each { |b| b.title = "Changed" }
-          item.set_books(b)
+          item.books = b
         }
       }
     end
@@ -990,7 +990,7 @@ RSpec.describe :agg do
       expect(user).to receive(:some_field=).with(:some_value)
 
       ENV['REE_DAO_SYNC_ASSOCIATIONS'] = "true"
-      res = agg_users.([user])
+      agg_users.([user])
       ENV.delete('REE_DAO_SYNC_ASSOCIATIONS')
     }
   end

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

@@ -5,6 +5,7 @@ module ReeDaoAggTest
 
   package do
     depends_on :ree_dao
+    depends_on :ree_dto
     depends_on :ree_array
     depends_on :ree_string
     depends_on :ree_hash
@@ -36,13 +37,15 @@ class ReeDaoAggTest::Db
 end
 
 class ReeDaoAggTest::Book
-  include ReeDto::EntityDSL
+  include ReeDto::DSL
 
-  properties(
-    id: Nilor[Integer],
-    user_id: Integer,
-    title: Nilor[String]
-  )
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :user_id, Integer
+    field :title, Nilor[String], default: nil
+
+    field :author, Any
+  end
 
   def set_chapters(chapters)
     @chapters = chapters; nil
@@ -67,71 +70,37 @@ class ReeDaoAggTest::Book
   def reviews
     @reviews
   end
-
-  def title=(t)
-    @title = t
-  end
-
-  attr_accessor :title, :user_id
 end
 
 class ReeDaoAggTest::BookDto < SimpleDelegator
 end
 
 class ReeDaoAggTest::User
-  include ReeDto::EntityDSL
-
-  properties(
-    id: Nilor[Integer],
-    name: String,
-    age: Integer,
-    organization_id: Integer
-  )
-
-  def set_organization(org)
-    @organization = org
-  end
-
-  def organization
-    @organization
-  end
-
-  def set_passport(passport)
-    @passport = passport
-  end
-
-  def passport
-    @passport
-  end
-
-  def books
-    @books
-  end
-
-  def set_active_books(books)
-    @active_books = books
-  end
-
-  def active_books
-    @active_books
-  end
-
-  contract(ArrayOf[ReeDaoAggTest::Book] => nil)
-  def set_books(books)
-    @books = books; nil
+  include ReeDto::DSL
+
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :name, String
+    field :age, Integer
+    field :organization_id, Integer
+
+    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
+    collection :vinyls, Any
+    collection :pets, Any
+    collection :skills, Any
+    collection :dreams, Any
+    collection :books, ReeDaoAggTest::Book
+    collection :active_books, ReeDaoAggTest::Book
   end
 
   [
-    :organization,
-    :passport,
-    :movies,
-    :videogames,
-    :hobbies,
-    :vinyls,
-    :pets,
-    :skills,
-    :dreams,
-    :custom_field
+    
   ].each do |attr|
     define_method("set_#{attr}") do |*args|
       instance_variable_set("@#{attr}", *args)
@@ -141,198 +110,161 @@ class ReeDaoAggTest::User
       instance_variable_get("@#{attr}")
     end
   end
-
-  attr_accessor :name, :age, :organization_id
 end
 
 class ReeDaoAggTest::UserDto
-  include ReeDto::EntityDSL
-
-  properties(
-    id: Integer,
-    organization_id: Integer,
-    name: String,
-    full_name: String,
-  )
-
-  def set_organization(org)
-    @organization = org; nil
-  end
+  include ReeDto::DSL
 
-  def organization
-    @organization
-  end
+  build_dto do
+    field :id, Integer
+    field :organization_id, Integer
+    field :name, String
+    field :full_name, String
 
-  def set_books(books)
-    @books = books; nil
-  end
+    field :organization, Any
 
-  def books
-    @books
+    collection :books, ReeDaoAggTest::BookDto
   end
 end
 
 class ReeDaoAggTest::Organization
-  include ReeDto::EntityDSL
+  include ReeDto::DSL
 
-  properties(
-    id: Nilor[Integer],
-    name: String
-  )
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :name, String
 
-  contract(Array[ReeDaoAggTest::User] => nil)
-  def set_users(users)
-    @users = users; nil
+    collection :users, ReeDaoAggTest::User
   end
-
-  def users
-    @users ||= []
-  end
-
-  attr_accessor :name
 end
 
 
 class ReeDaoAggTest::UserPassport
-  include ReeDto::EntityDSL
-
-  properties(
-    id: Nilor[Integer],
-    user_id: Integer,
-    info: Nilor[String]
-  )
+  include ReeDto::DSL
 
-  attr_accessor :info, :user_id
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :user_id, Integer
+    field :info, Nilor[String], default: nil
+  end
 end
 
 class ReeDaoAggTest::Movie
-  include ReeDto::EntityDSL
+  include ReeDto::DSL
 
-  properties(
-    id: Nilor[Integer],
-    user_id: Integer,
-    title: Nilor[String]
-  )
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :user_id, Integer
+    field :title, Nilor[String], default: nil
+  end
 end
 
 class ReeDaoAggTest::Videogame
-  include ReeDto::EntityDSL
+  include ReeDto::DSL
 
-  properties(
-    id: Nilor[Integer],
-    user_id: Integer,
-    title: Nilor[String]
-  )
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :user_id, Integer
+    field :title, Nilor[String], default: nil
+  end
 end
 
 class ReeDaoAggTest::Hobby
-  include ReeDto::EntityDSL
+  include ReeDto::DSL
 
-  properties(
-    id: Nilor[Integer],
-    user_id: Integer,
-    title: Nilor[String]
-  )
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :user_id, Integer
+    field :title, Nilor[String], default: nil
+  end
 end
 
 class ReeDaoAggTest::Vinyl
-  include ReeDto::EntityDSL
+  include ReeDto::DSL
 
-  properties(
-    id: Nilor[Integer],
-    user_id: Integer,
-    title: Nilor[String]
-  )
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :user_id, Integer
+    field :title, Nilor[String], default: nil
+  end
 end
 
 class ReeDaoAggTest::Pet
-  include ReeDto::EntityDSL
+  include ReeDto::DSL
 
-  properties(
-    id: Nilor[Integer],
-    user_id: Integer,
-    name: Nilor[String]
-  )
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :user_id, Integer
+    field :name, Nilor[String], default: nil
+  end
 end
 
 class ReeDaoAggTest::Skill
-  include ReeDto::EntityDSL
+  include ReeDto::DSL
 
-  properties(
-    id: Nilor[Integer],
-    user_id: Integer,
-    title: Nilor[String]
-  )
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :user_id, Integer
+    field :title, Nilor[String], default: nil
+  end
 end
 
 class ReeDaoAggTest::Dream
-  include ReeDto::EntityDSL
+  include ReeDto::DSL
 
-  properties(
-    id: Nilor[Integer],
-    user_id: Integer,
-    description: Nilor[String]
-  )
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :user_id, Integer
+    field :description, Nilor[String], default: nil
+  end
 end
 
 class ReeDaoAggTest::Chapter
-  include ReeDto::EntityDSL
-
-  properties(
-    id: Nilor[Integer],
-    book_id: Integer,
-    title: Nilor[String]
-  )
+  include ReeDto::DSL
 
-  attr_accessor :title, :book_id
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :book_id, Integer
+    field :title, Nilor[String], default: nil
+  end
 end
 
 class ReeDaoAggTest::ChapterDto < SimpleDelegator
 end
 
 class ReeDaoAggTest::Author
-  include ReeDto::EntityDSL
-
-  properties(
-    id: Nilor[Integer],
-    book_id: Integer,
-    name: Nilor[String]
-  )
+  include ReeDto::DSL
 
-  attr_accessor :name, :book_id
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :book_id, Integer
+    field :name, Nilor[String], default: nil
+  end
 end
 
 class ReeDaoAggTest::AuthorDto < SimpleDelegator
 end
 
-class ReeDaoAggTest::Review
-  include ReeDto::EntityDSL
-
-  properties(
-    id: Nilor[Integer],
-    book_id: Integer,
-    rating: Nilor[Integer]
-  )
-
-  def set_review_author(review_author)
-    @review_author = review_author
-  end
+class ReeDaoAggTest::ReviewAuthor
+  include ReeDto::DSL
 
-  def review_author
-    @review_author
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :review_id, Integer
+    field :name, String, default: nil
   end
-
-  attr_accessor :rating, :book_id
 end
 
-class ReeDaoAggTest::ReviewAuthor
-  include ReeDto::EntityDSL
+class ReeDaoAggTest::Review
+  include ReeDto::DSL
+
+  build_dto do
+    field :id, Nilor[Integer], default: nil
+    field :book_id, Integer
+    field :rating, Nilor[Integer], default: nil
 
-  properties(
-    id: Nilor[Integer],
-    review_id: Integer,
-    name: String
-  )
+    field :review_author, Nilor[ReeDaoAggTest::ReviewAuthor], default: nil
+  end
 end
 
 class ReeDaoAggTest::Users

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

@@ -33,6 +33,15 @@ class ReeDto::DtoCollection
     @list.inspect
   end
 
+  contract Any => Bool
+  def ==(other)
+    if other.is_a?(self.class)
+      @list == other.instance_variable_get(:@list)
+    else
+      @list == other
+    end
+  end
+
   class << self
     def filter(name, filter_proc)
       define_method name do

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

@@ -56,6 +56,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
@@ -90,8 +95,10 @@ module ReeDto::DtoInstanceMethods
     end
   end
 
-  contract Block => Any
+  contract Optblock => Any
   def each_field(&proc)
+    return enum_for(:each_field) unless block_given?
+    
     self.class.fields.select { has_value?(_1.name) }.each do |field|
       proc.call(field.name, get_value(field.name))
     end
@@ -101,8 +108,8 @@ module ReeDto::DtoInstanceMethods
   def to_s
     result = "#<dto #{self.class} "
 
-    data = self.class.fields.select { has_value?(_1.name) }.map do |field|
-      "#{field.name}=#{inspect_value(get_value(field.name))}"
+    data = each_field.map do |name, value|
+      "#{name}=#{inspect_value(value)}"
     end
 
     data += self.class.collections.select { send(_1.name).size > 0 }.map do |col|
@@ -118,6 +125,15 @@ module ReeDto::DtoInstanceMethods
     to_s
   end
 
+  contract Any => Bool
+  def ==(other)
+    return false unless other.is_a?(self.class)
+
+    each_field.all? do |name, value|
+      other.get_value(name) == value
+    end
+  end
+
   private
 
   def inspect_value(v)

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

@@ -141,4 +141,45 @@ RSpec.describe ReeDto::DSL do
       expect(dto.users.active.size).to eq(1)
     }
   end
+
+  describe "#==" do
+    it {
+      expect(
+        ReeDto::DtoClass.new(string: "str")
+      ).to eq(
+        ReeDto::DtoClass.new(string: "str")
+      )
+    }
+
+    it {
+      expect(
+        ReeDto::DtoClass.new(string: "str")
+      ).to eq(
+        ReeDto::DtoClass.new(string: "str", without_setter: 0)
+      )
+    }
+
+    it {
+      expect(
+        ReeDto::DtoClass.new(string: "str")
+      ).not_to eq(
+        ReeDto::DtoClass.new(string: "str2")
+      )
+    }
+
+    it {
+      expect(
+        ReeDto::DtoClass.new(string: "str")
+      ).not_to eq(
+        ReeDto::DtoClass.new(string: "str", with_default: 2)
+      )
+    }
+  end
+
+  describe "#to_h" do
+    it {
+      dto = ReeDto::DtoClass.new(string: "str")
+      expect(dto.to_h).to eq({ string: "str", with_default: 1 })
+    }
+  end
 end

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.120
+  version: 1.0.122
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -321,6 +321,7 @@ files:
 - lib/ree_lib/packages/ree_dao/package/ree_dao/associations.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/beans/connections.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/contract/dao_dataset_contract.rb
+- lib/ree_lib/packages/ree_dao/package/ree_dao/contract/dto_contract.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/contract/entity_contract.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/dataset_extensions.rb
 - lib/ree_lib/packages/ree_dao/package/ree_dao/dsl.rb