ree_lib 1.0.114 → 1.0.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fa0f66153a455f42150991660c75a1ce836918e054176f4043ad9d825c17a8a
-  data.tar.gz: b1a36ab72f838da9622f96e8e3f9fc8b1946a78608cfdd28a8dae4bf23a4ef52
+  metadata.gz: 62e25eddc0fd59750f4eb166fe3cc3b9b70bde690bc203452749aa3c9961a5ee
+  data.tar.gz: 40dc524a36e3de7b399d1d3453b57a38a8ce52bceebe681fcf160c2590449fd2
 SHA512:
-  metadata.gz: 278748204360c321e8bd91130bfc675183c4cf6a8fa8324c9383f678b6af1a70e06f11f0f9fc5ccbc34ee90f8c4a7d8caf36ff0240e6bb197de38e50a6742566
-  data.tar.gz: d2123d32021a00f673c5851174dc1c82e646f82db20409c9949842014e4527057e0d8076d8b856c9511a360cbc956d88764360c7e50ae6e6b6560509aab205b6
+  metadata.gz: 1e09f2db0575da0e803ed76c5bd162416e91c15d9c308252d0aa1dc7e7cb85fd3e08bfeb253c95346e2780b3c5987710d07b71f89cecf858ca8b5c433339d5d9
+  data.tar.gz: 3251732d5e69e2f3da4260ce95988a0e647f978234785ff6d3a445d59541155f917d28a3e19efb00eea14bfe53f7432eb42b1c2517cfc32a66fd629558ebf30a

data/Gemfile.lock

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

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

@@ -32,7 +32,7 @@ module ReeDao
       end
 
       def last(mapper: nil)
-        with_mapper(mapper).__original_last
+        with_mapper(mapper).reverse_order(:id).first
       end
 
       def all(mapper: nil)
@@ -43,6 +43,31 @@ module ReeDao
         where({}).__original_delete
       end
 
+      # @args [ReeDto::Dto, ReeDto::DtoCollection]
+      def persist(*args, set: nil)
+        args.each do |arg|
+          if arg.is_a?(ReeDto::DSL)
+            put_or_update(arg, set: set)
+          elsif arg.is_a?(ReeDto::DtoCollection) || arg.is_a?(Array) || arg.is_a?(Enumerable)
+            arg.each { put_or_update(_1, set: set) }
+          end
+        end
+      end
+
+      def put_or_update(entity, set: nil)
+        if set
+          set.each do |key, val|
+            entity.send("#{key}=", val)
+          end
+        end
+
+        if entity.id
+          update(entity)
+        else
+          put(entity)
+        end
+      end
+
       def put(entity)
         raw = dump_entity(entity)
 

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/persist_assoc_spec.rb

@@ -40,6 +40,7 @@ RSpec.describe :persist_assoc do
 
       package do
         depends_on :ree_dao
+        depends_on :ree_dto
       end
 
       class Db
@@ -74,16 +75,11 @@ RSpec.describe :persist_assoc do
       end
 
       class ProjectUser
-        include ReeDto::EntityDSL
+        include ReeDto::DSL
 
-        properties(
-          id: Nilor[Integer],
-          project_id: Nilor[Integer]
-        )
-
-        contract Integer => Integer
-        def project_id=(id)
-          @project_id = id
+        build_dto do
+          field :id, Nilor[Integer], default: nil
+          field :project_id, Integer
         end
       end
 
@@ -125,7 +121,12 @@ RSpec.describe :persist_assoc do
 
     TestPersistAssoc::ProjectsDao.new.put(project)
 
-    persist_assoc(project, TestPersistAssoc::ProjectUsersDao.new)
+    TestPersistAssoc::ProjectUsersDao.new.persist(
+      project.project_users.first,
+      project.project_users,
+      project.project_users.to_a,
+      set: {project_id: project.id}
+    )
 
     expect(project.id).to be_a(Integer)
     expect(project.project_users.first.id).to be_a(Integer)

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

@@ -28,6 +28,10 @@ class ReeDto::CollectionFilter
     count
   end
 
+  def inspect
+    to_a.inspect
+  end
+
   contract Any => Any
   def remove(item)
     check_item(item)

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

@@ -23,6 +23,16 @@ class ReeDto::DtoCollection
     @list.each(&block)
   end
 
+  contract None => String
+  def to_s
+    inspect
+  end
+
+  contract None => String
+  def inspect
+    @list.inspect
+  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

@@ -1,4 +1,5 @@
 require_relative "./field_meta"
+require "date"
 
 module ReeDto::DtoInstanceMethods
   include Ree::Contracts::Core
@@ -43,7 +44,7 @@ module ReeDto::DtoInstanceMethods
       meta = get_meta(name)
 
       if !meta.has_default?
-        raise FieldNotSetError.new("field :#{name} not set for:#{self}")
+        raise FieldNotSetError.new("field `#{name}` not set for: #{self}")
       else
         @_attrs[name] = meta.default
       end
@@ -91,21 +92,32 @@ module ReeDto::DtoInstanceMethods
 
   contract None => String
   def to_s
-    fields = self.class.fields
-    max_length = fields.map(&:name).sort_by(&:size).last.size
-    result     = "\n#{self.class}\n"
-
-    data = fields.select { has_value?(_1.name) }.map do |field|
-      name = field.name.to_s
-      extra_spaces = ' ' * (max_length - name.size)
-      %Q(  #{name}#{extra_spaces} = #{get_value(field.name).inspect})
+    result = "#<dto #{self.class} "
+
+    data = self.class.fields.select { has_value?(_1.name) }.map do |field|
+      "#{field.name}=#{inspect_value(get_value(field.name))}"
+    end
+
+    data += self.class.collections.select { send(_1.name).size > 0 }.map do |col|
+      "#{col.name}=#{send(col.name).inspect}"
     end
 
-    result << data.join("\n")
+    result << data.join(", ")
+    result << ">"
   end
 
   contract None => String
   def inspect
     to_s
   end
+
+  private
+
+  def inspect_value(v)
+    if v.is_a?(DateTime) || v.is_a?(Date) || v.is_a?(Time)
+      v.to_s.inspect
+    else
+      v.inspect
+    end
+  end
 end

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

@@ -56,7 +56,7 @@ RSpec.describe ReeDto::DSL do
       expect {
         dto.string
       }.to raise_error do |e|
-        expect(e.message).to eq("field :string not set for:\nReeDto::DtoClass\n  with_default   = 1")
+        expect(e.message).to eq("field `string` not set for: #<dto ReeDto::DtoClass with_default=1>")
       end
     }
 

data/lib/ree_lib/version.rb

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

metadata

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